Maxwell-Guo commented on code in PR #3562:
URL: https://github.com/apache/cassandra/pull/3562#discussion_r1917634542
##########
src/java/org/apache/cassandra/schema/ColumnMetadata.java:
##########
@@ -609,6 +696,13 @@ public void serialize(ColumnMetadata t, DataOutputPlus
out, Version version) thr
out.writeBoolean(t.mask != null);
if (t.mask != null)
ColumnMask.serializer.serialize(t.mask, out, version);
+ if (version.isAtLeast(Version.V6))
Review Comment:
Can we refer to the mask instead of redefining a version?
or can be changed to
`if (t.columnConstraints != null && version.isAtLeast(Version.V6) )`
##########
src/java/org/apache/cassandra/cql3/statements/schema/CreateTableStatement.java:
##########
@@ -56,6 +57,7 @@ public final class CreateTableStatement extends
AlterSchemaStatement
private final Map<ColumnIdentifier, ColumnProperties.Raw> rawColumns;
private final Set<ColumnIdentifier> staticColumns;
private final List<ColumnIdentifier> partitionKeyColumns;
+ Map<ColumnIdentifier, ColumnConstraints> columnConstraints;
Review Comment:
can be changed to : private final Map<ColumnIdentifier, ColumnConstraints>
columnConstraints;
##########
src/java/org/apache/cassandra/cql3/constraints/LengthConstraint.java:
##########
@@ -0,0 +1,118 @@
+/*
+ * 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.constraints;
+
+import com.google.common.collect.Sets;
+import org.apache.cassandra.cql3.ColumnIdentifier;
+import org.apache.cassandra.cql3.Operator;
+import org.apache.cassandra.db.marshal.AbstractType;
+import org.apache.cassandra.db.marshal.AsciiType;
+import org.apache.cassandra.db.marshal.BytesType;
+import org.apache.cassandra.db.marshal.UTF8Type;
+import org.apache.cassandra.schema.ColumnMetadata;
+
+import java.nio.ByteBuffer;
+import java.util.Set;
+
+public class LengthConstraint implements ConstraintFunction
+{
+ public static final String FUNCTION_NAME = "LENGTH";
+ private static final Set<Class<?>> SUPPORTED_TYPES =
Sets.newHashSet(UTF8Type.class,
+
AsciiType.class,
+
BytesType.class);
+
+ private final ColumnIdentifier columnName;
+
+ public LengthConstraint(ColumnIdentifier columnName)
+ {
+ this.columnName = columnName;
+ }
+
+ @Override
+ public String getName()
+ {
+ return FUNCTION_NAME;
+ }
+
+ @Override
+ public void evaluate(Class<? extends AbstractType> valueType, Operator
relationType, String term, Object columnValue)
+ {
+ int valueLength = getValueSize(columnValue, valueType);
+ int sizeConstraint = Integer.parseInt(term);
+
+ switch (relationType)
+ {
+ case EQ:
+ if (valueLength != sizeConstraint)
+ throw new ConstraintViolationException(columnName + "
value length should be exactly " + sizeConstraint);
+ break;
+ case NEQ:
+ if (valueLength == sizeConstraint)
+ throw new ConstraintViolationException(columnName + "
value length should be different from " + sizeConstraint);
+ break;
+ case GT:
+ if (valueLength <= sizeConstraint)
+ throw new ConstraintViolationException(columnName + "
value length should be larger than " + sizeConstraint);
+ break;
+ case LT:
+ if (valueLength >= sizeConstraint)
+ throw new ConstraintViolationException(columnName + "
value length should be smaller than " + sizeConstraint);
+ break;
+ case GTE:
+ if (valueLength < sizeConstraint)
+ throw new ConstraintViolationException(columnName + "
value length should be larger or equal than " + sizeConstraint);
+ break;
+ case LTE:
+ if (valueLength > sizeConstraint)
+ throw new ConstraintViolationException(columnName + "
value length should be smaller or equala than " + sizeConstraint);
+ break;
+ default:
+ throw new ConstraintViolationException("Invalid relation type:
" + relationType);
+ }
+ }
+
+ @Override
+ public void validate(ColumnMetadata columnMetadata)
+ {
+ Class<? extends AbstractType> valueType =
columnMetadata.type.getClass();
Review Comment:
I am +1 with @smiklosovic ,in this case, the code is more maintainable.
The logic of SUPPORTED_TYPES or UNSUPPORTED_TYPES's validation can be
delegated to the AbstractType class's checkConstraints function. The example
you mentioned seems to be able to do it in the AbstractType class.
--
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]
