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 21983c7b3ccfc551a0ab9dd13f8bc75b32a12dc6 Author: Blake Eggleston <[email protected]> AuthorDate: Wed Mar 27 09:18:39 2024 -0700 post-trunk rebase fixes --- modules/accord | 2 +- .../cassandra/cql3/selection/MapSelector.java | 3 ++- .../apache/cassandra/db/virtual/CachesTable.java | 6 ++--- .../dht/ReversedLongLocalPartitioner.java | 21 +++++++++++++++++ .../cassandra/exceptions/RequestFailure.java | 2 ++ .../cassandra/metrics/AbstractCacheMetrics.java | 26 +++++----------------- .../service/reads/thresholds/WarningContext.java | 2 +- .../tcm/sequences/CancelCMSReconfiguration.java | 3 ++- .../cassandra/distributed/test/TestBaseImpl.java | 3 ++- .../test/microbench/CachingBenchTest.java | 2 +- .../cluster/OnClusterMigrateConsensus.java | 4 ++-- test/unit/org/apache/cassandra/cql3/CQLTester.java | 4 +++- .../org/apache/cassandra/cql3/KeyCacheCqlTest.java | 4 ++-- .../cql3/conditions/ColumnConditionTest.java | 14 +++++------- .../cassandra/db/marshal/TypeValidationTest.java | 2 +- .../cassandra/io/sstable/LargePartitionsTest.java | 6 ++--- .../apache/cassandra/metrics/CacheMetricsTest.java | 6 ++--- .../apache/cassandra/transport/SerDeserTest.java | 13 ++++++----- .../cassandra/utils/AbstractTypeGenerators.java | 2 +- 19 files changed, 68 insertions(+), 57 deletions(-) diff --git a/modules/accord b/modules/accord index 6b8bef48e5..ef36616441 160000 --- a/modules/accord +++ b/modules/accord @@ -1 +1 @@ -Subproject commit 6b8bef48e5780aefda6bd1ff29a6290e56ede438 +Subproject commit ef36616441bd4ff4fec5379d986c75ad5a62ff7d diff --git a/src/java/org/apache/cassandra/cql3/selection/MapSelector.java b/src/java/org/apache/cassandra/cql3/selection/MapSelector.java index 450b64a58b..b0ccac4d93 100644 --- a/src/java/org/apache/cassandra/cql3/selection/MapSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/MapSelector.java @@ -34,6 +34,7 @@ import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.filter.ColumnFilter.Builder; 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.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; @@ -217,7 +218,7 @@ final class MapSelector extends Selector buffers.add(entry.getKey()); buffers.add(entry.getValue()); } - return type.pack(buffers); + return type.pack(buffers, ByteBufferAccessor.instance); } public void reset() diff --git a/src/java/org/apache/cassandra/db/virtual/CachesTable.java b/src/java/org/apache/cassandra/db/virtual/CachesTable.java index 9dabf8acbd..cc8a81b5b2 100644 --- a/src/java/org/apache/cassandra/db/virtual/CachesTable.java +++ b/src/java/org/apache/cassandra/db/virtual/CachesTable.java @@ -57,9 +57,9 @@ final class CachesTable extends AbstractVirtualTable private void addRow(SimpleDataSet result, String name, CacheMetrics metrics) { result.row(name) - .column(CAPACITY_BYTES, metrics.cacheSize.capacity.getValue()) - .column(SIZE_BYTES, metrics.cacheSize.size.getValue()) - .column(ENTRY_COUNT, metrics.cacheSize.entries.getValue()) + .column(CAPACITY_BYTES, metrics.capacity.getValue()) + .column(SIZE_BYTES, metrics.size.getValue()) + .column(ENTRY_COUNT, metrics.entries.getValue()) .column(REQUEST_COUNT, metrics.requests.getCount()) .column(HIT_COUNT, metrics.hits.getCount()) .column(HIT_RATIO, metrics.hitRate.mean.getValue()) diff --git a/src/java/org/apache/cassandra/dht/ReversedLongLocalPartitioner.java b/src/java/org/apache/cassandra/dht/ReversedLongLocalPartitioner.java index c56f3e920e..f290bcba9b 100644 --- a/src/java/org/apache/cassandra/dht/ReversedLongLocalPartitioner.java +++ b/src/java/org/apache/cassandra/dht/ReversedLongLocalPartitioner.java @@ -23,9 +23,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Random; +import java.util.function.Function; import com.google.common.primitives.Longs; +import accord.primitives.Ranges; import org.apache.cassandra.db.CachedHashDecoratedKey; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.marshal.AbstractType; @@ -155,6 +157,12 @@ public class ReversedLongLocalPartitioner implements IPartitioner return LongType.instance; } + @Override + public Function<Ranges, AccordSplitter> accordSplitter() + { + throw new UnsupportedOperationException("Accord is not supported by " + getClass().getName()); + } + private static class ReversedLongLocalToken extends Token { private final long token; @@ -188,6 +196,12 @@ public class ReversedLongLocalPartitioner implements IPartitioner return token; } + @Override + public int tokenHash() + { + return Long.hashCode(token); + } + @Override public ByteSource asComparableBytes(ByteComparable.Version version) { @@ -208,6 +222,13 @@ public class ReversedLongLocalPartitioner implements IPartitioner getClass().getSimpleName())); } + @Override + public Token decreaseSlightly() + { + throw new UnsupportedOperationException(String.format("Token type %s does not support token allocation.", + getClass().getSimpleName())); + } + @Override public int compareTo(Token o) { diff --git a/src/java/org/apache/cassandra/exceptions/RequestFailure.java b/src/java/org/apache/cassandra/exceptions/RequestFailure.java index c3732cc2a7..b1dbbd8e74 100644 --- a/src/java/org/apache/cassandra/exceptions/RequestFailure.java +++ b/src/java/org/apache/cassandra/exceptions/RequestFailure.java @@ -49,6 +49,7 @@ public class RequestFailure public static final RequestFailure INVALID_ROUTING = new RequestFailure(RequestFailureReason.INVALID_ROUTING); public static final RequestFailure INDEX_NOT_AVAILABLE = new RequestFailure(RequestFailureReason.INDEX_NOT_AVAILABLE); public static final RequestFailure COORDINATOR_BEHIND = new RequestFailure(RequestFailureReason.COORDINATOR_BEHIND); + public static final RequestFailure READ_TOO_MANY_INDEXES = new RequestFailure(RequestFailureReason.READ_TOO_MANY_INDEXES); static { @@ -131,6 +132,7 @@ public class RequestFailure case INVALID_ROUTING: return INVALID_ROUTING; case INDEX_NOT_AVAILABLE: return INDEX_NOT_AVAILABLE; case COORDINATOR_BEHIND: return COORDINATOR_BEHIND; + case READ_TOO_MANY_INDEXES: return READ_TOO_MANY_INDEXES; } } diff --git a/src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java b/src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java index 7b4b7510d5..8e67587662 100644 --- a/src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java +++ b/src/java/org/apache/cassandra/metrics/AbstractCacheMetrics.java @@ -21,7 +21,6 @@ import java.util.function.DoubleSupplier; import com.google.common.annotations.VisibleForTesting; -import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; import com.codahale.metrics.RatioGauge; @@ -53,19 +52,12 @@ public abstract class AbstractCacheMetrics /** * all time cache hit rate */ - public final Gauge<Double> hitRate; - /** - * 1m hit rate - */ - public final Gauge<Double> oneMinuteHitRate; - /** - * 5m hit rate - */ - public final Gauge<Double> fiveMinuteHitRate; + public final RatioGaugeSet hitRate; + /** - * 15m hit rate + * all time cache miss rate */ - public final Gauge<Double> fifteenMinuteHitRate; + public final RatioGaugeSet missRate; protected final MetricNameFactory factory; @@ -77,14 +69,8 @@ public abstract class AbstractCacheMetrics misses = Metrics.meter(factory.createMetricName("Misses")); requests = Metrics.meter(factory.createMetricName("Requests")); - hitRate = Metrics.register(factory.createMetricName("HitRate"), - ratioGauge(hits::getCount, requests::getCount)); - oneMinuteHitRate = Metrics.register(factory.createMetricName("OneMinuteHitRate"), - ratioGauge(hits::getOneMinuteRate, requests::getOneMinuteRate)); - fiveMinuteHitRate = Metrics.register(factory.createMetricName("FiveMinuteHitRate"), - ratioGauge(hits::getFiveMinuteRate, requests::getFiveMinuteRate)); - fifteenMinuteHitRate = Metrics.register(factory.createMetricName("FifteenMinuteHitRate"), - ratioGauge(hits::getFifteenMinuteRate, requests::getFifteenMinuteRate)); + this.hitRate = new RatioGaugeSet(hits, requests, factory, "%sHitRate"); + this.missRate = new RatioGaugeSet(misses, requests, factory, "%sMissRate"); } @VisibleForTesting diff --git a/src/java/org/apache/cassandra/service/reads/thresholds/WarningContext.java b/src/java/org/apache/cassandra/service/reads/thresholds/WarningContext.java index 9c3dd04d8c..5bb5deb99a 100644 --- a/src/java/org/apache/cassandra/service/reads/thresholds/WarningContext.java +++ b/src/java/org/apache/cassandra/service/reads/thresholds/WarningContext.java @@ -67,7 +67,7 @@ public class WarningContext counter = tombstones; break; case TOO_MANY_REFERENCED_INDEXES_FAIL: - reason = RequestFailureReason.READ_TOO_MANY_INDEXES; + reason = RequestFailure.READ_TOO_MANY_INDEXES; case TOO_MANY_REFERENCED_INDEXES_WARN: counter = indexReadSSTablesCount; break; diff --git a/src/java/org/apache/cassandra/tcm/sequences/CancelCMSReconfiguration.java b/src/java/org/apache/cassandra/tcm/sequences/CancelCMSReconfiguration.java index 3d6499f61b..a89a415e8e 100644 --- a/src/java/org/apache/cassandra/tcm/sequences/CancelCMSReconfiguration.java +++ b/src/java/org/apache/cassandra/tcm/sequences/CancelCMSReconfiguration.java @@ -33,6 +33,7 @@ import org.apache.cassandra.schema.KeyspaceMetadata; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.schema.ReplicationParams; import org.apache.cassandra.schema.SchemaConstants; +import org.apache.cassandra.service.accord.fastpath.FastPathStrategy; import org.apache.cassandra.tcm.ClusterMetadata; import org.apache.cassandra.tcm.Transformation; import org.apache.cassandra.tcm.membership.Directory; @@ -94,7 +95,7 @@ public class CancelCMSReconfiguration implements Transformation // Also update schema with the corrected params KeyspaceMetadata keyspace = prev.schema.getKeyspaceMetadata(SchemaConstants.METADATA_KEYSPACE_NAME); - KeyspaceMetadata newKeyspace = keyspace.withSwapped(new KeyspaceParams(keyspace.params.durableWrites, fromPlacement)); + KeyspaceMetadata newKeyspace = keyspace.withSwapped(new KeyspaceParams(keyspace.params.durableWrites, fromPlacement, FastPathStrategy.simple())); transformer = transformer.with(new DistributedSchema(prev.schema.getKeyspaces().withAddedOrUpdated(newKeyspace))); } diff --git a/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java b/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java index c4c9bf549d..ce0e95db03 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java +++ b/test/distributed/org/apache/cassandra/distributed/test/TestBaseImpl.java @@ -39,6 +39,7 @@ import org.junit.BeforeClass; import org.apache.cassandra.cql3.Duration; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.BooleanType; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.ByteType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.DecimalType; @@ -132,7 +133,7 @@ public class TestBaseImpl extends DistributedTestBase bbs.add(value == null ? null : type.decompose(value)); } TupleType tupleType = new TupleType(types); - return tupleType.pack(bbs); + return tupleType.pack(bbs, ByteBufferAccessor.instance); } public static String batch(String... queries) diff --git a/test/microbench/org/apache/cassandra/test/microbench/CachingBenchTest.java b/test/microbench/org/apache/cassandra/test/microbench/CachingBenchTest.java index 088f544601..bb1222373e 100644 --- a/test/microbench/org/apache/cassandra/test/microbench/CachingBenchTest.java +++ b/test/microbench/org/apache/cassandra/test/microbench/CachingBenchTest.java @@ -241,7 +241,7 @@ public class CachingBenchTest extends CQLTester System.out.println("Reader " + cfs.getLiveSSTables().iterator().next().getFileDataInput(0).toString()); if (cacheEnabled) System.out.format("Cache size %s requests %,d hit ratio %f\n", - FileUtils.stringifyFileSize(ChunkCache.instance.metrics.cacheSize.size.getValue()), + FileUtils.stringifyFileSize(ChunkCache.instance.metrics.size.getValue()), ChunkCache.instance.metrics.requests.getCount(), ChunkCache.instance.metrics.hitRate.mean.getValue()); else diff --git a/test/simulator/main/org/apache/cassandra/simulator/cluster/OnClusterMigrateConsensus.java b/test/simulator/main/org/apache/cassandra/simulator/cluster/OnClusterMigrateConsensus.java index 90e0b809c4..38857b5067 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/cluster/OnClusterMigrateConsensus.java +++ b/test/simulator/main/org/apache/cassandra/simulator/cluster/OnClusterMigrateConsensus.java @@ -29,7 +29,7 @@ import java.util.Map.Entry; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.distributed.test.log.PlacementSimulator.Lookup; +import org.apache.cassandra.harry.sut.TokenPlacementModel; import org.apache.cassandra.simulator.Action; import org.apache.cassandra.simulator.ActionList; import org.apache.cassandra.tcm.ClusterMetadata; @@ -57,7 +57,7 @@ class OnClusterMigrateConsensus extends Action ClusterMetadata cm = ClusterMetadata.current(); TokenMap tm = cm.tokenMap; IPartitioner partitioner = tm.partitioner(); - Lookup lookup = actions.factory.lookup(); + TokenPlacementModel.Lookup lookup = actions.factory.lookup(); Map<Integer, NodeId> idToNodeId = new HashMap<>(); for (int id : actions.all.toArray()) idToNodeId.put(id, lookup.nodeId(id)); diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java index 8c17d77e90..b3b9dcd9a0 100644 --- a/test/unit/org/apache/cassandra/cql3/CQLTester.java +++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java @@ -67,6 +67,8 @@ import com.google.common.base.Objects; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; + +import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.assertj.core.api.Assertions; import org.awaitility.Awaitility; import org.apache.commons.lang3.ArrayUtils; @@ -2878,7 +2880,7 @@ public abstract class CQLTester types.add(type); bbs.add(makeByteBuffer(value, type)); } - return new TupleType(types).pack(bbs); + return new TupleType(types).pack(bbs, ByteBufferAccessor.instance); } public String toCQLString() diff --git a/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java b/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java index 80a0693e82..5908e13068 100644 --- a/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java +++ b/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java @@ -608,10 +608,10 @@ public class KeyCacheCqlTest extends CQLTester CassandraMetricsRegistry.Metrics.getNames().forEach(CassandraMetricsRegistry.Metrics::remove); CacheService.instance.keyCache.clear(); CacheMetrics metrics = CacheService.instance.keyCache.getMetrics(); - Assert.assertEquals(0, metrics.cacheSize.entries.getValue().intValue()); + Assert.assertEquals(0, metrics.entries.getValue().intValue()); Assert.assertEquals(0L, metrics.hits.getCount()); Assert.assertEquals(0L, metrics.requests.getCount()); - Assert.assertEquals(0L, metrics.cacheSize.size.getValue().longValue()); + Assert.assertEquals(0L, metrics.size.getValue().longValue()); } private static void triggerBlockingFlush(Index index) throws Exception diff --git a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java index 6439503cee..5a2bb4fc00 100644 --- a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java @@ -101,7 +101,7 @@ public class ColumnConditionTest extends CQLTester } else { - ByteBuffer udtValue = TupleType.pack(ByteBufferAccessor.instance, List.of(value, TWO)); + ByteBuffer udtValue = TupleType.pack(ByteBufferAccessor.instance, Arrays.asList(value, TWO)); cell = new BufferCell(definition, 0L, Cell.NO_TTL, Cell.NO_DELETION_TIME, udtValue, null); } } @@ -117,7 +117,7 @@ public class ColumnConditionTest extends CQLTester AbstractType<?> type = definition.type; if (type.isFrozenCollection()) { - ByteBuffer cellValue = listType.pack(values); + ByteBuffer cellValue = listType.pack(values, ByteBufferAccessor.instance); Cell<ByteBuffer> cell = new BufferCell(definition, 0L, Cell.NO_TTL, Cell.NO_DELETION_TIME, cellValue, null); return BTreeRow.singleCellRow(Clustering.EMPTY, cell); } @@ -163,7 +163,7 @@ public class ColumnConditionTest extends CQLTester { if (definition.type.isFrozenCollection()) { - ByteBuffer cellValue = setType.pack(new ArrayList<>(values)); + ByteBuffer cellValue = setType.pack(new ArrayList<>(values), ByteBufferAccessor.instance); Cell<ByteBuffer> cell = new BufferCell(definition, 0L, Cell.NO_TTL, Cell.NO_DELETION_TIME, cellValue, null); return BTreeRow.singleCellRow(Clustering.EMPTY, cell); } @@ -193,11 +193,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()); -<<<<<<< HEAD - ByteBuffer cellValue = mapType.pack(packableValues); -======= - ByteBuffer cellValue = MapSerializer.pack(packableValues, values.size()); ->>>>>>> 54e38fca9f (Post-rebase fixes around CASSANDRA-18099 and CASSANDRA-18114 (among other things)) + ByteBuffer cellValue = mapType.pack(packableValues, ByteBufferAccessor.instance); Cell<ByteBuffer> cell = new BufferCell(definition, 0L, Cell.NO_TTL, Cell.NO_DELETION_TIME, cellValue, null); return BTreeRow.singleCellRow(Clustering.EMPTY, cell); } @@ -345,7 +341,7 @@ public class ColumnConditionTest extends CQLTester private boolean conditionApplies(SortedMap<ByteBuffer, ByteBuffer> rowValue, Operator op, SortedMap<ByteBuffer, ByteBuffer> conditionValue, MapType<Integer, Integer> columnType) { - ColumnMetadata definition = ColumnMetadata.regularColumn("ks", "cf", "c", columnType); + ColumnMetadata definition = ColumnMetadata.regularColumn(KEYSPACE, maybeCreateTable(columnType, columnType.isFrozenCollection()), "c", columnType); List<ByteBuffer> value = new ArrayList<>(conditionValue.size() * 2); for (Map.Entry<ByteBuffer, ByteBuffer> entry: conditionValue.entrySet()) { diff --git a/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java b/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java index 6897661cf6..ef264dfa14 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TypeValidationTest.java @@ -204,7 +204,7 @@ public class TypeValidationTest qt().forAll(tupleWithValueGen(baseGen)).checkAssert(pair -> { TupleType tuple = pair.left; ByteBuffer value = pair.right; - Assertions.assertThat(tuple.pack(tuple.unpack(value))) + Assertions.assertThat(tuple.pack(tuple.unpack(value), ByteBufferAccessor.instance)) .as("tuple.pack(tuple.unpack(value)) == value") .isEqualTo(value); }); diff --git a/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java b/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java index b0dc2134a9..0a6a3f3608 100644 --- a/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java @@ -131,9 +131,9 @@ public class LargePartitionsTest extends CQLTester private static void keyCacheMetrics(String title) { CacheMetrics metrics = CacheService.instance.keyCache.getMetrics(); - System.out.println("Key cache metrics " + title + ": capacity:" + metrics.cacheSize.capacity.getValue() + - " size:" + metrics.cacheSize.size.getValue() + - " entries:" + metrics.cacheSize.entries.getValue() + + System.out.println("Key cache metrics " + title + ": capacity:" + metrics.capacity.getValue() + + " size:" + metrics.size.getValue() + + " entries:" + metrics.entries.getValue() + " hit-rate:" + metrics.hitRate.mean.getValue() + " one-min-rate:" + metrics.hitRate.oneMinute.getValue()); } diff --git a/test/unit/org/apache/cassandra/metrics/CacheMetricsTest.java b/test/unit/org/apache/cassandra/metrics/CacheMetricsTest.java index 2a071cd244..cb0500b514 100644 --- a/test/unit/org/apache/cassandra/metrics/CacheMetricsTest.java +++ b/test/unit/org/apache/cassandra/metrics/CacheMetricsTest.java @@ -76,9 +76,9 @@ public class CacheMetricsTest // calculations - applying some general assertions for hitRate calculations that essentially just smoke test // existence (i.e. NaN at initialization) since they are established by way of an inner class on CacheMetrics // itself. - assertEquals(expectation.cacheSize.capacity(), actual.cacheSize.capacity.getValue().longValue()); - assertEquals(expectation.cacheSize.weightedSize(), actual.cacheSize.size.getValue().longValue()); - assertEquals(expectation.cacheSize.size(), actual.cacheSize.entries.getValue().intValue()); + assertEquals(expectation.cacheSize.capacity(), actual.capacity.getValue().longValue()); + assertEquals(expectation.cacheSize.weightedSize(), actual.size.getValue().longValue()); + assertEquals(expectation.cacheSize.size(), actual.entries.getValue().intValue()); assertEquals(expectation.hits, actual.hits.getCount()); assertEquals(expectation.misses, actual.misses.getCount()); assertEquals(expectation.requests(), actual.requests.getCount()); diff --git a/test/unit/org/apache/cassandra/transport/SerDeserTest.java b/test/unit/org/apache/cassandra/transport/SerDeserTest.java index b14e854cab..605119f65b 100644 --- a/test/unit/org/apache/cassandra/transport/SerDeserTest.java +++ b/test/unit/org/apache/cassandra/transport/SerDeserTest.java @@ -50,6 +50,7 @@ import org.apache.cassandra.cql3.terms.Term; import org.apache.cassandra.cql3.terms.UserTypes; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.marshal.AbstractType; +import org.apache.cassandra.db.marshal.ByteBufferAccessor; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.marshal.ListType; import org.apache.cassandra.db.marshal.LongType; @@ -94,7 +95,7 @@ public class SerDeserTest for (Integer i : l) lb.add(Int32Type.instance.decompose(i)); - assertEquals(l, lt.compose(lt.pack(lb))); + assertEquals(l, lt.compose(lt.pack(lb, ByteBufferAccessor.instance))); // Sets SetType<?> st = SetType.getInstance(UTF8Type.instance, true); @@ -104,7 +105,7 @@ public class SerDeserTest for (String t : s) sb.add(UTF8Type.instance.decompose(t)); - assertEquals(s, st.compose(st.pack(sb))); + assertEquals(s, st.compose(st.pack(sb, ByteBufferAccessor.instance))); // Maps MapType<?, ?> mt = MapType.getInstance(UTF8Type.instance, LongType.instance, true); @@ -120,7 +121,7 @@ public class SerDeserTest mb.add(LongType.instance.decompose(entry.getValue())); } - assertEquals(m, mt.compose(mt.pack(mb))); + assertEquals(m, mt.compose(mt.pack(mb, ByteBufferAccessor.instance))); } @Test(expected = MarshalException.class) @@ -130,7 +131,7 @@ public class SerDeserTest List<ByteBuffer> sb = new ArrayList<>(1); sb.add(null); - st.compose(st.pack(sb)); + st.compose(st.pack(sb, ByteBufferAccessor.instance)); } @Test(expected = MarshalException.class) @@ -141,7 +142,7 @@ public class SerDeserTest mb.add(null); mb.add(LongType.instance.decompose(999L)); - mt.compose(mt.pack(mb)); + mt.compose(mt.pack(mb, ByteBufferAccessor.instance)); } @Test(expected = MarshalException.class) @@ -152,7 +153,7 @@ public class SerDeserTest mb.add(UTF8Type.instance.decompose("danger")); mb.add(null); - mt.compose(mt.pack(mb)); + mt.compose(mt.pack(mb, ByteBufferAccessor.instance)); } @Test diff --git a/test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java b/test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java index d119da7bed..12ba7da102 100644 --- a/test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java +++ b/test/unit/org/apache/cassandra/utils/AbstractTypeGenerators.java @@ -1242,7 +1242,7 @@ public final class AbstractTypeGenerators TypeSupport<Object> support = eSupport.get(i); elements.add(support.type.decompose(support.valueGen.generate(rnd))); } - return type.pack(elements); + return type.pack(elements, ByteBufferAccessor.instance); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
