blerer commented on code in PR #3359:
URL: https://github.com/apache/cassandra/pull/3359#discussion_r1634837668
##########
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java:
##########
@@ -341,88 +356,102 @@ private static SortedSet<ByteBuffer> set(ByteBuffer...
values)
public void testSetCollectionBoundAppliesTo() throws
InvalidRequestException
{
// EQ
- assertTrue(conditionApplies(set(ONE), EQ, set(ONE)));
- assertTrue(conditionApplies(set(), EQ, set()));
- assertFalse(conditionApplies(set(ONE), EQ, set(ZERO)));
- assertFalse(conditionApplies(set(ZERO), EQ, set(ONE)));
- assertFalse(conditionApplies(set(ONE, TWO), EQ, set(ONE)));
- assertFalse(conditionApplies(set(ONE), EQ, set(ONE, TWO)));
- assertFalse(conditionApplies(set(ONE), EQ, set()));
- assertFalse(conditionApplies(set(), EQ, set(ONE)));
-
- assertFalse(conditionApplies(set(ONE), EQ,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
EQ, set(ONE)));
- assertTrue(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER), EQ,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesSetCondition(set(ONE), EQ, set(ONE)));
+ assertTrue(appliesSetCondition(null, EQ, null));
+ assertTrue(appliesSetCondition(null, EQ, set()));
+ assertFalse(appliesSetCondition(set(ONE), EQ, set(ZERO)));
+ assertFalse(appliesSetCondition(set(ZERO), EQ, set(ONE)));
+ assertFalse(appliesSetCondition(set(ONE, TWO), EQ, set(ONE)));
+ assertFalse(appliesSetCondition(set(ONE), EQ, set(ONE, TWO)));
+ assertFalse(appliesSetCondition(set(ONE), EQ, null));
+ assertFalse(appliesSetCondition(set(ONE), EQ, set()));
+ assertFalse(appliesSetCondition(null, EQ, set(ONE)));
+
+ assertFalse(appliesSetCondition(set(ONE), EQ,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
EQ, set(ONE)));
+ assertTrue(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
EQ, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// NEQ
- assertFalse(conditionApplies(set(ONE), NEQ, set(ONE)));
- assertFalse(conditionApplies(set(), NEQ, set()));
- assertTrue(conditionApplies(set(ONE), NEQ, set(ZERO)));
- assertTrue(conditionApplies(set(ZERO), NEQ, set(ONE)));
- assertTrue(conditionApplies(set(ONE, TWO), NEQ, set(ONE)));
- assertTrue(conditionApplies(set(ONE), NEQ, set(ONE, TWO)));
- assertTrue(conditionApplies(set(ONE), NEQ, set()));
- assertTrue(conditionApplies(set(), NEQ, set(ONE)));
-
- assertTrue(conditionApplies(set(ONE), NEQ,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
NEQ, set(ONE)));
- assertFalse(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
NEQ, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesSetCondition(set(ONE), NEQ, set(ONE)));
+ assertFalse(appliesSetCondition(set(ONE), EQ, null));
+ assertFalse(appliesSetCondition(set(ONE), EQ, set()));
+ assertFalse(appliesSetCondition(null, NEQ, null));
+ assertFalse(appliesSetCondition(null, NEQ, set()));
+ assertTrue(appliesSetCondition(set(ONE), NEQ, set(ZERO)));
+ assertTrue(appliesSetCondition(set(ZERO), NEQ, set(ONE)));
+ assertTrue(appliesSetCondition(set(ONE, TWO), NEQ, set(ONE)));
+ assertTrue(appliesSetCondition(set(ONE), NEQ, set(ONE, TWO)));
+ assertTrue(appliesSetCondition(set(ONE), NEQ, null));
+ assertTrue(appliesSetCondition(set(ONE), NEQ, set()));
+ assertTrue(appliesSetCondition(null, NEQ, set(ONE)));
+
+ assertTrue(appliesSetCondition(set(ONE), NEQ,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
NEQ, set(ONE)));
+ assertFalse(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
NEQ, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// LT
- assertFalse(conditionApplies(set(ONE), LT, set(ONE)));
- assertFalse(conditionApplies(set(), LT, set()));
- assertFalse(conditionApplies(set(ONE), LT, set(ZERO)));
- assertTrue(conditionApplies(set(ZERO), LT, set(ONE)));
- assertFalse(conditionApplies(set(ONE, TWO), LT, set(ONE)));
- assertTrue(conditionApplies(set(ONE), LT, set(ONE, TWO)));
- assertFalse(conditionApplies(set(ONE), LT, set()));
- assertTrue(conditionApplies(set(), LT, set(ONE)));
-
- assertFalse(conditionApplies(set(ONE), LT,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER), LT,
set(ONE)));
- assertFalse(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
LT, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesSetCondition(set(ONE), LT, set(ONE)));
+ assertThrowsIRE(() -> appliesSetCondition(null, LT, null), "Invalid
comparison with null for operator \"<\"");
+ assertThrowsIRE(() -> appliesSetCondition(null, LT, set()), "Invalid
comparison with an empty set for operator \"<\"");
+ assertFalse(appliesSetCondition(set(ONE), LT, set(ZERO)));
+ assertTrue(appliesSetCondition(set(ZERO), LT, set(ONE)));
+ assertFalse(appliesSetCondition(set(ONE, TWO), LT, set(ONE)));
+ assertTrue(appliesSetCondition(set(ONE), LT, set(ONE, TWO)));
+ assertThrowsIRE(() -> appliesSetCondition(set(ONE), LT, null),
"Invalid comparison with null for operator \"<\"");
+ assertThrowsIRE(() -> appliesSetCondition(set(ONE), LT, set()),
"Invalid comparison with an empty set for operator \"<\"");
+ assertFalse(appliesSetCondition(null, LT, set(ONE)));
+
+ assertFalse(appliesSetCondition(set(ONE), LT,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
LT, set(ONE)));
+ assertFalse(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
LT, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// LTE
- assertTrue(conditionApplies(set(ONE), LTE, set(ONE)));
- assertTrue(conditionApplies(set(), LTE, set()));
- assertFalse(conditionApplies(set(ONE), LTE, set(ZERO)));
- assertTrue(conditionApplies(set(ZERO), LTE, set(ONE)));
- assertFalse(conditionApplies(set(ONE, TWO), LTE, set(ONE)));
- assertTrue(conditionApplies(set(ONE), LTE, set(ONE, TWO)));
- assertFalse(conditionApplies(set(ONE), LTE, set()));
- assertTrue(conditionApplies(set(), LTE, set(ONE)));
-
- assertFalse(conditionApplies(set(ONE), LTE,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertTrue(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
LTE, set(ONE)));
- assertTrue(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
LTE, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesSetCondition(set(ONE), LTE, set(ONE)));
+ assertThrowsIRE(() -> appliesSetCondition(null, LTE, null), "Invalid
comparison with null for operator \"<=\"");
+ assertThrowsIRE(() -> appliesSetCondition(null, LTE, set()), "Invalid
comparison with an empty set for operator \"<=\"");
+ assertFalse(appliesSetCondition(set(ONE), LTE, set(ZERO)));
+ assertTrue(appliesSetCondition(set(ZERO), LTE, set(ONE)));
+ assertFalse(appliesSetCondition(set(ONE, TWO), LTE, set(ONE)));
+ assertTrue(appliesSetCondition(set(ONE), LTE, set(ONE, TWO)));
+ assertThrowsIRE(() -> appliesSetCondition(set(ONE), LTE, null),
"Invalid comparison with null for operator \"<=\"");
+ assertThrowsIRE(() -> appliesSetCondition(set(ONE), LTE, set()),
"Invalid comparison with an empty set for operator \"<=\"");
+ assertFalse(appliesSetCondition(null, LTE, set(ONE)));
+
+ assertFalse(appliesSetCondition(set(ONE), LTE,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
LTE, set(ONE)));
+ assertTrue(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
LTE, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// GT
- assertFalse(conditionApplies(set(ONE), GT, set(ONE)));
- assertFalse(conditionApplies(set(), GT, set()));
- assertTrue(conditionApplies(set(ONE), GT, set(ZERO)));
- assertFalse(conditionApplies(set(ZERO), GT, set(ONE)));
- assertTrue(conditionApplies(set(ONE, TWO), GT, set(ONE)));
- assertFalse(conditionApplies(set(ONE), GT, set(ONE, TWO)));
- assertTrue(conditionApplies(set(ONE), GT, set()));
- assertFalse(conditionApplies(set(), GT, set(ONE)));
-
- assertTrue(conditionApplies(set(ONE), GT,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
GT, set(ONE)));
- assertFalse(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
GT, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesSetCondition(set(ONE), GT, set(ONE)));
+ assertThrowsIRE(() -> appliesSetCondition(null, GT, null), "Invalid
comparison with null for operator \">\"");
+ assertThrowsIRE(() -> appliesSetCondition(null, GT, set()), "Invalid
comparison with an empty set for operator \">\"");
+ assertTrue(appliesSetCondition(set(ONE), GT, set(ZERO)));
+ assertFalse(appliesSetCondition(set(ZERO), GT, set(ONE)));
+ assertTrue(appliesSetCondition(set(ONE, TWO), GT, set(ONE)));
+ assertFalse(appliesSetCondition(set(ONE), GT, set(ONE, TWO)));
+ assertThrowsIRE(() -> appliesSetCondition(set(ONE), GT, null),
"Invalid comparison with null for operator \">\"");
+ assertThrowsIRE(() -> appliesSetCondition(set(ONE), GT, set()),
"Invalid comparison with an empty set for operator \">\"");
+ assertFalse(appliesSetCondition(null, GT, set(ONE)));
+
+ assertTrue(appliesSetCondition(set(ONE), GT,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertFalse(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
GT, set(ONE)));
+ assertFalse(appliesSetCondition(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
GT, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
// GTE
- assertTrue(conditionApplies(set(ONE), GTE, set(ONE)));
- assertTrue(conditionApplies(set(), GTE, set()));
- assertTrue(conditionApplies(set(ONE), GTE, set(ZERO)));
- assertFalse(conditionApplies(set(ZERO), GTE, set(ONE)));
- assertTrue(conditionApplies(set(ONE, TWO), GTE, set(ONE)));
- assertFalse(conditionApplies(set(ONE), GTE, set(ONE, TWO)));
- assertTrue(conditionApplies(set(ONE), GTE, set()));
- assertFalse(conditionApplies(set(), GTE, set(ONE)));
-
- assertTrue(conditionApplies(set(ONE), GTE,
set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
- assertFalse(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
GTE, set(ONE)));
- assertTrue(conditionApplies(set(ByteBufferUtil.EMPTY_BYTE_BUFFER),
GTE, set(ByteBufferUtil.EMPTY_BYTE_BUFFER)));
+ assertTrue(appliesSetCondition(set(ONE), GTE, set(ONE)));
+ assertThrowsIRE(() -> appliesSetCondition(null, GTE, null), "Invalid
comparison with null for operator \">=\"");
+ assertThrowsIRE(() -> appliesSetCondition(null, GTE, set()), "Invalid
comparison with an empty set for operator \">=\"");
+ assertTrue(appliesSetCondition(set(ONE), GTE, set(ZERO)));
+ assertFalse(appliesSetCondition(set(ZERO), GTE, set(ONE)));
+ assertTrue(appliesSetCondition(set(ONE, TWO), GTE, set(ONE)));
+ assertFalse(appliesSetCondition(set(ONE), GTE, set(ONE, TWO)));
+ assertThrowsIRE(() -> appliesSetCondition(set(ONE), GTE, null),
"Invalid comparison with null for operator \">=\"");
+ assertThrowsIRE(() -> appliesSetCondition(set(ONE), GTE, set()),
"Invalid comparison with an empty set for operator \">=\"");
+ assertFalse(appliesSetCondition(null, GTE, set(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()));
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]
