From 8288187dbd9577af3148eacb0dad0e8ba4377ead Mon Sep 17 00:00:00 2001 From: Mattias Persson Date: Mon, 18 Mar 2013 21:47:54 +0100 Subject: [PATCH] Fixes for a recent migration commit. - Fixed remaining hard references to legacy version v0.9.9 instead of using LegacyStore.LEGACY_VERSION. - Increased expected max ID of node store in a test due to the previous store migration code increasing max ID one too much even if the last ID wasn't in use. --- .../org/neo4j/kernel/impl/nioneo/store/UpgradeStoreIT.java | 2 +- .../impl/storemigration/StoreUpgradeIntegrationTest.java | 2 +- .../impl/storemigration/UpgradableDatabaseTestIT.java | 7 ++++--- .../impl/storemigration/legacystore/ReadRecordsTestIT.java | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/UpgradeStoreIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/UpgradeStoreIT.java index 55d7b408d52c5..88b1b5dcd4b84 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/UpgradeStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/UpgradeStoreIT.java @@ -296,7 +296,7 @@ private void setBlockSize( File file, int blockSize, String oldVersionToSet ) th buffer.flip(); channel.write( buffer ); - // It's the same length as the current version v0.9.9 + // It's the same length as the current version channel.position( channel.size() - UTF8.encode( oldVersionToSet ).length ); buffer = ByteBuffer.wrap( UTF8.encode( oldVersionToSet ) ); channel.write( buffer ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgradeIntegrationTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgradeIntegrationTest.java index df46602a6b48b..ad8468e2a9f52 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgradeIntegrationTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/StoreUpgradeIntegrationTest.java @@ -91,7 +91,7 @@ public void shouldAbortOnCorruptStore() throws IOException assertTrue( allStoreFilesHaveVersion( fileSystem, workingDirectory, LEGACY_VERSION ) ); truncateFile(fileSystem, new File( workingDirectory, "neostore.propertystore.db.index.keys" ), - "StringPropertyStore v0.9.9" ); + "StringPropertyStore " + LEGACY_VERSION ); Map params = new HashMap(); params.put( Config.ALLOW_STORE_UPGRADE, "true" ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTestIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTestIT.java index 3d2ae863f40ef..6b942a7ea8d67 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTestIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTestIT.java @@ -28,6 +28,7 @@ import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.changeVersionNumber; import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.truncateFile; import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.truncateToFixedLength; +import static org.neo4j.kernel.impl.storemigration.legacystore.LegacyStore.LEGACY_VERSION; import static org.neo4j.kernel.impl.util.FileUtils.copyRecursively; import java.io.File; @@ -92,7 +93,7 @@ public void shouldRejectStoresIfOneFileHasNoVersionAsIfNotShutDownCleanly() thro copyRecursively( resourceDirectory, workingDirectory ); - truncateFile( fileSystem, new File( workingDirectory, "neostore.nodestore.db" ), "StringPropertyStore v0.9.9" ); + truncateFile( fileSystem, new File( workingDirectory, "neostore.nodestore.db" ), "StringPropertyStore " + LEGACY_VERSION ); assertFalse( new UpgradableDatabase(fileSystem).storeFilesUpgradeable( new File( workingDirectory, "neostore" ) ) ); } @@ -110,7 +111,7 @@ public void shouldRejectStoresIfOneFileShorterThanExpectedVersionString() throws copyRecursively( resourceDirectory, workingDirectory ); int shortFileLength = 5 /* (RelationshipTypeStore.RECORD_SIZE) */ * 3; - assertTrue( shortFileLength < UTF8.encode( "StringPropertyStore v0.9.9" ).length ); + assertTrue( shortFileLength < UTF8.encode( "StringPropertyStore " + LEGACY_VERSION ).length ); truncateToFixedLength( fileSystem, new File( workingDirectory, "neostore.relationshiptypestore.db" ), shortFileLength ); assertFalse( new UpgradableDatabase(fileSystem).storeFilesUpgradeable( new File( workingDirectory, "neostore" ) ) ); @@ -140,7 +141,7 @@ public void shouldCommunicateWhatCausesInabilityToUpgrade() throws IOException catch (StoreUpgrader.UnableToUpgradeException e) { assertThat( e.getMessage(), is("'neostore.nodestore.db' has a store version number that we cannot upgrade " + - "from. Expected 'NodeStore v0.9.9' but file is version 'NodeStore v0.9.5'.") ); + "from. Expected 'NodeStore " + LEGACY_VERSION + "' but file is version 'NodeStore v0.9.5'.") ); } } } diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/ReadRecordsTestIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/ReadRecordsTestIT.java index f5528aa546b74..e72f3d5595fbf 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/ReadRecordsTestIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/legacystore/ReadRecordsTestIT.java @@ -38,7 +38,7 @@ public void shouldReadNodeRecords() throws IOException URL nodeStoreFile = getClass().getResource( "exampledb/neostore.nodestore.db" ); LegacyNodeStoreReader nodeStoreReader = new LegacyNodeStoreReader( fs, new File( nodeStoreFile.getFile() ) ); - assertEquals( 1001, nodeStoreReader.getMaxId() ); + assertEquals( 1002, nodeStoreReader.getMaxId() ); Iterable records = nodeStoreReader.readNodeStore(); int nodeCount = 0; for ( NodeRecord record : records )