You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/04/15 05:07:40 UTC
[11/32] incubator-geode git commit: GEODE-1219: Updated lucene
version to 6.0.0
GEODE-1219: Updated lucene version to 6.0.0
Modifications to code due to lucene api changes
Implemented temporary output stream in Directory and FileSystem
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6c7a0d2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6c7a0d2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6c7a0d2a
Branch: refs/heads/feature/GEODE-17-2
Commit: 6c7a0d2a2d3c0c56828c9c0498390b505de00ea4
Parents: f473fac
Author: Jason Huynh <hu...@gmail.com>
Authored: Thu Apr 7 15:40:35 2016 -0700
Committer: Jason Huynh <hu...@gmail.com>
Committed: Wed Apr 13 11:13:27 2016 -0700
----------------------------------------------------------------------
.../internal/directory/RegionDirectory.java | 20 ++++++++++++++++----
.../lucene/internal/filesystem/FileSystem.java | 5 +++++
.../repository/IndexRepositoryImpl.java | 2 +-
.../repository/serializer/SerializerUtil.java | 16 ++++++++--------
.../IndexRepositoryImplPerformanceTest.java | 4 ++--
gradle/dependency-versions.properties | 2 +-
6 files changed, 33 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6c7a0d2a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java
index e25dc77..28117bd 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/directory/RegionDirectory.java
@@ -21,7 +21,9 @@ package com.gemstone.gemfire.cache.lucene.internal.directory;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Arrays;
import java.util.Collection;
+import java.util.UUID;
import java.util.concurrent.ConcurrentMap;
import org.apache.lucene.store.BaseDirectory;
@@ -45,7 +47,7 @@ import com.gemstone.gemfire.cache.lucene.internal.filesystem.FileSystem;
public class RegionDirectory extends BaseDirectory {
private final FileSystem fs;
-
+
/**
* Create a region directory with a given file and chunk region. These regions
* may be bucket regions or they may be replicated regions.
@@ -54,11 +56,13 @@ public class RegionDirectory extends BaseDirectory {
super(new SingleInstanceLockFactory());
fs = new FileSystem(fileRegion, chunkRegion);
}
-
+
@Override
public String[] listAll() throws IOException {
ensureOpen();
- return fs.listFileNames().toArray(new String[] {});
+ String[] array = fs.listFileNames().toArray(new String[]{});
+ Arrays.sort(array);
+ return array;
}
@Override
@@ -79,7 +83,15 @@ public class RegionDirectory extends BaseDirectory {
final File file = fs.createFile(name);
final OutputStream out = file.getOutputStream();
- return new OutputStreamIndexOutput(name, out, 1000);
+ return new OutputStreamIndexOutput(name, name, out, 1000);
+ }
+
+ public IndexOutput createTempOutput(String prefix, String suffix, IOContext context) throws IOException {
+ String name = prefix + "_temp_" + UUID.randomUUID() + suffix;
+ final File file = fs.createTemporaryFile(name);
+ final OutputStream out = file.getOutputStream();
+
+ return new OutputStreamIndexOutput(name, name, out, 1000);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6c7a0d2a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
index b84dc92..44513f1 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/filesystem/FileSystem.java
@@ -60,6 +60,11 @@ public class FileSystem {
// TODO unlock region ?
return file;
}
+
+ public File createTemporaryFile(final String name) throws IOException {
+ final File file = new File(this, name);
+ return file;
+ }
public File getFile(final String name) throws FileNotFoundException {
final File file = fileRegion.get(name);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6c7a0d2a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
index a9c463e..e589ef4 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImpl.java
@@ -51,7 +51,7 @@ public class IndexRepositoryImpl implements IndexRepository {
public IndexRepositoryImpl(Region<?,?> region, IndexWriter writer, LuceneSerializer serializer) throws IOException {
this.region = region;
this.writer = writer;
- searcherManager = new SearcherManager(writer, APPLY_ALL_DELETES, null);
+ searcherManager = new SearcherManager(writer, APPLY_ALL_DELETES, true, null);
this.serializer = serializer;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6c7a0d2a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java
index 7ffc5db..0ed9d5d 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/serializer/SerializerUtil.java
@@ -24,11 +24,11 @@ import java.io.DataOutputStream;
import java.io.IOException;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DoubleField;
+import org.apache.lucene.document.DoublePoint;
import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.FloatField;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.LongField;
+import org.apache.lucene.document.FloatPoint;
+import org.apache.lucene.document.IntPoint;
+import org.apache.lucene.document.LongPoint;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexableField;
@@ -79,13 +79,13 @@ public class SerializerUtil {
if(clazz == String.class) {
doc.add(new TextField(field, (String)fieldValue, Store.NO));
} else if (clazz == Long.class) {
- doc.add(new LongField(field, (Long) fieldValue, Store.NO));
+ doc.add(new LongPoint(field, (Long) fieldValue));
} else if (clazz == Integer.class) {
- doc.add(new IntField(field, (Integer) fieldValue, Store.NO));
+ doc.add(new IntPoint(field, (Integer) fieldValue));
} else if (clazz == Float.class) {
- doc.add(new FloatField(field, (Float) fieldValue, Store.NO));
+ doc.add(new FloatPoint(field, (Float) fieldValue));
} else if (clazz == Double.class) {
- doc.add(new DoubleField(field, (Double) fieldValue, Store.NO));
+ doc.add(new DoublePoint(field, (Double) fieldValue));
} else {
return false;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6c7a0d2a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
index 74f3742..e996f30 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
@@ -222,7 +222,7 @@ public class IndexRepositoryImplPerformanceTest {
RegionDirectory dir = new RegionDirectory(new ConcurrentHashMap<String, File>(), new ConcurrentHashMap<ChunkKey, byte[]>());
IndexWriterConfig config = new IndexWriterConfig(analyzer);
writer = new IndexWriter(dir, config);
- searcherManager = new SearcherManager(writer, true, null);
+ searcherManager = new SearcherManager(writer, true, true, null);
}
@Override
@@ -275,7 +275,7 @@ public class IndexRepositoryImplPerformanceTest {
RAMDirectory dir = new RAMDirectory();
IndexWriterConfig config = new IndexWriterConfig(analyzer);
writer = new IndexWriter(dir, config);
- searcherManager = new SearcherManager(writer, true, null);
+ searcherManager = new SearcherManager(writer, true, true, null);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6c7a0d2a/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 18e327e..f89f281 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -71,7 +71,7 @@ jsr305.version = 3.0.1
junit.version = 4.12
JUnitParams.version = 1.0.4
log4j.version = 2.5
-lucene.version = 5.3.0
+lucene.version = 6.0.0
mockito-core.version = 1.10.19
mockrunner.version = 1.0.8
multithreadedtc.version = 1.01