adelapena commented on code in PR #2556:
URL: https://github.com/apache/cassandra/pull/2556#discussion_r1288549393
##########
src/java/org/apache/cassandra/cql3/MultiColumnRelation.java:
##########
@@ -95,6 +96,11 @@ public static MultiColumnRelation
createInRelation(List<ColumnIdentifier> entiti
return new MultiColumnRelation(entities, Operator.IN, null, inValues,
null);
}
+ public static MultiColumnRelation
createNotInRelation(List<ColumnIdentifier> entities, List<? extends
Term.MultiColumnRaw> inValues)
Review Comment:
This could have JavaDoc like the method `createInRelation` right above.
##########
src/antlr/Parser.g:
##########
@@ -1789,6 +1793,16 @@ relation[WhereClause.Builder clauses]
| markers=tupleOfMarkersForTuples /* (a, b, c) IN (?, ?, ...) */
{ $clauses.add(MultiColumnRelation.createInRelation(ids,
markers)); }
)
+ | K_NOT K_IN
+ ( '(' ')'
+ { $clauses.add(MultiColumnRelation.createNotInRelation(ids, new
ArrayList<Tuples.Literal>())); }
+ | tupleInMarker=inMarkerForTuple /* (a, b, c) IN ? */
+ {
$clauses.add(MultiColumnRelation.createSingleMarkerNotInRelation(ids,
tupleInMarker)); }
+ | literals=tupleOfTupleLiterals /* (a, b, c) IN ((1, 2, 3), (4, 5,
6), ...) */
+ { $clauses.add(MultiColumnRelation.createNotInRelation(ids,
literals)); }
+ | markers=tupleOfMarkersForTuples /* (a, b, c) IN (?, ?, ...) */
Review Comment:
The three comments should use `NOT IN` instead of only `IN`
##########
src/java/org/apache/cassandra/cql3/Relation.java:
##########
@@ -203,7 +270,7 @@ protected abstract Restriction
newSliceRestriction(TableMetadata table,
* @return a new Contains <code>Restriction</code> instance
* @throws InvalidRequestException if the <code>Relation</code> is not
valid
*/
- protected abstract Restriction newContainsRestriction(TableMetadata table,
VariableSpecifications boundNames, boolean isKey);
+ protected abstract Restriction newContainsRestriction(TableMetadata table,
VariableSpecifications boundNames, boolean isKey, boolean isNot);
Review Comment:
The new `isNot` parameter should probably be documented. However, given that
EQ/NEQ and IN/NOT_INT pairs have separate `new*Restriction` methods for the
"not" variant, perhaps we should do the same here and have a separate
`newNotContains` method instead of the parameter?
##########
src/java/org/apache/cassandra/cql3/MarkerOrList.java:
##########
@@ -0,0 +1,140 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.cql3;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.cassandra.cql3.functions.Function;
+
+import static
org.apache.cassandra.cql3.statements.RequestValidations.checkBindValueSet;
+import static
org.apache.cassandra.cql3.statements.RequestValidations.checkNotNull;
+
+/**
+ * Represents either a single marker for IN values, or a list of IN values,
like:
+ * "SELECT ... WHERE x IN ?"
+ * "SELECT ... WHERE x IN (?, ?, ?)"
+ * "SELECT ... WHERE x IN (a, b, c)"
+ */
+public class MarkerOrList
Review Comment:
Maybe this could be named `MarkerOrTerms`, since without context it's not
very clear what kind of list it is. Also, the constructor and most methods are
branched depending on whether it's a single marker or a list of terms. This
makes me think that the class could benefit from inheritance, more or less this
way:
https://github.com/adelapena/cassandra/commit/1a2361db14e4f1e2c32fbda4a0a3b8dd8543ea66
##########
src/java/org/apache/cassandra/cql3/Relation.java:
##########
@@ -169,6 +214,17 @@ public final Restriction toRestriction(TableMetadata
table, VariableSpecificatio
*/
protected abstract Restriction newEQRestriction(TableMetadata table,
VariableSpecifications boundNames);
+ /**
+ * Creates a new NEQ restriction instance.
+ *
+ * @param table the table meta data
+ * @param boundNames the variables specification where to collect the bind
variables
+ * @return a new EQ restriction instance.
Review Comment:
```suggestion
* @return a new NEQ restriction instance.
```
--
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]
