This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cep-15-accord in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit c7fd7cbc53bb1c2eb77abd7ef32b6a6c19e35465 Author: Caleb Rackliffe <[email protected]> AuthorDate: Wed Jan 25 14:32:12 2023 -0600 Post-rebase fixes around CASSANDRA-18099 and CASSANDRA-18114 (among other things) --- src/java/org/apache/cassandra/cql3/Maps.java | 1 - src/java/org/apache/cassandra/cql3/Operator.java | 7 +++---- .../cassandra/cql3/conditions/ColumnCondition.java | 21 +++++++++++---------- .../apache/cassandra/cql3/selection/Selector.java | 2 +- .../cql3/statements/TransactionStatement.java | 2 +- .../org/apache/cassandra/db/PartitionPosition.java | 3 +-- .../org/apache/cassandra/db/marshal/UserType.java | 2 +- .../org/apache/cassandra/dht/AbstractBounds.java | 1 - .../dht/IPartitionerDependentSerializer.java | 1 - src/java/org/apache/cassandra/dht/Token.java | 8 ++++---- .../service/accord/AccordCommandsForKey.java | 1 - .../cassandra/service/accord/AccordKeyspace.java | 11 +++++------ .../service/accord/AccordSerializerVersion.java | 4 ++-- .../cassandra/service/accord/AccordSerializers.java | 20 +++++++++----------- .../cassandra/service/accord/api/AccordAgent.java | 2 -- .../accord/serializers/CheckStatusSerializers.java | 1 - .../accord/serializers/CommitSerializers.java | 1 - .../service/accord/serializers/DepsSerializer.java | 12 ++++++------ .../service/accord/serializers/EnumSerializer.java | 4 ++-- .../service/accord/serializers/KeySerializers.java | 9 ++++----- .../accord/serializers/ReadDataSerializers.java | 1 - .../accord/serializers/WaitOnCommitSerializer.java | 1 - .../service/accord/store/StoredNavigableMap.java | 2 -- .../cassandra/service/accord/txn/TxnCondition.java | 9 ++++----- .../cassandra/service/accord/txn/TxnData.java | 2 +- .../cassandra/service/accord/txn/TxnDataName.java | 8 ++++---- .../cassandra/service/accord/txn/TxnReference.java | 5 ++--- .../service/accord/txn/TxnReferenceOperation.java | 17 ++++++++--------- .../service/accord/txn/TxnReferenceValue.java | 6 ++---- .../cassandra/service/accord/txn/TxnUpdate.java | 9 ++++----- .../apache/cassandra/utils/ArraySerializers.java | 5 ++--- .../org/apache/cassandra/utils/ByteBufferUtil.java | 4 ++-- .../paxos/PairOfSequencesAccordSimulation.java | 2 -- .../paxos/StrictSerializabilityValidator.java | 1 - .../systems/InterceptingGlobalMethods.java | 3 --- .../systems/InterceptorOfGlobalMethods.java | 3 +++ .../cql3/conditions/ColumnConditionTest.java | 8 +++----- .../dht/OrderPreservingPartitionerTest.java | 4 ---- .../apache/cassandra/dht/PartitionerTestCase.java | 1 - 39 files changed, 85 insertions(+), 119 deletions(-) diff --git a/src/java/org/apache/cassandra/cql3/Maps.java b/src/java/org/apache/cassandra/cql3/Maps.java index 872c1ce600..6f8c42a927 100644 --- a/src/java/org/apache/cassandra/cql3/Maps.java +++ b/src/java/org/apache/cassandra/cql3/Maps.java @@ -36,7 +36,6 @@ import org.apache.cassandra.db.guardrails.Guardrails; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.MapType; -import org.apache.cassandra.db.marshal.ReversedType; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.exceptions.InvalidRequestException; diff --git a/src/java/org/apache/cassandra/cql3/Operator.java b/src/java/org/apache/cassandra/cql3/Operator.java index 625e53ee83..5933f95705 100644 --- a/src/java/org/apache/cassandra/cql3/Operator.java +++ b/src/java/org/apache/cassandra/cql3/Operator.java @@ -33,7 +33,6 @@ import org.apache.cassandra.serializers.ListSerializer; import org.apache.cassandra.utils.ByteBufferUtil; import static com.google.common.base.Preconditions.checkArgument; -import static com.google.common.primitives.Ints.checkedCast; import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt; public enum Operator @@ -295,7 +294,7 @@ public enum Operator * Creates a new <code>Operator</code> with the specified binary representation. * @param b the binary representation of this <code>Enum</code> value */ - private Operator(int b) + Operator(int b) { this.b = b; } @@ -319,7 +318,7 @@ public enum Operator */ public void writeToUnsignedVInt(DataOutputPlus output) throws IOException { - output.writeUnsignedVInt(b); + output.writeUnsignedVInt32(b); } public int getValue() @@ -348,7 +347,7 @@ public enum Operator */ public static Operator readFromUnsignedVInt(DataInputPlus input) throws IOException { - return fromBinary(checkedCast(input.readUnsignedVInt())); + return fromBinary(input.readUnsignedVInt32()); } private static Operator fromBinary(int b) throws IOException diff --git a/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java b/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java index 7af4635b2a..c5e7334454 100644 --- a/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java +++ b/src/java/org/apache/cassandra/cql3/conditions/ColumnCondition.java @@ -69,9 +69,10 @@ import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; -import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.primitives.Ints.checkedCast; import static java.util.stream.Collectors.toList; + +import static com.google.common.base.Preconditions.checkNotNull; + import static org.apache.cassandra.cql3.Constants.UNSET_VALUE; import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse; import static org.apache.cassandra.cql3.statements.RequestValidations.invalidRequest; @@ -369,7 +370,7 @@ public abstract class ColumnCondition columnMetadataSerializer.serialize(bound.column, out, version); bound.comparisonOperator.writeToUnsignedVInt(out); BoundKind kind = bound.kind(); - out.writeUnsignedVInt(kind.ordinal()); + out.writeUnsignedVInt32(kind.ordinal()); kind.serializer.serialize(bound, out, version); } @@ -378,7 +379,7 @@ public abstract class ColumnCondition { ColumnMetadata column = columnMetadataSerializer.deserialize(in, version); Operator comparisonOperator = Operator.readFromUnsignedVInt(in); - int boundKind = checkedCast(in.readUnsignedVInt()); + int boundKind = in.readUnsignedVInt32(); return BoundKind.serializer(boundKind).deserialize(in, version, column, comparisonOperator); } @@ -402,21 +403,21 @@ public abstract class ColumnCondition long serializedSize(T condition, int version); } - protected static final Cell<?> getCell(Row row, ColumnMetadata column) + protected static Cell<?> getCell(Row row, ColumnMetadata column) { // If we're asking for a given cell, and we didn't got any row from our read, it's // the same as not having said cell. return row == null ? null : row.getCell(column); } - protected static final Cell<?> getCell(Row row, ColumnMetadata column, CellPath path) + protected static Cell<?> getCell(Row row, ColumnMetadata column, CellPath path) { // If we're asking for a given cell, and we didn't got any row from our read, it's // the same as not having said cell. return row == null ? null : row.getCell(column, path); } - protected static final Iterator<Cell<?>> getCells(Row row, ColumnMetadata column) + protected static Iterator<Cell<?>> getCells(Row row, ColumnMetadata column) { // If we're asking for a complex cells, and we didn't got any row from our read, it's // the same as not having any cells for that column. @@ -427,7 +428,7 @@ public abstract class ColumnCondition return complexData == null ? Collections.<Cell<?>>emptyIterator() : complexData.iterator(); } - protected static final boolean evaluateComparisonWithOperator(int comparison, Operator operator) + protected static boolean evaluateComparisonWithOperator(int comparison, Operator operator) { // called when comparison != 0 switch (operator) @@ -829,7 +830,7 @@ public abstract class ColumnCondition else { for (int i = 0; i < numTerminals; i++) - terminals.add(deserializeCqlCollectionAsTerm(nullableByteBufferSerializer.deserialize(in, version), column.type, ProtocolVersion.CURRENT)); + terminals.add(deserializeCqlCollectionAsTerm(nullableByteBufferSerializer.deserialize(in, version), column.type)); } return new MultiCellCollectionBound(column, operator, terminals); } @@ -1007,7 +1008,7 @@ public abstract class ColumnCondition UserType userType = (UserType) column.type; Iterator<Cell<?>> iter = getCells(row, column); // User type doesn't use the protocol version so passing in null - return iter.hasNext() ? userType.serializeForNativeProtocol(iter, null) : null; + return iter.hasNext() ? userType.serializeForNativeProtocol(iter) : null; } private boolean isSatisfiedBy(ByteBuffer rowValue) diff --git a/src/java/org/apache/cassandra/cql3/selection/Selector.java b/src/java/org/apache/cassandra/cql3/selection/Selector.java index 121ecad4be..de004d6cbc 100644 --- a/src/java/org/apache/cassandra/cql3/selection/Selector.java +++ b/src/java/org/apache/cassandra/cql3/selection/Selector.java @@ -405,7 +405,7 @@ public abstract class Selector UserType udt = (UserType) type; int size = udt.size(); - values[index] = udt.serializeForNativeProtocol(ccd.iterator(), protocolVersion); + values[index] = udt.serializeForNativeProtocol(ccd.iterator()); short fieldPosition = 0; for (Cell<?> cell : ccd) diff --git a/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java b/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java index ee254beb50..a150e8d7f3 100644 --- a/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/TransactionStatement.java @@ -488,7 +488,7 @@ public class TransactionStatement implements CQLStatement { ModificationStatement.Parsed parsed = updates.get(i); - ModificationStatement prepared = parsed.prepare(bindVariables); + ModificationStatement prepared = parsed.prepare(state, bindVariables); checkFalse(prepared.hasConditions(), NO_CONDITIONS_IN_UPDATES_MESSAGE); checkFalse(prepared.isTimestampSet(), NO_TIMESTAMPS_IN_UPDATES_MESSAGE); diff --git a/src/java/org/apache/cassandra/db/PartitionPosition.java b/src/java/org/apache/cassandra/db/PartitionPosition.java index 09a6cba72c..d936e566a7 100644 --- a/src/java/org/apache/cassandra/db/PartitionPosition.java +++ b/src/java/org/apache/cassandra/db/PartitionPosition.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.db; -import java.io.DataInput; import java.io.IOException; import java.nio.ByteBuffer; @@ -30,7 +29,7 @@ import org.apache.cassandra.utils.bytecomparable.ByteSource; public interface PartitionPosition extends RingPosition<PartitionPosition>, ByteComparable { - public static enum Kind + public enum Kind { // Only add new values to the end of the enum, the ordinal is used // during serialization diff --git a/src/java/org/apache/cassandra/db/marshal/UserType.java b/src/java/org/apache/cassandra/db/marshal/UserType.java index 889e1a819b..0f9d61ae3e 100644 --- a/src/java/org/apache/cassandra/db/marshal/UserType.java +++ b/src/java/org/apache/cassandra/db/marshal/UserType.java @@ -173,7 +173,7 @@ public class UserType extends TupleType implements SchemaElement return ShortType.instance; } - public ByteBuffer serializeForNativeProtocol(Iterator<Cell<?>> cells, ProtocolVersion protocolVersion) + public ByteBuffer serializeForNativeProtocol(Iterator<Cell<?>> cells) { assert isMultiCell; diff --git a/src/java/org/apache/cassandra/dht/AbstractBounds.java b/src/java/org/apache/cassandra/dht/AbstractBounds.java index a730d6ddf4..82fab94bad 100644 --- a/src/java/org/apache/cassandra/dht/AbstractBounds.java +++ b/src/java/org/apache/cassandra/dht/AbstractBounds.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.dht; -import java.io.DataInput; import java.io.IOException; import java.io.Serializable; import java.util.Collection; diff --git a/src/java/org/apache/cassandra/dht/IPartitionerDependentSerializer.java b/src/java/org/apache/cassandra/dht/IPartitionerDependentSerializer.java index 4e02c58d91..5c75788c0b 100644 --- a/src/java/org/apache/cassandra/dht/IPartitionerDependentSerializer.java +++ b/src/java/org/apache/cassandra/dht/IPartitionerDependentSerializer.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.dht; -import java.io.DataInput; import java.io.IOException; import org.apache.cassandra.io.util.DataInputPlus; diff --git a/src/java/org/apache/cassandra/dht/Token.java b/src/java/org/apache/cassandra/dht/Token.java index e5b76e9a30..bd327f96b9 100644 --- a/src/java/org/apache/cassandra/dht/Token.java +++ b/src/java/org/apache/cassandra/dht/Token.java @@ -77,9 +77,9 @@ public abstract class Token implements RingPosition<Token>, Serializable out.put(toByteArray(token)); } - public Token deserialize(DataInputPlus in, IPartitioner p, int version) throws IOException + public Token deserialize(DataInputPlus in, IPartitioner p) throws IOException { - int size = p.isFixedLength() ? p.getMaxTokenSize() : (int)in.readUnsignedVInt(); + int size = p.isFixedLength() ? p.getMaxTokenSize() : in.readUnsignedVInt32(); byte[] bytes = new byte[size]; in.readFully(bytes); return p.getTokenFactory().fromByteArray(ByteBuffer.wrap(bytes)); @@ -135,13 +135,13 @@ public abstract class Token implements RingPosition<Token>, Serializable { IPartitioner p = token.getPartitioner(); if (!p.isFixedLength()) - out.writeUnsignedVInt(p.getTokenFactory().byteSize(token)); + out.writeUnsignedVInt32(p.getTokenFactory().byteSize(token)); p.getTokenFactory().serialize(token, out); } public Token deserialize(DataInputPlus in, IPartitioner p, int version) throws IOException { - int size = p.isFixedLength() ? p.getMaxTokenSize() : (int)in.readUnsignedVInt(); + int size = p.isFixedLength() ? p.getMaxTokenSize() : in.readUnsignedVInt32(); byte[] bytes = new byte[size]; in.readFully(bytes); return p.getTokenFactory().fromByteArray(ByteBuffer.wrap(bytes)); diff --git a/src/java/org/apache/cassandra/service/accord/AccordCommandsForKey.java b/src/java/org/apache/cassandra/service/accord/AccordCommandsForKey.java index 437c3b5f66..ada3ee0742 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordCommandsForKey.java +++ b/src/java/org/apache/cassandra/service/accord/AccordCommandsForKey.java @@ -53,7 +53,6 @@ import org.assertj.core.util.VisibleForTesting; import static accord.local.CommandsForKey.CommandTimeseries.TestDep.ANY_DEPS; import static accord.local.CommandsForKey.CommandTimeseries.TestDep.WITHOUT; import static accord.local.CommandsForKey.CommandTimeseries.TestKind.RorWs; -import static accord.primitives.Txn.Kind.Write; import static org.apache.cassandra.service.accord.AccordState.WriteOnly.applyMapChanges; import static org.apache.cassandra.service.accord.AccordState.WriteOnly.applySetChanges; diff --git a/src/java/org/apache/cassandra/service/accord/AccordKeyspace.java b/src/java/org/apache/cassandra/service/accord/AccordKeyspace.java index e17172de66..bee00a965b 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordKeyspace.java +++ b/src/java/org/apache/cassandra/service/accord/AccordKeyspace.java @@ -87,13 +87,13 @@ import org.apache.cassandra.io.LocalVersionedSerializer; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.Functions; import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.Tables; import org.apache.cassandra.schema.Types; +import org.apache.cassandra.schema.UserFunctions; import org.apache.cassandra.schema.Views; import org.apache.cassandra.serializers.UUIDSerializer; import org.apache.cassandra.service.accord.AccordCommandsForKey.SeriesKind; @@ -211,7 +211,7 @@ public class AccordKeyspace + format("key %s, ", KEY_TUPLE) + format("max_timestamp %s static, ", TIMESTAMP_TUPLE) + format("last_executed_timestamp %s static, ", TIMESTAMP_TUPLE) - + format("last_executed_micros bigint static, ") + + "last_executed_micros bigint static, " + format("last_write_timestamp %s static, ", TIMESTAMP_TUPLE) + format("blind_witnessed set<%s> static, ", TIMESTAMP_TUPLE) + "series int, " @@ -283,7 +283,7 @@ public class AccordKeyspace public static KeyspaceMetadata metadata() { - return KeyspaceMetadata.create(ACCORD_KEYSPACE_NAME, KeyspaceParams.local(), tables(), Views.none(), Types.none(), Functions.none()); + return KeyspaceMetadata.create(ACCORD_KEYSPACE_NAME, KeyspaceParams.local(), tables(), Views.none(), Types.none(), UserFunctions.none()); } private static Tables tables() @@ -515,13 +515,12 @@ public class AccordKeyspace private static ByteBuffer serializeKey(PartitionKey key) { - return TupleType.buildValue(new ByteBuffer[]{UUIDSerializer.instance.serialize(key.tableId().asUUID()), - key.partitionKey().getKey()}); + return TupleType.buildValue(UUIDSerializer.instance.serialize(key.tableId().asUUID()), key.partitionKey().getKey()); } private static ByteBuffer serializeTimestamp(Timestamp timestamp) { - return TupleType.buildValue(new ByteBuffer[]{bytes(timestamp.msb), bytes(timestamp.lsb), bytes(timestamp.node.id)}); + return TupleType.buildValue(bytes(timestamp.msb), bytes(timestamp.lsb), bytes(timestamp.node.id)); } public interface TimestampFactory<T extends Timestamp> diff --git a/src/java/org/apache/cassandra/service/accord/AccordSerializerVersion.java b/src/java/org/apache/cassandra/service/accord/AccordSerializerVersion.java index cb6f8000f1..c0c03c8d93 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordSerializerVersion.java +++ b/src/java/org/apache/cassandra/service/accord/AccordSerializerVersion.java @@ -86,7 +86,7 @@ public enum AccordSerializerVersion implements MessageVersionProvider public void serialize(AccordSerializerVersion t, DataOutputPlus out) throws IOException { - out.writeUnsignedVInt(t.version); + out.writeUnsignedVInt32(t.version); } @Override @@ -97,7 +97,7 @@ public enum AccordSerializerVersion implements MessageVersionProvider public AccordSerializerVersion deserialize(DataInputPlus in) throws IOException { - return fromVersion(Math.toIntExact(in.readUnsignedVInt())); + return fromVersion(in.readUnsignedVInt32()); } @Override diff --git a/src/java/org/apache/cassandra/service/accord/AccordSerializers.java b/src/java/org/apache/cassandra/service/accord/AccordSerializers.java index 7d6a3fe212..6e8c33776f 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/AccordSerializers.java @@ -47,10 +47,8 @@ import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableId; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; -import static com.google.common.primitives.Ints.checkedCast; import static org.apache.cassandra.db.TypeSizes.sizeof; import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt; import static org.apache.cassandra.db.marshal.CollectionType.Kind.LIST; @@ -65,7 +63,7 @@ public class AccordSerializers long size = serializer.serializedSize(item, version) + sizeofUnsignedVInt(version); try (DataOutputBuffer out = new DataOutputBuffer((int) size)) { - out.writeUnsignedVInt(version); + out.writeUnsignedVInt32(version); serializer.serialize(item, out, version); return out.buffer(false); } @@ -87,7 +85,7 @@ public class AccordSerializers { try (DataInputBuffer in = new DataInputBuffer(bytes, true)) { - int version = checkedCast(in.readUnsignedVInt()); + int version = in.readUnsignedVInt32(); return serializer.deserialize(in, version); } catch (IOException e) @@ -96,16 +94,16 @@ public class AccordSerializers } } - public static Term.Terminal deserializeCqlCollectionAsTerm(ByteBuffer buffer, AbstractType<?> type, ProtocolVersion version) + public static Term.Terminal deserializeCqlCollectionAsTerm(ByteBuffer buffer, AbstractType<?> type) { CollectionType<?> collectionType = (CollectionType<?>) type; if (collectionType.kind == SET) - return Sets.Value.fromSerialized(buffer, (SetType<?>) type, version); + return Sets.Value.fromSerialized(buffer, (SetType<?>) type); else if (collectionType.kind == LIST) - return Lists.Value.fromSerialized(buffer, (ListType<?>) type, version); + return Lists.Value.fromSerialized(buffer, (ListType<?>) type); else if (collectionType.kind == MAP) - return Maps.Value.fromSerialized(buffer, (MapType<?, ?>) type, version); + return Maps.Value.fromSerialized(buffer, (MapType<?, ?>) type); throw new UnsupportedOperationException("Unsupported collection type: " + type); } @@ -202,7 +200,7 @@ public class AccordSerializers else { out.writeBoolean(false); - out.writeUnsignedVInt(clustering.size()); + out.writeUnsignedVInt32(clustering.size()); ValueAccessor<V> accessor = clustering.accessor(); for (int i = 0; i < clustering.size(); i++) { @@ -221,11 +219,11 @@ public class AccordSerializers } else { - int numComponents = checkedCast(in.readUnsignedVInt()); + int numComponents = in.readUnsignedVInt32(); byte[][] components = new byte[numComponents][]; for (int ci = 0; ci < numComponents; ci++) { - int componentLength = checkedCast(in.readUnsignedVInt()); + int componentLength = in.readUnsignedVInt32(); components[ci] = new byte[componentLength]; in.readFully(components[ci]); } diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java index 31db8b9646..72aee3c92a 100644 --- a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java +++ b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java @@ -18,8 +18,6 @@ package org.apache.cassandra.service.accord.api; -import java.util.concurrent.TimeUnit; - import accord.api.Agent; import accord.api.Result; import accord.local.Command; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/CheckStatusSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/CheckStatusSerializers.java index ce8ef96b48..803a25b9c2 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/CheckStatusSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/CheckStatusSerializers.java @@ -32,7 +32,6 @@ import accord.messages.CheckStatus.CheckStatusReply; import accord.primitives.Ballot; import accord.primitives.PartialDeps; import accord.primitives.PartialTxn; -import accord.primitives.Routables; import accord.primitives.Route; import accord.primitives.Timestamp; import accord.primitives.TxnId; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/CommitSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/CommitSerializers.java index ed251016dd..6b349e7ee9 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/CommitSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/CommitSerializers.java @@ -22,7 +22,6 @@ import java.io.IOException; import accord.messages.Commit; import accord.primitives.PartialRoute; -import accord.primitives.Routables; import accord.primitives.TxnId; import accord.primitives.Unseekables; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/DepsSerializer.java b/src/java/org/apache/cassandra/service/accord/serializers/DepsSerializer.java index 083315bc7c..854df207b7 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/DepsSerializer.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/DepsSerializer.java @@ -75,14 +75,14 @@ public abstract class DepsSerializer<D extends Deps> implements IVersionedSerial KeySerializers.keys.serialize(keys, out, version); int txnIdCount = deps.txnIdCount(); - out.writeUnsignedVInt(txnIdCount); + out.writeUnsignedVInt32(txnIdCount); for (int i=0; i<txnIdCount; i++) CommandSerializers.txnId.serialize(deps.txnId(i), out, version); int keyToTxnIdCount = keyToTxnIdCount(deps); - out.writeUnsignedVInt(keyToTxnIdCount); + out.writeUnsignedVInt32(keyToTxnIdCount); for (int i=0; i<keyToTxnIdCount; i++) - out.writeUnsignedVInt(keyToTxnId(deps, i)); + out.writeUnsignedVInt32(keyToTxnId(deps, i)); } @Override @@ -90,13 +90,13 @@ public abstract class DepsSerializer<D extends Deps> implements IVersionedSerial { Keys keys = KeySerializers.keys.deserialize(in, version); - TxnId[] txnIds = new TxnId[(int) in.readUnsignedVInt()]; + TxnId[] txnIds = new TxnId[in.readUnsignedVInt32()]; for (int i=0; i<txnIds.length; i++) txnIds[i] = CommandSerializers.txnId.deserialize(in, version); - int[] keyToTxnIds = new int[(int) in.readUnsignedVInt()]; + int[] keyToTxnIds = new int[in.readUnsignedVInt32()]; for (int i=0; i<keyToTxnIds.length; i++) - keyToTxnIds[i] = (int) in.readUnsignedVInt(); + keyToTxnIds[i] = in.readUnsignedVInt32(); return deserialize(keys, txnIds, keyToTxnIds, in, version); } diff --git a/src/java/org/apache/cassandra/service/accord/serializers/EnumSerializer.java b/src/java/org/apache/cassandra/service/accord/serializers/EnumSerializer.java index 2d66c2433b..1bad94da82 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/EnumSerializer.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/EnumSerializer.java @@ -41,13 +41,13 @@ public class EnumSerializer<E extends Enum<E>> implements IVersionedSerializer<E @Override public void serialize(E t, DataOutputPlus out, int version) throws IOException { - out.writeUnsignedVInt(t.ordinal()); + out.writeUnsignedVInt32(t.ordinal()); } @Override public E deserialize(DataInputPlus in, int version) throws IOException { - return values[(int)in.readUnsignedVInt()]; + return values[in.readUnsignedVInt32()]; } @Override diff --git a/src/java/org/apache/cassandra/service/accord/serializers/KeySerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/KeySerializers.java index 646abd3b3d..5d6453f807 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/KeySerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/KeySerializers.java @@ -36,7 +36,6 @@ import accord.primitives.PartialRoute; import accord.primitives.Range; import accord.primitives.Ranges; import accord.primitives.RoutableKey; -import accord.primitives.Routables; import accord.primitives.Route; import accord.primitives.RoutingKeys; import accord.primitives.Seekables; @@ -343,7 +342,7 @@ public class KeySerializers @Override public void serialize(KS keys, DataOutputPlus out, int version) throws IOException { - out.writeUnsignedVInt(keys.size()); + out.writeUnsignedVInt32(keys.size()); for (int i=0, mi=keys.size(); i<mi; i++) keySerializer.serialize(keys.get(i), out, version); } @@ -353,7 +352,7 @@ public class KeySerializers @Override public KS deserialize(DataInputPlus in, int version) throws IOException { - K[] keys = allocate.apply((int)in.readUnsignedVInt()); + K[] keys = allocate.apply(in.readUnsignedVInt32()); for (int i=0; i<keys.length; i++) keys[i] = keySerializer.deserialize(in, version); return deserialize(in, version, keys); @@ -374,7 +373,7 @@ public class KeySerializers @Override public void serialize(RS ranges, DataOutputPlus out, int version) throws IOException { - out.writeUnsignedVInt(ranges.size()); + out.writeUnsignedVInt32(ranges.size()); for (int i=0, mi=ranges.size(); i<mi; i++) TokenRange.serializer.serialize((TokenRange) ranges.get(i), out, version); } @@ -382,7 +381,7 @@ public class KeySerializers @Override public RS deserialize(DataInputPlus in, int version) throws IOException { - Range[] ranges = new Range[(int)in.readUnsignedVInt()]; + Range[] ranges = new Range[in.readUnsignedVInt32()]; for (int i=0; i<ranges.length; i++) ranges[i] = TokenRange.serializer.deserialize(in, version); return deserialize(in, version, ranges); diff --git a/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializers.java b/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializers.java index c7c234c490..4899316cc5 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializers.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/ReadDataSerializers.java @@ -24,7 +24,6 @@ import accord.messages.ReadData; import accord.messages.ReadData.ReadNack; import accord.messages.ReadData.ReadOk; import accord.messages.ReadData.ReadReply; -import accord.primitives.Keys; import accord.primitives.Seekables; import accord.primitives.TxnId; import org.apache.cassandra.db.TypeSizes; diff --git a/src/java/org/apache/cassandra/service/accord/serializers/WaitOnCommitSerializer.java b/src/java/org/apache/cassandra/service/accord/serializers/WaitOnCommitSerializer.java index 742da8d462..a56b1b29bf 100644 --- a/src/java/org/apache/cassandra/service/accord/serializers/WaitOnCommitSerializer.java +++ b/src/java/org/apache/cassandra/service/accord/serializers/WaitOnCommitSerializer.java @@ -22,7 +22,6 @@ import java.io.IOException; import accord.messages.WaitOnCommit; import accord.messages.WaitOnCommit.WaitOnCommitOk; -import accord.primitives.Routables; import accord.primitives.TxnId; import accord.primitives.Unseekables; import org.apache.cassandra.io.IVersionedSerializer; diff --git a/src/java/org/apache/cassandra/service/accord/store/StoredNavigableMap.java b/src/java/org/apache/cassandra/service/accord/store/StoredNavigableMap.java index 22c5e2ec4a..81f7efdc03 100644 --- a/src/java/org/apache/cassandra/service/accord/store/StoredNavigableMap.java +++ b/src/java/org/apache/cassandra/service/accord/store/StoredNavigableMap.java @@ -21,10 +21,8 @@ package org.apache.cassandra.service.accord.store; import java.util.Collections; import java.util.Map; import java.util.NavigableMap; -import java.util.NavigableSet; import java.util.Objects; import java.util.TreeMap; -import java.util.TreeSet; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.ToLongFunction; diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnCondition.java b/src/java/org/apache/cassandra/service/accord/txn/TxnCondition.java index fb2a372068..e0bfaa1f7b 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnCondition.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnCondition.java @@ -53,7 +53,7 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.primitives.Ints.checkedCast; + import static org.apache.cassandra.service.accord.AccordSerializers.clusteringSerializer; import static org.apache.cassandra.service.accord.AccordSerializers.deserializeCqlCollectionAsTerm; import static org.apache.cassandra.service.accord.txn.TxnRead.SERIAL_READ; @@ -63,7 +63,6 @@ import static org.apache.cassandra.utils.CollectionSerializers.serializeList; import static org.apache.cassandra.utils.CollectionSerializers.serializedCollectionSize; import static org.apache.cassandra.utils.CollectionSerializers.serializedListSize; - public abstract class TxnCondition { private interface ConditionSerializer<T extends TxnCondition> @@ -439,7 +438,7 @@ public abstract class TxnCondition } else { - Term.Terminal term = deserializeCqlCollectionAsTerm(value, type, version); + Term.Terminal term = deserializeCqlCollectionAsTerm(value, type); return ColumnCondition.MultiCellCollectionBound.appliesTo(column, kind.operator, Collections.singletonList(term), row); } } @@ -585,14 +584,14 @@ public abstract class TxnCondition @Override public void serialize(TxnCondition condition, DataOutputPlus out, int version) throws IOException { - out.writeUnsignedVInt(condition.kind.ordinal()); + out.writeUnsignedVInt32(condition.kind.ordinal()); condition.kind.serializer().serialize(condition, out, version); } @Override public TxnCondition deserialize(DataInputPlus in, int version) throws IOException { - Kind kind = Kind.values()[checkedCast(in.readUnsignedVInt())]; + Kind kind = Kind.values()[in.readUnsignedVInt32()]; return kind.serializer().deserialize(in, version, kind); } diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnData.java b/src/java/org/apache/cassandra/service/accord/txn/TxnData.java index 20b56b4c9c..a095d8ba78 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnData.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnData.java @@ -162,7 +162,7 @@ public class TxnData implements Data, Result, Iterable<FilteredPartition> @Override public void serialize(TxnData data, DataOutputPlus out, int version) throws IOException { - out.writeUnsignedVInt(data.data.size()); + out.writeUnsignedVInt32(data.data.size()); for (Map.Entry<TxnDataName, FilteredPartition> entry : data.data.entrySet()) { TxnDataName.serializer.serialize(entry.getKey(), out, version); diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnDataName.java b/src/java/org/apache/cassandra/service/accord/txn/TxnDataName.java index 224df3230f..92a9be1ab3 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnDataName.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnDataName.java @@ -38,7 +38,7 @@ import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.ObjectSizes; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.common.primitives.Ints.checkedCast; + import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt; import static org.apache.cassandra.service.accord.AccordSerializers.clusteringSerializer; import static org.apache.cassandra.utils.NullableSerializer.deserializeNullable; @@ -217,7 +217,7 @@ public class TxnDataName implements Comparable<TxnDataName> @Override public String toString() { - return kind.name() + ":" + name(); + return kind.name() + ':' + name(); } public static final IVersionedSerializer<TxnDataName> serializer = new IVersionedSerializer<TxnDataName>() @@ -226,7 +226,7 @@ public class TxnDataName implements Comparable<TxnDataName> public void serialize(TxnDataName t, DataOutputPlus out, int version) throws IOException { out.writeByte(t.kind.value); - out.writeUnsignedVInt(t.parts.length); + out.writeUnsignedVInt32(t.parts.length); for (String part : t.parts) out.writeUTF(part); serializeNullable(t.clustering, out, version, clusteringSerializer); @@ -236,7 +236,7 @@ public class TxnDataName implements Comparable<TxnDataName> public TxnDataName deserialize(DataInputPlus in, int version) throws IOException { Kind kind = Kind.from(in.readByte()); - int length = checkedCast(in.readUnsignedVInt()); + int length = in.readUnsignedVInt32(); String[] parts = new String[length]; for (int i = 0; i < length; i++) parts[i] = in.readUTF(); diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnReference.java b/src/java/org/apache/cassandra/service/accord/txn/TxnReference.java index 6871b7261d..618b93dd29 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnReference.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnReference.java @@ -38,7 +38,6 @@ import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.db.marshal.CollectionType.Kind.SET; @@ -241,12 +240,12 @@ public class TxnReference if (type instanceof CollectionType) { CollectionType<?> col = (CollectionType<?>) type; - return col.serializeForNativeProtocol(complex.iterator(), ProtocolVersion.CURRENT); + return col.serializeForNativeProtocol(complex.iterator()); } else if (type instanceof UserType) { UserType udt = (UserType) type; - return udt.serializeForNativeProtocol(complex.iterator(), ProtocolVersion.CURRENT); + return udt.serializeForNativeProtocol(complex.iterator()); } throw new UnsupportedOperationException("Unsupported complex type: " + type); diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnReferenceOperation.java b/src/java/org/apache/cassandra/service/accord/txn/TxnReferenceOperation.java index 695b920d91..f06d3a785f 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnReferenceOperation.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnReferenceOperation.java @@ -48,7 +48,6 @@ import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.service.accord.AccordSerializers; -import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.db.marshal.CollectionType.Kind.MAP; @@ -223,30 +222,30 @@ public class TxnReferenceOperation public void apply(TxnData data, DecoratedKey key, UpdateParameters up) { - Operation operation = toOperation(data, up); + Operation operation = toOperation(data); operation.execute(key, up); } - private Operation toOperation(TxnData data, UpdateParameters up) + private Operation toOperation(TxnData data) { FieldIdentifier fieldIdentifier = field == null ? null : new FieldIdentifier(field); - Term valueTerm = toTerm(data, valueType, up.options.getProtocolVersion()); - Term keyorIndexTerm = key == null ? null : toTerm(key, valueType, up.options.getProtocolVersion()); + Term valueTerm = toTerm(data, valueType); + Term keyorIndexTerm = key == null ? null : toTerm(key, valueType); return kind.toOperation(receiver, keyorIndexTerm, fieldIdentifier, valueTerm); } - private Term toTerm(TxnData data, AbstractType<?> receivingType, ProtocolVersion version) + private Term toTerm(TxnData data, AbstractType<?> receivingType) { ByteBuffer bytes = value.compute(data, receivingType); if (bytes == null) return Constants.NULL_VALUE; - return toTerm(bytes, receivingType, version); + return toTerm(bytes, receivingType); } - private Term toTerm(ByteBuffer bytes, AbstractType<?> receivingType, ProtocolVersion version) + private Term toTerm(ByteBuffer bytes, AbstractType<?> receivingType) { if (receivingType.isCollection()) - return AccordSerializers.deserializeCqlCollectionAsTerm(bytes, receivingType, version); + return AccordSerializers.deserializeCqlCollectionAsTerm(bytes, receivingType); else if (receivingType.isUDT()) return UserTypes.Value.fromSerialized(bytes, (UserType) receivingType); else if (receivingType.isTuple()) diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnReferenceValue.java b/src/java/org/apache/cassandra/service/accord/txn/TxnReferenceValue.java index fb4a54f8d5..73033fe61c 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnReferenceValue.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnReferenceValue.java @@ -29,8 +29,6 @@ import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.ByteBufferUtil; -import static com.google.common.primitives.Ints.checkedCast; - public abstract class TxnReferenceValue { private interface Serializer<T extends TxnReferenceValue> @@ -196,14 +194,14 @@ public abstract class TxnReferenceValue @Override public void serialize(TxnReferenceValue value, DataOutputPlus out, int version) throws IOException { - out.writeUnsignedVInt(value.kind().ordinal()); + out.writeUnsignedVInt32(value.kind().ordinal()); value.kind().serializer.serialize(value, out, version); } @Override public TxnReferenceValue deserialize(DataInputPlus in, int version) throws IOException { - Kind kind = Kind.values()[checkedCast(in.readUnsignedVInt())]; + Kind kind = Kind.values()[in.readUnsignedVInt32()]; return kind.serializer.deserialize(in, version, kind); } diff --git a/src/java/org/apache/cassandra/service/accord/txn/TxnUpdate.java b/src/java/org/apache/cassandra/service/accord/txn/TxnUpdate.java index 025217d1e4..ddd57eaf72 100644 --- a/src/java/org/apache/cassandra/service/accord/txn/TxnUpdate.java +++ b/src/java/org/apache/cassandra/service/accord/txn/TxnUpdate.java @@ -47,7 +47,6 @@ import org.apache.cassandra.transport.ProtocolVersion; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.ObjectSizes; -import static java.lang.Math.toIntExact; import static org.apache.cassandra.service.accord.AccordSerializers.serialize; import static org.apache.cassandra.utils.ArraySerializers.deserializeArray; import static org.apache.cassandra.utils.ArraySerializers.serializeArray; @@ -245,8 +244,8 @@ public class TxnUpdate implements Update try (DataOutputBuffer out = new DataOutputBuffer((int) size)) { - out.writeUnsignedVInt(version); - out.writeUnsignedVInt(end - start); + out.writeUnsignedVInt32(version); + out.writeUnsignedVInt32(end - start); for (int i = start ; i < end ; ++i) serializer.serialize(items.get(i), out, version); return out.buffer(false); @@ -264,8 +263,8 @@ public class TxnUpdate implements Update try (DataInputBuffer in = new DataInputBuffer(bytes, true)) { - int version = toIntExact(in.readUnsignedVInt()); - int count = toIntExact(in.readUnsignedVInt()); + int version = in.readUnsignedVInt32(); + int count = in.readUnsignedVInt32(); switch (count) { case 0: throw new IllegalStateException(); diff --git a/src/java/org/apache/cassandra/utils/ArraySerializers.java b/src/java/org/apache/cassandra/utils/ArraySerializers.java index a2c9539313..63ee3029c7 100644 --- a/src/java/org/apache/cassandra/utils/ArraySerializers.java +++ b/src/java/org/apache/cassandra/utils/ArraySerializers.java @@ -25,21 +25,20 @@ import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; -import static com.google.common.primitives.Ints.checkedCast; import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt; public class ArraySerializers { public static <T> void serializeArray(T[] items, DataOutputPlus out, int version, IVersionedSerializer<T> serializer) throws IOException { - out.writeUnsignedVInt(items.length); + out.writeUnsignedVInt32(items.length); for (T item : items) serializer.serialize(item, out, version); } public static <T> T[] deserializeArray(DataInputPlus in, int version, IVersionedSerializer<T> serializer, IntFunction<T[]> arrayFactory) throws IOException { - int size = checkedCast(in.readUnsignedVInt()); + int size = in.readUnsignedVInt32(); T[] items = arrayFactory.apply(size); for (int i = 0; i < size; i++) items[i] = serializer.deserialize(in, version); diff --git a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java index 71b0fb5db5..615138e7d2 100644 --- a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java +++ b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java @@ -364,11 +364,11 @@ public class ByteBufferUtil { if (bytes == null) { - out.writeVInt(-1); + out.writeVInt32(-1); return; } - out.writeVInt(bytes.remaining()); + out.writeVInt32(bytes.remaining()); out.write(bytes); } diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesAccordSimulation.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesAccordSimulation.java index 7724690bc5..fc929a9460 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesAccordSimulation.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/PairOfSequencesAccordSimulation.java @@ -57,8 +57,6 @@ import org.apache.cassandra.simulator.systems.SimulatedSystems; import org.apache.cassandra.simulator.utils.IntRange; import static org.apache.cassandra.simulator.paxos.HistoryChecker.fail; -import static org.apache.cassandra.utils.AssertionUtils.hasCause; -import static org.apache.cassandra.utils.AssertionUtils.isThrowableInstanceof; // TODO: the class hierarchy is a bit broken, but hard to untangle. Need to go Paxos->Consensus, probably. @SuppressWarnings("unused") diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/StrictSerializabilityValidator.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/StrictSerializabilityValidator.java index 8469423bb9..c50a1b4428 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/StrictSerializabilityValidator.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/StrictSerializabilityValidator.java @@ -23,7 +23,6 @@ import javax.annotation.Nullable; import accord.verify.StrictSerializabilityVerifier; import com.carrotsearch.hppc.IntIntHashMap; import com.carrotsearch.hppc.IntIntMap; -import com.carrotsearch.hppc.cursors.IntIntCursor; public class StrictSerializabilityValidator implements HistoryValidator { diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingGlobalMethods.java b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingGlobalMethods.java index d2cfa98c6b..115b3b9628 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingGlobalMethods.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptingGlobalMethods.java @@ -24,9 +24,6 @@ import java.util.function.LongConsumer; import javax.annotation.Nullable; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.simulator.RandomSource; import org.apache.cassandra.simulator.systems.InterceptedWait.CaptureSites.Capture; import org.apache.cassandra.simulator.systems.InterceptedWait.InterceptedConditionWait; diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java index 3be81b13dd..bd8478d47b 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java +++ b/test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfGlobalMethods.java @@ -25,6 +25,9 @@ import java.util.function.IntSupplier; import java.util.function.LongConsumer; import java.util.function.ToIntFunction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.openhft.chronicle.core.util.WeakIdentityHashMap; import org.apache.cassandra.simulator.systems.InterceptedWait.CaptureSites; import org.apache.cassandra.utils.Clock; diff --git a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java index 870345a17e..76b219b9b3 100644 --- a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java @@ -77,14 +77,12 @@ import static org.apache.cassandra.cql3.Operator.GTE; import static org.apache.cassandra.cql3.Operator.LT; import static org.apache.cassandra.cql3.Operator.LTE; import static org.apache.cassandra.cql3.Operator.NEQ; -import static org.apache.cassandra.transport.ProtocolVersion.CURRENT; import static org.apache.cassandra.utils.ByteBufferUtil.EMPTY_BYTE_BUFFER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - public class ColumnConditionTest extends CQLTester { public static final ByteBuffer ZERO = Int32Type.instance.fromString("0"); @@ -122,7 +120,7 @@ public class ColumnConditionTest extends CQLTester AbstractType<?> type = definition.type; if (type.isFrozenCollection()) { - ByteBuffer cellValue = ListSerializer.pack(values, values.size(), CURRENT); + ByteBuffer cellValue = ListSerializer.pack(values, values.size()); Cell<ByteBuffer> cell = new BufferCell(definition, 0L, Cell.NO_TTL, Cell.NO_DELETION_TIME, cellValue, null); return BTreeRow.singleCellRow(Clustering.EMPTY, cell); } @@ -168,7 +166,7 @@ public class ColumnConditionTest extends CQLTester { if (definition.type.isFrozenCollection()) { - ByteBuffer cellValue = SetSerializer.pack(values, values.size(), CURRENT); + ByteBuffer cellValue = SetSerializer.pack(values, values.size()); Cell<ByteBuffer> cell = new BufferCell(definition, 0L, Cell.NO_TTL, Cell.NO_DELETION_TIME, cellValue, null); return BTreeRow.singleCellRow(Clustering.EMPTY, cell); } @@ -198,7 +196,7 @@ public class ColumnConditionTest extends CQLTester if (definition.type.isFrozenCollection()) { List<ByteBuffer> packableValues = values.entrySet().stream().flatMap(entry -> Stream.of(entry.getKey(), entry.getValue())).collect(Collectors.toList()); - ByteBuffer cellValue = MapSerializer.pack(packableValues, values.size(), CURRENT); + ByteBuffer cellValue = MapSerializer.pack(packableValues, values.size()); Cell<ByteBuffer> cell = new BufferCell(definition, 0L, Cell.NO_TTL, Cell.NO_DELETION_TIME, cellValue, null); return BTreeRow.singleCellRow(Clustering.EMPTY, cell); } diff --git a/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java b/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java index f8e65bd89f..131ce13d58 100644 --- a/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java +++ b/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java @@ -18,16 +18,12 @@ package org.apache.cassandra.dht; import java.io.IOException; -import java.math.BigInteger; import org.junit.Assert; import org.junit.BeforeClass; -import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.dht.OrderPreservingPartitioner.StringToken; -import org.apache.cassandra.service.accord.TokenRange; -import org.apache.cassandra.service.accord.api.AccordRoutingKey; public class OrderPreservingPartitionerTest extends PartitionerTestCase { diff --git a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java index a4346b8a0c..6779c1db0d 100644 --- a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java +++ b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java @@ -35,7 +35,6 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.service.accord.TokenRange; -import org.apache.cassandra.service.accord.api.AccordRoutingKey; import org.apache.cassandra.service.accord.api.AccordRoutingKey.TokenKey; import static org.junit.Assert.assertEquals; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
