more tests

Author: duhizjame

server/core/src/main/java/io/whitefox/core/types/predicates/NonLeafOp.java

@@ -17,7 +17,8 @@
   @JsonSubTypes.Type(value = LessThanOp.class, name = "lessThan"),
   @JsonSubTypes.Type(value = LessThanOrEqualOp.class, name = "lessThanOrEqual"),
   @JsonSubTypes.Type(value = GreaterThanOp.class, name = "greaterThan"),
-  @JsonSubTypes.Type(value = GreaterThanOrEqualOp.class, name = "greaterThanOrEqual")
+  @JsonSubTypes.Type(value = GreaterThanOrEqualOp.class, name = "greaterThanOrEqual"),
+  @JsonSubTypes.Type(value = DifferentThanOp.class, name = "differentThan")
 })
 public abstract class NonLeafOp implements BaseOp {
 
@@ -37,8 +38,8 @@ public static NonLeafOp createPartitionFilter(List<LeafOp> children, String oper
         return new GreaterThanOp(children);
       case ">=":
         return new GreaterThanOrEqualOp(children);
-        //      case "<>":
-        //        return new DifferentThanOp(children);
+      case "<>":
+        return new DifferentThanOp(children);
       case "isnull":
         return new IsNullOp(children);
       default:
@@ -104,6 +105,33 @@ public Object eval(EvalContext ctx) throws PredicateException {
   }
 }
 
+// not used in JsonPredicates, only for SQL
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "differentThan")
+class DifferentThanOp extends NonLeafOp implements BinaryOp {
+  @JsonProperty("children")
+  List<LeafOp> children;
+
+  public DifferentThanOp() {
+    super();
+  }
+
+  public DifferentThanOp(List<LeafOp> children) {
+    this.children = children;
+  }
+
+  @Override
+  public void validate() throws PredicateException {
+    validateChildren(
+        List.copyOf(children).stream().map(c -> (BaseOp) c).collect(Collectors.toList()));
+  }
+
+  @Override
+  public Object eval(EvalContext ctx) throws PredicateException {
+    this.validate();
+    return EvalHelper.equal(children, ctx);
+  }
+}
+
 @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "lessThan")
 class LessThanOp extends NonLeafOp implements BinaryOp {
   @JsonProperty("children")

server/core/src/test/java/io/whitefox/core/services/DeltaShareServiceTest.java

@@ -2,6 +2,7 @@
 
 import io.whitefox.DeltaTestUtils;
 import io.whitefox.core.*;
+import io.whitefox.core.services.exceptions.TableNotFound;
 import io.whitefox.persistence.StorageManager;
 import io.whitefox.persistence.memory.InMemoryStorageManager;
 import java.util.Collections;
@@ -38,7 +39,7 @@ public void listShares() throws ExecutionException, InterruptedException {
   }
 
   @Test
-  public void listSharesWithToken() throws ExecutionException, InterruptedException {
+  public void listSharesWithToken() {
     var shares = List.of(createShare("name", "key", Collections.emptyMap()));
     StorageManager storageManager = new InMemoryStorageManager(shares);
     DeltaSharesService deltaSharesService =
@@ -49,7 +50,7 @@ public void listSharesWithToken() throws ExecutionException, InterruptedExceptio
   }
 
   @Test
-  public void listSchemasOfEmptyShare() throws ExecutionException, InterruptedException {
+  public void listSchemasOfEmptyShare() {
     var shares = List.of(createShare("name", "key", Collections.emptyMap()));
     StorageManager storageManager = new InMemoryStorageManager(shares);
     DeltaSharesService deltaSharesService =
@@ -61,7 +62,7 @@ public void listSchemasOfEmptyShare() throws ExecutionException, InterruptedExce
   }
 
   @Test
-  public void listSchemas() throws ExecutionException, InterruptedException {
+  public void listSchemas() {
     var shares = List.of(createShare(
         "name", "key", Map.of("default", new Schema("default", Collections.emptyList(), "name"))));
     StorageManager storageManager = new InMemoryStorageManager(shares);
@@ -89,7 +90,7 @@ public void listSchemasOfUnknownShare() throws ExecutionException, InterruptedEx
   }
 
   @Test
-  public void listTables() throws ExecutionException, InterruptedException {
+  public void listTables() {
     var shares = List.of(createShare(
         "name",
         "key",
@@ -114,7 +115,7 @@ public void listTables() throws ExecutionException, InterruptedException {
   }
 
   @Test
-  public void listAllTables() throws ExecutionException, InterruptedException {
+  public void listAllTables() {
     var shares = List.of(createShare(
         "name",
         "key",
@@ -224,4 +225,51 @@ public void tableMetadataNotFound() {
     var resultTable = deltaSharesService.getTableMetadata("name", "default", "tableNotFound", null);
     Assertions.assertTrue(resultTable.isEmpty());
   }
+
+  @Test
+  public void queryExistingTable() {
+    var shares = List.of(createShare(
+        "name",
+        "key",
+        Map.of(
+            "default",
+            new Schema(
+                "default",
+                List.of(new SharedTable(
+                    "partitioned-delta-table",
+                    "default",
+                    "name",
+                    DeltaTestUtils.deltaTable("partitioned-delta-table"))),
+                "name"))));
+    StorageManager storageManager = new InMemoryStorageManager(shares);
+    DeltaSharesService deltaSharesService =
+        new DeltaSharesServiceImpl(storageManager, 100, loader, fileSignerFactory);
+    var resultTable = deltaSharesService.queryTable(
+        "name",
+        "default",
+        "partitioned-delta-table",
+        new ReadTableRequest.ReadTableCurrentVersion(
+            Optional.empty(), Optional.empty(), Optional.empty()));
+    Assertions.assertEquals(9, resultTable.files().size());
+  }
+
+  @Test
+  public void queryNonExistingTable() {
+    var shares = List.of(createShare(
+        "name",
+        "key",
+        Map.of(
+            "default",
+            new Schema(
+                "default",
+                List.of(new SharedTable(
+                    "table1", "default", "name", DeltaTestUtils.deltaTable("location1"))),
+                "name"))));
+    StorageManager storageManager = new InMemoryStorageManager(shares);
+    DeltaSharesService deltaSharesService =
+        new DeltaSharesServiceImpl(storageManager, 100, loader, fileSignerFactory);
+    Assertions.assertThrows(
+        TableNotFound.class,
+        () -> deltaSharesService.queryTable("name", "default", "tableNotFound", null));
+  }
 }