lucene-pylucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From va...@apache.org
Subject svn commit: r1757206 - in /lucene/pylucene/trunk: ./ java/org/apache/pylucene/analysis/ java/org/apache/pylucene/search/ test/
Date Mon, 22 Aug 2016 15:20:51 GMT
Author: vajda
Date: Mon Aug 22 15:20:51 2016
New Revision: 1757206

URL: http://svn.apache.org/viewvc?rev=1757206&view=rev
Log:
 - updated Makefile so that PyLucene can build from lucene's branch 6x
 - removed test_Sort.py (obsolete) and its dependent extension classes

Removed:
    lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonByteParser.java
    lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonDoubleParser.java
    lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonFloatParser.java
    lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonIntParser.java
    lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonLongParser.java
    lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonShortParser.java
    lucene/pylucene/trunk/test/test_Sort.py
Modified:
    lucene/pylucene/trunk/   (props changed)
    lucene/pylucene/trunk/CHANGES   (contents, props changed)
    lucene/pylucene/trunk/Makefile   (contents, props changed)
    lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java
    lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonCollector.java
    lucene/pylucene/trunk/test/PyLuceneTestCase.py
    lucene/pylucene/trunk/test/test_BinaryDocument.py
    lucene/pylucene/trunk/test/test_BooleanOr.py

Propchange: lucene/pylucene/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 15:20:51 2016
@@ -5,3 +5,5 @@
 /lucene/pylucene/branches/pylucene_4_3:1479735-1497065
 /lucene/pylucene/branches/pylucene_4_5:1529353-1536565
 /lucene/pylucene/branches/pylucene_4_6:1563225-1565815
+/lucene/pylucene/branches/pylucene_4_8:1591153-1608439
+/lucene/pylucene/branches/pylucene_4_9:1608478-1611288

Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=1757206&r1=1757205&r2=1757206&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Mon Aug 22 15:20:51 2016
@@ -1,7 +1,13 @@
-Version 4.8.0 ->
+Version 4.9.0 -> 4.10.1
+-----------------------
+ - using Lucene 4.10.1 sources
+ - PyLucene built with JCC 2.20
+
+Version 4.8.0 -> 4.9.0
 ----------------------
- - FacetSample.py fixed to work with Lucene 4.8 facets API (Thomas Koch)
- - 
+ - using Lucene 4.9.0 sources
+ - FacetSample.py fixed to work with Lucene 4.9 facets API (Thomas Koch)
+ - PyLucene built with JCC 2.20
 
 Version 4.7.2 -> 4.8.0
 ----------------------

Propchange: lucene/pylucene/trunk/CHANGES
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 15:20:51 2016
@@ -4,3 +4,4 @@
 /lucene/pylucene/branches/pylucene_4_5/CHANGES:1529353-1536565
 /lucene/pylucene/branches/pylucene_4_6/CHANGES:1563225-1565815
 /lucene/pylucene/branches/pylucene_4_8/CHANGES:1591153-1608439
+/lucene/pylucene/branches/pylucene_4_9/CHANGES:1608478-1611288

Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1757206&r1=1757205&r2=1757206&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Mon Aug 22 15:20:51 2016
@@ -15,10 +15,9 @@
 # site-packages directory.
 #
 
-VERSION=4.x
-LUCENE_SVN_VER=HEAD
-LUCENE_VER=4.x
-LUCENE_SVN=http://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x
+VERSION=6.x
+LUCENE_BRANCH=6x
+LUCENE_VER=6.3.0-SNAPSHOT
 PYLUCENE:=$(shell pwd)
 LUCENE_SRC=lucene-java-$(LUCENE_VER)
 LUCENE=$(LUCENE_SRC)/lucene
@@ -158,7 +157,7 @@ JARS=$(LUCENE_JAR)
 JARS+=$(ANALYZERS_JAR)          # many language analyzers
 JARS+=$(MEMORY_JAR)             # single-document memory index
 JARS+=$(HIGHLIGHTER_JAR)        # needs memory contrib
-JARS+=$(EXTENSIONS_JAR)         # needs highlighter contrib
+#JARS+=$(EXTENSIONS_JAR)         # needs highlighter contrib
 JARS+=$(QUERIES_JAR)            # regex and other contrib queries
 JARS+=$(QUERYPARSER_JAR)        # query parser
 JARS+=$(SANDBOX_JAR)            # needed by query parser
