Add in a test

stargate · Mar 30, 2022 · 013012f · 013012f
1 parent caef986
commit 013012f
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 10 deletions.
diff --git a/persistence-api/src/main/java/io/stargate/db/AbstractRowDecorator.java b/persistence-api/src/main/java/io/stargate/db/AbstractRowDecorator.java
@@ -19,7 +19,6 @@
 import io.stargate.db.schema.TableName;
 import java.nio.ByteBuffer;
 import java.util.List;
-import java.util.stream.Stream;
 
 public abstract class AbstractRowDecorator implements RowDecorator {
 
@@ -55,6 +54,4 @@ public <T extends Comparable<T>> ComparableKey<T> decoratePartitionKey(Row row)
     //noinspection unchecked
     return (ComparableKey<T>) decoratePrimaryKey(pkValues);
   }
-
-  public abstract Stream<Byte> getComparableBytes();
 }
diff --git a/persistence-api/src/main/java/io/stargate/db/RowDecorator.java b/persistence-api/src/main/java/io/stargate/db/RowDecorator.java
@@ -17,6 +17,7 @@
 
 import io.stargate.db.datastore.ResultSet;
 import io.stargate.db.datastore.Row;
+import java.util.stream.Stream;
 
 /**
  * A table-specific interface for extracting key column values from a {@link ResultSet} {@link Row}
@@ -29,4 +30,6 @@ public interface RowDecorator {
    * same order that queries iterate / paginate over the Cassandra data ring.
    */
   <T extends Comparable<T>> ComparableKey<T> decoratePartitionKey(Row row);
+
+  Stream<Byte> getComparableBytes(Object... rawKeyValues);
 }
diff --git a/persistence-cassandra-3.11/src/main/java/io/stargate/db/cassandra/impl/RowDecoratorImpl.java b/persistence-cassandra-3.11/src/main/java/io/stargate/db/cassandra/impl/RowDecoratorImpl.java
@@ -52,7 +52,7 @@ protected ComparableKey<?> decoratePrimaryKey(Object... pkValues) {
   }
 
   @Override
-  public Stream<Byte> getComparableBytes() {
+  public Stream<Byte> getComparableBytes(Object... rawKeyValues) {
     // TODO replace this with the relevant row's byte-comparable value when
     // https://github.com/apache/cassandra/pull/1294 is ready
     return Stream.empty();

diff --git a/persistence-cassandra-4.0/src/main/java/io/stargate/db/cassandra/impl/RowDecoratorImpl.java b/persistence-cassandra-4.0/src/main/java/io/stargate/db/cassandra/impl/RowDecoratorImpl.java
@@ -50,7 +50,7 @@ protected ComparableKey<?> decoratePrimaryKey(Object... pkValues) {
   }
 
   @Override
-  public Stream<Byte> getComparableBytes() {
+  public Stream<Byte> getComparableBytes(Object... rawKeyValues) {
     // TODO replace this with the relevant row's byte-comparable value when
     // https://github.com/apache/cassandra/pull/1294 is ready
     return Stream.empty();

diff --git a/persistence-dse-6.8/src/main/java/io/stargate/db/dse/impl/RowDecoratorImpl.java b/persistence-dse-6.8/src/main/java/io/stargate/db/dse/impl/RowDecoratorImpl.java
@@ -68,11 +68,10 @@ protected ComparableKey<?> decoratePrimaryKey(Object... rawKeyValues) {
   }
 
   @Override
-  public Stream<Byte> getComparableBytes() {
-    ByteSource src = decoratePrimaryKey().asComparableBytes();
-    Spliterator<Byte>
-            spliterator = Spliterators
-            .spliteratorUnknownSize(new ByteSourceIterable(src), 0);
+  public Stream<Byte> getComparableBytes(Object... rawKeyValues) {
+    ByteSource src = decoratePrimaryKey(rawKeyValues).asComparableBytes();
+    Spliterator<Byte> spliterator = Spliterators
+        .spliteratorUnknownSize(new ByteSourceIterable(src), 0);
     return StreamSupport.stream(spliterator, false);
   }
 }
diff --git a/persistence-test/src/main/java/io/stargate/it/PersistenceTest.java b/persistence-test/src/main/java/io/stargate/it/PersistenceTest.java
@@ -1964,6 +1964,31 @@ public void testRowDecorator() throws ExecutionException, InterruptedException {
     assertGt(last, first, dec1, dec2);
   }
 
+  @Test
+  public void testRowDecoratorComparableBytes() throws ExecutionException, InterruptedException {
+    setupCustomPagingData();
+
+    // Obtain partition keys in "ring" order
+    AbstractBound<?> selectAll =
+        dataStore
+            .queryBuilder()
+            .select()
+            .column("pk")
+            .column("val")
+            .from(keyspace, table)
+            .build()
+            .bind();
+
+    ResultSet rs1 = dataStore.execute(selectAll).get();
+    RowDecorator dec1 = rs1.makeRowDecorator();
+    Stream<Byte> src = dec1.getComparableBytes();
+    if (backend.isDse()) {
+      assertThat(src.collect(Collectors.toList()).size()).isGreaterThan(0);
+    } else {
+      assertThat(src.collect(Collectors.toList()).size()).isEqualTo(0);
+    }
+  }
+
   private boolean isCassandra4() {
     return !backend.isDse()
         && Version.parse(backend.clusterVersion()).nextStable().compareTo(Version.V4_0_0) >= 0;

diff --git a/restapi/src/test/java/io/stargate/db/datastore/AlphabeticalOrderPartitionKeyDecorator.java b/restapi/src/test/java/io/stargate/db/datastore/AlphabeticalOrderPartitionKeyDecorator.java
@@ -20,6 +20,7 @@
 import io.stargate.db.schema.Column;
 import java.util.List;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * A test implementation of {@link RowDecorator} that assumes partition keys to be {@link String}
@@ -43,4 +44,11 @@ public <T extends Comparable<T>> ComparableKey<T> decoratePartitionKey(Row row)
     //noinspection unchecked
     return (ComparableKey<T>) new ComparableKey<>(String.class, decorated);
   }
+
+  @Override
+  public Stream<Byte> getComparableBytes(Object... rawKeyValues) {
+    // TODO replace this with the relevant row's byte-comparable value when
+    // https://github.com/apache/cassandra/pull/1294 is ready
+    return Stream.empty();
+  }
 }