From d623b4d636f4c3f40bfbf47606ef2afd4d308787 Mon Sep 17 00:00:00 2001 From: Sanket Sarang Date: Tue, 16 Aug 2016 02:07:23 +0530 Subject: [PATCH 01/15] Renamed TableType to CollectionType --- .../blobcity/db/enums/{TableType.java => CollectionType.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/main/java/com/blobcity/db/enums/{TableType.java => CollectionType.java} (83%) diff --git a/src/main/java/com/blobcity/db/enums/TableType.java b/src/main/java/com/blobcity/db/enums/CollectionType.java similarity index 83% rename from src/main/java/com/blobcity/db/enums/TableType.java rename to src/main/java/com/blobcity/db/enums/CollectionType.java index 6becb9c..64ccdc9 100644 --- a/src/main/java/com/blobcity/db/enums/TableType.java +++ b/src/main/java/com/blobcity/db/enums/CollectionType.java @@ -7,14 +7,14 @@ * * @author Prikshit Kumar */ -public enum TableType { +public enum CollectionType { ON_DISK("on-disk"), IN_MEMORY("in-memory"), IN_MEMORY_NON_DURABLE("in-memory-nd"); private final String type; - TableType(final String type) { + CollectionType(final String type) { this.type = type; } From 1658f9a82d72594b2ce72d9ccb781a4a90e6ad17 Mon Sep 17 00:00:00 2001 From: Sanket Sarang Date: Tue, 16 Aug 2016 12:27:55 +0530 Subject: [PATCH 02/15] Code clean up and refactoring --- .idea/workspace.xml | 475 ++++++--- .../{TableStore.java => CollectionStore.java} | 32 +- .../db/{CloudStorage.java => Db.java} | 935 ++++++++++-------- .../java/com/blobcity/db/DbQueryRequest.java | 2 +- .../java/com/blobcity/db/QueryExecuter.java | 4 +- .../com/blobcity/db/annotations/Entity.java | 4 +- .../com/blobcity/db/config/Credentials.java | 6 +- .../blobcity/db/enums/ReplicationType.java | 2 +- .../java/com/blobcity/db/search/Query.java | 37 +- .../com/blobcity/db/entity/TestTable.java | 4 +- .../test/integration/TableOperationsIT.java | 12 +- 11 files changed, 918 insertions(+), 595 deletions(-) rename src/main/java/com/blobcity/db/{TableStore.java => CollectionStore.java} (77%) rename src/main/java/com/blobcity/db/{CloudStorage.java => Db.java} (64%) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7b88bf1..ec9d516 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,11 +2,17 @@ - - - - - + + + + + + + + + + + @@ -28,84 +34,99 @@ - + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -138,9 +159,7 @@ @@ -416,6 +441,126 @@