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 2022/01/04 18:06:15 UTC
svn commit: r1896669 - in /lucene/pylucene/trunk: ./ java/org/apache/pylucene/queries/ java/org/apache/pylucene/queries/spans/ java/org/apache/pylucene/queryparser/classic/ java/org/apache/pylucene/search/spans/ java/org/apache/pylucene/util/ python/ t...
Author: vajda
Date: Tue Jan 4 18:06:15 2022
New Revision: 1896669
URL: http://svn.apache.org/viewvc?rev=1896669&view=rev
Log:
PyLucene builds and passes tests with Lucene 9.0
Added:
lucene/pylucene/trunk/java/org/apache/pylucene/queries/
lucene/pylucene/trunk/java/org/apache/pylucene/queries/spans/
- copied from r1896668, lucene/pylucene/trunk/java/org/apache/pylucene/search/spans/
Removed:
lucene/pylucene/trunk/java/org/apache/pylucene/search/spans/
Modified:
lucene/pylucene/trunk/CHANGES
lucene/pylucene/trunk/Makefile
lucene/pylucene/trunk/java/org/apache/pylucene/queries/spans/PythonSpanCollector.java
lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonMultiFieldQueryParser.java
lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java
lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonComparable.java
lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonIterator.java
lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonList.java
lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonListIterator.java
lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonSet.java
lucene/pylucene/trunk/python/ICUFoldingFilter.py
lucene/pylucene/trunk/test2/PyLuceneTestCase.py
lucene/pylucene/trunk/test2/test_FuzzyQuery.py
lucene/pylucene/trunk/test2/test_ICUFoldingFilter.py
lucene/pylucene/trunk/test2/test_PyLucene.py
lucene/pylucene/trunk/test2/test_bug1763.py
lucene/pylucene/trunk/test3/PyLuceneTestCase.py
lucene/pylucene/trunk/test3/test_FuzzyQuery.py
lucene/pylucene/trunk/test3/test_ICUFoldingFilter.py
lucene/pylucene/trunk/test3/test_PyLucene.py
lucene/pylucene/trunk/test3/test_bug1763.py
Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Tue Jan 4 18:06:15 2022
@@ -1,3 +1,8 @@
+Version 8.11.0 ->
+-----------------------
+ - using Lucene 9.0 sources
+ - PyLucene built with JCC 3.11
+
Version 8.9.0 -> 8.11.0
-----------------------
- using Lucene 8.11.0 sources
Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Tue Jan 4 18:06:15 2022
@@ -15,8 +15,8 @@
# site-packages directory.
#
-VERSION=8.11.0
-LUCENE_VER=8.11.0
+VERSION=9.0.0
+LUCENE_VER=9.0.0
PYLUCENE:=$(shell pwd)
LUCENE_SRC=lucene-java-$(LUCENE_VER)
LUCENE=$(LUCENE_SRC)/lucene
@@ -44,90 +44,61 @@ LUCENE=$(LUCENE_SRC)/lucene
#
# Mac OS X 11.4 (64-bit intel Python 3.9, Java 17)
-#PREFIX_PYTHON=/Users/vajda/apache/pylucene/_install3
-#ANT=/Users/vajda/tmp/apache-ant-1.9.3/bin/ant
-#PYTHON=$(PREFIX_PYTHON)/bin/python
-#JCC=$(PYTHON) -m jcc --shared --arch x86_64 --wheel
-#NUM_FILES=10
+PREFIX_PYTHON=/Users/vajda/apache/pylucene/_install3
+PYTHON=$(PREFIX_PYTHON)/bin/python
+JCC=$(PYTHON) -m jcc --shared --arch x86_64 --wheel
+NUM_FILES=16
-# Mac OS X 10.15 (64-bit Python 2.7, Java 11)
+# Mac OS X 11.4 (64-bit Python 2.7, Java 17)
#PREFIX_PYTHON=/Users/vajda/apache/pylucene/_install2
-#ANT=/Users/vajda/tmp/apache-ant-1.9.3/bin/ant
#PYTHON=$(PREFIX_PYTHON)/bin/python
#JCC=$(PYTHON) -m jcc.__main__ --shared --arch x86_64
-#NUM_FILES=10
-
-# Mac OS X (Python 2.3.5, Java 1.5, setuptools 0.6c7, Intel Mac OS X 10.4)
-#PREFIX_PYTHON=/usr
-#ANT=ant
-#PYTHON=$(PREFIX_PYTHON)/bin/python
-#JCC=$(PYTHON) /System/Library/Frameworks/Python.framework/Versions/2.3/lib/python2.3/site-packages/JCC-2.3-py2.3-macosx-10.4-i386.egg/jcc/__init__.py
-#NUM_FILES=10
+#NUM_FILES=16
# Linux (Debian Jessie 64-bit, Python 3.4.2, Oracle Java 1.8
# Be sure to also set JDK['linux'] in jcc's setup.py to the JAVA_HOME value
# used below for ANT (and rebuild jcc after changing it).
#PREFIX_PYTHON=/usr
-#ANT=JAVA_HOME=/usr/lib/jvm/java-8-oracle /usr/bin/ant
#PYTHON=$(PREFIX_PYTHON)/bin/python3
#JCC=$(PYTHON) -m jcc --shared
-#NUM_FILES=10
+#NUM_FILES=16
# Linux (Debian Jessie 64-bit, Python 2.7.9, Oracle Java 1.8
# Be sure to also set JDK['linux2'] in jcc's setup.py to the JAVA_HOME value
# used below for ANT (and rebuild jcc after changing it).
#PREFIX_PYTHON=/opt/apache/pylucene/_install
-#ANT=JAVA_HOME=/usr/lib/jvm/java-8-oracle /usr/bin/ant
#PYTHON=$(PREFIX_PYTHON)/bin/python
#JCC=$(PYTHON) -m jcc --shared
-#NUM_FILES=10
-
-# Linux (Ubuntu 6.06, Python 2.4, Java 1.5, no setuptools)
-#PREFIX_PYTHON=/usr
-#ANT=ant
-#PYTHON=$(PREFIX_PYTHON)/bin/python
-#JCC=$(PYTHON) $(PREFIX_PYTHON)/lib/python2.4/site-packages/jcc/__init__.py
-#NUM_FILES=10
+#NUM_FILES=16
# FreeBSD
#PREFIX_PYTHON=/usr
-#ANT=ant
#PYTHON=$(PREFIX_PYTHON)/bin/python
#JCC=$(PYTHON) -m jcc
-#NUM_FILES=10
-
-# Solaris (Solaris 11, Python 2.4 32-bit, Sun Studio 12, Java 1.6)
-#PREFIX_PYTHON=/usr
-#ANT=/usr/local/apache-ant-1.7.0/bin/ant
-#PYTHON=$(PREFIX_PYTHON)/bin/python
-#JCC=$(PYTHON) $(PREFIX_PYTHON)/lib/python2.4/site-packages/jcc/__init__.py
-#NUM_FILES=10
+#NUM_FILES=16
# Windows (Win32, Python 2.5.1, Java 1.6, ant 1.7.0)
#PREFIX_PYTHON=/cygdrive/o/Python-2.5.2/PCbuild
-#ANT=JAVA_HOME=o:\\Java\\jdk1.6.0_02 /cygdrive/o/java/apache-ant-1.7.0/bin/ant
#PYTHON=$(PREFIX_PYTHON)/python.exe
#JCC=$(PYTHON) -m jcc --shared
-#NUM_FILES=10
+#NUM_FILES=16
# Windows (Win32, msys/MinGW, Python 2.6.4, Java 1.6, ant 1.7.1 (WinAnt))
#PREFIX_PYTHON=/c/Python26
-#ANT=JAVA_HOME="c:\\Program Files\\Java\\jdk1.6.0_18" "/c/Program Files/WinAnt/bin/ant"
#PYTHON=$(PREFIX_PYTHON)/python.exe
#JCC=$(PYTHON) -m jcc.__main__ --shared --compiler mingw32
-#NUM_FILES=10
+#NUM_FILES=16
# Windows (Win32, Python 2.7, Java 1.6, ant 1.8.1, Java not on PATH)
#PREFIX_PYTHON=/cygdrive/c/Python27
-#ANT=JAVA_HOME=c:\\jdk1.6.0_22 /cygdrive/c/java/apache-ant-1.8.1/bin/ant
#PYTHON=$(PREFIX_PYTHON)/python.exe
#JCC=$(PYTHON) -m jcc --shared --find-jvm-dll
-#NUM_FILES=10
+#NUM_FILES=16
JARS=$(LUCENE_JAR)
# comment/uncomment the desired/undesired optional contrib modules below
-JARS+=$(ANALYZERS_JAR) # many language analyzers
+JARS+=$(ANALYSIS_JAR) # many language analyzers
JARS+=$(BACKWARD_CODECS_JAR) # backward codecs
JARS+=$(CLASSIFICATION_JAR) # classification module
JARS+=$(CODECS_JAR) # codecs
@@ -138,7 +109,6 @@ JARS+=$(GROUPING_JAR) # groupi
JARS+=$(HIGHLIGHTER_JAR) # highlighter module, needs memory contrib
JARS+=$(JOIN_JAR) # join module
JARS+=$(KUROMOJI_JAR) # japanese analyzer module
-#JARS+=$(LUKE_JAR) # luke
JARS+=$(MEMORY_JAR) # single-document memory index
JARS+=$(MISC_JAR) # misc
JARS+=$(MORFOLOGIK_JAR) # morfologik analyzer module
@@ -164,146 +134,55 @@ endif
DEFINES=-DPYLUCENE_VER="\"$(VERSION)\"" -DLUCENE_VER="\"$(LUCENE_VER)\""
-LUCENE_JAR=$(LUCENE)/build/core/lucene-core-$(LUCENE_VER).jar
+LUCENE_JAR=$(LUCENE)/core/build/runtimeJars/lucene-core-$(LUCENE_VER)-SNAPSHOT.jar
-ANALYZERS_JAR=$(LUCENE)/build/analysis/common/lucene-analyzers-common-$(LUCENE_VER).jar
-BACKWARD_CODECS_JAR=$(LUCENE)/build/backward-codecs/lucene-backward-codecs-$(LUCENE_VER).jar
-CLASSIFICATION_JAR=$(LUCENE)/build/classification/lucene-classification-$(LUCENE_VER).jar
-CODECS_JAR=$(LUCENE)/build/codecs/lucene-codecs-$(LUCENE_VER).jar
-EXPRESSIONS_JAR=$(LUCENE)/build/expressions/lucene-expressions-$(LUCENE_VER).jar
-EXTENSIONS_JAR=build/jar/extensions.jar
-FACET_JAR=$(LUCENE)/build/facet/lucene-facet-$(LUCENE_VER).jar
-GROUPING_JAR=$(LUCENE)/build/grouping/lucene-grouping-$(LUCENE_VER).jar
-HIGHLIGHTER_JAR=$(LUCENE)/build/highlighter/lucene-highlighter-$(LUCENE_VER).jar
-JOIN_JAR=$(LUCENE)/build/join/lucene-join-$(LUCENE_VER).jar
-KUROMOJI_JAR=$(LUCENE)/build/analysis/kuromoji/lucene-analyzers-kuromoji-$(LUCENE_VER).jar
-LUKE_JAR=$(LUCENE)/build/luke/lucene-luke-$(LUCENE_VER).jar
-MEMORY_JAR=$(LUCENE)/build/memory/lucene-memory-$(LUCENE_VER).jar
-MISC_JAR=$(LUCENE)/build/misc/lucene-misc-$(LUCENE_VER).jar
-NORI_JAR=$(LUCENE)/build/analysis/nori/lucene-analyzers-nori-$(LUCENE_VER).jar
-PHONETIC_JAR=$(LUCENE)/build/analysis/phonetic/lucene-analyzers-phonetic-$(LUCENE_VER).jar
-QUERIES_JAR=$(LUCENE)/build/queries/lucene-queries-$(LUCENE_VER).jar
-QUERYPARSER_JAR=$(LUCENE)/build/queryparser/lucene-queryparser-$(LUCENE_VER).jar
-SANDBOX_JAR=$(LUCENE)/build/sandbox/lucene-sandbox-$(LUCENE_VER).jar
-SMARTCN_JAR=$(LUCENE)/build/analysis/smartcn/lucene-analyzers-smartcn-$(LUCENE_VER).jar
-SPATIAL3D_JAR=$(LUCENE)/build/spatial3d/lucene-spatial3d-$(LUCENE_VER).jar
-SPATIAL_EXTRAS_JAR=$(LUCENE)/build/spatial-extras/lucene-spatial-extras-$(LUCENE_VER).jar
-STEMPEL_JAR=$(LUCENE)/build/analysis/stempel/lucene-analyzers-stempel-$(LUCENE_VER).jar
-SUGGEST_JAR=$(LUCENE)/build/suggest/lucene-suggest-$(LUCENE_VER).jar
-
-ANTLR_JAR=$(LUCENE)/expressions/lib/antlr4-runtime-4.5.1-1.jar
-ASM_JAR=$(LUCENE)/expressions/lib/asm-8.0.1.jar
-ASM_COMMONS_JAR=$(LUCENE)/expressions/lib/asm-commons-8.0.1.jar
-HPPC_JAR=$(LUCENE)/facet/lib/hppc-0.8.1.jar
-LOG4J_API_JAR=$(LUCENE)/luke/lib/log4j-api-2.11.2.jar
-LOG4J_CORE_JAR=$(LUCENE)/luke/lib/log4j-core-2.11.2.jar
+ANALYSIS_JAR=$(LUCENE)/analysis/common/build/runtimeJars/lucene-analysis-common-$(LUCENE_VER)-SNAPSHOT.jar
+BACKWARD_CODECS_JAR=$(LUCENE)/backward-codecs/build/runtimeJars/lucene-backward-codecs-$(LUCENE_VER)-SNAPSHOT.jar
+CLASSIFICATION_JAR=$(LUCENE)/classification/build/runtimeJars/lucene-classification-$(LUCENE_VER)-SNAPSHOT.jar
+CODECS_JAR=$(LUCENE)/codecs/build/runtimeJars/lucene-codecs-$(LUCENE_VER)-SNAPSHOT.jar
+EXPRESSIONS_JAR=$(LUCENE)/expressions/build/runtimeJars/lucene-expressions-$(LUCENE_VER)-SNAPSHOT.jar
+EXTENSIONS_JAR=$(LUCENE)/extensions/build/runtimeJars/lucene-extensions-$(LUCENE_VER)-SNAPSHOT.jar
+FACET_JAR=$(LUCENE)/facet/build/runtimeJars/lucene-facet-$(LUCENE_VER)-SNAPSHOT.jar
+GROUPING_JAR=$(LUCENE)/grouping/build/runtimeJars/lucene-grouping-$(LUCENE_VER)-SNAPSHOT.jar
+HIGHLIGHTER_JAR=$(LUCENE)/highlighter/build/runtimeJars/lucene-highlighter-$(LUCENE_VER)-SNAPSHOT.jar
+JOIN_JAR=$(LUCENE)/join/build/runtimeJars/lucene-join-$(LUCENE_VER)-SNAPSHOT.jar
+KUROMOJI_JAR=$(LUCENE)/analysis/kuromoji/build/runtimeJars/lucene-analysis-kuromoji-$(LUCENE_VER)-SNAPSHOT.jar
+MEMORY_JAR=$(LUCENE)/memory/build/runtimeJars/lucene-memory-$(LUCENE_VER)-SNAPSHOT.jar
+MISC_JAR=$(LUCENE)/misc/build/runtimeJars/lucene-misc-$(LUCENE_VER)-SNAPSHOT.jar
+NORI_JAR=$(LUCENE)/analysis/nori/build/runtimeJars/lucene-analysis-nori-$(LUCENE_VER)-SNAPSHOT.jar
+PHONETIC_JAR=$(LUCENE)/analysis/phonetic/build/runtimeJars/lucene-analysis-phonetic-$(LUCENE_VER)-SNAPSHOT.jar
+QUERIES_JAR=$(LUCENE)/queries/build/runtimeJars/lucene-queries-$(LUCENE_VER)-SNAPSHOT.jar
+QUERYPARSER_JAR=$(LUCENE)/queryparser/build/runtimeJars/lucene-queryparser-$(LUCENE_VER)-SNAPSHOT.jar
+SANDBOX_JAR=$(LUCENE)/sandbox/build/runtimeJars/lucene-sandbox-$(LUCENE_VER)-SNAPSHOT.jar
+SMARTCN_JAR=$(LUCENE)/analysis/smartcn/build/runtimeJars/lucene-analysis-smartcn-$(LUCENE_VER)-SNAPSHOT.jar
+SPATIAL3D_JAR=$(LUCENE)/spatial3d/build/runtimeJars/lucene-spatial3d-$(LUCENE_VER)-SNAPSHOT.jar
+SPATIAL_EXTRAS_JAR=$(LUCENE)/spatial-extras/build/runtimeJars/lucene-spatial-extras-$(LUCENE_VER)-SNAPSHOT.jar
+STEMPEL_JAR=$(LUCENE)/analysis/stempel/build/runtimeJars/lucene-analysis-stempel-$(LUCENE_VER)-SNAPSHOT.jar
+SUGGEST_JAR=$(LUCENE)/suggest/build/runtimeJars/lucene-suggest-$(LUCENE_VER)-SNAPSHOT.jar
+
+ANTLR_JAR=$(LUCENE)/expressions/build/runtimeJars/antlr4-runtime-4.5.1-1.jar
+ASM_JAR=$(LUCENE)/expressions/build/runtimeJars/asm-7.2.jar
+ASM_COMMONS_JAR=$(LUCENE)/expressions/build/runtimeJars/asm-commons-7.2.jar
+HPPC_JAR=$(LUCENE)/facet/build/runtimeJars/hppc-0.9.0.jar
ICUPKG:=$(shell which icupkg)
.PHONY: generate compile install default all clean realclean \
- sources ivy test jars distrib now
+ sources test jars distrib now
default: all
$(LUCENE_SRC):
mkdir -p $(LUCENE_SRC)
- tar -C ~/apache/lucene.git -cf - lucene | tar -C $(LUCENE_SRC) -xvf -
+ tar -C ~/apache/lucene.git -cf - . | tar -C $(LUCENE_SRC) -xvf -
+ mkdir -p $(LUCENE_SRC)/lucene/extensions/src
+ tar -cf - java | tar -C $(LUCENE_SRC)/lucene/extensions/src -xvf -
sources: $(LUCENE_SRC)
-ivy:
-ifeq ($(ANT),)
- $(error ANT is not defined, please edit Makefile as required at top)
-else ifeq ($(PYTHON),)
- $(error PYTHON is not defined, please edit Makefile as required at top)
-else ifeq ($(JCC),)
- $(error JCC is not defined, please edit Makefile as required at top)
-else ifeq ($(NUM_FILES),)
- $(error NUM_FILES is not defined, please edit Makefile as required at top)
-endif
- cd $(LUCENE); ($(ANT) ivy-availability-check || $(ANT) ivy-bootstrap)
-
lucene:
- rm -f $(LUCENE_JAR)
- $(MAKE) $(LUCENE_JAR)
-
-$(LUCENE_JAR): $(LUCENE)
- cd $(LUCENE); $(ANT) -Dversion=$(LUCENE_VER)
-
-$(ANALYZERS_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/analysis; $(ANT) -Dversion=$(LUCENE_VER) compile
-
-$(MEMORY_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/memory; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(HIGHLIGHTER_JAR): $(LUCENE_JAR) $(MEMORY_JAR)
- cd $(LUCENE)/highlighter; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(QUERIES_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/queries; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(QUERYPARSER_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/queryparser; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(SANDBOX_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/sandbox; $(ANT) -Dversion=$(LUCENE_VER)
+ (cd $(LUCENE_SRC); ./gradlew collectRuntimeJars)
-$(EXTENSIONS_JAR): $(LUCENE_JAR) $(HIGHLIGHTER_JAR) $(QUERYPARSER_JAR)
- $(ANT) -f extensions.xml -Dlucene.dir=$(LUCENE_SRC)
-
-$(SMARTCN_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/analysis/smartcn; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(STEMPEL_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/analysis/stempel; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(SPATIAL_EXTRAS_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/spatial-extras; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(SPATIAL3D_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/spatial3d; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(GROUPING_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/grouping; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(JOIN_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/join; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(FACET_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/facet; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(SUGGEST_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/suggest; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(EXPRESSIONS_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/expressions; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(KUROMOJI_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/analysis/kuromoji; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(NORI_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/analysis/nori; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(PHONETIC_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/analysis/phonetic; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(MORFOLOGIK_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/analysis/morfologik; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(MISC_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/misc; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(CODECS_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/codecs; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(BACKWARD_CODECS_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/backward-codecs; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(CLASSIFICATION_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/classification; $(ANT) -Dversion=$(LUCENE_VER)
-
-$(LUKE_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/luke; $(ANT) -Dversion=$(LUCENE_VER)
JCCFLAGS?=
@@ -364,8 +243,8 @@ GENERATE=$(JCC) $(foreach jar,$(JARS),--
--package org.antlr.v4.runtime.atn \
--exclude org.apache.lucene.sandbox.queries.regex.JakartaRegexpCapabilities \
--exclude org.apache.regexp.RegexpTunnel \
- --exclude org.apache.lucene.store.WindowsDirectory \
- --exclude org.apache.lucene.store.NativePosixUtil \
+ --exclude org.apache.lucene.misc.store.WindowsDirectory \
+ --exclude org.apache.lucene.misc.store.NativePosixUtil \
--python lucene \
--mapping org.apache.lucene.document.Document 'get:(Ljava/lang/String;)Ljava/lang/String;' \
--mapping java.util.Properties 'getProperty:(Ljava/lang/String;)Ljava/lang/String;' \
@@ -399,15 +278,14 @@ bdist: jars
wininst: jars
$(GENERATE) --wininst
-all: sources ivy jars resources compile
+all: sources jars resources compile
@echo build of pylucene $(LUCENE_VER) complete
clean:
- if test -f $(LUCENE)/build.xml; then cd $(LUCENE); $(ANT) clean; fi
- rm -rf $(LUCENE)/build build
+ (cd $(LUCENE_SRC); ./gradlew clean)
realclean:
- if test ! -d $(LUCENE_SRC)/.svn; then rm -rf $(LUCENE_SRC) lucene.egg-info; else rm -rf $(LUCENE)/build; fi
+ rm -rf $(LUCENE_SRC) lucene.egg-info
rm -rf build
OS=$(shell uname)
@@ -443,8 +321,5 @@ distrib:
stage:
cd distrib; cp -p $(ARCHIVE) $(ARCHIVE).asc $(ARCHIVE).sha256 ../../dist/dev/pylucene/
-release:
- cd distrib; cp -p $(ARCHIVE) $(ARCHIVE).asc $(ARCHIVE).sha256 ../../dist/release/pylucene/
-
print-%:
@echo $* = $($*)
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/queries/spans/PythonSpanCollector.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/queries/spans/PythonSpanCollector.java?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/queries/spans/PythonSpanCollector.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/queries/spans/PythonSpanCollector.java Tue Jan 4 18:06:15 2022
@@ -13,14 +13,14 @@
* ====================================================================
*/
-package org.apache.pylucene.search.spans;
+package org.apache.pylucene.queries.spans;
import java.io.IOException;
import org.apache.lucene.index.PostingsEnum;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.spans.SpanCollector;
+import org.apache.lucene.queries.spans.SpanCollector;
public class PythonSpanCollector implements SpanCollector {
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonMultiFieldQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonMultiFieldQueryParser.java?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonMultiFieldQueryParser.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonMultiFieldQueryParser.java Tue Jan 4 18:06:15 2022
@@ -18,6 +18,7 @@ package org.apache.pylucene.queryparser.
import java.util.List;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.Query;
import org.apache.lucene.queryparser.classic.MultiFieldQueryParser;
import org.apache.lucene.queryparser.classic.ParseException;
@@ -50,7 +51,7 @@ public class PythonMultiFieldQueryParser
public native void pythonDecRef();
@Override
- public native Query getBooleanQuery(List clauses);
+ public native Query getBooleanQuery(List<BooleanClause> clauses);
@Override
public native Query getFuzzyQuery(String field, String termText,
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/queryparser/classic/PythonQueryParser.java Tue Jan 4 18:06:15 2022
@@ -18,9 +18,10 @@ package org.apache.pylucene.queryparser.
import java.util.List;
import org.apache.lucene.analysis.Analyzer;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.Query;
+import org.apache.lucene.queryparser.charstream.CharStream;
import org.apache.lucene.queryparser.classic.QueryParser;
-import org.apache.lucene.queryparser.classic.CharStream;
import org.apache.lucene.queryparser.classic.ParseException;
@@ -56,7 +57,7 @@ public class PythonQueryParser extends Q
public native void pythonDecRef();
@Override
- public native Query getBooleanQuery(List clauses);
+ public native Query getBooleanQuery(List<BooleanClause> clauses);
@Override
public native Query getFuzzyQuery(String field, String termText,
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonComparable.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonComparable.java?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonComparable.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonComparable.java Tue Jan 4 18:06:15 2022
@@ -16,7 +16,7 @@
package org.apache.pylucene.util;
-public class PythonComparable implements Comparable {
+public class PythonComparable implements Comparable<Object> {
private long pythonObject;
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonIterator.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonIterator.java?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonIterator.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonIterator.java Tue Jan 4 18:06:15 2022
@@ -18,7 +18,7 @@ package org.apache.pylucene.util;
import java.util.Iterator;
-public class PythonIterator implements Iterator {
+public class PythonIterator implements Iterator<Object> {
private long pythonObject;
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonList.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonList.java?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonList.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonList.java Tue Jan 4 18:06:15 2022
@@ -21,7 +21,7 @@ import java.util.Collection;
import java.util.Iterator;
import java.lang.reflect.Array;
-public class PythonList implements List {
+public class PythonList implements List<Object> {
private long pythonObject;
@@ -51,17 +51,15 @@ public class PythonList implements List
@Override
public native void add(int index, Object obj);
@Override
- public native boolean addAll(Collection c);
+ public native boolean addAll(Collection<? extends Object> c);
@Override
- public native boolean addAll(int index, Collection c);
+ public native boolean addAll(int index, Collection<? extends Object> c);
@Override
public native void clear();
@Override
public native boolean contains(Object obj);
@Override
- public native boolean containsAll(Collection c);
- @Override
- public native boolean equals(Object obj);
+ public native boolean containsAll(Collection<? extends Object> c);
@Override
public native Object get(int index);
// public native int hashCode();
@@ -70,13 +68,13 @@ public class PythonList implements List
@Override
public native boolean isEmpty();
@Override
- public native Iterator iterator();
+ public native Iterator<Object> iterator();
@Override
public native int lastIndexOf(Object obj);
- public native ListIterator listIterator(int index);
+ public native ListIterator<Object> listIterator(int index);
@Override
- public ListIterator listIterator()
+ public ListIterator<Object> listIterator()
{
return listIterator(0);
}
@@ -100,17 +98,17 @@ public class PythonList implements List
}
@Override
- public native boolean removeAll(Collection c);
+ public native boolean removeAll(Collection<? extends Object> c);
@Override
- public native boolean retainAll(Collection c);
+ public native boolean retainAll(Collection<? extends Object> c);
@Override
public native Object set(int index, Object obj);
@Override
public native int size();
- private native List subListChecked(int fromIndex, int toIndex);
+ private native List<Object> subListChecked(int fromIndex, int toIndex);
@Override
- public List subList(int fromIndex, int toIndex)
+ public List<Object> subList(int fromIndex, int toIndex)
throws IndexOutOfBoundsException, IllegalArgumentException
{
if (fromIndex < 0 || toIndex >= size() || fromIndex > toIndex)
@@ -118,7 +116,8 @@ public class PythonList implements List
return subListChecked(fromIndex, toIndex);
}
-
+
+ @Override
public native Object[] toArray();
@Override
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonListIterator.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonListIterator.java?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonListIterator.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonListIterator.java Tue Jan 4 18:06:15 2022
@@ -17,7 +17,8 @@ package org.apache.pylucene.util;
import java.util.ListIterator;
-public class PythonListIterator extends PythonIterator implements ListIterator {
+public class PythonListIterator extends PythonIterator
+ implements ListIterator<Object> {
@Override
public native boolean hasPrevious();
@Override
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonSet.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonSet.java?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonSet.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/util/PythonSet.java Tue Jan 4 18:06:15 2022
@@ -21,7 +21,7 @@ import java.util.Iterator;
import java.lang.reflect.Array;
-public class PythonSet implements Set {
+public class PythonSet implements Set<Object> {
private long pythonObject;
@@ -49,28 +49,27 @@ public class PythonSet implements Set {
@Override
public native boolean add(Object obj);
@Override
- public native boolean addAll(Collection c);
+ public native boolean addAll(Collection<? extends Object> c);
@Override
public native void clear();
@Override
public native boolean contains(Object obj);
@Override
- public native boolean containsAll(Collection c);
- @Override
- public native boolean equals(Object obj);
+ public native boolean containsAll(Collection<? extends Object> c);
@Override
public native boolean isEmpty();
@Override
- public native Iterator iterator();
+ public native Iterator<Object> iterator();
@Override
public native boolean remove(Object obj);
@Override
- public native boolean removeAll(Collection c);
+ public native boolean removeAll(Collection<? extends Object> c);
@Override
- public native boolean retainAll(Collection c);
+ public native boolean retainAll(Collection<? extends Object> c);
@Override
public native int size();
+ @Override
public native Object[] toArray();
@Override
Modified: lucene/pylucene/trunk/python/ICUFoldingFilter.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/python/ICUFoldingFilter.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/python/ICUFoldingFilter.py (original)
+++ lucene/pylucene/trunk/python/ICUFoldingFilter.py Tue Jan 4 18:06:15 2022
@@ -54,14 +54,19 @@
#
# ====================================================================
-import os, lucene
+import os, sys, lucene
from lucene.ICUNormalizer2Filter import ICUNormalizer2Filter
from icu import ResourceBundle, Normalizer2, UNormalizationMode2
-utr30 = os.path.join(lucene.__module_dir__, 'resources',
- 'org', 'apache', 'lucene', 'analysis', 'icu',
- 'utr30.dat')
+if sys.version_info < (3,):
+ utr30 = os.path.join(lucene.__dir__, 'resources',
+ 'org', 'apache', 'lucene', 'analysis', 'icu',
+ 'utr30.dat')
+else:
+ utr30 = os.path.join(lucene.__module_dir__, 'resources',
+ 'org', 'apache', 'lucene', 'analysis', 'icu',
+ 'utr30.dat')
print(utr30)
ResourceBundle.setAppData("utr30", utr30)
Modified: lucene/pylucene/trunk/test2/PyLuceneTestCase.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test2/PyLuceneTestCase.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test2/PyLuceneTestCase.py (original)
+++ lucene/pylucene/trunk/test2/PyLuceneTestCase.py Tue Jan 4 18:06:15 2022
@@ -23,7 +23,7 @@ from org.apache.lucene.analysis.miscella
from org.apache.lucene.index import \
IndexWriter, IndexWriterConfig, DirectoryReader
from org.apache.lucene.search import IndexSearcher
-from org.apache.lucene.store import RAMDirectory
+from org.apache.lucene.store import ByteBuffersDirectory
from org.apache.lucene.util import Version
@@ -33,7 +33,7 @@ class PyLuceneTestCase(TestCase):
super(PyLuceneTestCase, self).__init__(*args)
def setUp(self):
- self.directory = RAMDirectory()
+ self.directory = ByteBuffersDirectory()
def tearDown(self):
self.directory.close()
Modified: lucene/pylucene/trunk/test2/test_FuzzyQuery.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test2/test_FuzzyQuery.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test2/test_FuzzyQuery.py (original)
+++ lucene/pylucene/trunk/test2/test_FuzzyQuery.py Tue Jan 4 18:06:15 2022
@@ -21,7 +21,7 @@ from org.apache.lucene.analysis.standard
from org.apache.lucene.document import Document, Field, TextField
from org.apache.lucene.index import MultiReader, Term
from org.apache.lucene.search import FuzzyQuery, MultiTermQuery
-from org.apache.lucene.store import RAMDirectory
+from org.apache.lucene.store import ByteBuffersDirectory
class FuzzyQueryTestCase(PyLuceneTestCase):
@@ -234,14 +234,14 @@ class FuzzyQueryTestCase(PyLuceneTestCas
# FuzzyQuery optimizes itself around this information, if the attribute
# is not implemented correctly, there will be problems!
#
- directory = RAMDirectory()
+ directory = ByteBuffersDirectory()
writer = self.getWriter(directory=directory)
self._addDoc("a123456", writer)
self._addDoc("c123456", writer)
self._addDoc("d123456", writer)
self._addDoc("e123456", writer)
- directory2 = RAMDirectory()
+ directory2 = ByteBuffersDirectory()
writer2 = self.getWriter(directory=directory2)
self._addDoc("a123456", writer2)
self._addDoc("b123456", writer2)
Modified: lucene/pylucene/trunk/test2/test_ICUFoldingFilter.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test2/test_ICUFoldingFilter.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test2/test_ICUFoldingFilter.py (original)
+++ lucene/pylucene/trunk/test2/test_ICUFoldingFilter.py Tue Jan 4 18:06:15 2022
@@ -83,7 +83,7 @@ if __name__ == "__main__":
except ImportError:
pass
else:
- if icu.ICU_VERSION >= '49' and icu.ICU_VERSION <= '59.1':
+ if icu.ICU_VERSION >= '70.1':
lucene.initVM(vmargs=['-Djava.awt.headless=true'])
if '-loop' in sys.argv:
sys.argv.remove('-loop')
@@ -95,4 +95,4 @@ if __name__ == "__main__":
else:
unittest.main()
else:
- print >>sys.stderr, "ICU version [49 - 59.1] is required, running:", icu.ICU_VERSION
+ print >>sys.stderr, "ICU version >= 70.1 is required, running:", icu.ICU_VERSION
Modified: lucene/pylucene/trunk/test2/test_PyLucene.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test2/test_PyLucene.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test2/test_PyLucene.py (original)
+++ lucene/pylucene/trunk/test2/test_PyLucene.py Tue Jan 4 18:06:15 2022
@@ -28,7 +28,7 @@ from org.apache.lucene.index import \
from org.apache.lucene.queryparser.classic import \
MultiFieldQueryParser, QueryParser
from org.apache.lucene.search import BooleanClause, IndexSearcher, TermQuery
-from org.apache.lucene.store import MMapDirectory, SimpleFSDirectory
+from org.apache.lucene.store import MMapDirectory, NIOFSDirectory
from org.apache.lucene.util import BytesRefIterator
@@ -324,7 +324,7 @@ class Test_PyLuceneWithFSStore(unittest.
def openStore(self):
- return SimpleFSDirectory(Paths.get(self.STORE_DIR))
+ return NIOFSDirectory(Paths.get(self.STORE_DIR))
def closeStore(self, store, *args):
Modified: lucene/pylucene/trunk/test2/test_bug1763.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test2/test_bug1763.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test2/test_bug1763.py (original)
+++ lucene/pylucene/trunk/test2/test_bug1763.py Tue Jan 4 18:06:15 2022
@@ -18,7 +18,7 @@ from PyLuceneTestCase import PyLuceneTes
from org.apache.lucene.analysis.standard import StandardAnalyzer
from org.apache.lucene.document import Document, Field, StoredField, TextField
from org.apache.lucene.queryparser.classic import QueryParser
-from org.apache.lucene.store import RAMDirectory
+from org.apache.lucene.store import ByteBuffersDirectory
class Test_Bug1763(PyLuceneTestCase):
@@ -27,8 +27,8 @@ class Test_Bug1763(PyLuceneTestCase):
super(Test_Bug1763, self).setUp()
self.analyzer = StandardAnalyzer()
- self.d1 = RAMDirectory()
- self.d2 = RAMDirectory()
+ self.d1 = ByteBuffersDirectory()
+ self.d2 = ByteBuffersDirectory()
w1, w2 = [self.getWriter(directory=d, analyzer=self.analyzer)
for d in [self.d1, self.d2]]
Modified: lucene/pylucene/trunk/test3/PyLuceneTestCase.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test3/PyLuceneTestCase.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test3/PyLuceneTestCase.py (original)
+++ lucene/pylucene/trunk/test3/PyLuceneTestCase.py Tue Jan 4 18:06:15 2022
@@ -23,7 +23,7 @@ from org.apache.lucene.analysis.miscella
from org.apache.lucene.index import \
IndexWriter, IndexWriterConfig, DirectoryReader
from org.apache.lucene.search import IndexSearcher
-from org.apache.lucene.store import RAMDirectory
+from org.apache.lucene.store import ByteBuffersDirectory
from org.apache.lucene.util import Version
@@ -33,7 +33,7 @@ class PyLuceneTestCase(TestCase):
super(PyLuceneTestCase, self).__init__(*args)
def setUp(self):
- self.directory = RAMDirectory()
+ self.directory = ByteBuffersDirectory()
def tearDown(self):
self.directory.close()
Modified: lucene/pylucene/trunk/test3/test_FuzzyQuery.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test3/test_FuzzyQuery.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test3/test_FuzzyQuery.py (original)
+++ lucene/pylucene/trunk/test3/test_FuzzyQuery.py Tue Jan 4 18:06:15 2022
@@ -21,7 +21,7 @@ from org.apache.lucene.analysis.standard
from org.apache.lucene.document import Document, Field, TextField
from org.apache.lucene.index import MultiReader, Term
from org.apache.lucene.search import FuzzyQuery, MultiTermQuery
-from org.apache.lucene.store import RAMDirectory
+from org.apache.lucene.store import ByteBuffersDirectory
class FuzzyQueryTestCase(PyLuceneTestCase):
@@ -234,14 +234,14 @@ class FuzzyQueryTestCase(PyLuceneTestCas
# FuzzyQuery optimizes itself around this information, if the attribute
# is not implemented correctly, there will be problems!
#
- directory = RAMDirectory()
+ directory = ByteBuffersDirectory()
writer = self.getWriter(directory=directory)
self._addDoc("a123456", writer)
self._addDoc("c123456", writer)
self._addDoc("d123456", writer)
self._addDoc("e123456", writer)
- directory2 = RAMDirectory()
+ directory2 = ByteBuffersDirectory()
writer2 = self.getWriter(directory=directory2)
self._addDoc("a123456", writer2)
self._addDoc("b123456", writer2)
Modified: lucene/pylucene/trunk/test3/test_ICUFoldingFilter.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test3/test_ICUFoldingFilter.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test3/test_ICUFoldingFilter.py (original)
+++ lucene/pylucene/trunk/test3/test_ICUFoldingFilter.py Tue Jan 4 18:06:15 2022
@@ -83,7 +83,7 @@ if __name__ == "__main__":
except ImportError:
pass
else:
- if icu.ICU_VERSION >= '49' and icu.ICU_VERSION <= '59.1':
+ if icu.ICU_VERSION >= '70.1':
lucene.initVM(vmargs=['-Djava.awt.headless=true'])
if '-loop' in sys.argv:
sys.argv.remove('-loop')
@@ -95,4 +95,4 @@ if __name__ == "__main__":
else:
unittest.main()
else:
- print("ICU version [49 - 59.1] is required, running:", icu.ICU_VERSION, file=sys.stderr)
+ print("ICU version >= 70.1 is required, running:", icu.ICU_VERSION, file=sys.stderr)
Modified: lucene/pylucene/trunk/test3/test_PyLucene.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test3/test_PyLucene.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test3/test_PyLucene.py (original)
+++ lucene/pylucene/trunk/test3/test_PyLucene.py Tue Jan 4 18:06:15 2022
@@ -30,7 +30,7 @@ from org.apache.lucene.util import Print
from org.apache.lucene.queryparser.classic import \
MultiFieldQueryParser, QueryParser
from org.apache.lucene.search import BooleanClause, IndexSearcher, TermQuery
-from org.apache.lucene.store import MMapDirectory, SimpleFSDirectory
+from org.apache.lucene.store import MMapDirectory, NIOFSDirectory
from org.apache.lucene.util import BytesRefIterator
@@ -327,7 +327,7 @@ class Test_PyLuceneWithFSStore(unittest.
def openStore(self):
- return SimpleFSDirectory(Paths.get(self.STORE_DIR))
+ return NIOFSDirectory(Paths.get(self.STORE_DIR))
def closeStore(self, store, *args):
for arg in args:
Modified: lucene/pylucene/trunk/test3/test_bug1763.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/test3/test_bug1763.py?rev=1896669&r1=1896668&r2=1896669&view=diff
==============================================================================
--- lucene/pylucene/trunk/test3/test_bug1763.py (original)
+++ lucene/pylucene/trunk/test3/test_bug1763.py Tue Jan 4 18:06:15 2022
@@ -18,7 +18,7 @@ from PyLuceneTestCase import PyLuceneTes
from org.apache.lucene.analysis.standard import StandardAnalyzer
from org.apache.lucene.document import Document, Field, StoredField, TextField
from org.apache.lucene.queryparser.classic import QueryParser
-from org.apache.lucene.store import RAMDirectory
+from org.apache.lucene.store import ByteBuffersDirectory
class Test_Bug1763(PyLuceneTestCase):
@@ -27,8 +27,8 @@ class Test_Bug1763(PyLuceneTestCase):
super(Test_Bug1763, self).setUp()
self.analyzer = StandardAnalyzer()
- self.d1 = RAMDirectory()
- self.d2 = RAMDirectory()
+ self.d1 = ByteBuffersDirectory()
+ self.d2 = ByteBuffersDirectory()
w1, w2 = [self.getWriter(directory=d, analyzer=self.analyzer)
for d in [self.d1, self.d2]]