rebase test fixes

apache · Mar 28, 2024 · c2ef5f6 · c2ef5f6
1 parent 303de2f
commit c2ef5f6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modules/accord b/modules/accord
diff --git a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java
@@ -341,7 +341,7 @@ private boolean conditionApplies(SortedMap<ByteBuffer, ByteBuffer> rowValue, Ope
 
     private boolean conditionApplies(SortedMap<ByteBuffer, ByteBuffer> rowValue, Operator op, SortedMap<ByteBuffer, ByteBuffer> conditionValue, MapType<Integer, Integer> columnType)
     {
-        ColumnMetadata definition = ColumnMetadata.regularColumn("ks", "cf", "c", columnType);
+        ColumnMetadata definition = ColumnMetadata.regularColumn(KEYSPACE, maybeCreateTable(columnType, columnType.isFrozenCollection()), "c", columnType);
         List<ByteBuffer> value = new ArrayList<>(conditionValue.size() * 2);
         for (Map.Entry<ByteBuffer, ByteBuffer> entry: conditionValue.entrySet())
         {

diff --git a/test/unit/org/apache/cassandra/index/sai/cql/AllTypesSimpleEqTest.java b/test/unit/org/apache/cassandra/index/sai/cql/AllTypesSimpleEqTest.java
@@ -78,7 +78,7 @@ public void smallDomain()
     {
         Gen<ByteBuffer> gen = genFromType();
         test(type, SHORT_DOMAIN_FAILING_SEEDS.get(type), 10, rs -> {
-            List<ByteBuffer> domain = Gens.lists(gen).unique().ofSizeBetween(5, 100).next(rs);
+            List<ByteBuffer> domain = Gens.lists(gen).uniqueBestEffort().ofSizeBetween(5, 100).next(rs);
             return r -> r.pick(domain);
         });
     }