Fix to remove BLOB type limitations

Author: KodaiD

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitIntegrationTestWithObjectStorage.java

@@ -11,11 +11,6 @@ protected Properties getProps(String testName) {
     return ConsensusCommitObjectStorageEnv.getProperties(testName);
   }
 
-  @Override
-  protected boolean isTimestampTypeSupported() {
-    return false;
-  }
-
   @Override
   @Disabled("Object Storage does not support index-related operations")
   public void get_GetGivenForIndexColumn_ShouldReturnRecords() {}

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageConditionalMutationIntegrationTest.java

@@ -1,40 +1,12 @@
 package com.scalar.db.storage.objectstorage;
 
-import com.scalar.db.api.ConditionalExpression;
 import com.scalar.db.api.DistributedStorageConditionalMutationIntegrationTestBase;
-import com.scalar.db.io.DataType;
-import java.util.List;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
 public class ObjectStorageConditionalMutationIntegrationTest
     extends DistributedStorageConditionalMutationIntegrationTestBase {
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
-
-  @Override
-  protected int getThreadNum() {
-    return 3;
-  }
-
-  @Override
-  protected List<OperatorAndDataType> getOperatorAndDataTypeListForTest() {
-    return super.getOperatorAndDataTypeListForTest().stream()
-        .filter(
-            operatorAndDataType -> {
-              // Object Storage only supports EQ, NE, IS_NULL, and IS_NOT_NULL conditions for BLOB
-              // type
-              if (operatorAndDataType.getDataType() == DataType.BLOB) {
-                return operatorAndDataType.getOperator() == ConditionalExpression.Operator.EQ
-                    || operatorAndDataType.getOperator() == ConditionalExpression.Operator.NE
-                    || operatorAndDataType.getOperator() == ConditionalExpression.Operator.IS_NULL
-                    || operatorAndDataType.getOperator()
-                        == ConditionalExpression.Operator.IS_NOT_NULL;
-              }
-              return true;
-            })
-        .collect(Collectors.toList());
-  }
 }

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageCrossPartitionScanIntegrationTest.java

@@ -13,11 +13,6 @@ protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
 
-  @Override
-  protected int getThreadNum() {
-    return 3;
-  }
-
   @Override
   protected boolean isParallelDdlSupported() {
     return false;

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMultipleClusteringKeyScanIntegrationTest.java

@@ -1,10 +1,7 @@
 package com.scalar.db.storage.objectstorage;
 
 import com.scalar.db.api.DistributedStorageMultipleClusteringKeyScanIntegrationTestBase;
-import com.scalar.db.io.DataType;
-import java.util.List;
 import java.util.Properties;
-import java.util.stream.Collectors;
 
 public class ObjectStorageMultipleClusteringKeyScanIntegrationTest
     extends DistributedStorageMultipleClusteringKeyScanIntegrationTestBase {
@@ -14,14 +11,6 @@ protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
 
-  @Override
-  protected List<DataType> getDataTypes() {
-    // Return types without BLOB because blob is not supported for clustering key for now
-    return super.getDataTypes().stream()
-        .filter(type -> type != DataType.BLOB)
-        .collect(Collectors.toList());
-  }
-
   @Override
   protected boolean isParallelDdlSupported() {
     return false;

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageSingleClusteringKeyScanIntegrationTest.java

@@ -1,9 +1,6 @@
 package com.scalar.db.storage.objectstorage;
 
 import com.scalar.db.api.DistributedStorageSingleClusteringKeyScanIntegrationTestBase;
-import com.scalar.db.io.DataType;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Properties;
 
 public class ObjectStorageSingleClusteringKeyScanIntegrationTest
@@ -12,17 +9,4 @@ public class ObjectStorageSingleClusteringKeyScanIntegrationTest
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
-
-  @Override
-  protected List<DataType> getClusteringKeyTypes() {
-    // Return types without BLOB because blob is not supported for clustering key for now
-    List<DataType> clusteringKeyTypes = new ArrayList<>();
-    for (DataType dataType : DataType.values()) {
-      if (dataType == DataType.BLOB) {
-        continue;
-      }
-      clusteringKeyTypes.add(dataType);
-    }
-    return clusteringKeyTypes;
-  }
 }

core/src/main/java/com/scalar/db/common/CoreError.java

@@ -901,12 +901,6 @@ public enum CoreError implements ScalarDbError {
       "The value of the column %s in the primary key contains an illegal character.",
       "",
       ""),
-  OBJECT_STORAGE_CONDITION_OPERATION_NOT_SUPPORTED_FOR_BLOB_TYPE(
-      Category.USER_ERROR,
-      "0258",
-      "Object Storage supports only EQ, NE, IS_NULL, and IS_NOT_NULL operations for the BLOB type in conditions. Mutation: %s",
-      "",
-      ""),
 
   //
   // Errors for the concurrency error category

core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStorageOperationChecker.java

@@ -1,13 +1,10 @@
 package com.scalar.db.storage.objectstorage;
 
-import com.scalar.db.api.ConditionalExpression;
 import com.scalar.db.api.Delete;
 import com.scalar.db.api.Get;
-import com.scalar.db.api.Mutation;
 import com.scalar.db.api.Operation;
 import com.scalar.db.api.Put;
 import com.scalar.db.api.Scan;
-import com.scalar.db.api.TableMetadata;
 import com.scalar.db.common.CoreError;
 import com.scalar.db.common.StorageInfoProvider;
 import com.scalar.db.common.TableMetadataManager;
@@ -18,7 +15,6 @@
 import com.scalar.db.io.BlobColumn;
 import com.scalar.db.io.BooleanColumn;
 import com.scalar.db.io.ColumnVisitor;
-import com.scalar.db.io.DataType;
 import com.scalar.db.io.DateColumn;
 import com.scalar.db.io.DoubleColumn;
 import com.scalar.db.io.FloatColumn;
@@ -109,18 +105,12 @@ public void check(Scan scan) throws ExecutionException {
   public void check(Put put) throws ExecutionException {
     super.check(put);
     checkPrimaryKey(put);
-
-    TableMetadata metadata = getTableMetadata(put);
-    checkCondition(put, metadata);
   }
 
   @Override
   public void check(Delete delete) throws ExecutionException {
     super.check(delete);
     checkPrimaryKey(delete);
-
-    TableMetadata metadata = getTableMetadata(delete);
-    checkCondition(delete, metadata);
   }
 
   private void checkPrimaryKey(Operation operation) {
@@ -133,22 +123,4 @@ private void checkPrimaryKey(Operation operation) {
         .ifPresent(
             c -> c.getColumns().forEach(column -> column.accept(PRIMARY_KEY_COLUMN_CHECKER)));
   }
-
-  private void checkCondition(Mutation mutation, TableMetadata metadata) {
-    if (!mutation.getCondition().isPresent()) {
-      return;
-    }
-    for (ConditionalExpression expression : mutation.getCondition().get().getExpressions()) {
-      if (metadata.getColumnDataType(expression.getColumn().getName()) == DataType.BLOB) {
-        if (expression.getOperator() != ConditionalExpression.Operator.EQ
-            && expression.getOperator() != ConditionalExpression.Operator.NE
-            && expression.getOperator() != ConditionalExpression.Operator.IS_NULL
-            && expression.getOperator() != ConditionalExpression.Operator.IS_NOT_NULL) {
-          throw new IllegalArgumentException(
-              CoreError.OBJECT_STORAGE_CONDITION_OPERATION_NOT_SUPPORTED_FOR_BLOB_TYPE.buildMessage(
-                  mutation));
-        }
-      }
-    }
-  }
 }