Rename low limit format into standard.

Rename format name and packages. Adapt test names.
neo4j · Apr 15, 2016 · e5fa87c · e5fa87c
1 parent 1198ea4
commit e5fa87c
Show file tree

Hide file tree

Showing 107 changed files with 404 additions and 458 deletions.
diff --git a/...onsistency-check/src/test/java/org/neo4j/consistency/checking/DynamicRecordCheckTest.java b/...onsistency-check/src/test/java/org/neo4j/consistency/checking/DynamicRecordCheckTest.java
@@ -27,14 +27,13 @@
 import org.neo4j.consistency.report.ConsistencyReport;
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.SchemaStore;
-import org.neo4j.kernel.impl.store.format.lowlimit.DynamicRecordFormat;
+import org.neo4j.kernel.impl.store.format.standard.DynamicRecordFormat;
 import org.neo4j.kernel.impl.store.record.DynamicRecord;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
-
 import static org.neo4j.consistency.store.RecordAccessStub.SCHEMA_RECORD_TYPE;
 
 @RunWith(Suite.class)

diff --git a/...ity/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java b/...ity/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java
@@ -57,7 +57,7 @@
 import org.neo4j.kernel.impl.store.StoreAccess;
 import org.neo4j.kernel.impl.store.StoreFactory;
 import org.neo4j.kernel.impl.store.format.RecordFormatSelector;
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0;
+import org.neo4j.kernel.impl.store.format.standard.StandardV3_0;
 import org.neo4j.kernel.impl.store.record.DynamicRecord;
 import org.neo4j.kernel.impl.store.record.NeoStoreRecord;
 import org.neo4j.kernel.impl.store.record.NodeRecord;
@@ -117,7 +117,7 @@ public GraphStoreFixture( String formatName )
 
     public GraphStoreFixture()
     {
-        this( false, LowLimitV3_0.NAME );
+        this( false, StandardV3_0.NAME );
     }
 
     public void apply( Transaction transaction ) throws TransactionFailureException

diff --git a/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java b/community/import-tool/src/test/java/org/neo4j/tooling/ImportToolTest.java
@@ -55,7 +55,7 @@
 import org.neo4j.io.fs.FileUtils;
 import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine;
 import org.neo4j.kernel.impl.store.NeoStores;
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0;
+import org.neo4j.kernel.impl.store.format.standard.StandardV3_0;
 import org.neo4j.kernel.impl.util.Validator;
 import org.neo4j.kernel.impl.util.Validators;
 import org.neo4j.kernel.internal.Version;
@@ -1544,7 +1544,7 @@ public void shouldRespectDbConfig() throws Exception
         // THEN
         NeoStores stores = dbRule.getGraphDatabaseAPI().getDependencyResolver()
                 .resolveDependency( RecordStorageEngine.class ).testAccessNeoStores();
-        int headerSize = LowLimitV3_0.RECORD_FORMATS.dynamic().getRecordHeaderSize();
+        int headerSize = StandardV3_0.RECORD_FORMATS.dynamic().getRecordHeaderSize();
         assertEquals( arrayBlockSize + headerSize, stores.getPropertyStore().getArrayStore().getRecordSize() );
         assertEquals( stringBlockSize + headerSize, stores.getPropertyStore().getStringStore().getRecordSize() );
     }

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityEditionModule.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityEditionModule.java
@@ -47,7 +47,7 @@
 import org.neo4j.kernel.impl.locking.ResourceTypes;
 import org.neo4j.kernel.impl.locking.community.CommunityLockManger;
 import org.neo4j.kernel.impl.logging.LogService;
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0;
+import org.neo4j.kernel.impl.store.format.standard.StandardV3_0;
 import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory;
@@ -110,7 +110,7 @@ public CommunityEditionModule( PlatformModule platformModule )
 
         ioLimiter = IOLimiter.unlimited();
 
-        formats = LowLimitV3_0.RECORD_FORMATS;
+        formats = StandardV3_0.RECORD_FORMATS;
 
         registerRecovery( platformModule.databaseInfo, life, dependencies );
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MetaDataStore.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/MetaDataStore.java
@@ -30,7 +30,7 @@
 import org.neo4j.io.pagecache.PagedFile;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.store.format.RecordFormat;
-import org.neo4j.kernel.impl.store.format.lowlimit.MetaDataRecordFormat;
+import org.neo4j.kernel.impl.store.format.standard.MetaDataRecordFormat;
 import org.neo4j.kernel.impl.store.id.IdGeneratorFactory;
 import org.neo4j.kernel.impl.store.id.IdType;
 import org.neo4j.kernel.impl.store.record.MetaDataRecord;
