Maxwell-Guo commented on code in PR #2655:
URL: https://github.com/apache/cassandra/pull/2655#discussion_r1328206497
##########
src/java/org/apache/cassandra/cql3/SingleColumnRelation.java:
##########
@@ -86,17 +84,29 @@ public SingleColumnRelation(ColumnIdentifier entity,
Operator type, Term.Raw val
this(entity, null, type, value);
}
+ /**
+ * Creates a new relation.
+ *
+ * @param entity the kind of relation this is; what the term is being
compared to.
Review Comment:
”the kind of relation this is; what the term is being compared to.“ --- I
feel like this expression is a bit awkward，I don’t know if it’s because I’m a
non-native English speaker
##########
src/java/org/apache/cassandra/cql3/Constants.java:
##########
@@ -195,7 +194,8 @@ public AbstractType<?> getExactTypeIfKnown(String keyspace)
public static final Term.Terminal NULL_VALUE = new Value(null)
{
- @Override
+
+ /// TODO: The bind overridding should be removed. A user does not have
to call bind on a Terminal.
Review Comment:
Nit: seems "//" is enough not "///"
##########
src/java/org/apache/cassandra/cql3/Marker.java:
##########
@@ -0,0 +1,128 @@
+/*
+ * 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.List;
+
+import org.apache.cassandra.cql3.functions.Function;
+import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.MultiElementType;
+import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.serializers.MarshalException;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
+import static
org.apache.cassandra.cql3.statements.RequestValidations.checkFalse;
+
+/**
+ * A placeholder, also called bind marker, for a single value represented in
CQL as '?' for an unnamed marker or ':<name>' for a named marker.
+ * For example, 'SELECT ... WHERE pk = ?' or 'SELECT ... WHERE pk = :myKey '.
+ */
+public final class Marker extends Term.NonTerminal
+{
+ private final int bindIndex;
+
+ private final ColumnSpecification receiver;
+
+ private Marker(int bindIndex, ColumnSpecification receiver)
+ {
+ this.bindIndex = bindIndex;
+ this.receiver = receiver;
+ }
+
+ @Override
+ public void collectMarkerSpecification(VariableSpecifications boundNames)
+ {
+ boundNames.add(bindIndex, receiver);
+ }
+
+ @Override
+ public boolean containsBindMarker()
+ {
+ return true;
+ }
+
+ @Override
+ public void addFunctionsTo(List<Function> functions)
+ {
+ }
+
+ @Override
+ public Term.Terminal bind(QueryOptions options) throws
InvalidRequestException
+ {
+ try
+ {
+ ByteBuffer bytes = options.getValues().get(bindIndex);
+ if (bytes == null)
+ return null;
+
+ if (bytes == ByteBufferUtil.UNSET_BYTE_BUFFER)
+ {
+ checkFalse(receiver.type.isTuple(), "Invalid unset value for
tuple %s", receiver.name);
+ return Constants.UNSET_VALUE;
+ }
+
+ if (receiver.type instanceof MultiElementType<?>)
+ return MultiElements.Value.fromSerialized(bytes,
(MultiElementType<?>) receiver.type);
+
+ receiver.type.validate(bytes);
+ return new Constants.Value(bytes);
+ }
+ catch (MarshalException e)
+ {
+ throw new InvalidRequestException(e.getMessage(), e);
Review Comment:
why some times we use "throw invalidRequest" to throw an
Invalidrequestexception but some times we new an Invalidrequestexception and
throw here ?
##########
src/java/org/apache/cassandra/db/marshal/CollectionType.java:
##########
@@ -318,7 +321,7 @@ static <V> ByteSource
asComparableBytesListOrSet(AbstractType<?> elementsCompara
return ByteSource.withTerminatorMaybeLegacy(version, 0x00, srcs);
}
- static <V> V fromComparableBytesListOrSet(ValueAccessor<V> accessor,
+ <V> V fromComparableBytesListOrSet(ValueAccessor<V> accessor,
ByteSource.Peekable
comparableBytes,
Review Comment:
The input parameters should be aligned
##########
src/java/org/apache/cassandra/cql3/MultiElements.java:
##########
@@ -0,0 +1,163 @@
+/*
+ * 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.List;
+
+import org.apache.cassandra.cql3.functions.Function;
+import org.apache.cassandra.db.marshal.MultiElementType;
+import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.serializers.MarshalException;
+
+/**
+ * Static classes for MultiElementTypes.
+ */
+public final class MultiElements
+{
+ private MultiElements()
+ {
+ }
+
+ /**
+ * The serialized elements a multi-element type (collection, tuple, udt,
...)
+ */
+ public static class Value extends Term.Terminal
+ {
+ /**
+ * The type represented by this {@code Value}
+ */
+ private final MultiElementType<?> type;
+
+ /**
+ * The serialized values of the elements composing this value.
+ */
+ private final List<ByteBuffer> elements;
+
+ /**
+ * Creates a {@code Value} from its serialized representation.
+ *
+ * @param value a serialized value from the specified type
+ * @param type the value type
+ * @return a {@code Value}
+ */
+ public static Value fromSerialized(ByteBuffer value,
MultiElementType<?> type)
+ {
+ try
+ {
+ // We depend for SetType and MapType on the collections being
without duplicated keys and sorted.
+ return new Value(type,
type.filterSortAndValidateElements(type.unpack(value)));
+ }
+ catch (MarshalException e)
+ {
+ throw new InvalidRequestException(e.getMessage());
+ }
+ }
+
+ public Value(MultiElementType<?> type, List<ByteBuffer> elements)
+ {
+ this.type = type;
+ this.elements = elements;
+ }
+
+ @Override
+ public ByteBuffer get()
+ {
+ return type.pack(elements);
+ }
+
+ @Override
+ public List<ByteBuffer> getElements()
+ {
+ return elements;
+ }
+ }
+
+ /**
+ * The terms representing a multi-element value (collection, tuple, udt,
...) where at least one of the terms
+ * represent a non-pure functions or a bind marker.
+ */
+ public static class DelayedValue extends Term.NonTerminal
+ {
+ /**
+ * The type represented by this {@code DelayedValue}
+ */
+ private final MultiElementType<?> type;
+
+ /**
+ * The terms representing the elements composing this value.
+ */
+ private final List<Term> elements;
+
+ public DelayedValue(MultiElementType<?> type, List<Term> elements)
+ {
+ this.type = type;
+ this.elements = elements;
+ }
+
+ @Override
+ public void collectMarkerSpecification(VariableSpecifications
boundNames)
+ {
+ if (type.supportElementBindMarkers())
+ {
+ for (int i = 0, m = elements.size(); i < m; i++)
+ elements.get(i).collectMarkerSpecification(boundNames);
+ }
+ }
+
+ @Override
+ public Terminal bind(QueryOptions options)
+ {
+ try
+ {
+ List<ByteBuffer> buffers = new
ArrayList<ByteBuffer>(elements.size());
+ for (Term t : elements)
+ {
+ buffers.add(t.bindAndGet(options));
+ }
+
+ buffers = type.filterSortAndValidateElements(buffers);
+ return new Value(type, buffers);
+ }
+ catch (MarshalException e)
+ {
+ throw new InvalidRequestException(e.getMessage());
Review Comment:
can we use "throw invalidRequest(" here too?
##########
src/java/org/apache/cassandra/db/marshal/MapType.java:
##########
@@ -398,4 +375,37 @@ public ByteBuffer getMaskedValue()
{
return decompose(Collections.emptyMap());
}
+
+ @Override
+ public List<ByteBuffer> filterSortAndValidateElements(List<ByteBuffer>
buffers)
+ {
+ // We depend on Maps to be properly sorted by their keys, so use a
sorted map implementation here.
+ SortedMap<ByteBuffer, ByteBuffer> map = new TreeMap<>(getKeysType());
+ Iterator<ByteBuffer> iter = buffers.iterator();
+ while (iter.hasNext())
+ {
+ ByteBuffer keyBytes = iter.next();
+ ByteBuffer valueBytes = iter.next();
+
+ if (keyBytes == null)
+ throw new MarshalException("null is not supported inside
collections");
+
+ getKeysType().validate(keyBytes);
+
+ if (valueBytes == null)
+ throw new MarshalException("null is not supported inside
collections");
+
+ getValuesType().validate(valueBytes);
+
Review Comment:
we will throw exception if at least one is null ,so what about doing check
at the before ?
```
ByteBuffer keyBytes = iter.next();
ByteBuffer valueBytes = iter.next();
if (keyBytes == null || valueBytes == null)
throw new MarshalException("null is not supported inside
collections");
getKeysType().validate(keyBytes);
getValuesType().validate(valueBytes);
map.put(keyBytes, valueBytes);
```
##########
src/java/org/apache/cassandra/cql3/MultiElements.java:
##########
@@ -0,0 +1,163 @@
+/*
+ * 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.List;
+
+import org.apache.cassandra.cql3.functions.Function;
+import org.apache.cassandra.db.marshal.MultiElementType;
+import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.serializers.MarshalException;
+
+/**
+ * Static classes for MultiElementTypes.
+ */
+public final class MultiElements
+{
+ private MultiElements()
+ {
+ }
+
+ /**
+ * The serialized elements a multi-element type (collection, tuple, udt,
...)
+ */
+ public static class Value extends Term.Terminal
+ {
+ /**
+ * The type represented by this {@code Value}
+ */
+ private final MultiElementType<?> type;
+
+ /**
+ * The serialized values of the elements composing this value.
+ */
+ private final List<ByteBuffer> elements;
+
+ /**
+ * Creates a {@code Value} from its serialized representation.
+ *
+ * @param value a serialized value from the specified type
+ * @param type the value type
+ * @return a {@code Value}
+ */
+ public static Value fromSerialized(ByteBuffer value,
MultiElementType<?> type)
+ {
+ try
+ {
+ // We depend for SetType and MapType on the collections being
without duplicated keys and sorted.
+ return new Value(type,
type.filterSortAndValidateElements(type.unpack(value)));
+ }
+ catch (MarshalException e)
+ {
+ throw new InvalidRequestException(e.getMessage());
Review Comment:
can we use "throw invalidRequest(" here too?
##########
src/java/org/apache/cassandra/cql3/SingleColumnRelation.java:
##########
@@ -86,17 +84,29 @@ public SingleColumnRelation(ColumnIdentifier entity,
Operator type, Term.Raw val
this(entity, null, type, value);
}
+ /**
+ * Creates a new relation.
+ *
+ * @param entity the kind of relation this is; what the term is being
compared to.
Review Comment:
”the kind of relation this is; what the term is being compared to.“ --- I
feel like this expression is a bit awkward，I don’t know if it’s because I’m a
non-native English speaker
##########
src/java/org/apache/cassandra/cql3/MultiElements.java:
##########
@@ -0,0 +1,163 @@
+/*
+ * 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.List;
+
+import org.apache.cassandra.cql3.functions.Function;
+import org.apache.cassandra.db.marshal.MultiElementType;
+import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.serializers.MarshalException;
+
+/**
+ * Static classes for MultiElementTypes.
+ */
+public final class MultiElements
Review Comment:
+1 on this
--
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]
