Introduce neo4j upgrader artifact to be able to migrate oblsolete ver…

…sions of lucene indexes.
neo4j · Dec 5, 2015 · 3299958 · 3299958
1 parent b369359
commit 3299958
Show file tree

Hide file tree

Showing 101 changed files with 1,995 additions and 99 deletions.
diff --git a/advanced/neo4j-advanced/LICENSES.txt b/advanced/neo4j-advanced/LICENSES.txt
@@ -7,6 +7,7 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   opencsv
   parboiled-core

diff --git a/advanced/neo4j-advanced/NOTICE.txt b/advanced/neo4j-advanced/NOTICE.txt
@@ -29,6 +29,7 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   opencsv
   parboiled-core

diff --git a/advanced/server-advanced/LICENSES.txt b/advanced/server-advanced/LICENSES.txt
@@ -24,6 +24,7 @@ Apache Software License, Version 2.0
   Jetty :: XML utilities
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   Netty/All-in-One
   opencsv

diff --git a/advanced/server-advanced/NOTICE.txt b/advanced/server-advanced/NOTICE.txt
@@ -46,6 +46,7 @@ Apache Software License, Version 2.0
   Jetty :: XML utilities
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   Netty/All-in-One
   opencsv

diff --git a/community/bolt/LICENSES.txt b/community/bolt/LICENSES.txt
@@ -7,6 +7,7 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   Netty/All-in-One
   opencsv

diff --git a/community/bolt/NOTICE.txt b/community/bolt/NOTICE.txt
@@ -30,6 +30,7 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   Netty/All-in-One
   opencsv

diff --git a/community/consistency-check-legacy/LICENSES.txt b/community/consistency-check-legacy/LICENSES.txt
@@ -6,6 +6,7 @@ Apache Software License, Version 2.0
   Apache Commons Lang
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
 ------------------------------------------------------------------------------
 

diff --git a/community/consistency-check-legacy/NOTICE.txt b/community/consistency-check-legacy/NOTICE.txt
@@ -29,5 +29,6 @@ Apache Software License, Version 2.0
   Apache Commons Lang
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
 
diff --git a/community/consistency-check/LICENSES.txt b/community/consistency-check/LICENSES.txt
@@ -6,6 +6,7 @@ Apache Software License, Version 2.0
   Apache Commons Lang
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
 ------------------------------------------------------------------------------
 

diff --git a/community/consistency-check/NOTICE.txt b/community/consistency-check/NOTICE.txt
@@ -29,5 +29,6 @@ Apache Software License, Version 2.0
   Apache Commons Lang
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
 
diff --git a/community/cypher/cypher/LICENSES.txt b/community/cypher/cypher/LICENSES.txt
@@ -6,6 +6,7 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   opencsv
   parboiled-core

diff --git a/community/cypher/cypher/NOTICE.txt b/community/cypher/cypher/NOTICE.txt
@@ -29,6 +29,7 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   opencsv
   parboiled-core

diff --git a/community/embedded-examples/LICENSES.txt b/community/embedded-examples/LICENSES.txt
@@ -7,6 +7,7 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   opencsv
   parboiled-core

diff --git a/community/embedded-examples/NOTICE.txt b/community/embedded-examples/NOTICE.txt
@@ -30,6 +30,7 @@ Apache Software License, Version 2.0
   ConcurrentLinkedHashMap
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
   opencsv
   parboiled-core

diff --git a/community/graph-algo/LICENSES.txt b/community/graph-algo/LICENSES.txt
@@ -4,6 +4,8 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
 ------------------------------------------------------------------------------
 Apache Software License, Version 2.0
   Apache Commons Lang
+  Lucene Core
+  Lucene Memory
 ------------------------------------------------------------------------------
 
                                  Apache License

diff --git a/community/graph-algo/NOTICE.txt b/community/graph-algo/NOTICE.txt
@@ -27,4 +27,6 @@ Third-party licenses
 
 Apache Software License, Version 2.0
   Apache Commons Lang
+  Lucene Core
+  Lucene Memory
 
diff --git a/community/graph-matching/LICENSES.txt b/community/graph-matching/LICENSES.txt
@@ -4,6 +4,8 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
 ------------------------------------------------------------------------------
 Apache Software License, Version 2.0
   Apache Commons Lang
+  Lucene Core
+  Lucene Memory
 ------------------------------------------------------------------------------
 
                                  Apache License

diff --git a/community/graph-matching/NOTICE.txt b/community/graph-matching/NOTICE.txt
@@ -27,4 +27,6 @@ Third-party licenses
 
 Apache Software License, Version 2.0
   Apache Commons Lang
+  Lucene Core
+  Lucene Memory
 
diff --git a/community/graphviz/LICENSES.txt b/community/graphviz/LICENSES.txt
@@ -4,6 +4,8 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
 ------------------------------------------------------------------------------
 Apache Software License, Version 2.0
   Apache Commons Lang
+  Lucene Core
+  Lucene Memory
 ------------------------------------------------------------------------------
 
                                  Apache License

diff --git a/community/graphviz/NOTICE.txt b/community/graphviz/NOTICE.txt
@@ -27,4 +27,6 @@ Third-party licenses
 
 Apache Software License, Version 2.0
   Apache Commons Lang
+  Lucene Core
+  Lucene Memory
 
diff --git a/community/import-tool/LICENSES.txt b/community/import-tool/LICENSES.txt
@@ -5,6 +5,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
 Apache Software License, Version 2.0
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
 ------------------------------------------------------------------------------
 