@@ -48,10 +48,9 @@
 
 import static java.lang.String.format;
 import static java.util.concurrent.TimeUnit.SECONDS;
-
 import static org.neo4j.io.pagecache.PagedFile.PF_SHARED_READ_LOCK;
 import static org.neo4j.io.pagecache.PagedFile.PF_SHARED_WRITE_LOCK;
-import static org.neo4j.kernel.impl.store.format.lowlimit.MetaDataRecordFormat.RECORD_SIZE;
+import static org.neo4j.kernel.impl.store.format.standard.MetaDataRecordFormat.RECORD_SIZE;
 
 public class MetaDataStore extends CommonAbstractStore<MetaDataRecord,NoStoreHeader>
         implements TransactionIdStore, LogVersionRepository

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyType.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/PropertyType.java
@@ -24,7 +24,7 @@
 
 import org.neo4j.kernel.api.properties.DefinedProperty;
 import org.neo4j.kernel.api.properties.Property;
-import org.neo4j.kernel.impl.store.format.lowlimit.PropertyRecordFormat;
+import org.neo4j.kernel.impl.store.format.standard.PropertyRecordFormat;
 import org.neo4j.kernel.impl.store.record.PropertyBlock;
 
 /**

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreId.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/StoreId.java
@@ -26,13 +26,13 @@
 import java.security.SecureRandom;
 import java.util.Random;
 
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0;
+import org.neo4j.kernel.impl.store.format.standard.StandardV3_0;
 
 import static org.neo4j.kernel.impl.store.MetaDataStore.versionStringToLong;
 
 public final class StoreId implements Externalizable
 {
-    public static final long CURRENT_STORE_VERSION = versionStringToLong( LowLimitV3_0.STORE_VERSION );
+    public static final long CURRENT_STORE_VERSION = versionStringToLong( StandardV3_0.STORE_VERSION );
 
     public static final StoreId DEFAULT = new StoreId( -1, -1, -1, -1, -1 );
 

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/BaseRecordFormats.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/BaseRecordFormats.java
@@ -22,11 +22,10 @@
 import java.util.Set;
 import java.util.stream.Stream;
 
-import org.neo4j.kernel.impl.store.format.lowlimit.MetaDataRecordFormat;
+import org.neo4j.kernel.impl.store.format.standard.MetaDataRecordFormat;
 import org.neo4j.kernel.impl.store.record.MetaDataRecord;
 
 import static java.util.stream.Collectors.toSet;
-
 import static org.neo4j.helpers.ArrayUtil.contains;
 
 /**

diff --git a/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/RecordFormatSelector.java b/community/kernel/src/main/java/org/neo4j/kernel/impl/store/format/RecordFormatSelector.java
@@ -26,11 +26,11 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.logging.LogService;
 import org.neo4j.kernel.impl.logging.NullLogService;
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV2_0;
+import org.neo4j.kernel.impl.store.format.standard.StandardV2_0;
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV2_1;
+import org.neo4j.kernel.impl.store.format.standard.StandardV2_1;
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV2_2;
+import org.neo4j.kernel.impl.store.format.standard.StandardV2_2;
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV2_3;
+import org.neo4j.kernel.impl.store.format.standard.StandardV2_3;
-import org.neo4j.kernel.impl.store.format.lowlimit.LowLimitV3_0;
+import org.neo4j.kernel.impl.store.format.standard.StandardV3_0;
 import org.neo4j.logging.Log;
 
 import static java.util.Arrays.asList;
@@ -47,14 +47,14 @@
 public class RecordFormatSelector
 {
 
-    private static final RecordFormats DEFAULT_AUTOSELECT_FORMAT = LowLimitV3_0.RECORD_FORMATS;
+    private static final RecordFormats DEFAULT_AUTOSELECT_FORMAT = StandardV3_0.RECORD_FORMATS;
 
     private static final Iterable<RecordFormats> KNOWN_FORMATS = asList(
-            LowLimitV2_0.RECORD_FORMATS,
+            StandardV2_0.RECORD_FORMATS,
-            LowLimitV2_1.RECORD_FORMATS,
+            StandardV2_1.RECORD_FORMATS,
-            LowLimitV2_2.RECORD_FORMATS,
+            StandardV2_2.RECORD_FORMATS,
-            LowLimitV2_3.RECORD_FORMATS,
+            StandardV2_3.RECORD_FORMATS,
-            LowLimitV3_0.RECORD_FORMATS
+            StandardV3_0.RECORD_FORMATS
     );
 
     /**
@@ -168,9 +168,9 @@ private static RecordFormats loadRecordFormat( String recordFormat )
     {
         if ( StringUtils.isNotEmpty( recordFormat ) )
         {
-            if ( LowLimitV3_0.NAME.equals( recordFormat ) )
+            if ( StandardV3_0.NAME.equals( recordFormat ) )
             {
-                return LowLimitV3_0.RECORD_FORMATS;
+                return StandardV3_0.RECORD_FORMATS;
             }
             RecordFormats.Factory formatFactory = Service.loadSilently( RecordFormats.Factory.class, recordFormat );
             if ( formatFactory != null )

diff --git a/.../format/lowlimit/DynamicRecordFormat.java → .../format/standard/DynamicRecordFormat.java b/.../format/lowlimit/DynamicRecordFormat.java → .../format/standard/DynamicRecordFormat.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.io.pagecache.PagedFile;
@@ -38,7 +38,7 @@ public class DynamicRecordFormat extends BaseOneByteHeaderRecordFormat<DynamicRe
     public DynamicRecordFormat()
     {
         super( INT_STORE_HEADER_READER, RECORD_HEADER_SIZE, 0x10/*the inUse bit is the lsb in the second nibble*/,
