You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pylucene-commits@lucene.apache.org by va...@apache.org on 2013/08/17 16:07:16 UTC
svn commit: r1514995 - in /lucene/pylucene/trunk: CHANGES Makefile
test/MultiSpansWrapper.py test/test_IndexDeletionPolicy.py
test/test_PhraseQuery.py test/test_PositionIncrement.py
Author: vajda
Date: Sat Aug 17 14:07:16 2013
New Revision: 1514995
URL: http://svn.apache.org/r1514995
Log:
all tests pass on trunk
Modified:
lucene/pylucene/trunk/CHANGES
lucene/pylucene/trunk/Makefile
lucene/pylucene/trunk/test/MultiSpansWrapper.py
lucene/pylucene/trunk/test/test_IndexDeletionPolicy.py
lucene/pylucene/trunk/test/test_PhraseQuery.py
lucene/pylucene/trunk/test/test_PositionIncrement.py
Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=1514995&r1=1514994&r2=1514995&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Sat Aug 17 14:07:16 2013
@@ -1,13 +1,12 @@
-Version 4.3.1 ->
+Version 4.3.0 -> 4.4.0
----------------------
- - enabled wrapping of polish analyzer and stemmer
+ - added vmargs=['-Djava.awt.headless=true'] to all initVM() calls
+ - using Lucene 4.4.0 sources
+ - added of polish analyzer and stemmer
+ - added inclusion of misc.jar because of cross-dependencies
+ - PyLucene built with JCC 2.17
-
-Version 4.3.0 -> 4.3.1
-----------------------
- - added vmargs=['-Djava.awt.headless=true'] to all unit test initVM() calls
- - using Lucene 4.3.1 sources
-
Version 3.6.2 -> 4.3.0
----------------------
- switched build to --use_full_names, Python wrappers now follow Java packages
Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1514995&r1=1514994&r2=1514995&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Sat Aug 17 14:07:16 2013
@@ -191,6 +191,7 @@ GROUPING_JAR=$(LUCENE)/build/grouping/lu
JOIN_JAR=$(LUCENE)/build/join/lucene-join-$(LUCENE_VER).jar
FACET_JAR=$(LUCENE)/build/facet/lucene-facet-$(LUCENE_VER).jar
SUGGEST_JAR=$(LUCENE)/build/suggest/lucene-suggest-$(LUCENE_VER).jar
+MISC_JAR=$(LUCENE)/build/misc/lucene-misc-$(LUCENE_VER).jar
ICUPKG:=$(shell which icupkg)
@@ -274,9 +275,12 @@ $(FACET_JAR): $(LUCENE_JAR)
$(SUGGEST_JAR): $(LUCENE_JAR)
cd $(LUCENE)/suggest; $(ANT) -Dversion=$(LUCENE_VER)
+$(MISC_JAR): $(LUCENE_JAR)
+ cd $(LUCENE)/misc; $(ANT) -Dversion=$(LUCENE_VER)
+
JCCFLAGS?=
-jars: $(JARS)
+jars: $(JARS) $(MISC_JAR)
ifneq ($(ICUPKG),)
@@ -303,7 +307,7 @@ resources:
endif
-GENERATE=$(JCC) $(foreach jar,$(JARS),--jar $(jar)) \
+GENERATE=$(JCC) $(foreach jar,$(JARS),--jar $(jar)) --include $(MISC_JAR) \
$(JCCFLAGS) --use_full_names \
--package java.lang java.lang.System \
java.lang.Runtime \
Modified: lucene/pylucene/trunk/test/MultiSpansWrapper.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/MultiSpansWrapper.py?rev=1514995&r1=1514994&r2=1514995&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/MultiSpansWrapper.py (original)
+++ lucene/pylucene/trunk/test/MultiSpansWrapper.py Sat Aug 17 14:07:16 2013
@@ -40,8 +40,7 @@ class MultiSpansWrapper(PythonSpans):
terms = TreeSet()
query.extractTerms(terms)
for term in terms:
- termContexts.put(term, TermContext.build(topLevelReaderContext, term,
- True))
+ termContexts.put(term, TermContext.build(topLevelReaderContext, term))
leaves = topLevelReaderContext.leaves()
if leaves.size() == 1:
Modified: lucene/pylucene/trunk/test/test_IndexDeletionPolicy.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/test_IndexDeletionPolicy.py?rev=1514995&r1=1514994&r2=1514995&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/test_IndexDeletionPolicy.py (original)
+++ lucene/pylucene/trunk/test/test_IndexDeletionPolicy.py Sat Aug 17 14:07:16 2013
@@ -21,7 +21,6 @@ from org.apache.lucene.index import Dire
from org.apache.pylucene.index import PythonIndexDeletionPolicy
-# Test reusableTokenStream, using ReusableAnalyzerBase:
class MyDeletionPolicy(PythonIndexDeletionPolicy):
onInitCalled = False
@@ -49,7 +48,7 @@ class IndexDeletionPolicyTestCase(PyLuce
writer = self.getWriter()
# no commits exist in the index yet
- self.assertFalse(self.policy.onInitCalled)
+ self.assertTrue(self.policy.onInitCalled)
# we haven't called commit yet
self.assertFalse(self.policy.onCommitCalled)
Modified: lucene/pylucene/trunk/test/test_PhraseQuery.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/test_PhraseQuery.py?rev=1514995&r1=1514994&r2=1514995&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/test_PhraseQuery.py (original)
+++ lucene/pylucene/trunk/test/test_PhraseQuery.py Sat Aug 17 14:07:16 2013
@@ -113,7 +113,7 @@ class PhraseQueryTestCase(PyLuceneTestCa
topDocs = self.searcher.search(self.query, 50)
self.assertEqual(0, topDocs.totalHits, "not sloppy enough")
- def testMulipleTerms(self):
+ def testMultipleTerms(self):
"""
slop is the total number of positional moves allowed
to line up a phrase
Modified: lucene/pylucene/trunk/test/test_PositionIncrement.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test/test_PositionIncrement.py?rev=1514995&r1=1514994&r2=1514995&view=diff
==============================================================================
--- lucene/pylucene/trunk/test/test_PositionIncrement.py (original)
+++ lucene/pylucene/trunk/test/test_PositionIncrement.py Sat Aug 17 14:07:16 2013
@@ -216,7 +216,6 @@ class PositionIncrementTestCase(PyLucene
count = 0
sawZero = False
-
pspans = MultiSpansWrapper.wrap(searcher.getTopReaderContext(), snq)
while pspans.next():
payloads = pspans.getPayload()