Re: [PR] CASSANDRA-19637(4.0): Makes conditions behavior on frozen and non-frozen columns consistent for null column values [cassandra]

via GitHub Tue, 11 Jun 2024 05:54:45 -0700


blerer commented on code in PR #3359:
URL: https://github.com/apache/cassandra/pull/3359#discussion_r1634838060



##########
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java:
##########
@@ -439,117 +468,129 @@ private static SortedMap<ByteBuffer, ByteBuffer> 
map(ByteBuffer... values)
     public void testMapCollectionBoundIsSatisfiedByValue() throws 
InvalidRequestException
     {
         // EQ
-        assertTrue(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(), EQ, map()));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ZERO, ONE)));
-        assertFalse(conditionApplies(map(ZERO, ONE), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ZERO)));
-        assertFalse(conditionApplies(map(ONE, ZERO), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), EQ, map(ONE, 
ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE, TWO, 
ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map()));
-        assertFalse(conditionApplies(map(), EQ, map(ONE, ONE)));
-
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, 
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
-        assertFalse(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertTrue(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+        assertTrue(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE)));
+        assertTrue(appliesMapCondition(null, EQ, null));
+        assertTrue(appliesMapCondition(null, EQ, map()));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ZERO, ONE)));
+        assertFalse(appliesMapCondition(map(ZERO, ONE), EQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ZERO)));
+        assertFalse(appliesMapCondition(map(ONE, ZERO), EQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), EQ, map(ONE, 
ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE, TWO, 
ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, null));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map()));
+        assertFalse(appliesMapCondition(null, EQ, map(ONE, ONE)));

Review Comment:
   Same reason as previously explained.



##########
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java:
##########
@@ -439,117 +468,129 @@ private static SortedMap<ByteBuffer, ByteBuffer> 
map(ByteBuffer... values)
     public void testMapCollectionBoundIsSatisfiedByValue() throws 
InvalidRequestException
     {
         // EQ
-        assertTrue(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(), EQ, map()));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ZERO, ONE)));
-        assertFalse(conditionApplies(map(ZERO, ONE), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ZERO)));
-        assertFalse(conditionApplies(map(ONE, ZERO), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), EQ, map(ONE, 
ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE, TWO, 
ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map()));
-        assertFalse(conditionApplies(map(), EQ, map(ONE, ONE)));
-
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, 
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
-        assertFalse(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertTrue(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+        assertTrue(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE)));
+        assertTrue(appliesMapCondition(null, EQ, null));
+        assertTrue(appliesMapCondition(null, EQ, map()));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ZERO, ONE)));
+        assertFalse(appliesMapCondition(map(ZERO, ONE), EQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ZERO)));
+        assertFalse(appliesMapCondition(map(ONE, ZERO), EQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), EQ, map(ONE, 
ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE, TWO, 
ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, null));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map()));
+        assertFalse(appliesMapCondition(null, EQ, map(ONE, ONE)));
+
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, 
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+        assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+        assertFalse(appliesMapCondition(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
+        assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+        assertTrue(appliesMapCondition(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
 
         // NEQ
-        assertFalse(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(), NEQ, map()));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ZERO, ONE)));
-        assertTrue(conditionApplies(map(ZERO, ONE), NEQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ZERO)));
-        assertTrue(conditionApplies(map(ONE, ZERO), NEQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE, TWO, ONE), NEQ, map(ONE, 
ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ONE, TWO, 
ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map()));
-        assertTrue(conditionApplies(map(), NEQ, map(ONE, ONE)));
-
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, 
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), NEQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
-        assertTrue(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), NEQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertFalse(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(null, NEQ, null));
+        assertFalse(appliesMapCondition(null, NEQ, map()));

Review Comment:
   Same reason as previously explained.



##########
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java:
##########
@@ -439,117 +468,129 @@ private static SortedMap<ByteBuffer, ByteBuffer> 
map(ByteBuffer... values)
     public void testMapCollectionBoundIsSatisfiedByValue() throws 
InvalidRequestException
     {
         // EQ
-        assertTrue(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(), EQ, map()));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ZERO, ONE)));
-        assertFalse(conditionApplies(map(ZERO, ONE), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ZERO)));
-        assertFalse(conditionApplies(map(ONE, ZERO), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE, TWO, ONE), EQ, map(ONE, 
ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, ONE, TWO, 
ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map()));
-        assertFalse(conditionApplies(map(), EQ, map(ONE, ONE)));
-
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, 
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ONE, ONE), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
-        assertFalse(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertTrue(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+        assertTrue(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE)));
+        assertTrue(appliesMapCondition(null, EQ, null));
+        assertTrue(appliesMapCondition(null, EQ, map()));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ZERO, ONE)));
+        assertFalse(appliesMapCondition(map(ZERO, ONE), EQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ZERO)));
+        assertFalse(appliesMapCondition(map(ONE, ZERO), EQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE, TWO, ONE), EQ, map(ONE, 
ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, ONE, TWO, 
ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, null));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map()));
+        assertFalse(appliesMapCondition(null, EQ, map(ONE, ONE)));
+
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, 
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+        assertFalse(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+        assertFalse(appliesMapCondition(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, ONE)));
+        assertTrue(appliesMapCondition(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), EQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
+        assertTrue(appliesMapCondition(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
 
         // NEQ
-        assertFalse(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(), NEQ, map()));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ZERO, ONE)));
-        assertTrue(conditionApplies(map(ZERO, ONE), NEQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ZERO)));
-        assertTrue(conditionApplies(map(ONE, ZERO), NEQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE, TWO, ONE), NEQ, map(ONE, 
ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, ONE, TWO, 
ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map()));
-        assertTrue(conditionApplies(map(), NEQ, map(ONE, ONE)));
-
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, 
map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertTrue(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), NEQ, map(ONE, ONE)));
-        assertTrue(conditionApplies(map(ONE, ONE), NEQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
-        assertTrue(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE, ONE)));
-        assertFalse(conditionApplies(map(ByteBufferUtil.EMPTY_BYTE_BUFFER, 
ONE), NEQ, map(ByteBufferUtil.EMPTY_BYTE_BUFFER, ONE)));
-        assertFalse(conditionApplies(map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER), NEQ, map(ONE, 
ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+        assertFalse(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ONE)));
+        assertFalse(appliesMapCondition(null, NEQ, null));
+        assertFalse(appliesMapCondition(null, NEQ, map()));
+        assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ZERO, ONE)));
+        assertTrue(appliesMapCondition(map(ZERO, ONE), NEQ, map(ONE, ONE)));
+        assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ZERO)));
+        assertTrue(appliesMapCondition(map(ONE, ZERO), NEQ, map(ONE, ONE)));
+        assertTrue(appliesMapCondition(map(ONE, ONE, TWO, ONE), NEQ, map(ONE, 
ONE)));
+        assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map(ONE, ONE, TWO, 
ONE)));
+        assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, null));
+        assertTrue(appliesMapCondition(map(ONE, ONE), NEQ, map()));
+        assertTrue(appliesMapCondition(null, NEQ, map(ONE, ONE)));

Review Comment:
   Same reason as previously explained.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Re: [PR] CASSANDRA-19637(4.0): Makes conditions behavior on frozen and non-frozen columns consistent for null column values [cassandra]

Reply via email to