Introduce org.neo4j.index.lucene.legacy package for legacy indexes.

Move org.neo4j.index.impl.lucene into org.neo4j.index.lucene.legacy.
neo4j · Dec 5, 2015 · b48af5b · b48af5b
1 parent 2d5a4ff
commit b48af5b
Show file tree

Hide file tree

Showing 69 changed files with 190 additions and 195 deletions.
diff --git a/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/DataImportTest.scala b/community/cypher/cypher/src/test/scala/org/neo4j/cypher/performance/DataImportTest.scala
@@ -22,7 +22,7 @@ package org.neo4j.cypher.performance
 import java.io.File
 import org.neo4j.cypher.internal.frontend.v3_0.test_helpers.CypherFunSuite
 import org.neo4j.graphdb.RelationshipType
-import org.neo4j.index.impl.lucene.LuceneBatchInserterIndexProviderNewImpl
+import org.neo4j.index.lucene.legacy.LuceneBatchInserterIndexProviderNewImpl
 import org.neo4j.unsafe.batchinsert.{BatchInserter, BatchInserterIndex, BatchInserters}
 
 import scala.collection.JavaConverters._

diff --git a/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneKernelExtension.java b/community/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneKernelExtension.java
@@ -23,7 +23,7 @@
 import java.util.function.Supplier;
 
 import org.neo4j.graphdb.index.IndexProviders;
-import org.neo4j.index.impl.lucene.LuceneIndexImplementation;
+import org.neo4j.index.lucene.legacy.LuceneIndexImplementation;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.index.IndexConfigStore;

diff --git a/...unity/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneKernelExtensionFactory.java b/...unity/lucene-index/src/main/java/org/neo4j/index/lucene/LuceneKernelExtensionFactory.java
@@ -20,7 +20,7 @@
 package org.neo4j.index.lucene;
 
 import org.neo4j.graphdb.index.IndexProviders;
-import org.neo4j.index.impl.lucene.LuceneIndexImplementation;
+import org.neo4j.index.lucene.legacy.LuceneIndexImplementation;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
 import org.neo4j.kernel.impl.index.IndexConfigStore;

