From d75c00cc781eebf2857d5642b80781338c008760 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Thu, 7 Mar 2019 19:02:10 +0100 Subject: [PATCH] Fixed typo --- ....java => EnhancedObjectStrangeDbList.java} | 6 +- ...deDbList.java => ObjectStrangeDbList.java} | 6 +- ...{StrandeDbList.java => StrangeDbList.java} | 8 +-- .../strangedb/tests/Performance.java | 57 +++++++++---------- 4 files changed, 38 insertions(+), 39 deletions(-) rename src/main/java/it/cavallium/strangedb/java/objects/lists/{EnhancedObjectStrandeDbList.java => EnhancedObjectStrangeDbList.java} (83%) rename src/main/java/it/cavallium/strangedb/java/objects/lists/{ObjectStrandeDbList.java => ObjectStrangeDbList.java} (83%) rename src/main/java/it/cavallium/strangedb/java/objects/lists/{StrandeDbList.java => StrangeDbList.java} (90%) diff --git a/src/main/java/it/cavallium/strangedb/java/objects/lists/EnhancedObjectStrandeDbList.java b/src/main/java/it/cavallium/strangedb/java/objects/lists/EnhancedObjectStrangeDbList.java similarity index 83% rename from src/main/java/it/cavallium/strangedb/java/objects/lists/EnhancedObjectStrandeDbList.java rename to src/main/java/it/cavallium/strangedb/java/objects/lists/EnhancedObjectStrangeDbList.java index ae629e0..e1bb0ce 100644 --- a/src/main/java/it/cavallium/strangedb/java/objects/lists/EnhancedObjectStrandeDbList.java +++ b/src/main/java/it/cavallium/strangedb/java/objects/lists/EnhancedObjectStrangeDbList.java @@ -8,7 +8,7 @@ import it.cavallium.strangedb.java.annotations.DbField; import java.io.IOException; -public class EnhancedObjectStrandeDbList extends StrandeDbList { +public class EnhancedObjectStrangeDbList extends StrangeDbList { @DbField(id = 0, type = DbDataType.REFERENCES_LIST) private LongArrayList indices; @@ -21,11 +21,11 @@ public class EnhancedObjectStrandeDbList extends Stran return indices; } - public EnhancedObjectStrandeDbList() { + public EnhancedObjectStrangeDbList() { super(); } - public EnhancedObjectStrandeDbList(IDatabaseTools databaseTools, Class type) throws IOException { + public EnhancedObjectStrangeDbList(IDatabaseTools databaseTools, Class type) throws IOException { super(databaseTools); this.type = type; indices = new LongArrayList(); diff --git a/src/main/java/it/cavallium/strangedb/java/objects/lists/ObjectStrandeDbList.java b/src/main/java/it/cavallium/strangedb/java/objects/lists/ObjectStrangeDbList.java similarity index 83% rename from src/main/java/it/cavallium/strangedb/java/objects/lists/ObjectStrandeDbList.java rename to src/main/java/it/cavallium/strangedb/java/objects/lists/ObjectStrangeDbList.java index 79fe971..fc3f489 100644 --- a/src/main/java/it/cavallium/strangedb/java/objects/lists/ObjectStrandeDbList.java +++ b/src/main/java/it/cavallium/strangedb/java/objects/lists/ObjectStrangeDbList.java @@ -7,7 +7,7 @@ import it.cavallium.strangedb.java.annotations.DbField; import java.io.IOException; -public class ObjectStrandeDbList extends StrandeDbList { +public class ObjectStrangeDbList extends StrangeDbList { @DbField(id = 0, type = DbDataType.REFERENCES_LIST) private LongArrayList indices; @@ -17,11 +17,11 @@ public class ObjectStrandeDbList extends StrandeDbList { return indices; } - public ObjectStrandeDbList() { + public ObjectStrangeDbList() { super(); } - public ObjectStrandeDbList(IDatabaseTools databaseTools) throws IOException { + public ObjectStrangeDbList(IDatabaseTools databaseTools) throws IOException { super(databaseTools); indices = new LongArrayList(); } diff --git a/src/main/java/it/cavallium/strangedb/java/objects/lists/StrandeDbList.java b/src/main/java/it/cavallium/strangedb/java/objects/lists/StrangeDbList.java similarity index 90% rename from src/main/java/it/cavallium/strangedb/java/objects/lists/StrandeDbList.java rename to src/main/java/it/cavallium/strangedb/java/objects/lists/StrangeDbList.java index 8ded793..d21a117 100644 --- a/src/main/java/it/cavallium/strangedb/java/objects/lists/StrandeDbList.java +++ b/src/main/java/it/cavallium/strangedb/java/objects/lists/StrangeDbList.java @@ -7,17 +7,17 @@ import it.cavallium.strangedb.java.database.IDatabaseTools; import java.io.IOException; import java.util.StringJoiner; -public abstract class StrandeDbList extends EnhancedObject { +public abstract class StrangeDbList extends EnhancedObject { private final Object indicesAccessLock = new Object(); protected abstract LongArrayList getIndices(); - public StrandeDbList() { + public StrangeDbList() { } - public StrandeDbList(IDatabaseTools databaseTools) throws IOException { + public StrangeDbList(IDatabaseTools databaseTools) throws IOException { super(databaseTools); } @@ -87,7 +87,7 @@ public abstract class StrandeDbList extends EnhancedObject { @Override public String toString() { - return new StringJoiner(", ", StrandeDbList.class.getSimpleName() + "[", "]") + return new StringJoiner(", ", StrangeDbList.class.getSimpleName() + "[", "]") .add(getIndices().size() + " items") .toString(); } diff --git a/src/test/java/it/cavallium/strangedb/tests/Performance.java b/src/test/java/it/cavallium/strangedb/tests/Performance.java index f75ef56..2035d63 100644 --- a/src/test/java/it/cavallium/strangedb/tests/Performance.java +++ b/src/test/java/it/cavallium/strangedb/tests/Performance.java @@ -3,10 +3,9 @@ package it.cavallium.strangedb.tests; import it.cavallium.strangedb.functionalinterfaces.RunnableWithIO; import it.cavallium.strangedb.java.annotations.*; import it.cavallium.strangedb.java.database.DatabaseJava; -import it.cavallium.strangedb.java.objects.lists.EnhancedObjectStrandeDbList; -import it.cavallium.strangedb.java.objects.lists.ObjectStrandeDbList; +import it.cavallium.strangedb.java.objects.lists.EnhancedObjectStrangeDbList; +import it.cavallium.strangedb.java.objects.lists.ObjectStrangeDbList; import it.unimi.dsi.fastutil.longs.LongArrayList; -import it.cavallium.strangedb.database.DatabaseCore; import it.cavallium.strangedb.java.objects.EnhancedObject; import it.cavallium.strangedb.java.database.IDatabaseTools; import it.cavallium.strangedb.VariableWrapper; @@ -53,23 +52,23 @@ public class Performance { testS("DatabaseCore root creation", 3000, Performance::regenDb, () -> db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new), () -> {}); final VariableWrapper preloadedListContainer = new VariableWrapper<>(null); final VariableWrapper simpleEnhancedObjectContainer = new VariableWrapper<>(null); - testS("ObjectStrandeDbList creation", 3000, () -> { + testS("ObjectStrangeDbList creation", 3000, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - }, () -> preloadedListContainer.var.list = new ObjectStrandeDbList<>(db), () -> {}); - testS("ObjectStrandeDbList: Filling with 1000 items", 100, () -> { + }, () -> preloadedListContainer.var.list = new ObjectStrangeDbList<>(db), () -> {}); + testS("ObjectStrangeDbList: Filling with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectStrandeDbList<>(db); + preloadedListContainer.var.list = new ObjectStrangeDbList<>(db); }, () -> { for (int i = 0; i < 1000; i++) { preloadedListContainer.var.list.add(1000); } }, () -> {}); - testS("ObjectStrandeDbList: Filling with 1000 items", 100, () -> { + testS("ObjectStrangeDbList: Filling with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectStrandeDbList<>(db, SimpleEnhancedObject.class); + preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectStrangeDbList<>(db, SimpleEnhancedObject.class); simpleEnhancedObjectContainer.var = new SimpleEnhancedObject(db); simpleEnhancedObjectContainer.var.integerNumber = 10; simpleEnhancedObjectContainer.var.longNumber = 10L; @@ -82,28 +81,28 @@ public class Performance { preloadedListContainer.var.listOfEnhancedObj.add(simpleEnhancedObjectContainer.var); } }, () -> {}); - testS("ObjectStrandeDbList: Filling with 10000 items", 10, () -> { + testS("ObjectStrangeDbList: Filling with 10000 items", 10, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectStrandeDbList<>(db); + preloadedListContainer.var.list = new ObjectStrangeDbList<>(db); }, () -> { for (int i = 0; i < 10000; i++) { preloadedListContainer.var.list.add(1000); } }, () -> {}); - testS("ObjectStrandeDbList: Filling with 100000 items", 1, () -> { + testS("ObjectStrangeDbList: Filling with 100000 items", 1, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectStrandeDbList<>(db); + preloadedListContainer.var.list = new ObjectStrangeDbList<>(db); }, () -> { for (int i = 0; i < 100000; i++) { preloadedListContainer.var.list.add(1000); } }, () -> {}); - testS("ObjectStrandeDbList: Loading 1000 items", 100, () -> { + testS("ObjectStrangeDbList: Loading 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectStrandeDbList<>(db); + preloadedListContainer.var.list = new ObjectStrangeDbList<>(db); for (int i = 0; i < 1000; i++) { preloadedListContainer.var.list.add(1000); } @@ -112,10 +111,10 @@ public class Performance { preloadedListContainer.var.list.get(i); } }, () -> {}); - testS("ObjectStrandeDbList: Loading with 1000 items", 100, () -> { + testS("ObjectStrangeDbList: Loading with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectStrandeDbList<>(db, SimpleEnhancedObject.class); + preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectStrangeDbList<>(db, SimpleEnhancedObject.class); simpleEnhancedObjectContainer.var = new SimpleEnhancedObject(db); simpleEnhancedObjectContainer.var.integerNumber = 10; simpleEnhancedObjectContainer.var.longNumber = 10L; @@ -131,10 +130,10 @@ public class Performance { preloadedListContainer.var.listOfEnhancedObj.get(i); } }, () -> {}); - testS("ObjectStrandeDbList: Loading 10000 items", 10, () -> { + testS("ObjectStrangeDbList: Loading 10000 items", 10, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectStrandeDbList<>(db); + preloadedListContainer.var.list = new ObjectStrangeDbList<>(db); for (int i = 0; i < 10000; i++) { preloadedListContainer.var.list.add(1000); } @@ -143,20 +142,20 @@ public class Performance { preloadedListContainer.var.list.get(i); } }, () -> {}); - testS("ObjectStrandeDbList: getLast() with 1000 items", 100, () -> { + testS("ObjectStrangeDbList: getLast() with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectStrandeDbList<>(db); + preloadedListContainer.var.list = new ObjectStrangeDbList<>(db); for (int i = 0; i < 1000; i++) { preloadedListContainer.var.list.add(1000); } }, () -> { preloadedListContainer.var.list.getLast(); }, () -> {}); - testS("ObjectStrandeDbList: getLast() with 1000 items", 100, () -> { + testS("ObjectStrangeDbList: getLast() with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectStrandeDbList<>(db, SimpleEnhancedObject.class); + preloadedListContainer.var.listOfEnhancedObj = new EnhancedObjectStrangeDbList<>(db, SimpleEnhancedObject.class); simpleEnhancedObjectContainer.var = new SimpleEnhancedObject(db); simpleEnhancedObjectContainer.var.integerNumber = 10; simpleEnhancedObjectContainer.var.longNumber = 10L; @@ -170,10 +169,10 @@ public class Performance { }, () -> { preloadedListContainer.var.listOfEnhancedObj.getLast(); }, () -> {}); - testS("ObjectStrandeDbList: size() with 1000 items", 100, () -> { + testS("ObjectStrangeDbList: size() with 1000 items", 100, () -> { regenDb(); preloadedListContainer.var = db.loadRoot(PreloadedListContainer.class, PreloadedListContainer::new); - preloadedListContainer.var.list = new ObjectStrandeDbList<>(db); + preloadedListContainer.var.list = new ObjectStrangeDbList<>(db); for (int i = 0; i < 1000; i++) { preloadedListContainer.var.list.add(1000); } @@ -286,10 +285,10 @@ public class Performance { public static class PreloadedListContainer extends EnhancedObject { @DbField(id = 0, type = DbDataType.ENHANCED_OBJECT) - public ObjectStrandeDbList list; + public ObjectStrangeDbList list; @DbField(id = 1, type = DbDataType.ENHANCED_OBJECT) - public EnhancedObjectStrandeDbList listOfEnhancedObj; + public EnhancedObjectStrangeDbList listOfEnhancedObj; public PreloadedListContainer() { @@ -312,12 +311,12 @@ public class Performance { @DbPropertyGetter(id = 0, type = DbDataType.ENHANCED_OBJECT) - public ObjectStrandeDbList getList() { + public ObjectStrangeDbList getList() { return getProperty(); } @DbPropertySetter(id = 1, type = DbDataType.ENHANCED_OBJECT) - public void setList(ObjectStrandeDbList list) { + public void setList(ObjectStrangeDbList list) { setProperty(list); } }