ekaterinadimitrova2 commented on code in PR #3366:
URL: https://github.com/apache/cassandra/pull/3366#discussion_r1639644755
##########
src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java:
##########
@@ -488,10 +491,15 @@ public boolean appliesTo(Row row)
return false;
}
+ private boolean isEmpty(CollectionType<?> type, Term.Terminal value)
Review Comment:
```suggestion
private boolean isEmpty(Term.Terminal value)
```
##########
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java:
##########
@@ -209,66 +220,66 @@ private static void assertThrowsIRE(CheckedFunction
runnable, String errorMessag
public void testSimpleBoundIsSatisfiedByValue() throws
InvalidRequestException
{
// EQ
- assertTrue(conditionApplies(ONE, EQ, ONE));
- assertFalse(conditionApplies(TWO, EQ, ONE));
- assertFalse(conditionApplies(ONE, EQ, TWO));
- assertFalse(conditionApplies(ONE, EQ, EMPTY_BYTE_BUFFER));
- assertFalse(conditionApplies(EMPTY_BYTE_BUFFER, EQ, ONE));
- assertTrue(conditionApplies(EMPTY_BYTE_BUFFER, EQ, EMPTY_BYTE_BUFFER));
- assertFalse(conditionApplies(ONE, EQ, null));
- assertFalse(conditionApplies(null, EQ, ONE));
- assertTrue(conditionApplies((ByteBuffer) null, EQ, (ByteBuffer) null));
+ assertTrue(appliesSimpleCondition(ONE, EQ, ONE));
+ assertFalse(appliesSimpleCondition(TWO, EQ, ONE));
+ assertFalse(appliesSimpleCondition(ONE, EQ, TWO));
+ assertFalse(appliesSimpleCondition(ONE, EQ, EMPTY_BYTE_BUFFER));
+ assertFalse(appliesSimpleCondition(EMPTY_BYTE_BUFFER, EQ, ONE));
+ assertTrue(appliesSimpleCondition(EMPTY_BYTE_BUFFER, EQ,
EMPTY_BYTE_BUFFER));
+ assertFalse(appliesSimpleCondition(ONE, EQ, null));
+ assertFalse(appliesSimpleCondition(null, EQ, ONE));
+ assertTrue(appliesSimpleCondition((ByteBuffer) null, EQ, (ByteBuffer)
null));
// NEQ
- assertFalse(conditionApplies(ONE, NEQ, ONE));
- assertTrue(conditionApplies(TWO, NEQ, ONE));
- assertTrue(conditionApplies(ONE, NEQ, TWO));
- assertTrue(conditionApplies(ONE, NEQ, EMPTY_BYTE_BUFFER));
- assertTrue(conditionApplies(EMPTY_BYTE_BUFFER, NEQ, ONE));
- assertFalse(conditionApplies(EMPTY_BYTE_BUFFER, NEQ,
EMPTY_BYTE_BUFFER));
- assertTrue(conditionApplies(ONE, NEQ, null));
- assertTrue(conditionApplies(null, NEQ, ONE));
- assertFalse(conditionApplies((ByteBuffer) null, NEQ, (ByteBuffer)
null));
+ assertFalse(appliesSimpleCondition(ONE, NEQ, ONE));
+ assertTrue(appliesSimpleCondition(TWO, NEQ, ONE));
+ assertTrue(appliesSimpleCondition(ONE, NEQ, TWO));
+ assertTrue(appliesSimpleCondition(ONE, NEQ, EMPTY_BYTE_BUFFER));
+ assertTrue(appliesSimpleCondition(EMPTY_BYTE_BUFFER, NEQ, ONE));
+ assertFalse(appliesSimpleCondition(EMPTY_BYTE_BUFFER, NEQ,
EMPTY_BYTE_BUFFER));
+ assertTrue(appliesSimpleCondition(ONE, NEQ, null));
+ assertTrue(appliesSimpleCondition(null, NEQ, ONE));
+ assertFalse(appliesSimpleCondition((ByteBuffer) null, NEQ,
(ByteBuffer) null));
Review Comment:
```suggestion
assertFalse(appliesSimpleCondition(null, NEQ, null));
```
##########
test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java:
##########
@@ -209,66 +220,66 @@ private static void assertThrowsIRE(CheckedFunction
runnable, String errorMessag
public void testSimpleBoundIsSatisfiedByValue() throws
InvalidRequestException
{
// EQ
- assertTrue(conditionApplies(ONE, EQ, ONE));
- assertFalse(conditionApplies(TWO, EQ, ONE));
- assertFalse(conditionApplies(ONE, EQ, TWO));
- assertFalse(conditionApplies(ONE, EQ, EMPTY_BYTE_BUFFER));
- assertFalse(conditionApplies(EMPTY_BYTE_BUFFER, EQ, ONE));
- assertTrue(conditionApplies(EMPTY_BYTE_BUFFER, EQ, EMPTY_BYTE_BUFFER));
- assertFalse(conditionApplies(ONE, EQ, null));
- assertFalse(conditionApplies(null, EQ, ONE));
- assertTrue(conditionApplies((ByteBuffer) null, EQ, (ByteBuffer) null));
+ assertTrue(appliesSimpleCondition(ONE, EQ, ONE));
+ assertFalse(appliesSimpleCondition(TWO, EQ, ONE));
+ assertFalse(appliesSimpleCondition(ONE, EQ, TWO));
+ assertFalse(appliesSimpleCondition(ONE, EQ, EMPTY_BYTE_BUFFER));
+ assertFalse(appliesSimpleCondition(EMPTY_BYTE_BUFFER, EQ, ONE));
+ assertTrue(appliesSimpleCondition(EMPTY_BYTE_BUFFER, EQ,
EMPTY_BYTE_BUFFER));
+ assertFalse(appliesSimpleCondition(ONE, EQ, null));
+ assertFalse(appliesSimpleCondition(null, EQ, ONE));
+ assertTrue(appliesSimpleCondition((ByteBuffer) null, EQ, (ByteBuffer)
null));
Review Comment:
nit:
```suggestion
assertTrue(appliesSimpleCondition(null, EQ, null));
```
--
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]
