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 2020/08/24 23:11:58 UTC
svn commit: r1881162 - in /lucene/pylucene/trunk: CHANGES Makefile
java/org/apache/pylucene/store/PythonIndexInput.java jcc/CHANGES
jcc/jcc2/__main__.py jcc/setup.py python/ICUFoldingFilter.py
Author: vajda
Date: Mon Aug 24 23:11:57 2020
New Revision: 1881162
URL: http://svn.apache.org/viewvc?rev=1881162&view=rev
Log:
preparing PyLucene 8.6.1 rc1 with JCC 3.8
Modified:
lucene/pylucene/trunk/CHANGES
lucene/pylucene/trunk/Makefile
lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonIndexInput.java
lucene/pylucene/trunk/jcc/CHANGES
lucene/pylucene/trunk/jcc/jcc2/__main__.py
lucene/pylucene/trunk/jcc/setup.py
lucene/pylucene/trunk/python/ICUFoldingFilter.py
Modified: lucene/pylucene/trunk/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/CHANGES?rev=1881162&r1=1881161&r2=1881162&view=diff
==============================================================================
--- lucene/pylucene/trunk/CHANGES (original)
+++ lucene/pylucene/trunk/CHANGES Mon Aug 24 23:11:57 2020
@@ -1,3 +1,8 @@
+Version 8.3.0 -> 8.6.1
+----------------------
+ - using Lucene 8.6.1 sources
+ - PyLucene built with JCC 3.8
+
Version 8.1.1 -> 8.3.0
----------------------
- using Lucene 8.3.0 sources
Modified: lucene/pylucene/trunk/Makefile
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/Makefile?rev=1881162&r1=1881161&r2=1881162&view=diff
==============================================================================
--- lucene/pylucene/trunk/Makefile (original)
+++ lucene/pylucene/trunk/Makefile Mon Aug 24 23:11:57 2020
@@ -15,8 +15,8 @@
# site-packages directory.
#
-VERSION=8.3.0
-LUCENE_VER=8.3.0
+VERSION=8.6.1
+LUCENE_VER=8.6.1
PYLUCENE:=$(shell pwd)
LUCENE_SRC=lucene-java-$(LUCENE_VER)
LUCENE=$(LUCENE_SRC)/lucene
@@ -43,12 +43,12 @@ LUCENE=$(LUCENE_SRC)/lucene
# limit.
#
-# Mac OS X 10.12 (64-bit Python 3.8, Java 1.8)
-#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
-#NUM_FILES=10
+# Mac OS X 10.12 (64-bit Python 3.8, Java 11)
+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
# Mac OS X 10.12 (64-bit Python 2.7, Java 1.8)
#PREFIX_PYTHON=/Users/vajda/apache/pylucene/_install2
@@ -149,7 +149,7 @@ JARS+=$(QUERYPARSER_JAR) # query
JARS+=$(SANDBOX_JAR) # needed by query parser
#JARS+=$(SMARTCN_JAR) # smart chinese analyzer
JARS+=$(SPATIAL3D_JAR) # spatial3d lucene
-JARS+=$(SPATIAL_JAR) # spatial lucene
+#JARS+=$(SPATIAL_EXTRAS_JAR) # spatial-extras
JARS+=$(STEMPEL_JAR) # polish analyzer and stemmer
JARS+=$(SUGGEST_JAR) # suggest/spell module
@@ -187,13 +187,13 @@ QUERYPARSER_JAR=$(LUCENE)/build/querypar
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_JAR=$(LUCENE)/build/spatial/lucene-spatial-$(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-5.1.jar
-ASM_COMMONS_JAR=$(LUCENE)/expressions/lib/asm-commons-5.1.jar
+ASM_JAR=$(LUCENE)/expressions/lib/asm-7.2.jar
+ASM_COMMONS_JAR=$(LUCENE)/expressions/lib/asm-commons-7.2.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
@@ -257,8 +257,8 @@ $(SMARTCN_JAR): $(LUCENE_JAR)
$(STEMPEL_JAR): $(LUCENE_JAR)
cd $(LUCENE)/analysis/stempel; $(ANT) -Dversion=$(LUCENE_VER)
-$(SPATIAL_JAR): $(LUCENE_JAR)
- cd $(LUCENE)/spatial; $(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)
@@ -354,11 +354,14 @@ GENERATE=$(JCC) $(foreach jar,$(JARS),--
java.text.DecimalFormat \
java.text.Collator \
--package java.util.concurrent java.util.concurrent.Executors \
+ --package java.util.function \
--package java.util.regex \
--package java.io java.io.StringReader \
--package java.nio.file java.nio.file.Path \
java.nio.file.Files \
java.nio.file.Paths \
+ --package org.antlr.v4.runtime \
+ --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 \
Modified: lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonIndexInput.java
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonIndexInput.java?rev=1881162&r1=1881161&r2=1881162&view=diff
==============================================================================
--- lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonIndexInput.java (original)
+++ lucene/pylucene/trunk/java/org/apache/pylucene/store/PythonIndexInput.java Mon Aug 24 23:11:57 2020
@@ -16,6 +16,7 @@
package org.apache.pylucene.store;
import java.io.IOException;
+import java.nio.ByteBuffer;
import org.apache.lucene.store.BufferedIndexInput;
import org.apache.lucene.store.IOContext;
@@ -71,10 +72,12 @@ public class PythonIndexInput extends Bu
throws IOException;
@Override
- protected void readInternal(byte[] b, int offset, int length)
+ protected void readInternal(ByteBuffer b)
throws IOException
{
- byte[] data = readInternal(length, getFilePointer());
- System.arraycopy(data, 0, b, offset, data.length);
+ byte[] data = readInternal(b.remaining(), getFilePointer());
+
+ System.arraycopy(data, 0, b.array(), b.position(), data.length);
+ b.position(b.position() + data.length);
}
}
Modified: lucene/pylucene/trunk/jcc/CHANGES
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/CHANGES?rev=1881162&r1=1881161&r2=1881162&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/CHANGES (original)
+++ lucene/pylucene/trunk/jcc/CHANGES Mon Aug 24 23:11:57 2020
@@ -1,8 +1,7 @@
-Version 3.7 ->
+Version 3.7 -> 3.8
------------------
- added support for building wheels via --wheel flag (Chee Yong Teh)
- fixed bug with class order dependent missing required dependencies
- -
Version 3.6 -> 3.7
------------------
Modified: lucene/pylucene/trunk/jcc/jcc2/__main__.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc2/__main__.py?rev=1881162&r1=1881161&r2=1881162&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/jcc2/__main__.py (original)
+++ lucene/pylucene/trunk/jcc/jcc2/__main__.py Mon Aug 24 23:11:57 2020
@@ -7,7 +7,7 @@ if len(sys.argv) == 1 or '--help' in sys
help = '''
JCC - C++/Python Java Native Interface Code Generator
- Usage: python -m jcc [options] [actions]
+ Usage: python -m jcc [options] [actions] classes...
Input options:
--jar JARFILE - make JCC wrap all public classes found in
@@ -21,6 +21,7 @@ if len(sys.argv) == 1 or '--help' in sys
--exclude CLASS - explicitly don't wrap CLASS
--package PACKAGE - add PACKAGE to the list of packages from
which dependencies are automatically wrapped
+ in addition to java.lang, --jar or classes
--classpath [PATH|JAR] - add [PATH|JAR] to CLASSPATH while generating
wrappers
--libpath [PATH] - add [PATH] to java.library.path while generating
Modified: lucene/pylucene/trunk/jcc/setup.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/setup.py?rev=1881162&r1=1881161&r2=1881162&view=diff
==============================================================================
--- lucene/pylucene/trunk/jcc/setup.py (original)
+++ lucene/pylucene/trunk/jcc/setup.py Mon Aug 24 23:11:57 2020
@@ -12,7 +12,7 @@
import os, sys, platform, subprocess
-jcc_ver = '3.7'
+jcc_ver = '3.8'
machine = platform.machine()
using_python2 = sys.version_info < (3,)
Modified: lucene/pylucene/trunk/python/ICUFoldingFilter.py
URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/python/ICUFoldingFilter.py?rev=1881162&r1=1881161&r2=1881162&view=diff
==============================================================================
--- lucene/pylucene/trunk/python/ICUFoldingFilter.py (original)
+++ lucene/pylucene/trunk/python/ICUFoldingFilter.py Mon Aug 24 23:11:57 2020
@@ -62,6 +62,7 @@ from icu import ResourceBundle, Normaliz
utr30 = os.path.join(lucene.__module_dir__, 'resources',
'org', 'apache', 'lucene', 'analysis', 'icu',
'utr30.dat')
+print(utr30)
ResourceBundle.setAppData("utr30", utr30)