From a313086d2d6f30bebf8272be821f586cc09ed000 Mon Sep 17 00:00:00 2001 From: Anton Persson Date: Mon, 23 Jul 2018 15:15:56 +0200 Subject: [PATCH] PR comment: Change method name SchemaIndex#providerName -> SchemaIndex#providerIdentifier --- .../ConsistencyCheckServiceIntegrationTest.java | 4 ++-- .../dbms/MemoryRecommendationsCommandTest.java | 2 +- .../index/impl/lucene/explicit/NonUniqueIndexTest.java | 4 ++-- .../api/impl/schema/DefaultSchemaIndexConfigTest.java | 6 +++--- .../neo4j/kernel/api/impl/schema/FusionIndexIT.java | 2 +- .../FusionIndexProvider10CompatibilitySuiteTest.java | 2 +- .../FusionIndexProvider20CompatibilitySuiteTest.java | 2 +- .../LuceneIndexProviderCompatibilitySuiteTest.java | 2 +- .../neo4j/kernel/impl/index/schema/IndexCreateIT.java | 2 +- .../impl/index/schema/NativeStringIndexingIT.java | 2 +- .../impl/newapi/NodeValueIndexCursorLuceneTest.java | 2 +- .../impl/newapi/NodeValueIndexCursorNative10Test.java | 2 +- .../impl/newapi/NodeValueIndexCursorNative20Test.java | 2 +- .../GenericIndexProviderCompatibilitySuiteTest.java | 2 +- .../internal/BatchInsertIndexProviderTest.java | 6 +++--- .../src/test/java/recovery/RecoveryCleanupIT.java | 2 +- .../neo4j/graphdb/factory/GraphDatabaseSettings.java | 10 +++++++--- .../GraphDatabaseConfigurationMigrator.java | 2 +- .../schema/GenericNativeIndexProviderFactory.java | 2 +- .../TestGraphDatabaseConfigurationMigrator.java | 10 +++++----- .../api/impl/schema/LuceneIndexProviderFactory.java | 2 +- .../NativeLuceneFusionIndexProviderFactory10.java | 2 +- .../NativeLuceneFusionIndexProviderFactory20.java | 2 +- .../builtinprocs/EnterpriseCreateIndexProcedureIT.java | 8 ++++---- 24 files changed, 43 insertions(+), 39 deletions(-) diff --git a/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java b/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java index b83029bd16bac..09d34d3491e55 100644 --- a/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java +++ b/community/community-it/consistency-it/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java @@ -252,7 +252,7 @@ public void oldLuceneSchemaIndexShouldBeConsideredConsistentWithFusionProvider() String propKey = "propKey"; // Given a lucene index - GraphDatabaseService db = getGraphDatabaseService( storeDir, defaultSchemaProvider, LUCENE10.providerName() ); + GraphDatabaseService db = getGraphDatabaseService( storeDir, defaultSchemaProvider, LUCENE10.providerIdentifier() ); createIndex( db, label, propKey ); try ( Transaction tx = db.beginTx() ) { @@ -264,7 +264,7 @@ public void oldLuceneSchemaIndexShouldBeConsideredConsistentWithFusionProvider() ConsistencyCheckService service = new ConsistencyCheckService(); Config configuration = - Config.defaults( settings( defaultSchemaProvider, NATIVE20.providerName() ) ); + Config.defaults( settings( defaultSchemaProvider, NATIVE20.providerIdentifier() ) ); Result result = runFullConsistencyCheck( service, configuration, testDirectory.databaseDir() ); assertTrue( result.isSuccessful() ); } diff --git a/community/community-it/dbms-it/src/test/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommandTest.java b/community/community-it/dbms-it/src/test/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommandTest.java index 2517d756f509a..34da442520121 100644 --- a/community/community-it/dbms-it/src/test/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommandTest.java +++ b/community/community-it/dbms-it/src/test/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommandTest.java @@ -245,7 +245,7 @@ private static void createDatabaseWithNativeIndexes( File storeDir, String datab { GraphDatabaseService db = new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( storeDir ) - .setConfig( default_schema_provider, schemaIndex.providerName() ) + .setConfig( default_schema_provider, schemaIndex.providerIdentifier() ) .setConfig( active_database, databaseName ) .newGraphDatabase(); String key = "key-" + schemaIndex.name(); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java b/community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java index 092b5bf9ab0cc..5e2843dd6ff96 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java @@ -177,12 +177,12 @@ private static IndexProvider selectIndexProvider( PageCache pageCache, File data { String defaultSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider ); RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE; - if ( LUCENE10.providerName().equals( defaultSchemaProvider ) ) + if ( LUCENE10.providerIdentifier().equals( defaultSchemaProvider ) ) { return LuceneIndexProviderFactory .newInstance( pageCache, databaseDirectory, fs, monitor, config, operationalMode, recoveryCleanupWorkCollector ); } - else if ( NATIVE10.providerName().equals( defaultSchemaProvider ) ) + else if ( NATIVE10.providerIdentifier().equals( defaultSchemaProvider ) ) { return NativeLuceneFusionIndexProviderFactory10 .create( pageCache, databaseDirectory, fs, monitor, config, operationalMode, recoveryCleanupWorkCollector ); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/DefaultSchemaIndexConfigTest.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/DefaultSchemaIndexConfigTest.java index bb2d46e189f17..eca15e4474c2f 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/DefaultSchemaIndexConfigTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/DefaultSchemaIndexConfigTest.java @@ -63,7 +63,7 @@ public void shouldUseConfiguredIndexProviderLucene() throws IndexNotFoundKernelE { // given GraphDatabaseService db = dbBuilder.setConfig( GraphDatabaseSettings.default_schema_provider, - GraphDatabaseSettings.SchemaIndex.LUCENE10.providerName() ).newGraphDatabase(); + GraphDatabaseSettings.SchemaIndex.LUCENE10.providerIdentifier() ).newGraphDatabase(); // when createIndex( db ); @@ -77,7 +77,7 @@ public void shouldUseConfiguredIndexProviderNative10() throws IndexNotFoundKerne { // given GraphDatabaseService db = dbBuilder.setConfig( GraphDatabaseSettings.default_schema_provider, - GraphDatabaseSettings.SchemaIndex.NATIVE10.providerName() ).newGraphDatabase(); + GraphDatabaseSettings.SchemaIndex.NATIVE10.providerIdentifier() ).newGraphDatabase(); // when createIndex( db ); @@ -91,7 +91,7 @@ public void shouldUseConfiguredIndexProviderNative20() throws IndexNotFoundKerne { // given GraphDatabaseService db = dbBuilder.setConfig( GraphDatabaseSettings.default_schema_provider, - GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() ).newGraphDatabase(); + GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() ).newGraphDatabase(); // when createIndex( db ); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java index 3953d962a474e..11c673ccc9d1f 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java @@ -50,7 +50,7 @@ public class FusionIndexIT { @Rule public DatabaseRule db = new EmbeddedDatabaseRule() - .withSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() ); + .withSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() ); private File databaseDirectory; private final Label label = Label.label( "label" ); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider10CompatibilitySuiteTest.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider10CompatibilitySuiteTest.java index f326b3e71d23a..9884b62e74e4d 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider10CompatibilitySuiteTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider10CompatibilitySuiteTest.java @@ -39,7 +39,7 @@ public class FusionIndexProvider10CompatibilitySuiteTest extends IndexProviderCo protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ) { IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; - Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE10.providerName() ) ); + Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE10.providerIdentifier() ) ); OperationalMode mode = OperationalMode.single; RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE; return NativeLuceneFusionIndexProviderFactory10.create( pageCache, graphDbDir, fs, monitor, config, mode, recoveryCleanupWorkCollector ); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider20CompatibilitySuiteTest.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider20CompatibilitySuiteTest.java index 954f7ede17c6b..6918fbb577e40 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider20CompatibilitySuiteTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider20CompatibilitySuiteTest.java @@ -39,7 +39,7 @@ public class FusionIndexProvider20CompatibilitySuiteTest extends IndexProviderCo protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ) { IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; - Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE20.providerName() ) ); + Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE20.providerIdentifier() ) ); OperationalMode mode = OperationalMode.single; RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE; return NativeLuceneFusionIndexProviderFactory20.create( pageCache, graphDbDir, fs, monitor, config, mode, recoveryCleanupWorkCollector ); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderCompatibilitySuiteTest.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderCompatibilitySuiteTest.java index 45f6fd17f5439..ae00f7cf9a3ff 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderCompatibilitySuiteTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderCompatibilitySuiteTest.java @@ -39,7 +39,7 @@ public class LuceneIndexProviderCompatibilitySuiteTest extends IndexProviderComp protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ) { IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; - Config config = Config.defaults( stringMap( default_schema_provider.name(), LUCENE10.providerName() ) ); + Config config = Config.defaults( stringMap( default_schema_provider.name(), LUCENE10.providerIdentifier() ) ); OperationalMode mode = OperationalMode.single; RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE; return LuceneIndexProviderFactory.newInstance( pageCache, graphDbDir, fs, monitor, config, mode, recoveryCleanupWorkCollector ); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/IndexCreateIT.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/IndexCreateIT.java index 409df557ba458..58758eb9e2a48 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/IndexCreateIT.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/IndexCreateIT.java @@ -91,7 +91,7 @@ void shouldCreateWithSpecificExistingProviderName( IndexCreator creator ) throws { // given SchemaWrite schemaWrite = schemaWriteInNewTransaction(); - String provider = indexSetting.providerName(); + String provider = indexSetting.providerIdentifier(); LabelSchemaDescriptor descriptor = forLabel( labelId++, 0 ); creator.create( schemaWrite, descriptor, provider ); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java index f4c6d6a8fce3b..9ddd51a7cfcf6 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java @@ -58,7 +58,7 @@ public class NativeStringIndexingIT @Rule public final DatabaseRule db = new EmbeddedDatabaseRule() - .withSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() ); + .withSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() ); @Rule public final RandomRule random = new RandomRule(); diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorLuceneTest.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorLuceneTest.java index 8827be7e7e436..527f6ef0f2610 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorLuceneTest.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorLuceneTest.java @@ -29,7 +29,7 @@ public class NodeValueIndexCursorLuceneTest extends AbstractNodeValueIndexCursor public ReadTestSupport newTestSupport() { ReadTestSupport readTestSupport = new ReadTestSupport(); - readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, LUCENE10.providerName() ); + readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, LUCENE10.providerIdentifier() ); return readTestSupport; } diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative10Test.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative10Test.java index 77ffcabe9add5..dd9fcd892fb53 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative10Test.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative10Test.java @@ -27,7 +27,7 @@ public class NodeValueIndexCursorNative10Test extends AbstractNodeValueIndexCurs public ReadTestSupport newTestSupport() { ReadTestSupport readTestSupport = new ReadTestSupport(); - readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE10.providerName() ); + readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE10.providerIdentifier() ); return readTestSupport; } diff --git a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative20Test.java b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative20Test.java index 8fde247fea9aa..136c1fa5c060f 100644 --- a/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative20Test.java +++ b/community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative20Test.java @@ -27,7 +27,7 @@ public class NodeValueIndexCursorNative20Test extends AbstractNodeValueIndexCurs public ReadTestSupport newTestSupport() { ReadTestSupport readTestSupport = new ReadTestSupport(); - readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() ); + readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() ); return readTestSupport; } diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/GenericIndexProviderCompatibilitySuiteTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/GenericIndexProviderCompatibilitySuiteTest.java index aee8f2d762ec1..8f77ab33abcb9 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/GenericIndexProviderCompatibilitySuiteTest.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/GenericIndexProviderCompatibilitySuiteTest.java @@ -38,7 +38,7 @@ public class GenericIndexProviderCompatibilitySuiteTest extends IndexProviderCom protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir ) { IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY; - Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE_GBPTREE10.providerName() ) ); + Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE_GBPTREE10.providerIdentifier() ) ); OperationalMode mode = OperationalMode.single; RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE; return GenericNativeIndexProviderFactory.create( pageCache, graphDbDir, fs, monitor, config, mode, recoveryCleanupWorkCollector ); diff --git a/community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertIndexProviderTest.java b/community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertIndexProviderTest.java index 434f5c5c54a46..b4937c3819cec 100644 --- a/community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertIndexProviderTest.java +++ b/community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertIndexProviderTest.java @@ -82,7 +82,7 @@ public BatchInsertIndexProviderTest( GraphDatabaseSettings.SchemaIndex schemaInd @Test public void batchInserterShouldUseConfiguredIndexProvider() throws Exception { - Map config = stringMap( default_schema_provider.name(), schemaIndex.providerName() ); + Map config = stringMap( default_schema_provider.name(), schemaIndex.providerIdentifier() ); BatchInserter inserter = newBatchInserter( config ); inserter.createDeferredSchemaIndex( TestLabels.LABEL_ONE ).on( "key" ).create(); inserter.shutdown(); @@ -97,8 +97,8 @@ public void batchInserterShouldUseConfiguredIndexProvider() throws Exception int labelId = tokenRead.nodeLabel( TestLabels.LABEL_ONE.name() ); int propertyId = tokenRead.propertyKey( "key" ); IndexReference index = schemaRead.index( labelId, propertyId ); - assertTrue( unexpectedIndexProviderMessage( index ), schemaIndex.providerName().contains( index.providerKey() ) ); - assertTrue( unexpectedIndexProviderMessage( index ), schemaIndex.providerName().contains( index.providerVersion() ) ); + assertTrue( unexpectedIndexProviderMessage( index ), schemaIndex.providerIdentifier().contains( index.providerKey() ) ); + assertTrue( unexpectedIndexProviderMessage( index ), schemaIndex.providerIdentifier().contains( index.providerVersion() ) ); tx.success(); } finally diff --git a/community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java b/community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java index afb6d32a94ea5..006c2cc21a4ff 100644 --- a/community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java +++ b/community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java @@ -155,7 +155,7 @@ public void scanStoreMustLogCrashPointerCleanupDuringRecovery() throws Exception public void nativeIndexMustLogCrashPointerCleanupDuringRecovery() throws Exception { // given - setTestConfig( GraphDatabaseSettings.default_schema_provider, NATIVE20.providerName() ); + setTestConfig( GraphDatabaseSettings.default_schema_provider, NATIVE20.providerIdentifier() ); dirtyDatabase(); // when diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java index 5c7796ce0d537..2ec09401ce450 100644 --- a/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java +++ b/community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java @@ -50,6 +50,10 @@ import org.neo4j.logging.Level; import org.neo4j.logging.LogTimeZone; +import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.LUCENE10; +import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.NATIVE10; +import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.NATIVE20; +import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.NATIVE_GBPTREE10; import static org.neo4j.kernel.configuration.Settings.BOOLEAN; import static org.neo4j.kernel.configuration.Settings.BYTES; import static org.neo4j.kernel.configuration.Settings.DEFAULT; @@ -567,7 +571,7 @@ public enum SchemaIndex this.providerName = providerName; } - public String providerName() + public String providerIdentifier() { return providerName; } @@ -595,8 +599,8 @@ public String providerName() "- Controllable memory usage, due to being bound by the page cache" ) public static final Setting default_schema_provider = setting( "dbms.index.default_schema_provider", - optionsIgnoreCase( SchemaIndex.NATIVE20.providerName(), SchemaIndex.NATIVE10.providerName(), SchemaIndex.LUCENE10.providerName(), - SchemaIndex.NATIVE_GBPTREE10.providerName() ), + optionsIgnoreCase( NATIVE20.providerIdentifier(), NATIVE10.providerIdentifier(), LUCENE10.providerIdentifier(), + NATIVE_GBPTREE10.providerIdentifier() ), null ); @Description( "Location where Neo4j keeps the logical transaction logs." ) diff --git a/community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java b/community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java index a787bd6ca9c1c..788f7a1f1e58b 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java @@ -127,7 +127,7 @@ public void setValueWithOldSetting( String value, Map rawConfigur if ( value.equals( Settings.FALSE ) ) { rawConfiguration.putIfAbsent( GraphDatabaseSettings.default_schema_provider.name(), - GraphDatabaseSettings.SchemaIndex.LUCENE10.providerName() ); + GraphDatabaseSettings.SchemaIndex.LUCENE10.providerIdentifier() ); } } } ); diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProviderFactory.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProviderFactory.java index 4b787cc7ddfac..03115603e24f3 100644 --- a/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProviderFactory.java +++ b/community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProviderFactory.java @@ -88,7 +88,7 @@ public static GenericNativeIndexProvider create( PageCache pageCache, File store { String selectedSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider ); int priority = PRIORITY; - if ( GraphDatabaseSettings.SchemaIndex.NATIVE_GBPTREE10.providerName().equals( selectedSchemaProvider ) ) + if ( GraphDatabaseSettings.SchemaIndex.NATIVE_GBPTREE10.providerIdentifier().equals( selectedSchemaProvider ) ) { priority = 100; } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java b/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java index ae083af620e38..d488073d053d3 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java @@ -172,7 +172,7 @@ public void migrateEnableNativeSchemaIndex() { Map migratedProperties = migrator.apply( stringMap( "unsupported.dbms.enable_native_schema_index", "false" ), getLog() ); assertEquals( "Old property should be migrated to new", - migratedProperties, stringMap( "dbms.index.default_schema_provider", LUCENE10.providerName() )); + migratedProperties, stringMap( "dbms.index.default_schema_provider", LUCENE10.providerIdentifier() )); assertContainsWarningMessage("unsupported.dbms.enable_native_schema_index has been replaced with dbms.index.default_schema_provider."); } @@ -180,8 +180,8 @@ public void migrateEnableNativeSchemaIndex() @Test public void skipMigrationOfEnableNativeSchemaIndexIfNotPresent() { - Map migratedProperties = migrator.apply( stringMap( "dbms.index.default_schema_provider", NATIVE10.providerName() ), getLog() ); - assertEquals( "Nothing to migrate", migratedProperties, stringMap( "dbms.index.default_schema_provider", NATIVE10.providerName() ) ); + Map migratedProperties = migrator.apply( stringMap( "dbms.index.default_schema_provider", NATIVE10.providerIdentifier() ), getLog() ); + assertEquals( "Nothing to migrate", migratedProperties, stringMap( "dbms.index.default_schema_provider", NATIVE10.providerIdentifier() ) ); logProvider.assertNoLoggingOccurred(); } @@ -189,11 +189,11 @@ public void skipMigrationOfEnableNativeSchemaIndexIfNotPresent() public void skipMigrationOfEnableNativeSchemaIndexIfDefaultSchemaIndexConfigured() { Map migratedProperties = migrator.apply( stringMap( - "dbms.index.default_schema_provider", NATIVE10.providerName(), + "dbms.index.default_schema_provider", NATIVE10.providerIdentifier(), "unsupported.dbms.enable_native_schema_index", "false" ), getLog() ); assertEquals( "Should keep pre configured default schema index.", - migratedProperties, stringMap( "dbms.index.default_schema_provider", NATIVE10.providerName() ) ); + migratedProperties, stringMap( "dbms.index.default_schema_provider", NATIVE10.providerIdentifier() ) ); assertContainsWarningMessage(); } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java index a6d6ffb4b985d..92bfa7c202cb7 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java @@ -108,7 +108,7 @@ public static FusionIndexProvider newInstance( PageCache pageCache, File databas String defaultSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider ); int priority = LuceneIndexProvider.PRIORITY; - if ( GraphDatabaseSettings.SchemaIndex.LUCENE10.providerName().equals( defaultSchemaProvider ) ) + if ( GraphDatabaseSettings.SchemaIndex.LUCENE10.providerIdentifier().equals( defaultSchemaProvider ) ) { priority = 100; } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java index 0b7c2ffb81d1a..8522da4e89735 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java @@ -89,7 +89,7 @@ public static FusionIndexProvider create( PageCache pageCache, File databaseDire String defaultSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider ); int priority = PRIORITY; - if ( GraphDatabaseSettings.SchemaIndex.NATIVE10.providerName().equals( defaultSchemaProvider ) ) + if ( GraphDatabaseSettings.SchemaIndex.NATIVE10.providerIdentifier().equals( defaultSchemaProvider ) ) { priority = 100; } diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java index fb028f1f197cf..0fa23ca3e453e 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java @@ -91,7 +91,7 @@ public static FusionIndexProvider create( PageCache pageCache, File databaseDire String defaultSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider ); int priority = PRIORITY; - if ( GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName().equals( defaultSchemaProvider ) ) + if ( GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier().equals( defaultSchemaProvider ) ) { priority = 100; } diff --git a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/kernel/builtinprocs/EnterpriseCreateIndexProcedureIT.java b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/kernel/builtinprocs/EnterpriseCreateIndexProcedureIT.java index 5a942358d9004..9d025d5cf866c 100644 --- a/enterprise/neo4j-enterprise/src/test/java/org/neo4j/kernel/builtinprocs/EnterpriseCreateIndexProcedureIT.java +++ b/enterprise/neo4j-enterprise/src/test/java/org/neo4j/kernel/builtinprocs/EnterpriseCreateIndexProcedureIT.java @@ -121,7 +121,7 @@ public void shouldCreateNonExistingLabelAndPropertyToken() throws Exception // when newTransaction( AnonymousContext.full() ); - callIndexProcedure( indexPattern( label, propKey ), GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() ); + callIndexProcedure( indexPattern( label, propKey ), GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() ); commit(); // then @@ -196,7 +196,7 @@ public void throwIfIndexAlreadyExists() throws Exception String pattern = indexPattern( label, propertyKey ); try { - callIndexProcedure( pattern, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() ); + callIndexProcedure( pattern, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() ); fail( "Should have failed" ); } catch ( ProcedureException e ) @@ -270,7 +270,7 @@ private void testCreateIndexWithGivenProvider( String label, String... propertie // when newTransaction( AnonymousContext.full() ); String pattern = indexPattern( label, properties ); - String specifiedProvider = NATIVE10.providerName(); + String specifiedProvider = NATIVE10.providerIdentifier(); RawIterator result = callIndexProcedure( pattern, specifiedProvider ); // then assertThat( Arrays.asList( result.next() ), contains( pattern, specifiedProvider, expectedSuccessfulCreationStatus ) ); @@ -417,7 +417,7 @@ private void createConstraint( String label, String... properties ) throws Trans { newTransaction( AnonymousContext.full() ); String pattern = indexPattern( label, properties ); - String specifiedProvider = NATIVE10.providerName(); + String specifiedProvider = NATIVE10.providerIdentifier(); callIndexProcedure( pattern, specifiedProvider ); commit(); }