Permalink
Browse files

refactored for maven

  • Loading branch information...
1 parent ea01076 commit e19542e32b3372883066a6a7262d38f6b34c0c4b John Wang committed Jan 21, 2011
Showing with 436 additions and 214 deletions.
  1. +5 −6 .classpath
  2. +7 −1 .project
  3. +12 −1 .settings/org.eclipse.jdt.core.prefs
  4. +201 −0 LICENSE
  5. +26 −3 pom.xml
  6. 0 src/{ → main/java}/com/kamikaze/docidset/api/DocSet.java
  7. 0 src/{ → main/java}/com/kamikaze/docidset/api/StatefulDSIterator.java
  8. 0 src/{ → main/java}/com/kamikaze/docidset/bitset/MyOpenBitSet.java
  9. 0 src/{ → main/java}/com/kamikaze/docidset/compression/CompressedSortedIntegerSegment.java
  10. 0 src/{ → main/java}/com/kamikaze/docidset/compression/P4DSet.java
  11. 0 src/{ → main/java}/com/kamikaze/docidset/compression/P4DSetNoBase.java
  12. 0 src/{ → main/java}/com/kamikaze/docidset/compression/PForDeltaCompressedSortedIntegerSegment.java
  13. 0 src/{ → main/java}/com/kamikaze/docidset/compression/PForDeltaUnpack.java
  14. 0 src/{ → main/java}/com/kamikaze/docidset/compression/PForDeltaWithBase.java
  15. 0 src/{ → main/java}/com/kamikaze/docidset/impl/AbstractDocSet.java
  16. +0 −4 src/{ → main/java}/com/kamikaze/docidset/impl/AndDocIdSet.java
  17. 0 src/{ → main/java}/com/kamikaze/docidset/impl/ImmutableDocSet.java
  18. 0 src/{ → main/java}/com/kamikaze/docidset/impl/ImmutableIntArrayDocIdSet.java
  19. 0 src/{ → main/java}/com/kamikaze/docidset/impl/IntArrayDocIdSet.java
  20. 0 src/{ → main/java}/com/kamikaze/docidset/impl/NotDocIdSet.java
  21. 0 src/{ → main/java}/com/kamikaze/docidset/impl/OBSDocIdSet.java
  22. +0 −2 src/{ → main/java}/com/kamikaze/docidset/impl/OrDocIdSet.java
  23. 0 src/{ → main/java}/com/kamikaze/docidset/impl/OrDocIdSetIterator.java
  24. 0 src/{ → main/java}/com/kamikaze/docidset/impl/P4DDocIdSet.java
  25. +1 −4 src/{ → main/java}/com/kamikaze/docidset/impl/PForDeltaAndDocIdSet.java
  26. +7 −10 src/{ → main/java}/com/kamikaze/docidset/impl/PForDeltaDocIdSet.java
  27. +0 −2 src/{ → main/java}/com/kamikaze/docidset/impl/PForDeltaOrDocIdSet.java
  28. 0 src/{ → main/java}/com/kamikaze/docidset/utils/CompResult.java
  29. 0 src/{ → main/java}/com/kamikaze/docidset/utils/DisiDocQueue.java
  30. 0 src/{ → main/java}/com/kamikaze/docidset/utils/DocSetFactory.java
  31. 0 src/{ → main/java}/com/kamikaze/docidset/utils/GenerateUnpackClass.java
  32. 0 src/{ → main/java}/com/kamikaze/docidset/utils/IntArray.java
  33. 0 src/{ → main/java}/com/kamikaze/docidset/utils/LongSegmentArray.java
  34. 0 src/{ → main/java}/com/kamikaze/docidset/utils/MyOpenBitSetArray.java
  35. 0 src/{ → main/java}/com/kamikaze/docidset/utils/PForDeltaEstimateSizeOfMultiChoices.java
  36. 0 src/{ → main/java}/com/kamikaze/docidset/utils/PForDeltaIntSegmentArray.java
  37. 0 src/{ → main/java}/com/kamikaze/docidset/utils/PrimitiveArray.java
  38. 0 src/{ → main/java}/com/kamikaze/docidset/utils/TestSizeEstimates.java
  39. 0 src/{ → main/java}/com/kamikaze/pfordelta/PForDelta.java
  40. 0 src/{ → main/java}/com/kamikaze/pfordelta/Simple16.java
  41. +1 −3 {test → src/test/java}/com/kamikaze/test/PForDeltaKamikazeTest.java
  42. +0 −6 {test → src/test/java}/com/kamikaze/test/PForDeltaMultiThreadedAccessTest.java
  43. 0 {test → src/test/java}/com/kamikaze/test/TestBooleanDocIdSet.java
  44. 0 {test → src/test/java}/com/kamikaze/test/TestDocIdSetSuite.java
  45. 0 {test → src/test/java}/com/kamikaze/test/TestDocSetFactory.java
  46. 0 {test → src/test/java}/com/kamikaze/test/TestDocSetSerialization.java
  47. 0 {test → src/test/java}/com/kamikaze/test/TestDocSets.java
  48. 0 {test → src/test/java}/com/kamikaze/test/TestKamikaze.java
  49. +104 −0 src/test/java/com/kamikaze/test/TestMultiThreadedAccess.java
  50. 0 {test → src/test/java}/com/kamikaze/test/TestParameterizedDocSets.java
  51. +72 −1 {test → src/test/java}/com/kamikaze/test/perf/PForDeltaPerfTest.java
  52. 0 {test → src/test/java}/com/kamikaze/test/perf/TestDocSets.java
  53. 0 {test → src/test/java}/com/kamikaze/test/perf/TestRealisticOrNetwork.java
  54. 0 {test → src/test/java}/com/kamikaze/test/perf/TestSizeEstimates.java
  55. +0 −1 test.txt
  56. +0 −170 test/com/kamikaze/test/TestMultiThreadedAccess.java
