jyothsnakonisa commented on code in PR #4518: URL: https://github.com/apache/cassandra/pull/4518#discussion_r2615436998
########## test/unit/org/apache/cassandra/service/accord/txn/TxnReferenceOperationTest.java: ########## @@ -0,0 +1,289 @@ +/* + * 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.service.accord.txn; + +import java.nio.ByteBuffer; +import java.util.List; +import java.util.Set; + +import javax.annotation.Nullable; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; +import org.junit.Test; + +import accord.utils.Gen; +import org.apache.cassandra.cql3.ColumnIdentifier; +import org.apache.cassandra.cql3.FieldIdentifier; +import org.apache.cassandra.cql3.Operation; +import org.apache.cassandra.cql3.terms.Constants; +import org.apache.cassandra.cql3.terms.UserTypes; +import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.CollectionType; +import org.apache.cassandra.db.marshal.Int32Type; +import org.apache.cassandra.db.marshal.ListType; +import org.apache.cassandra.db.marshal.MapType; +import org.apache.cassandra.db.marshal.SetType; +import org.apache.cassandra.db.marshal.UTF8Type; +import org.apache.cassandra.db.marshal.UserType; +import org.apache.cassandra.dht.Murmur3Partitioner; +import org.apache.cassandra.io.Serializers; +import org.apache.cassandra.io.util.DataOutputBuffer; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; +import org.apache.cassandra.service.accord.serializers.TableMetadatas; +import org.apache.cassandra.utils.AbstractTypeGenerators; +import org.apache.cassandra.utils.ByteBufferUtil; +import org.apache.cassandra.utils.Generators; +import org.reflections.Reflections; +import org.reflections.scanners.Scanners; +import org.reflections.util.ConfigurationBuilder; + +import static accord.utils.Property.qt; + +public class TxnReferenceOperationTest +{ + private static final String KS = "ks"; + private static final TxnData EMPTY = new TxnData(); + + @Test + public void coverage() + { + Reflections reflections = new Reflections(new ConfigurationBuilder() + .forPackage("org.apache.cassandra") + .setScanners(Scanners.SubTypes) + .setExpandSuperTypes(true) + .setParallel(true)); + var subTypes = reflections.getSubTypesOf(Operation.class); + var knownTypes = TxnReferenceOperation.initOperationKindMap().keySet(); + // these types do not have a way to define a reference, as they are column level: + Set<Class<? extends Operation>> safeToExclude = ImmutableSet.of(Constants.Deleter.class, // DELETE foo + UserTypes.DeleterByField.class // DELETE foo.bar + ); + + StringBuilder sb = null; + for (var klass : Sets.difference(subTypes, Sets.union(knownTypes, safeToExclude))) + { + if (sb == null) + sb = new StringBuilder(); + sb.append(klass.getCanonicalName()).append('\n'); + } + if (sb != null) + throw new AssertionError(sb.toString()); + } + + @Test + public void serde() + { + @SuppressWarnings({ "resource", "IOResourceOpenedButNotSafelyClosed" }) DataOutputBuffer output = new DataOutputBuffer(); + qt().withExamples(10_000).forAll(gen()).check(txnOp -> { + Serializers.testSerde(output, TxnReferenceOperation.serializer, txnOp, TableMetadatas.of(txnOp.table)); + + txnOp.toOperation(EMPTY); + }); + } + + private enum Group + { + Setter, SetterByIndex, SetterByKey, SetterByField, + Adder, Subtracter, + Appender, Putter, Discarder, Prepender, + } + + private static Gen<TxnReferenceValue> valueGen(AbstractType<?> type) + { + return Generators.toGen(AbstractTypeGenerators.getTypeSupport(type) + .bytesGen()) + .map(TxnReferenceValue.Constant::new); + } + + private static Gen<TxnReferenceOperation> gen() + { + return rs -> { + TxnReferenceOperation.Kind kind; + ColumnMetadata receiver; + TableMetadata table; + @Nullable ByteBuffer keyOrIndex = null; + @Nullable ByteBuffer field = null; + TxnReferenceValue value; + Group group = rs.pick(Group.values()); + switch (group) + { + case Prepender: + { + kind = TxnReferenceOperation.Kind.ListPrepender; + ListType<?> type = ListType.getInstance(Int32Type.instance, true); + value = valueGen(type).next(rs); + + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + } + break; + case Discarder: + { + CollectionType<?> type = (CollectionType<?>) Generators.toGen(AbstractTypeGenerators.builder() + .withMaxDepth(1) + .withTypeKinds(AbstractTypeGenerators.TypeKind.LIST, + AbstractTypeGenerators.TypeKind.SET, + AbstractTypeGenerators.TypeKind.MAP) + .build()) + .next(rs); + kind = type instanceof ListType + ? TxnReferenceOperation.Kind.ListDiscarder + : TxnReferenceOperation.Kind.SetDiscarder; + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + if (kind == TxnReferenceOperation.Kind.ListDiscarder && rs.nextBoolean()) + { + kind = TxnReferenceOperation.Kind.ListDiscarderByIndex; + value = new TxnReferenceValue.Constant(Int32Type.instance.decompose(42)); + } + else if (type instanceof MapType && rs.nextBoolean()) + { + kind = TxnReferenceOperation.Kind.MapDiscarderByKey; + var keyType = ((MapType<?, ?>) type).getKeysType(); + value = valueGen(keyType).next(rs); + } + else if (type instanceof SetType && rs.nextBoolean()) + { + kind = TxnReferenceOperation.Kind.SetElementDiscarder; + var elementType = ((SetType<?>) type).getElementsType(); + value = valueGen(elementType).next(rs); + } + else + { + CollectionType<?> discardType = type instanceof MapType + ? SetType.getInstance(((MapType<?, ?>) type).getKeysType(), true) + : type; + value = valueGen(discardType).next(rs); + } + } + break; + case Adder: + case Subtracter: + { + if (group == Group.Adder && rs.nextBoolean()) + { + // this is similar to ListAppend + var type = SetType.getInstance(Int32Type.instance, true); + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + value = valueGen(type).next(rs); + kind = TxnReferenceOperation.Kind.SetAdder; + } + else + { + var type = Int32Type.instance; + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + value = valueGen(type).next(rs); + kind = group == Group.Adder ? TxnReferenceOperation.Kind.ConstantAdder : TxnReferenceOperation.Kind.ConstantSubtracter; + } + } + break; + case Setter: + { + var type = Generators.toGen(AbstractTypeGenerators.builder() + .withoutUnsafeEquality() + .withMaxDepth(1) + .build()) + .next(rs); + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + value = valueGen(type).next(rs); + if (type instanceof ListType) + kind = TxnReferenceOperation.Kind.ListSetter; + else if (type instanceof SetType) + kind = TxnReferenceOperation.Kind.SetSetter; + else if (type instanceof MapType) + kind = TxnReferenceOperation.Kind.MapSetter; + else if (type instanceof UserType) + kind = TxnReferenceOperation.Kind.UserTypeSetter; + else + kind = TxnReferenceOperation.Kind.ConstantSetter; + } + break; + case SetterByIndex: + { + ListType<String> type = ListType.getInstance(UTF8Type.instance, true); + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + value = valueGen(type.getElementsType()).next(rs); + kind = TxnReferenceOperation.Kind.ListSetterByIndex;// x[?] = ? + keyOrIndex = Int32Type.instance.decompose(42); + } + break; + case Appender: + { + ListType<String> type = ListType.getInstance(UTF8Type.instance, true); + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + value = valueGen(type).next(rs); + kind = TxnReferenceOperation.Kind.ListAppender; + } + break; + case SetterByKey: + { + MapType<Integer, String> type = MapType.getInstance(Int32Type.instance, UTF8Type.instance, true); + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + value = valueGen(type.getValuesType()).next(rs); + kind = TxnReferenceOperation.Kind.MapSetterByKey; + keyOrIndex = Int32Type.instance.decompose(42); + } + break; + case Putter: // x += {foo: bar, baz: biz} -- basically Appender but for Map! + { + MapType<Integer, String> type = MapType.getInstance(Int32Type.instance, UTF8Type.instance, true); + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + value = valueGen(type).next(rs); + kind = TxnReferenceOperation.Kind.MapPutter; + } + break; + case SetterByField: + { + UserType type = new UserType(KS, ByteBufferUtil.bytes("udt"), + List.of(FieldIdentifier.forUnquoted("f1")), + List.of(UTF8Type.instance), + true); + kind = TxnReferenceOperation.Kind.UserTypeSetterByField; + table = table(type); + receiver = table.getColumn(ColumnIdentifier.getInterned("col", true)); + value = valueGen(UTF8Type.instance).next(rs); + field = FieldIdentifier.forUnquoted("f1").bytes; + } + break; + + default: + throw new UnsupportedOperationException(); + } + return new TxnReferenceOperation(kind, receiver, table, keyOrIndex, field, value); + }; + } + + private static TableMetadata table(AbstractType<?> type) + { + return TableMetadata.builder(KS, "tbl") + .partitioner(Murmur3Partitioner.instance) + .addPartitionKeyColumn("pk", Int32Type.instance) + .addRegularColumn("col", type) + .build(); + } +} Review Comment: Please add a new line at the end of the file. ########## src/java/org/apache/cassandra/service/StorageProxy.java: ########## @@ -1316,13 +1318,17 @@ public static void dispatchMutationsWithRetryOnDifferentSystem(List<? extends IM { if (accordResult != null) { - TxnResult.Kind kind = accordResult.awaitAndGet().kind(); + TxnResult result = accordResult.awaitAndGet(); + TxnResult.Kind kind = result.kind(); if (kind == retry_new_protocol && failure == null) { Tracing.trace("Accord returned retry new protocol"); logger.debug("Retrying mutations on different system because some mutations were misrouted according to Accord"); continue; } + if (result.kind() == validation_rejection) + throw ((TxnValidationRejection) result).validationException; + Review Comment: Similar if condition checks are present in several parts of the code. Can this be moved to a helper in `TransactionResult` to avoid code duplication? -- 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]