diff --git a/community/lucene-index/src/main/java/org/neo4j/index/lucene/QueryContext.java b/community/lucene-index/src/main/java/org/neo4j/index/lucene/QueryContext.java
@@ -29,7 +29,7 @@
 
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.index.IndexHits;
-import org.neo4j.index.impl.lucene.LuceneUtil;
+import org.neo4j.index.lucene.legacy.LuceneUtil;
 
 /**
  * This class has the extra query configuration to use

diff --git a/.../index/impl/lucene/AbstractIndexHits.java → ...ndex/lucene/legacy/AbstractIndexHits.java b/.../index/impl/lucene/AbstractIndexHits.java → ...ndex/lucene/legacy/AbstractIndexHits.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import java.util.Iterator;
 

diff --git a/.../impl/lucene/AbstractLegacyIndexHits.java → ...ucene/legacy/AbstractLegacyIndexHits.java b/.../impl/lucene/AbstractLegacyIndexHits.java → ...ucene/legacy/AbstractLegacyIndexHits.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.neo4j.collection.primitive.PrimitiveLongCollections.PrimitiveLongBaseIterator;
 import org.neo4j.kernel.api.LegacyIndexHits;

diff --git a/.../index/impl/lucene/CombinedIndexHits.java → ...ndex/lucene/legacy/CombinedIndexHits.java b/.../index/impl/lucene/CombinedIndexHits.java → ...ndex/lucene/legacy/CombinedIndexHits.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import java.util.Collection;
 

diff --git a/...eo4j/index/impl/lucene/CommitContext.java → ...4j/index/lucene/legacy/CommitContext.java b/...eo4j/index/impl/lucene/CommitContext.java → ...4j/index/lucene/legacy/CommitContext.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.IndexWriter;

diff --git a/...ex/impl/lucene/ConstantScoreIterator.java → .../lucene/legacy/ConstantScoreIterator.java b/...ex/impl/lucene/ConstantScoreIterator.java → .../lucene/legacy/ConstantScoreIterator.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import java.util.Collection;
 import java.util.Iterator;

diff --git a/...4j/index/impl/lucene/DocToIdIterator.java → .../index/lucene/legacy/DocToIdIterator.java b/...4j/index/impl/lucene/DocToIdIterator.java → .../index/lucene/legacy/DocToIdIterator.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.document.Document;
 

diff --git a/...org/neo4j/index/impl/lucene/EntityId.java → ...g/neo4j/index/lucene/legacy/EntityId.java b/...org/neo4j/index/impl/lucene/EntityId.java → ...g/neo4j/index/lucene/legacy/EntityId.java
@@ -17,10 +17,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
 import org.apache.lucene.document.Field.Store;
 import org.apache.lucene.document.StringField;
 

diff --git a/.../neo4j/index/impl/lucene/ExactTxData.java → ...eo4j/index/lucene/legacy/ExactTxData.java b/.../neo4j/index/impl/lucene/ExactTxData.java → ...eo4j/index/lucene/legacy/ExactTxData.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;

diff --git a/...g/neo4j/index/impl/lucene/FullTxData.java → ...neo4j/index/lucene/legacy/FullTxData.java b/...g/neo4j/index/impl/lucene/FullTxData.java → ...neo4j/index/lucene/legacy/FullTxData.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.Field.Store;
@@ -55,7 +55,7 @@
 import org.neo4j.kernel.api.impl.index.DocValuesCollector;
 
 import static java.util.Collections.emptyList;
-import static org.neo4j.index.impl.lucene.LuceneIndex.KEY_DOC_ID;
+import static org.neo4j.index.lucene.legacy.LuceneIndex.KEY_DOC_ID;
 
 class FullTxData extends TxData
 {

diff --git a/...4j/index/impl/lucene/IndexClockCache.java → .../index/lucene/legacy/IndexClockCache.java b/...4j/index/impl/lucene/IndexClockCache.java → .../index/lucene/legacy/IndexClockCache.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import java.io.IOException;
 

diff --git a/...4j/index/impl/lucene/IndexIdentifier.java → .../index/lucene/legacy/IndexIdentifier.java b/...4j/index/impl/lucene/IndexIdentifier.java → .../index/lucene/legacy/IndexIdentifier.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.neo4j.kernel.impl.index.IndexEntityType;
 

diff --git a/...o4j/index/impl/lucene/IndexReference.java → ...j/index/lucene/legacy/IndexReference.java b/...o4j/index/impl/lucene/IndexReference.java → ...j/index/lucene/legacy/IndexReference.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicBoolean;

diff --git a/...rg/neo4j/index/impl/lucene/IndexType.java → .../neo4j/index/lucene/legacy/IndexType.java b/...rg/neo4j/index/impl/lucene/IndexType.java → .../neo4j/index/lucene/legacy/IndexType.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.document.Document;
@@ -56,8 +56,6 @@
 import static java.lang.Boolean.FALSE;
 import static java.lang.Boolean.TRUE;
 
-import static org.neo4j.index.impl.lucene.LuceneIndexImplementation.KEY_TO_LOWER_CASE;
-
 public abstract class IndexType
 {
     public static final IndexType EXACT = new IndexType( LuceneDataSource.KEYWORD_ANALYZER, false )
@@ -195,8 +193,8 @@ static IndexType getIndexType( Map<String, String> config )
         String type = config.get( LuceneIndexImplementation.KEY_TYPE );
         IndexType result = null;
         Similarity similarity = getCustomSimilarity( config );
-        Boolean toLowerCaseUnbiased = config.get( KEY_TO_LOWER_CASE ) != null ?
-                parseBoolean( config.get( KEY_TO_LOWER_CASE ), true ) : null;
+        Boolean toLowerCaseUnbiased = config.get( LuceneIndexImplementation.KEY_TO_LOWER_CASE ) != null ?
+                                      parseBoolean( config.get( LuceneIndexImplementation.KEY_TO_LOWER_CASE ), true ) : null;
         Analyzer customAnalyzer = getCustomAnalyzer( config );
         if ( type != null )
         {

diff --git a/...o4j/index/impl/lucene/IndexTypeCache.java → ...j/index/lucene/legacy/IndexTypeCache.java b/...o4j/index/impl/lucene/IndexTypeCache.java → ...j/index/lucene/legacy/IndexTypeCache.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import java.util.Collections;
 import java.util.HashMap;

diff --git a/...impl/lucene/LowerCaseKeywordAnalyzer.java → ...cene/legacy/LowerCaseKeywordAnalyzer.java b/...impl/lucene/LowerCaseKeywordAnalyzer.java → ...cene/legacy/LowerCaseKeywordAnalyzer.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordTokenizer;

diff --git a/...impl/lucene/LuceneBatchInserterIndex.java → ...cene/legacy/LuceneBatchInserterIndex.java b/...impl/lucene/LuceneBatchInserterIndex.java → ...cene/legacy/LuceneBatchInserterIndex.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.document.Document;
 import org.apache.lucene.index.CorruptIndexException;
@@ -43,7 +43,6 @@
 import org.neo4j.collection.primitive.PrimitiveLongCollections;
 import org.neo4j.graphdb.ResourceIterator;
 import org.neo4j.graphdb.index.IndexHits;
-import org.neo4j.index.impl.lucene.EntityId.IdData;
 import org.neo4j.index.lucene.ValueContext;
 import org.neo4j.kernel.api.LegacyIndexHits;
 import org.neo4j.kernel.api.exceptions.index.IndexCapacityExceededException;
@@ -57,8 +56,6 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
-import static org.neo4j.index.impl.lucene.LuceneDataSource.getDirectory;
-
 class LuceneBatchInserterIndex implements BatchInserterIndex
 {
     private final IndexIdentifier identifier;
@@ -118,7 +115,7 @@ private EntityId entityId( long id )
     {
         if ( identifier.entityType == IndexEntityType.Node )
         {
-            return new IdData( id );
+            return new EntityId.IdData( id );
         }
 
         return relationshipLookup.lookup( id );
@@ -157,7 +154,7 @@ private void addToCache( long entityId, String key, Object value )
                 ids = new HashSet<>();
                 cache.put( valueAsString, ids );
             }
-            ids.add( new IdData( entityId ) );
+            ids.add( new EntityId.IdData( entityId ) );
         }
     }
 
@@ -249,7 +246,7 @@ private void removeFromCache( long entityId, String key, Object value )
             Collection<EntityId> ids = cache.get( valueAsString );
             if ( ids != null )
             {
-                ids.remove( new IdData(entityId) );
+                ids.remove( new EntityId.IdData(entityId) );
             }
         }
     }
@@ -260,7 +257,7 @@ private LuceneIndexWriter instantiateWriter( File directory )
         {
             IndexWriterConfig writerConfig = new IndexWriterConfig( type.analyzer );
             writerConfig.setRAMBufferSizeMB( determineGoodBufferSize( writerConfig.getRAMBufferSizeMB() ) );
-            Directory luceneDir = getDirectory( directory, identifier );
+            Directory luceneDir = LuceneDataSource.getDirectory( directory, identifier );
             return IndexWriterFactories.batchInsert( writerConfig ).create( luceneDir );
         }
         catch ( IOException e )
@@ -358,7 +355,7 @@ protected boolean fetchNext()
                     {
                         if ( super.fetchNext() )
                         {
-                            ids.add( new IdData( next ) );
+                            ids.add( new EntityId.IdData( next ) );
                             return true;
                         }
                         addToCache( ids, key, value );

diff --git a/...eneBatchInserterIndexProviderNewImpl.java → ...eneBatchInserterIndexProviderNewImpl.java b/...eneBatchInserterIndexProviderNewImpl.java → ...eneBatchInserterIndexProviderNewImpl.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import java.io.File;
 import java.util.HashMap;
@@ -29,8 +29,7 @@
 import org.neo4j.graphdb.index.Index;
 import org.neo4j.graphdb.index.IndexManager;
 import org.neo4j.helpers.collection.MapUtil;
-import org.neo4j.index.impl.lucene.EntityId.RelationshipData;
-import org.neo4j.index.impl.lucene.LuceneBatchInserterIndex.RelationshipLookup;
+import org.neo4j.index.lucene.legacy.LuceneBatchInserterIndex.RelationshipLookup;
 import org.neo4j.kernel.impl.index.IndexConfigStore;
 import org.neo4j.kernel.impl.index.IndexEntityType;
 import org.neo4j.unsafe.batchinsert.BatchInserter;
@@ -62,7 +61,7 @@ public EntityId lookup( long id )
             {
                 // TODO too may objects allocated here
                 BatchRelationship rel = inserter.getRelationshipById( id );
-                return new RelationshipData( id, rel.getStartNode(), rel.getEndNode() );
+                return new EntityId.RelationshipData( id, rel.getStartNode(), rel.getEndNode() );
             }
         };
     }

diff --git a/...dex/impl/lucene/LuceneCommandApplier.java → ...x/lucene/legacy/LuceneCommandApplier.java b/...dex/impl/lucene/LuceneCommandApplier.java → ...x/lucene/legacy/LuceneCommandApplier.java
@@ -17,16 +17,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.neo4j.graphdb.index.IndexImplementation;
-import org.neo4j.index.impl.lucene.CommitContext.DocumentContext;
-import org.neo4j.index.impl.lucene.EntityId.IdData;
-import org.neo4j.index.impl.lucene.EntityId.RelationshipData;
+import org.neo4j.index.lucene.legacy.CommitContext.DocumentContext;
 import org.neo4j.kernel.impl.index.IndexCommand;
 import org.neo4j.kernel.impl.index.IndexCommand.AddNodeCommand;
 import org.neo4j.kernel.impl.index.IndexCommand.AddRelationshipCommand;
@@ -62,7 +60,7 @@ public boolean visitIndexAddNodeCommand( AddNodeCommand command ) throws IOExcep
         String key = definitions.getKey( command.getKeyId() );
         Object value = command.getValue();
         context.ensureWriterInstantiated();
-        context.indexType.addToDocument( context.getDocument( new IdData( command.getEntityId() ), true ).document,
+        context.indexType.addToDocument( context.getDocument( new EntityId.IdData( command.getEntityId() ), true ).document,
                 key, value );
         return false;
     }
@@ -74,7 +72,7 @@ public boolean visitIndexAddRelationshipCommand( AddRelationshipCommand command
         String key = definitions.getKey( command.getKeyId() );
         Object value = command.getValue();
         context.ensureWriterInstantiated();
-        RelationshipData entityId = new RelationshipData( command.getEntityId(),
+        EntityId.RelationshipData entityId = new EntityId.RelationshipData( command.getEntityId(),
                 command.getStartNode(), command.getEndNode() );
         context.indexType.addToDocument( context.getDocument( entityId, true ).document, key, value );
         return false;
@@ -87,7 +85,7 @@ public boolean visitIndexRemoveCommand( RemoveCommand command ) throws IOExcepti
         String key = definitions.getKey( command.getKeyId() );
         Object value = command.getValue();
         context.ensureWriterInstantiated();
-        DocumentContext document = context.getDocument( new IdData( command.getEntityId() ), false );
+        DocumentContext document = context.getDocument( new EntityId.IdData( command.getEntityId() ), false );
         if ( document != null )
         {
             context.indexType.removeFromDocument( document.document, key, value );

diff --git a/...j/index/impl/lucene/LuceneDataSource.java → ...index/lucene/legacy/LuceneDataSource.java b/...j/index/impl/lucene/LuceneDataSource.java → ...index/lucene/legacy/LuceneDataSource.java
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package org.neo4j.index.impl.lucene;
+package org.neo4j.index.lucene.legacy;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.Tokenizer;
@@ -42,7 +42,6 @@
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
 import org.apache.lucene.store.RAMDirectory;
-import org.apache.lucene.util.Version;
 
 import java.io.File;
 import java.io.IOException;