diff --git a/community/import-tool/NOTICE.txt b/community/import-tool/NOTICE.txt
@@ -28,5 +28,6 @@ Third-party licenses
 Apache Software License, Version 2.0
   Lucene Common Analyzers
   Lucene Core
+  Lucene Memory
   Lucene QueryParsers
 
diff --git a/community/kernel/LICENSES.txt b/community/kernel/LICENSES.txt
@@ -4,6 +4,8 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
 ------------------------------------------------------------------------------
 Apache Software License, Version 2.0
   Apache Commons Lang
+  Lucene Core
+  Lucene Memory
 ------------------------------------------------------------------------------
 
                                  Apache License

diff --git a/community/kernel/NOTICE.txt b/community/kernel/NOTICE.txt
@@ -27,4 +27,6 @@ Third-party licenses
 
 Apache Software License, Version 2.0
   Apache Commons Lang
+  Lucene Core
+  Lucene Memory
 
diff --git a/community/kernel/pom.xml b/community/kernel/pom.xml
@@ -294,6 +294,11 @@ the relevant Commercial Agreement.
       <artifactId>neo4j-logging</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-lucene-upgrade</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <!-- test dependencies -->
     <dependency>

diff --git a/community/kernel/src/main/java/org/neo4j/graphdb/index/IndexImplementation.java b/community/kernel/src/main/java/org/neo4j/graphdb/index/IndexImplementation.java
@@ -35,6 +35,9 @@
  */
 public interface IndexImplementation extends Lifecycle
 {
+
+    File getStoreDirectory( File storeDir );
+
     /**
      * Returns a {@link LegacyIndexProviderTransaction} that keeps transaction state for all
      * indexes for a given provider in a transaction.

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java b/community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java
@@ -90,6 +90,7 @@
 import org.neo4j.kernel.impl.store.StoreId;
 import org.neo4j.kernel.impl.store.UnderlyingStorageException;
 import org.neo4j.kernel.impl.store.record.SchemaRule;
+import org.neo4j.kernel.impl.storemigration.LegacyIndexMigrator;
 import org.neo4j.kernel.impl.storemigration.StoreMigrator;
 import org.neo4j.kernel.impl.storemigration.StoreUpgrader;
 import org.neo4j.kernel.impl.storemigration.StoreVersionCheck;
@@ -314,7 +315,7 @@ boolean applicable( DiagnosticsPhase phase )
 
     private Dependencies dependencies;
     private LifeSupport life;
-    private SchemaIndexProvider indexProvider;
+    private SchemaIndexProvider schemaIndexProvider;
     private File storeDir;
     private boolean readOnly;
 
@@ -444,7 +445,7 @@ public void start() throws IOException
         dependencies = new Dependencies();
         life = new LifeSupport();
 
-        indexProvider = dependencyResolver.resolveDependency( SchemaIndexProvider.class,
+        schemaIndexProvider = dependencyResolver.resolveDependency( SchemaIndexProvider.class,
                 HighestSelectionStrategy.getInstance() );
 
         LabelScanStoreProvider labelScanStoreProvider =
@@ -464,7 +465,8 @@ public void start() throws IOException
         life.add( new Lifecycle.Delegate( Lifecycles.multiple( indexProviders.values() ) ) );
 
         // Upgrade the store before we begin
-        upgradeStore( storeDir, storeMigrationProcess, indexProvider, labelScanStoreProvider );
+        upgradeStore( storeDir, storeMigrationProcess, schemaIndexProvider, labelScanStoreProvider, indexProviders,
+                logProvider );
 
         // Build all modules and their services
         StorageEngine storageEngine = null;
@@ -572,11 +574,13 @@ public void start() throws IOException
     // By doing this sequence of method calls we can ensure that no dependency cycles exist, and get a clearer view
     // of the dependency tree, starting at the bottom
     private void upgradeStore( File storeDir, StoreUpgrader storeMigrationProcess, SchemaIndexProvider indexProvider,
-            LabelScanStoreProvider labelScanStoreProvider )
+            LabelScanStoreProvider labelScanStoreProvider, Map<String,IndexImplementation> indexProviders,
+            LogProvider logProvider )
     {
         UpgradableDatabase upgradableDatabase =
                 new UpgradableDatabase( fs, new StoreVersionCheck( pageCache ), new LegacyStoreVersionCheck( fs ) );
         storeMigrationProcess.addParticipant( indexProvider.storeMigrationParticipant( fs, pageCache ) );
+        storeMigrationProcess.addParticipant( new LegacyIndexMigrator( fs, indexProviders, logProvider) );
         storeMigrationProcess.addParticipant( storeMigrator );
         storeMigrationProcess.migrateIfNeeded( storeDir, upgradableDatabase, indexProvider, labelScanStoreProvider );
     }
@@ -592,7 +596,7 @@ private StorageEngine buildStorageEngine(
         return life.add(
                 new RecordStorageEngine( storeDir, config, idGeneratorFactory, pageCache, fs, logProvider, propertyKeyTokenHolder,
                         labelTokens, relationshipTypeTokens, schemaStateChangeCallback, constraintSemantics, scheduler,
-                        tokenNameLookup, lockService, indexProvider, indexingServiceMonitor, databaseHealth,
+                        tokenNameLookup, lockService, schemaIndexProvider, indexingServiceMonitor, databaseHealth,
                         labelScanStore, legacyIndexProviderLookup, indexConfigStore ) );
     }