From 18a0d6c2f730019e1784ee95662d292912eb2a0a Mon Sep 17 00:00:00 2001 From: Ragnar Mellbin Date: Thu, 31 Aug 2017 11:06:44 +0200 Subject: [PATCH] Fulltext addon cleanup --- .../{fulltext-helper => fulltext-addon}/LICENSE.txt | 0 .../{fulltext-helper => fulltext-addon}/LICENSES.txt | 0 .../{fulltext-helper => fulltext-addon}/NOTICE.txt | 0 .../{fulltext-helper => fulltext-addon}/pom.xml | 0 .../kernel/api/impl/fulltext/BloomFieldEncoding.java | 0 .../kernel/api/impl/fulltext/BloomIndexReader.java | 0 .../api/impl/fulltext/FulltextHelperDescriptor.java | 0 .../fulltext/FulltextHelperDocumentStructure.java} | 12 ++++-------- .../api/impl/fulltext/FulltextHelperFactory.java | 4 ++-- .../api/impl/fulltext/FulltextHelperProvider.java | 0 .../FulltextHelplerTransactionEventUpdater.java | 0 .../api/impl/fulltext/LuceneFulltextHelper.java | 0 .../impl/fulltext/PartitionedBloomIndexReader.java | 0 .../impl/fulltext/PartitionedInsightBloomWriter.java | 0 .../api/impl/fulltext/SimpleBloomIndexReader.java | 0 .../impl/fulltext/WritableDatabaseBloomIndex.java | 0 .../integrations/bloom}/BloomKernelExtension.java | 4 ++-- .../bloom}/BloomKernelExtensionFactory.java | 2 +- .../fulltext/integrations/bloom}/BloomProcedure.java | 2 +- .../fulltext/LuceneFulltextHelperUpdaterTest.java | 0 .../impl/fulltext/integrations/bloom}/BloomIT.java | 2 +- enterprise/pom.xml | 2 +- 22 files changed, 12 insertions(+), 16 deletions(-) rename enterprise/{fulltext-helper => fulltext-addon}/LICENSE.txt (100%) rename enterprise/{fulltext-helper => fulltext-addon}/LICENSES.txt (100%) rename enterprise/{fulltext-helper => fulltext-addon}/NOTICE.txt (100%) rename enterprise/{fulltext-helper => fulltext-addon}/pom.xml (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java (100%) rename enterprise/{fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomDocumentStructure.java => fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDocumentStructure.java} (93%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperFactory.java (97%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java (100%) rename enterprise/{fulltext-helper => fulltext-addon}/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java (100%) rename enterprise/{fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration => fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom}/BloomKernelExtension.java (97%) rename enterprise/{fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration => fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom}/BloomKernelExtensionFactory.java (96%) rename enterprise/{fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration => fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom}/BloomProcedure.java (98%) rename enterprise/{fulltext-helper => fulltext-addon}/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java (100%) rename enterprise/{fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration => fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom}/BloomIT.java (98%) diff --git a/enterprise/fulltext-helper/LICENSE.txt b/enterprise/fulltext-addon/LICENSE.txt similarity index 100% rename from enterprise/fulltext-helper/LICENSE.txt rename to enterprise/fulltext-addon/LICENSE.txt diff --git a/enterprise/fulltext-helper/LICENSES.txt b/enterprise/fulltext-addon/LICENSES.txt similarity index 100% rename from enterprise/fulltext-helper/LICENSES.txt rename to enterprise/fulltext-addon/LICENSES.txt diff --git a/enterprise/fulltext-helper/NOTICE.txt b/enterprise/fulltext-addon/NOTICE.txt similarity index 100% rename from enterprise/fulltext-helper/NOTICE.txt rename to enterprise/fulltext-addon/NOTICE.txt diff --git a/enterprise/fulltext-helper/pom.xml b/enterprise/fulltext-addon/pom.xml similarity index 100% rename from enterprise/fulltext-helper/pom.xml rename to enterprise/fulltext-addon/pom.xml diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomFieldEncoding.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomIndexReader.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDescriptor.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomDocumentStructure.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDocumentStructure.java similarity index 93% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomDocumentStructure.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDocumentStructure.java index f3b613944658e..54987a7eef67c 100644 --- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/BloomDocumentStructure.java +++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperDocumentStructure.java @@ -32,15 +32,16 @@ import org.neo4j.values.storable.Value; import org.neo4j.values.storable.Values; +import static org.apache.lucene.document.Field.Store.NO; import static org.apache.lucene.document.Field.Store.YES; -class BloomDocumentStructure +class FulltextHelperDocumentStructure { static final String ID_KEY = "id"; private static final ThreadLocal perThreadDocument = ThreadLocal.withInitial( DocWithId::new ); - private BloomDocumentStructure() + private FulltextHelperDocumentStructure() { } @@ -58,11 +59,6 @@ public static Document documentRepresentingProperties( long id, Map population; private final File storeDir; - private Analyzer analyzer; + private final Analyzer analyzer; public LuceneFulltextHelper createFulltextHelper( String identifier, FULLTEXT_HELPER_TYPE type ) { diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelperProvider.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/FulltextHelplerTransactionEventUpdater.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelper.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedBloomIndexReader.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/PartitionedInsightBloomWriter.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/SimpleBloomIndexReader.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java similarity index 100% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/WritableDatabaseBloomIndex.java diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtension.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtension.java similarity index 97% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtension.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtension.java index 1654ff2bd35d4..87f0d6eb2998b 100644 --- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtension.java +++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtension.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.fulltext.bloom.integration; +package org.neo4j.kernel.api.impl.fulltext.integrations.bloom; import java.io.File; import java.io.IOException; @@ -56,9 +56,9 @@ public void init() throws IOException, ProcedureException FulltextHelperProvider provider = FulltextHelperProvider.instance( db ); fulltextHelperFactory = new FulltextHelperFactory( fileSystemAbstraction, storeDir, config ); LuceneFulltextHelper nodes = fulltextHelperFactory.createFulltextHelper( "bloomNodes", FulltextHelperFactory.FULLTEXT_HELPER_TYPE.NODES ); - provider.register( nodes ); LuceneFulltextHelper relationships = fulltextHelperFactory.createFulltextHelper( "bloomRelationships", FulltextHelperFactory.FULLTEXT_HELPER_TYPE.RELATIONSHIPS ); + provider.register( nodes ); provider.register( relationships ); procedures.register( new BloomProcedure( "Nodes", nodes ) ); diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtensionFactory.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtensionFactory.java similarity index 96% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtensionFactory.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtensionFactory.java index ab8f8bac51e1e..2b6a5ff0b486d 100644 --- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomKernelExtensionFactory.java +++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomKernelExtensionFactory.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.fulltext.bloom.integration; +package org.neo4j.kernel.api.impl.fulltext.integrations.bloom; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.io.fs.FileSystemAbstraction; diff --git a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomProcedure.java b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedure.java similarity index 98% rename from enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomProcedure.java rename to enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedure.java index 105d105c76fe5..6168cd495e9e7 100644 --- a/enterprise/fulltext-helper/src/main/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomProcedure.java +++ b/enterprise/fulltext-addon/src/main/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomProcedure.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.fulltext.bloom.integration; +package org.neo4j.kernel.api.impl.fulltext.integrations.bloom; import java.util.Arrays; diff --git a/enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java b/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java similarity index 100% rename from enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java rename to enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/LuceneFulltextHelperUpdaterTest.java diff --git a/enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomIT.java b/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomIT.java similarity index 98% rename from enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomIT.java rename to enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomIT.java index 14ddeacf045e3..de288c93eb1cd 100644 --- a/enterprise/fulltext-helper/src/test/java/org/neo4j/kernel/api/impl/fulltext/bloom/integration/BloomIT.java +++ b/enterprise/fulltext-addon/src/test/java/org/neo4j/kernel/api/impl/fulltext/integrations/bloom/BloomIT.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.neo4j.kernel.api.impl.fulltext.bloom.integration; +package org.neo4j.kernel.api.impl.fulltext.integrations.bloom; import org.junit.After; import org.junit.Before; diff --git a/enterprise/pom.xml b/enterprise/pom.xml index 7c697bed7e830..a133b3a8d4727 100644 --- a/enterprise/pom.xml +++ b/enterprise/pom.xml @@ -46,7 +46,7 @@ deferred-locks ha procedure-compiler-enterprise-tests - fulltext-helper + fulltext-addon