lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dsmi...@apache.org
Subject svn commit: r1536177 - in /lucene/dev/branches/branch_4x: ./ dev-tools/ dev-tools/idea/lucene/benchmark/src/ dev-tools/idea/lucene/spatial/ dev-tools/maven/lucene/benchmark/ lucene/ lucene/benchmark/ lucene/benchmark/conf/ lucene/benchmark/src/java/org...
Date Sun, 27 Oct 2013 18:19:40 GMT
Author: dsmiley
Date: Sun Oct 27 18:19:39 2013
New Revision: 1536177

URL: http://svn.apache.org/r1536177
Log:
LUCENE-2844: spatial benchmark

Added:
    lucene/dev/branches/branch_4x/lucene/benchmark/conf/spatial.alg
      - copied unchanged from r1536176, lucene/dev/trunk/lucene/benchmark/conf/spatial.alg
    lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/GeonamesLineParser.java
      - copied unchanged from r1536176, lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/GeonamesLineParser.java
    lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
      - copied unchanged from r1536176, lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java
    lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java
      - copied unchanged from r1536176, lucene/dev/trunk/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java
Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/   (props changed)
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/src/benchmark.iml
    lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml
    lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/benchmark/   (props changed)
    lucene/dev/branches/branch_4x/lucene/benchmark/build.xml
    lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/src/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/src/benchmark.iml?rev=1536177&r1=1536176&r2=1536177&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/src/benchmark.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/benchmark/src/benchmark.iml Sun Oct
27 18:19:39 2013
@@ -24,6 +24,7 @@
     <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
     <orderEntry type="module" scope="TEST" module-name="lucene-test-framework" />
     <orderEntry type="module" scope="TEST" module-name="benchmark-conf" />
+    <orderEntry type="module" module-name="spatial" />
     <orderEntry type="module" module-name="facet" />
     <orderEntry type="module" module-name="highlighter" />
     <orderEntry type="module" module-name="icu" />

Modified: lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml?rev=1536177&r1=1536176&r2=1536177&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml (original)
+++ lucene/dev/branches/branch_4x/dev-tools/idea/lucene/spatial/spatial.iml Sun Oct 27 18:19:39
2013
@@ -11,7 +11,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
+    <orderEntry type="module-library" exported="">
       <library>
         <CLASSES>
           <root url="file://$MODULE_DIR$/lib" />

Modified: lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template?rev=1536177&r1=1536176&r2=1536177&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/branch_4x/dev-tools/maven/lucene/benchmark/pom.xml.template Sun Oct
27 18:19:39 2013
@@ -80,6 +80,11 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>lucene-spatial</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>com.ibm.icu</groupId>
       <artifactId>icu4j</artifactId>
     </dependency>

Modified: lucene/dev/branches/branch_4x/lucene/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/build.xml?rev=1536177&r1=1536176&r2=1536177&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/build.xml Sun Oct 27 18:19:39 2013
@@ -37,6 +37,8 @@
         <available file="temp/20news-18828.tar.gz" property="20news-18828.exists"/>
         <available file="${working.dir}/20news-18828" property="20news-18828.expanded"/>
         <available file="${working.dir}/mini_newsgroups" property="mini.expanded"/>
+        <available file="temp/allCountries.txt.bz2" property="geonames.exists"/>
+        <available file="${working.dir}/geonames" property="geonames.expanded"/>
         
         <available file="temp/enwiki-20070527-pages-articles.xml.bz2" property="enwiki.exists"/>
         <available file="temp/enwiki-20070527-pages-articles.xml" property="enwiki.expanded"/>
@@ -62,6 +64,25 @@
         <bunzip2 src="temp/enwiki-20070527-pages-articles.xml.bz2" dest="temp"/>
     </target>
 
