Changes

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/dao/ScalarDBDao.java

@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Optional;
+import javax.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -285,10 +286,10 @@ public Scanner createScanner(
   public Scanner createScanner(
       String namespace,
       String table,
-      Key partitionKey,
-      ScanRange scanRange,
-      List<Scan.Ordering> sortOrders,
-      List<String> projectionColumns,
+      @Nullable Key partitionKey,
+      @Nullable ScanRange scanRange,
+      @Nullable List<Scan.Ordering> sortOrders,
+      @Nullable List<String> projectionColumns,
       int limit,
       DistributedStorage storage)
       throws ScalarDBDaoException {
@@ -317,10 +318,10 @@ public Scanner createScanner(
   Scan createScan(
       String namespace,
       String table,
-      Key partitionKey,
-      ScanRange scanRange,
-      List<Scan.Ordering> sortOrders,
-      List<String> projectionColumns,
+      @Nullable Key partitionKey,
+      @Nullable ScanRange scanRange,
+      @Nullable List<Scan.Ordering> sortOrders,
+      @Nullable List<String> projectionColumns,
       int limit) {
     // If no partition key is provided a scan all is created
     if (partitionKey == null) {
@@ -331,9 +332,11 @@ Scan createScan(
       if (projectionColumns != null && !projectionColumns.isEmpty()) {
         buildableScanAll.projections(projectionColumns);
       }
-      // Can ordering be added?
-      for (Scan.Ordering sort : sortOrders) {
-        buildableScanAll.ordering(sort);
+
+      if (sortOrders != null && !sortOrders.isEmpty()) {
+        for (Scan.Ordering sort : sortOrders) {
+          buildableScanAll.ordering(sort);
+        }
       }
 
       // limit
@@ -361,8 +364,10 @@ Scan createScan(
     }
 
     // clustering order
-    for (Scan.Ordering sort : sortOrders) {
-      buildableScan.ordering(sort);
+    if (sortOrders != null && !sortOrders.isEmpty()) {
+      for (Scan.Ordering sort : sortOrders) {
+        buildableScan.ordering(sort);
+      }
     }
 
     // projections
@@ -386,7 +391,8 @@ Scan createScan(
    * @param clusteringKey Optional clustering key for get
    * @return ScalarDB Get instance
    */
-  private Get createGetWith(String namespace, String table, Key partitionKey, Key clusteringKey) {
+  private Get createGetWith(
+      String namespace, String table, Key partitionKey, @Nullable Key clusteringKey) {
     GetBuilder.BuildableGetWithPartitionKey buildable =
         Get.newBuilder().namespace(namespace).table(table).partitionKey(partitionKey);
     if (clusteringKey != null) {
@@ -409,7 +415,7 @@ private Put createPutWith(
       String namespace,
       String table,
       Key partitionKey,
-      Key clusteringKey,
+      @Nullable Key clusteringKey,
       List<Column<?>> columns) {
     Buildable buildable =
         Put.newBuilder().namespace(namespace).table(table).partitionKey(partitionKey);

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/dao/ScalarDbStorageManger.java → data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/dao/ScalarDbStorageManager.java

@@ -6,7 +6,7 @@
 import java.io.IOException;
 import javax.annotation.Nullable;
 
-public class ScalarDbStorageManger {
+public class ScalarDbStorageManager {
 
   @Nullable private final DistributedStorage storage;
   private final DistributedStorageAdmin storageAdmin;
@@ -16,17 +16,17 @@ public class ScalarDbStorageManger {
    *
    * @param storageFactory Factory to create all the necessary ScalarDB data managers
    */
-  public ScalarDbStorageManger(StorageFactory storageFactory) throws IOException {
+  public ScalarDbStorageManager(StorageFactory storageFactory) throws IOException {
     storage = storageFactory.getStorage();
     storageAdmin = storageFactory.getStorageAdmin();
   }
 
-  /** @return storage for ScalarDB connection that is running in storage mode */
+  /** Returns distributed storage for ScalarDB connection that is running in storage mode */
   public DistributedStorage getDistributedStorage() {
     return storage;
   }
 
-  /** @return Distributed storage admin for ScalarDB admin operations */
+  /** Returns distributed storage admin for ScalarDB admin operations */
   public DistributedStorageAdmin getDistributedStorageAdmin() {
     return storageAdmin;
   }

data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/dao/ScalarDbTransactionManger.java → data-loader/core/src/main/java/com/scalar/db/dataloader/core/dataimport/dao/ScalarDbTransactionManager.java

@@ -4,17 +4,17 @@
 import com.scalar.db.service.TransactionFactory;
 import java.io.IOException;
 
-public class ScalarDbTransactionManger {
+public class ScalarDbTransactionManager {
 
   private final DistributedTransactionManager transactionManager;
 
-  public ScalarDbTransactionManger(TransactionFactory transactionFactory) throws IOException {
+  public ScalarDbTransactionManager(TransactionFactory transactionFactory) throws IOException {
     transactionManager = transactionFactory.getTransactionManager();
   }
 
   /**
-   * @return Distributed Transaction manager for ScalarDB connection that is running in transaction
-   *     mode
+   * Returns distributed Transaction manager for ScalarDB connection that is running in transaction
+   * mode
    */
   public DistributedTransactionManager getDistributedTransactionManager() {
     return transactionManager;