@@ -170,14 +169,13 @@ JARS+=$(JOIN_JAR)               # join m
 JARS+=$(FACET_JAR)              # facet module
 JARS+=$(SUGGEST_JAR)            # suggest/spell module
 JARS+=$(EXPRESSIONS_JAR)        # expressions module
+JARS+=$(KUROMOJI_JAR)           # japanese analyzer module
 
 
 #
 # No edits required below
 #
 
-SVNOP?=export
-
 ifeq ($(DEBUG),1)
   DEBUG_OPT=--debug
 endif
@@ -200,11 +198,12 @@ JOIN_JAR=$(LUCENE)/build/join/lucene-joi
 FACET_JAR=$(LUCENE)/build/facet/lucene-facet-$(LUCENE_VER).jar
 SUGGEST_JAR=$(LUCENE)/build/suggest/lucene-suggest-$(LUCENE_VER).jar
 EXPRESSIONS_JAR=$(LUCENE)/build/expressions/lucene-expressions-$(LUCENE_VER).jar
+KUROMOJI_JAR=$(LUCENE)/build/analysis/kuromoji/lucene-analyzers-kuromoji-$(LUCENE_VER).jar
 
 MISC_JAR=$(LUCENE)/build/misc/lucene-misc-$(LUCENE_VER).jar
-ANTLR_JAR=$(LUCENE)/expressions/lib/antlr-runtime-3.5.jar
-ASM_JAR=$(LUCENE)/expressions/lib/asm-4.1.jar
-ASM_COMMONS_JAR=$(LUCENE)/expressions/lib/asm-commons-4.1.jar
+ANTLR_JAR=$(LUCENE)/expressions/lib/antlr4-runtime-4.5.1-1.jar
+ASM_JAR=$(LUCENE)/expressions/lib/asm-5.1.jar
+ASM_COMMONS_JAR=$(LUCENE)/expressions/lib/asm-commons-5.1.jar
 
 ICUPKG:=$(shell which icupkg)
 
@@ -214,8 +213,8 @@ ICUPKG:=$(shell which icupkg)
 default: all
 
 $(LUCENE_SRC):
-	svn $(SVNOP) --depth files -r $(LUCENE_SVN_VER) $(LUCENE_SVN) $(LUCENE_SRC)
-	svn $(SVNOP) -r $(LUCENE_SVN_VER) $(LUCENE_SVN)/lucene $(LUCENE_SRC)/lucene
+	mkdir -p $(LUCENE_SRC)
+	tar -C ~/apache/lucene.$(LUCENE_BRANCH) -cf - lucene | tar -C $(LUCENE_SRC) -xvf -
 
 sources: $(LUCENE_SRC)
 
@@ -231,14 +230,6 @@ else ifeq ($(NUM_FILES),)
 endif
 	cd $(LUCENE); ($(ANT) ivy-availability-check || $(ANT) ivy-bootstrap)
 
-to-orig: sources
-	mkdir -p $(LUCENE)-orig
-	tar -C $(LUCENE) -cf - . | tar -C $(LUCENE)-orig -xvf -
-
-from-orig: $(LUCENE)-orig
-	mkdir -p $(LUCENE)
-	tar -C $(LUCENE)-orig -cf - . | tar -C $(LUCENE) -xvf -
-
 lucene:
 	rm -f $(LUCENE_JAR)
 	$(MAKE) $(LUCENE_JAR)
