adelapena commented on code in PR #2310:
URL: https://github.com/apache/cassandra/pull/2310#discussion_r1221873829
##########
src/java/org/apache/cassandra/db/NativeClustering.java:
##########
@@ -45,7 +46,7 @@ public NativeClustering(NativeAllocator allocator,
OpOrder.Group writeOp, Cluste
int bitmapSize = ((count + 7) >>> 3);
assert count < 64 << 10;
- assert dataSize < 64 << 10;
+ assert dataSize <= FBUtilities.MAX_UNSIGNED_SHORT :
String.format("Data size %d >= %d", dataSize, FBUtilities.MAX_UNSIGNED_SHORT +
1);
Review Comment:
Nice :)
##########
src/java/org/apache/cassandra/cql3/Vectors.java:
##########
@@ -0,0 +1,176 @@
+/*
+ * 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.AbstractType;
+import org.apache.cassandra.db.marshal.VectorType;
+import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.transport.ProtocolVersion;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
+public class Vectors
+{
+ private Vectors() {}
+
+ private static AbstractType<?> elementsType(AbstractType<?> type)
+ {
+ return ((VectorType<?>) type.unwrap()).getElementsType();
+ }
+
+ private static ColumnSpecification valueSpecOf(ColumnSpecification column)
+ {
+ return new ColumnSpecification(column.ksName, column.cfName, new
ColumnIdentifier("value(" + column.name + ")", true),
elementsType(column.type));
+ }
+
+ public static class Literal extends Term.Raw
+ {
+ private final List<Term.Raw> elements;
+
+ public Literal(List<Term.Raw> elements)
+ {
+ this.elements = elements;
+ }
+
+ @Override
+ public TestResult testAssignment(String keyspace, ColumnSpecification
receiver)
+ {
+ if (!(receiver.type instanceof VectorType))
+ return AssignmentTestable.TestResult.NOT_ASSIGNABLE;
+ VectorType<?> type = (VectorType<?>) receiver.type;
+ if (elements.size() != type.dimension)
+ return AssignmentTestable.TestResult.NOT_ASSIGNABLE;
+ ColumnSpecification valueSpec = valueSpecOf(receiver);
+ return AssignmentTestable.TestResult.testAll(receiver.ksName,
valueSpec, elements);
+ }
+
+ @Override
+ public Term prepare(String keyspace, ColumnSpecification receiver)
throws InvalidRequestException
+ {
+ if (!(receiver.type instanceof VectorType))
+ throw new InvalidRequestException(String.format("Invalid
vector literal for %s of type %s", receiver.name, receiver.type.asCQL3Type()));
+ VectorType<?> type = (VectorType<?>) receiver.type;
+ if (elements.size() != type.dimension)
+ throw new InvalidRequestException(String.format("Invalid
vector literal for %s of type %s; expected %d elements, but given %d",
receiver.name, receiver.type.asCQL3Type(), type.dimension, elements.size()));
Review Comment:
Maybe `expected %d dimensions` instead of `expected %s elements`?
##########
src/java/org/apache/cassandra/cql3/Vectors.java:
##########
@@ -0,0 +1,176 @@
+/*
+ * 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.AbstractType;
+import org.apache.cassandra.db.marshal.VectorType;
+import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.transport.ProtocolVersion;
+import org.apache.cassandra.utils.ByteBufferUtil;
+
+public class Vectors
+{
+ private Vectors() {}
+
+ private static AbstractType<?> elementsType(AbstractType<?> type)
+ {
+ return ((VectorType<?>) type.unwrap()).getElementsType();
+ }
+
+ private static ColumnSpecification valueSpecOf(ColumnSpecification column)
+ {
+ return new ColumnSpecification(column.ksName, column.cfName, new
ColumnIdentifier("value(" + column.name + ")", true),
elementsType(column.type));
+ }
+
+ public static class Literal extends Term.Raw
+ {
+ private final List<Term.Raw> elements;
+
+ public Literal(List<Term.Raw> elements)
+ {
+ this.elements = elements;
+ }
+
+ @Override
+ public TestResult testAssignment(String keyspace, ColumnSpecification
receiver)
+ {
+ if (!(receiver.type instanceof VectorType))
+ return AssignmentTestable.TestResult.NOT_ASSIGNABLE;
+ VectorType<?> type = (VectorType<?>) receiver.type;
+ if (elements.size() != type.dimension)
+ return AssignmentTestable.TestResult.NOT_ASSIGNABLE;
+ ColumnSpecification valueSpec = valueSpecOf(receiver);
+ return AssignmentTestable.TestResult.testAll(receiver.ksName,
valueSpec, elements);
+ }
+
+ @Override
+ public Term prepare(String keyspace, ColumnSpecification receiver)
throws InvalidRequestException
+ {
+ if (!(receiver.type instanceof VectorType))
+ throw new InvalidRequestException(String.format("Invalid
vector literal for %s of type %s", receiver.name, receiver.type.asCQL3Type()));
+ VectorType<?> type = (VectorType<?>) receiver.type;
+ if (elements.size() != type.dimension)
+ throw new InvalidRequestException(String.format("Invalid
vector literal for %s of type %s; expected %d elements, but given %d",
receiver.name, receiver.type.asCQL3Type(), type.dimension, elements.size()));
+
+ ColumnSpecification valueSpec = valueSpecOf(receiver);
+ List<Term> values = new ArrayList<>(elements.size());
+ boolean allTerminal = true;
+ for (Term.Raw rt : elements)
+ {
+ if (!rt.testAssignment(keyspace, valueSpec).isAssignable())
+ throw new InvalidRequestException(String.format("Invalid
vector literal for %s: value %s is not of type %s", receiver.name, rt,
valueSpec.type.asCQL3Type()));
+
+ Term t = rt.prepare(keyspace, valueSpec);
+
+ if (t instanceof Term.NonTerminal)
+ allTerminal = false;
+
+ values.add(t);
+ }
+ DelayedValue<?> value = new DelayedValue<>(type, values);
+ return allTerminal ? value.bind(QueryOptions.DEFAULT) : value;
+ }
+
+ @Override
+ public String getText()
+ {
+ return Lists.listToString(elements, Term.Raw::getText);
+ }
+
+ @Override
+ public AbstractType<?> getExactTypeIfKnown(String keyspace)
+ {
+ // not enough information to know dimension
Review Comment:
Cannot we get the number of dimensions from the number of `Term.Raw`
elements? And the type of the elements can be taken form seeing if all those
elements have a common type.
Something similar can be done to implement `getCompatibleTypeIfKnown`.
--
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]