View
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="test"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
- <classpathentry kind="lib" path="lib/master/log4j.jar"/>
- <classpathentry kind="lib" path="lib/master/lucene-core.jar"/>
- <classpathentry kind="output" path="output"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>Kamikaze</name>
+ <name>kamikaze</name>
<comment></comment>
<projects>
</projects>
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
@@ -1,5 +1,16 @@
-#Thu Jun 26 09:39:43 PDT 2008
+#Fri Jan 21 14:15:28 PST 2011
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
View
201 LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
View
29 pom.xml
@@ -4,7 +4,7 @@
<groupId>com.snaproject.kamikaze</groupId>
<artifactId>kamikaze</artifactId>
<packaging>jar</packaging>
- <version>2.0.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<name>kamikaze</name>
<description>information retrieval utility package for enhancing Lucene</description>
<url>http://maven.apache.org</url>
@@ -23,7 +23,7 @@
<developers></developers>
<!-- Set the compiler to java6 -->
- <!--
+
<build>
<plugins>
<plugin>
@@ -35,9 +35,23 @@
<target>1.6</target>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <argLine>
+ -Xms256m -Xmx2g
+ </argLine>
+ <excludes>
+ <exclude>com/kamikaze/test/perf/*.java</exclude>
+ <exclude>**/*$*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
--->
+
<!-- Add findbugs to reporting -->
<!--
<reporting>
@@ -60,11 +74,13 @@
</distributionManagement>
<dependencies>
+ <!--
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.15</version>
</dependency>
+ -->
<dependency>
<groupId>fastutil</groupId>
<artifactId>fastutil</artifactId>
@@ -75,6 +91,13 @@
<artifactId>lucene-core</artifactId>
<version>2.9.1</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
@@ -6,7 +6,6 @@
import java.util.Comparator;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
@@ -16,9 +15,6 @@
public class AndDocIdSet extends ImmutableDocSet implements Serializable {
private static final long serialVersionUID = 1L;
-
- private static Logger log = Logger.getLogger(AndDocIdSet.class);
-
private ArrayList<Integer> _interSectionResult = new ArrayList<Integer>();
public class DescDocIdSetComparator implements Comparator<StatefulDSIterator>,
@@ -5,7 +5,6 @@
import java.util.Comparator;
import java.util.List;
-import org.apache.log4j.Logger;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
@@ -15,7 +14,6 @@
private static final int INVALID = -1;
- private static Logger log = Logger.getLogger(OrDocIdSet.class);
public class AescDocIdSetComparator implements Comparator<DocIdSetIterator>,
Serializable {
@@ -2,11 +2,10 @@
import java.io.IOException;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
-import java.util.ArrayList;
-import org.apache.log4j.Logger;
import org.apache.lucene.search.DocIdSet;
import org.apache.lucene.search.DocIdSetIterator;
@@ -21,8 +20,6 @@
public class PForDeltaAndDocIdSet extends ImmutableDocSet implements Serializable {
private static final long serialVersionUID = 1L;
- private static Logger log = Logger.getLogger(AndDocIdSet.class);
-
public class DescDocIdSetComparator implements Comparator<StatefulDSIterator>, Serializable {
private static final long serialVersionUID = 1L;
Oops, something went wrong.

0 comments on commit e19542e

Please sign in to comment.