@@ -291,6 +282,9 @@ $(SUGGEST_JAR): $(LUCENE_JAR)
 $(EXPRESSIONS_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/expressions; $(ANT) -Dversion=$(LUCENE_VER)
 
+$(KUROMOJI_JAR): $(LUCENE_JAR)
+	cd $(LUCENE)/analysis/kuromoji; $(ANT) -Dversion=$(LUCENE_VER)
+
 $(MISC_JAR): $(LUCENE_JAR)
 	cd $(LUCENE)/misc; $(ANT) -Dversion=$(LUCENE_VER)
 

Propchange: lucene/pylucene/trunk/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 22 15:20:51 2016
@@ -5,3 +5,4 @@
 /lucene/pylucene/branches/pylucene_4_5/Makefile:1529353-1536565
 /lucene/pylucene/branches/pylucene_4_6/Makefile:1563225-1565815
 /lucene/pylucene/branches/pylucene_4_8/Makefile:1591153-1608439
+/lucene/pylucene/branches/pylucene_4_9/Makefile:1608478-1611288

Modified: lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java?rev=1757206&r1=1757205&r2=1757206&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java
(original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/analysis/PythonFilteringTokenFilter.java
Mon Aug 22 15:20:51 2016
@@ -15,7 +15,7 @@
 
 package org.apache.pylucene.analysis;
 
-import org.apache.lucene.analysis.util.FilteringTokenFilter;
+import org.apache.lucene.analysis.FilteringTokenFilter;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.util.Version;
 import java.io.IOException;

Modified: lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonCollector.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonCollector.java?rev=1757206&r1=1757205&r2=1757206&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonCollector.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/search/PythonCollector.java Mon Aug 22
15:20:51 2016
@@ -19,7 +19,6 @@ import java.io.IOException;
 
 import org.apache.lucene.search.Collector;
 import org.apache.lucene.search.Scorer;
-import org.apache.lucene.index.AtomicReaderContext;
 
 
 public class PythonCollector extends Collector {

Modified: lucene/pylucene/trunk/test/PyLuceneTestCase.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/PyLuceneTestCase.py?rev=1757206&r1=1757205&r2=1757206&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/PyLuceneTestCase.py (original)
+++ lucene/pylucene/trunk/test/PyLuceneTestCase.py Mon Aug 22 15:20:51 2016
@@ -31,7 +31,6 @@ class PyLuceneTestCase(TestCase):
 
     def __init__(self, *args):
         super(PyLuceneTestCase, self).__init__(*args)
-        self.TEST_VERSION = Version.LUCENE_CURRENT
 
     def setUp(self):
         self.directory = RAMDirectory()
@@ -40,12 +39,12 @@ class PyLuceneTestCase(TestCase):
         self.directory.close()
 
     def getConfig(self, analyzer=None):
-        return IndexWriterConfig(self.TEST_VERSION, analyzer)
-        
+        return IndexWriterConfig(analyzer)
+
     def getWriter(self, directory=None, analyzer=None, open_mode=None,
                   similarity=None, maxBufferedDocs=None, mergePolicy=None):
         if analyzer is None:
-            analyzer = LimitTokenCountAnalyzer(WhitespaceAnalyzer(self.TEST_VERSION), 10000)
+            analyzer = LimitTokenCountAnalyzer(WhitespaceAnalyzer(), 10000)
         config = self.getConfig(analyzer)
 
         if open_mode is None:

Modified: lucene/pylucene/trunk/test/test_BinaryDocument.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/test_BinaryDocument.py?rev=1757206&r1=1757205&r2=1757206&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/test_BinaryDocument.py (original)
+++ lucene/pylucene/trunk/test/test_BinaryDocument.py Mon Aug 22 15:20:51 2016
@@ -45,7 +45,7 @@ class TestBinaryDocument(PyLuceneTestCas
         self.assertEqual(2, doc.fields.size())
     
         # add the doc to a ram index
-        writer = self.getWriter(analyzer=StandardAnalyzer(Version.LUCENE_CURRENT))
+        writer = self.getWriter(analyzer=StandardAnalyzer())
         writer.addDocument(doc)
         writer.close()
     
@@ -78,7 +78,7 @@ class TestBinaryDocument(PyLuceneTestCas
         doc.add(stringFldCompressed)
     
         # add the doc to a ram index
-        writer = self.getWriter(analyzer=StandardAnalyzer(Version.LUCENE_CURRENT))
+        writer = self.getWriter(analyzer=StandardAnalyzer())
         writer.addDocument(doc)
         writer.close()
     

Modified: lucene/pylucene/trunk/test/test_BooleanOr.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/test_BooleanOr.py?rev=1757206&r1=1757205&r2=1757206&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/test_BooleanOr.py (original)
+++ lucene/pylucene/trunk/test/test_BooleanOr.py Mon Aug 22 15:20:51 2016
@@ -45,7 +45,7 @@ class BooleanOrTestCase(PyLuceneTestCase
         super(BooleanOrTestCase, self).setUp()
 
         # add the doc to a ram index
-        writer = self.getWriter(analyzer=StandardAnalyzer(Version.LUCENE_CURRENT))
+        writer = self.getWriter(analyzer=StandardAnalyzer())
         d = Document()
         d.add(Field(self.FIELD_T, "Optimize not deleting all files",
                     TextField.TYPE_STORED))



Mime
View raw message