Repository: ignite Updated Branches: refs/heads/master f7c4e085c -> f5b5ecd36
IGNITE-9495 Update version for org.apache.lucene - Fixes #4710. Signed-off-by: Dmitriy Pavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f5b5ecd3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f5b5ecd3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f5b5ecd3 Branch: refs/heads/master Commit: f5b5ecd361e4fbc1c9b0b3b2b65cfaad744f2953 Parents: f7c4e08 Author: Max-Pudov <[email protected]> Authored: Wed Sep 12 16:23:35 2018 +0300 Committer: Dmitriy Pavlov <[email protected]> Committed: Wed Sep 12 16:23:35 2018 +0300 ---------------------------------------------------------------------- .../processors/query/h2/opt/GridLuceneDirectory.java | 12 +++++++++++- .../processors/query/h2/opt/GridLuceneIndex.java | 10 ++++------ .../processors/query/h2/opt/GridLuceneOutputStream.java | 2 +- parent/pom.xml | 4 ++-- 4 files changed, 18 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f5b5ecd3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java index 4994e61..a7703be 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneDirectory.java @@ -75,7 +75,7 @@ public class GridLuceneDirectory extends BaseDirectory implements Accountable { } /** {@inheritDoc} */ - @Override public void renameFile(String source, String dest) throws IOException { + @Override public void rename(String source, String dest) throws IOException { ensureOpen(); GridLuceneFile file = fileMap.get(source); @@ -89,6 +89,16 @@ public class GridLuceneDirectory extends BaseDirectory implements Accountable { } /** {@inheritDoc} */ + @Override public void syncMetaData() throws IOException { + // Noop. No meta data sync needed as all data is in-memory. + } + + /** {@inheritDoc} */ + @Override public IndexOutput createTempOutput(String prefix, String suffix, IOContext ctx) throws IOException { + throw new UnsupportedOperationException(); + } + + /** {@inheritDoc} */ @Override public final long fileLength(String name) throws IOException { ensureOpen(); http://git-wip-us.apache.org/repos/asf/ignite/blob/f5b5ecd3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java index b5d2456..02f4a60 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneIndex.java @@ -38,7 +38,7 @@ import org.apache.ignite.spi.indexing.IndexingQueryCacheFilter; import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.LongField; +import org.apache.lucene.document.LongPoint; import org.apache.lucene.document.StoredField; import org.apache.lucene.document.StringField; import org.apache.lucene.document.TextField; @@ -51,7 +51,6 @@ import org.apache.lucene.queryparser.classic.MultiFieldQueryParser; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.NumericRangeQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; @@ -201,7 +200,7 @@ public class GridLuceneIndex implements AutoCloseable { doc.add(new StoredField(VER_FIELD_NAME, ver.toString().getBytes())); - doc.add(new LongField(EXPIRATION_TIME_FIELD_NAME, expires, Field.Store.YES)); + doc.add(new LongPoint(EXPIRATION_TIME_FIELD_NAME, expires)); // Next implies remove than add atomically operation. writer.updateDocument(term, doc); @@ -255,7 +254,7 @@ public class GridLuceneIndex implements AutoCloseable { } //We can cache reader\searcher and change this to 'openIfChanged' - reader = DirectoryReader.open(writer, true); + reader = DirectoryReader.open(writer); } catch (IOException e) { throw new IgniteCheckedException(e); @@ -274,8 +273,7 @@ public class GridLuceneIndex implements AutoCloseable { // parser.setAllowLeadingWildcard(true); // Filter expired items. - Query filter = NumericRangeQuery.newLongRange(EXPIRATION_TIME_FIELD_NAME, U.currentTimeMillis(), - null, false, false); + Query filter = LongPoint.newRangeQuery(EXPIRATION_TIME_FIELD_NAME, U.currentTimeMillis(), Long.MAX_VALUE); BooleanQuery query = new BooleanQuery.Builder() .add(parser.parse(qry), BooleanClause.Occur.MUST) http://git-wip-us.apache.org/repos/asf/ignite/blob/f5b5ecd3/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java index d8f09df..ada3d9e 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneOutputStream.java @@ -66,7 +66,7 @@ public class GridLuceneOutputStream extends IndexOutput implements Accountable { * @param f File. */ public GridLuceneOutputStream(GridLuceneFile f) { - super("RAMOutputStream(name=\"noname\")"); + super("RAMOutputStream(name=\"noname\")", "noname"); file = f; http://git-wip-us.apache.org/repos/asf/ignite/blob/f5b5ecd3/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f5b49ba..0f0dfc0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -91,8 +91,8 @@ <kafka.version>0.10.0.1</kafka.version> <karaf.version>4.0.2</karaf.version> <log4j.version>2.11.0</log4j.version> - <lucene.bundle.version>5.5.2_1</lucene.bundle.version> - <lucene.version>5.5.2</lucene.version> + <lucene.bundle.version>7.4.0_1</lucene.bundle.version> + <lucene.version>7.4.0</lucene.version> <maven.bundle.plugin.version>3.5.0</maven.bundle.plugin.version> <mockito.version>1.10.19</mockito.version> <mysql.connector.version>5.1.39</mysql.connector.version>