+    <target name="geonames-files" depends="check-files">
+        <mkdir dir="temp"/>
+        <antcall target="get-geonames"/>
+        <antcall target="expand-geonames"/>
+    </target>
+
+    <target name="get-geonames" unless="geonames.exists">
+        <!-- note: latest data is at: http://download.geonames.org/export/dump/allCountries.zip
+         and then randomize with: gsort -R -S 1500M file.txt > file_random.txt
+         and then compress with: bzip2 -9 -k file_random.txt -->
+        <get src="http://people.apache.org/~dsmiley/data/geonames_20130921_randomOrder_allCountries.txt.bz2"
+             dest="temp/allCountries.txt.bz2"/>
+    </target>
+
+    <target name="expand-geonames" unless="geonames.expanded">
+        <mkdir dir="${working.dir}/geonames"/>
+        <bunzip2 src="temp/allCountries.txt.bz2" dest="${working.dir}/geonames"/>
+    </target>
+
     <target name="get-news-20" unless="20news-18828.exists">
         <get src="http://www-2.cs.cmu.edu/afs/cs.cmu.edu/project/theo-20/www/data/news20.tar.gz"
              dest="temp/news20.tar.gz"/>
@@ -147,8 +168,10 @@
       <pathelement path="${analyzers-common.jar}"/>
       <pathelement path="${queryparser.jar}"/>
       <pathelement path="${facet.jar}"/>
+      <pathelement path="${spatial.jar}"/>
       <pathelement path="${queries.jar}"/>
       <fileset dir="${common.dir}/analysis/icu/lib"/>
+      <fileset dir="${common.dir}/spatial/lib"/>
       <path refid="base.classpath"/>
       <fileset dir="lib"/>
     </path>
@@ -158,7 +181,8 @@
         <pathelement path="${benchmark.ext.classpath}"/>
     </path>
 
-    <target name="javadocs" depends="javadocs-memory,javadocs-highlighter,javadocs-analyzers-common,javadocs-queryparser,javadocs-facet,compile-core">
+    <target name="javadocs" depends="javadocs-memory,javadocs-highlighter,javadocs-analyzers-common,
+      javadocs-queryparser,javadocs-facet,javadocs-spatial,compile-core">
     <invoke-module-javadoc>
       <links>
         <link href="../memory"/>
@@ -166,6 +190,7 @@
         <link href="../analyzers-common"/>
         <link href="../queryparser"/>
         <link href="../facet"/>
+        <link href="../spatial"/>
       </links>
     </invoke-module-javadoc>
     </target>
@@ -256,7 +281,7 @@
       </ant>
     </target>
 
-    <target name="init" depends="module-build.init,resolve-icu,jar-memory,jar-highlighter,jar-analyzers-common,jar-queryparser,jar-facet"/>
+    <target name="init" depends="module-build.init,resolve-icu,jar-memory,jar-highlighter,jar-analyzers-common,jar-queryparser,jar-facet,jar-spatial"/>
   
     <target name="compile-test" depends="copy-alg-files-for-testing,module-build.compile-test"/>
     <target name="copy-alg-files-for-testing" description="copy .alg files as resources
for testing">

Modified: lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html?rev=1536177&r1=1536176&r2=1536177&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
(original)
+++ lucene/dev/branches/branch_4x/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package.html
Sun Oct 27 18:19:39 2013
@@ -469,9 +469,10 @@ regular index/search work tasks, report 
      its own queryMaker instance.
 	 <li>
 	 <font color="#FF0066">CommitIndex</font> and 
-	 <font color="#FF0066">Optimize</font> can be used to commit
-	 changes to the index and/or optimize the index created thus
-	 far.
+	 <font color="#FF0066">ForceMerge</font> can be used to commit
+	 changes to the index then merge the index segments. The integer
+   parameter specifies how many segments to merge down to (default
+   1).
 	 <li>
 	 <font color="#FF0066">WriteLineDoc</font> prepares a 'line'
 	 file where each line holds a document with <i>title</i>, 
@@ -593,6 +594,9 @@ Here is a list of currently defined prop
     <ul><li>doc.delete.step
     </li></ul>
   </li>
+
+  <li><b>Spatial</b>: Numerous; see spatial.alg
+  </li>
   
   <li><b>Task alternative packages</b>:
     <ul><li>alt.tasks.packages



Mime
View raw message