-                LowLimitFormatSettings.DYNAMIC_RECORD_MAXIMUM_ID_BITS );
+                StandardFormatSettings.DYNAMIC_RECORD_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...rmat/lowlimit/LabelTokenRecordFormat.java → ...rmat/standard/LabelTokenRecordFormat.java b/...rmat/lowlimit/LabelTokenRecordFormat.java → ...rmat/standard/LabelTokenRecordFormat.java
@@ -17,15 +17,15 @@
  * 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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import org.neo4j.kernel.impl.store.record.LabelTokenRecord;
 
 public class LabelTokenRecordFormat extends TokenRecordFormat<LabelTokenRecord>
 {
     public LabelTokenRecordFormat()
     {
-        super( BASE_RECORD_SIZE, LowLimitFormatSettings.LABEL_TOKEN_MAXIMUM_ID_BITS );
+        super( BASE_RECORD_SIZE, StandardFormatSettings.LABEL_TOKEN_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...format/lowlimit/MetaDataRecordFormat.java → ...format/standard/MetaDataRecordFormat.java b/...format/lowlimit/MetaDataRecordFormat.java → ...format/standard/MetaDataRecordFormat.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import java.io.IOException;
 

diff --git a/...store/format/lowlimit/NoRecordFormat.java → ...store/format/standard/NoRecordFormat.java b/...store/format/lowlimit/NoRecordFormat.java → ...store/format/standard/NoRecordFormat.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import java.io.IOException;
 

diff --git a/...ore/format/lowlimit/NodeRecordFormat.java → ...ore/format/standard/NodeRecordFormat.java b/...ore/format/lowlimit/NodeRecordFormat.java → ...ore/format/standard/NodeRecordFormat.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import java.io.IOException;
 
@@ -36,7 +36,7 @@ public class NodeRecordFormat extends BaseOneByteHeaderRecordFormat<NodeRecord>
 
     public NodeRecordFormat()
     {
-        super( fixedRecordSize( RECORD_SIZE ), 0, IN_USE_BIT, LowLimitFormatSettings.NODE_RECORD_MAXIMUM_ID_BITS );
+        super( fixedRecordSize( RECORD_SIZE ), 0, IN_USE_BIT, StandardFormatSettings.NODE_RECORD_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...format/lowlimit/NodeRecordFormatV2_0.java → ...format/standard/NodeRecordFormatV2_0.java b/...format/lowlimit/NodeRecordFormatV2_0.java → ...format/standard/NodeRecordFormatV2_0.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import java.io.IOException;
 
@@ -31,7 +31,7 @@ class NodeRecordFormatV2_0 extends BaseOneByteHeaderRecordFormat<NodeRecord>
 {
     NodeRecordFormatV2_0()
     {
-        super( fixedRecordSize( 14 ), 0, IN_USE_BIT, LowLimitFormatSettings.NODE_RECORD_MAXIMUM_ID_BITS );
+        super( fixedRecordSize( 14 ), 0, IN_USE_BIT, StandardFormatSettings.NODE_RECORD_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...owlimit/PropertyKeyTokenRecordFormat.java → ...tandard/PropertyKeyTokenRecordFormat.java b/...owlimit/PropertyKeyTokenRecordFormat.java → ...tandard/PropertyKeyTokenRecordFormat.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.kernel.impl.store.record.PropertyKeyTokenRecord;
@@ -26,7 +26,7 @@ public class PropertyKeyTokenRecordFormat extends TokenRecordFormat<PropertyKeyT
 {
     public PropertyKeyTokenRecordFormat()
     {
-        super( BASE_RECORD_SIZE + 4/*prop count field*/, LowLimitFormatSettings.PROPERTY_TOKEN_MAXIMUM_ID_BITS );
+        super( BASE_RECORD_SIZE + 4/*prop count field*/, StandardFormatSettings.PROPERTY_TOKEN_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...format/lowlimit/PropertyRecordFormat.java → ...format/standard/PropertyRecordFormat.java b/...format/lowlimit/PropertyRecordFormat.java → ...format/standard/PropertyRecordFormat.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import org.neo4j.io.pagecache.PageCursor;
 import org.neo4j.io.pagecache.PagedFile;
@@ -41,7 +41,7 @@ public class PropertyRecordFormat extends BaseRecordFormat<PropertyRecord>
 
     public PropertyRecordFormat()
     {
-        super( fixedRecordSize( RECORD_SIZE ), 0, LowLimitFormatSettings.PROPERTY_RECORD_MAXIMUM_ID_BITS );
+        super( fixedRecordSize( RECORD_SIZE ), 0, StandardFormatSettings.PROPERTY_RECORD_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...wlimit/RelationshipGroupRecordFormat.java → ...andard/RelationshipGroupRecordFormat.java b/...wlimit/RelationshipGroupRecordFormat.java → ...andard/RelationshipGroupRecordFormat.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import java.io.IOException;
 
@@ -43,7 +43,7 @@ public class RelationshipGroupRecordFormat extends BaseOneByteHeaderRecordFormat
     public RelationshipGroupRecordFormat()
     {
         super( fixedRecordSize( RECORD_SIZE ), 0, IN_USE_BIT,
-                LowLimitFormatSettings.RELATIONSHIP_GROUP_MAXIMUM_ID_BITS );
+                StandardFormatSettings.RELATIONSHIP_GROUP_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...at/lowlimit/RelationshipRecordFormat.java → ...at/standard/RelationshipRecordFormat.java b/...at/lowlimit/RelationshipRecordFormat.java → ...at/standard/RelationshipRecordFormat.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import java.io.IOException;
 
@@ -39,7 +39,7 @@ public class RelationshipRecordFormat extends BaseOneByteHeaderRecordFormat<Rela
 
     public RelationshipRecordFormat()
     {
-        super( fixedRecordSize( RECORD_SIZE ), 0, IN_USE_BIT, LowLimitFormatSettings.RELATIONSHIP_MAXIMUM_ID_BITS );
+        super( fixedRecordSize( RECORD_SIZE ), 0, IN_USE_BIT, StandardFormatSettings.RELATIONSHIP_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...owlimit/RelationshipRecordFormatV2_0.java → ...tandard/RelationshipRecordFormatV2_0.java b/...owlimit/RelationshipRecordFormatV2_0.java → ...tandard/RelationshipRecordFormatV2_0.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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import java.io.IOException;
 
@@ -31,7 +31,7 @@ class RelationshipRecordFormatV2_0 extends BaseOneByteHeaderRecordFormat<Relatio
 {
     RelationshipRecordFormatV2_0()
     {
-        super( fixedRecordSize( 33 ), 0, IN_USE_BIT, LowLimitFormatSettings.RELATIONSHIP_MAXIMUM_ID_BITS );
+        super( fixedRecordSize( 33 ), 0, IN_USE_BIT, StandardFormatSettings.RELATIONSHIP_MAXIMUM_ID_BITS );
     }
 
     @Override

diff --git a/...it/RelationshipTypeTokenRecordFormat.java → ...rd/RelationshipTypeTokenRecordFormat.java b/...it/RelationshipTypeTokenRecordFormat.java → ...rd/RelationshipTypeTokenRecordFormat.java
@@ -17,15 +17,15 @@
  * 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.kernel.impl.store.format.lowlimit;
+package org.neo4j.kernel.impl.store.format.standard;
 
 import org.neo4j.kernel.impl.store.record.RelationshipTypeTokenRecord;
 
 public class RelationshipTypeTokenRecordFormat extends TokenRecordFormat<RelationshipTypeTokenRecord>
 {
     public RelationshipTypeTokenRecordFormat()
     {
-        super( BASE_RECORD_SIZE, LowLimitFormatSettings.RELATIONSHIP_TYPE_TOKEN_MAXIMUM_ID_BITS );
+        super( BASE_RECORD_SIZE, StandardFormatSettings.RELATIONSHIP_TYPE_TOKEN_MAXIMUM_ID_BITS );
     }
 
     @Override