natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Mutation serializer 

Fix AccordJournal.Type interop entries
This commit is contained in:
Ariel Weisberg 2023-12-05 17:31:50 -05:00 committed by David Capwell
parent a9cb71833a
commit 021b06639e
6 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/cassandra/db/Mutation.java
View File

@ -541,7 +541,7 @@ public class Mutation implements IMutation, Supplier<Mutation>
boolean allowsOutOfRangeMutations = false;
if (version >= VERSION_51)
{
int flags = in.readByte();
int flags = teeIn.readByte();
allowsOutOfRangeMutations = allowsOutOfRangeMutations(flags);
}
int size = teeIn.readUnsignedVInt32();
@ -642,7 +642,7 @@ public class Mutation implements IMutation, Supplier<Mutation>
if (size == 0L)
{
if (version >= VERSION_51)
size += ALLOW_OUT_OF_RANGE_MUTATIONS_FLAG; // flags
size += TypeSizes.sizeof((byte)ALLOW_OUT_OF_RANGE_MUTATIONS_FLAG); // flags
size += TypeSizes.sizeofUnsignedVInt(mutation.modifications.size());
for (PartitionUpdate partitionUpdate : mutation.modifications.values())
size += serializer.serializedSize(partitionUpdate, version);

6
src/java/org/apache/cassandra/service/accord/AccordJournal.java
View File

@ -524,9 +524,9 @@ public class AccordJournal implements Shutdownable
APPLY_MAXIMAL (71, APPLY_MAXIMAL_REQ, ApplySerializers.request, TXN ),
INTEROP_COMMIT_MINIMAL (90, INTEROP_COMMIT_MINIMAL_REQ, COMMIT_MINIMAL_REQ, AccordInteropCommit.serializer, TXN),
INTEROP_COMMIT_MAXIMAL (91, INTEROP_COMMIT_MAXIMAL_REQ, COMMIT_MINIMAL_REQ, AccordInteropCommit.serializer, TXN),
INTEROP_APPLY_MINIMAL (92, INTEROP_APPLY_MINIMAL_REQ, COMMIT_MINIMAL_REQ, AccordInteropApply.serializer, TXN),
INTEROP_APPLY_MAXIMAL (93, INTEROP_APPLY_MAXIMAL_REQ, COMMIT_MINIMAL_REQ, AccordInteropApply.serializer, TXN),
INTEROP_COMMIT_MAXIMAL (91, INTEROP_COMMIT_MAXIMAL_REQ, COMMIT_MAXIMAL_REQ, AccordInteropCommit.serializer, TXN),
INTEROP_APPLY_MINIMAL (92, INTEROP_APPLY_MINIMAL_REQ, APPLY_MINIMAL_REQ, AccordInteropApply.serializer, TXN),
INTEROP_APPLY_MAXIMAL (93, INTEROP_APPLY_MAXIMAL_REQ, APPLY_MAXIMAL_REQ, AccordInteropApply.serializer, TXN),
BEGIN_RECOVER (72, BEGIN_RECOVER_REQ, RecoverySerializers.request, TXN ),
BEGIN_INVALIDATE (73, BEGIN_INVALIDATE_REQ, BeginInvalidationSerializers.request, EPOCH),

4
src/java/org/apache/cassandra/service/accord/AccordKeyspace.java
View File

@ -155,8 +155,8 @@ import org.apache.cassandra.service.accord.serializers.WaitingOnSerializer;
import org.apache.cassandra.transport.Dispatcher;
import org.apache.cassandra.utils.Clock;
import org.apache.cassandra.utils.MonotonicClock;
import org.apache.cassandra.utils.btree.BTree;
import org.apache.cassandra.utils.Throwables;
import org.apache.cassandra.utils.btree.BTree;
import org.apache.cassandra.utils.bytecomparable.ByteComparable;
import static accord.utils.Invariants.checkArgument;
@ -666,7 +666,7 @@ public class AccordKeyspace
return KeyspaceMetadata.create(ACCORD_KEYSPACE_NAME, KeyspaceParams.local(), tables(), Views.none(), Types.none(), UserFunctions.none());
}
private static Tables tables()
public static Tables tables()
{
return Tables.of(Commands, TimestampsForKeys, DepsCommandsForKeys, AllCommandsForKeys, Topologies, EpochMetadata, CommandStoreMetadata);
}

76
test/unit/org/apache/cassandra/service/StorageServiceServerTest.java
View File

@ -36,11 +36,11 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.CassandraTestBase;
import org.apache.cassandra.ServerTestUtils;
import org.apache.cassandra.audit.AuditLogManager;
import org.apache.cassandra.audit.AuditLogOptions;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.dht.Murmur3Partitioner.LongToken;
import org.apache.cassandra.dht.OrderPreservingPartitioner;
import org.apache.cassandra.dht.OrderPreservingPartitioner.StringToken;
@ -49,6 +49,7 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.distributed.test.log.ClusterMetadataTestHelper;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.locator.WithPartitioner;
import org.apache.cassandra.schema.KeyspaceMetadata;
import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.schema.ReplicationParams;
@ -68,7 +69,7 @@ import static org.apache.cassandra.config.CassandraRelevantProperties.GOSSIP_DIS
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class StorageServiceServerTest extends CassandraTestBase
public class StorageServiceServerTest
{
static final String DC1 = "DC1";
static final String DC2 = "DC2";
@ -93,6 +94,7 @@ public class StorageServiceServerTest extends CassandraTestBase
id4 = InetAddressAndPort.getByName("127.0.0.4");
id5 = InetAddressAndPort.getByName("127.0.0.5");
registerNodes();
ServerTestUtils.markCMS();
}
private static void registerNodes()
@ -157,7 +159,6 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseOrderPreservingPartitioner
public void testLocalPrimaryRangeForEndpointWithNetworkTopologyStrategy() throws Exception
{
setupDefaultPlacements();
@ -189,7 +190,6 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseOrderPreservingPartitioner
public void testPrimaryRangeForEndpointWithinDCWithNetworkTopologyStrategy() throws Exception
{
setupDefaultPlacements();
@ -225,7 +225,6 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseOrderPreservingPartitioner
public void testPrimaryRangesWithNetworkTopologyStrategy() throws Exception
{
setupDefaultPlacements();
@ -256,7 +255,6 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseOrderPreservingPartitioner
public void testPrimaryRangesWithNetworkTopologyStrategyOneDCOnly() throws Exception
{
setupDefaultPlacements();
@ -288,7 +286,6 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseOrderPreservingPartitioner
public void testPrimaryRangeForEndpointWithinDCWithNetworkTopologyStrategyOneDCOnly() throws Exception
{
setupDefaultPlacements();
@ -320,7 +317,6 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseOrderPreservingPartitioner
public void testPrimaryRangesWithVnodes() throws Exception
{
// DC1
@ -371,7 +367,6 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseOrderPreservingPartitioner
public void testPrimaryRangeForEndpointWithinDCWithVnodes() throws Exception
{
// DC1
@ -436,7 +431,6 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseOrderPreservingPartitioner
public void testPrimaryRangesWithSimpleStrategy() throws Exception
{
ClusterMetadataTestHelper.join(id1, new StringToken("A"));
@ -462,7 +456,6 @@ public class StorageServiceServerTest extends CassandraTestBase
/* Does not make much sense to use -local and -pr with simplestrategy, but just to prevent human errors */
@Test
@UseOrderPreservingPartitioner
public void testPrimaryRangeForEndpointWithinDCWithSimpleStrategy() throws Exception
{
ClusterMetadataTestHelper.join(id1, new StringToken("A"));
@ -490,43 +483,46 @@ public class StorageServiceServerTest extends CassandraTestBase
}
@Test
@UseMurmur3Partitioner
public void testCreateRepairRangeFrom() throws Exception
{
ClusterMetadataTestHelper.join(id1, new LongToken(1000L));
ClusterMetadataTestHelper.join(id2, new LongToken(2000L));
ClusterMetadataTestHelper.join(id3, new LongToken(3000L));
ClusterMetadataTestHelper.join(id4, new LongToken(4000L));
try (WithPartitioner m3p = new WithPartitioner(Murmur3Partitioner.instance))
{
registerNodes();
ClusterMetadataTestHelper.join(id1, new LongToken(1000L));
ClusterMetadataTestHelper.join(id2, new LongToken(2000L));
ClusterMetadataTestHelper.join(id3, new LongToken(3000L));
ClusterMetadataTestHelper.join(id4, new LongToken(4000L));
Collection<Range<Token>> repairRangeFrom = StorageService.instance.createRepairRangeFrom("1500", "3700");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(3);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(1500L), new LongToken(2000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(2000L), new LongToken(3000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(3000L), new LongToken(3700L)));
Collection<Range<Token>> repairRangeFrom = StorageService.instance.createRepairRangeFrom("1500", "3700");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(3);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(1500L), new LongToken(2000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(2000L), new LongToken(3000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(3000L), new LongToken(3700L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("500", "700");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(1);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(500L), new LongToken(700L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("500", "700");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(1);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(500L), new LongToken(700L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("500", "1700");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(2);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(500L), new LongToken(1000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(1000L), new LongToken(1700L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("500", "1700");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(2);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(500L), new LongToken(1000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(1000L), new LongToken(1700L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("2500", "2300");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(5);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(2500L), new LongToken(3000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(3000L), new LongToken(4000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(4000L), new LongToken(1000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(1000L), new LongToken(2000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(2000L), new LongToken(2300L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("2500", "2300");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(5);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(2500L), new LongToken(3000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(3000L), new LongToken(4000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(4000L), new LongToken(1000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(1000L), new LongToken(2000L)));
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(2000L), new LongToken(2300L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("2000", "3000");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(1);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(2000L), new LongToken(3000L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("2000", "3000");
Assertions.assertThat(repairRangeFrom.size()).as(repairRangeFrom.toString()).isEqualTo(1);
Assertions.assertThat(repairRangeFrom).contains(new Range<>(new LongToken(2000L), new LongToken(3000L)));
repairRangeFrom = StorageService.instance.createRepairRangeFrom("2000", "2000");
Assertions.assertThat(repairRangeFrom).isEmpty();
repairRangeFrom = StorageService.instance.createRepairRangeFrom("2000", "2000");
Assertions.assertThat(repairRangeFrom).isEmpty();
}
}
/**

2
test/unit/org/apache/cassandra/service/accord/AccordSyncPropagatorTest.java
View File

@ -82,7 +82,7 @@ public class AccordSyncPropagatorTest
@BeforeClass
public static void setup() throws NoSuchFieldException, IllegalAccessException
{
DatabaseDescriptor.clientInitialization();
DatabaseDescriptor.daemonInitialization();
DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
ClusterMetadataService.unsetInstance();
ClusterMetadataService.setInstance(StubClusterMetadataService.forTesting());

15
test/unit/org/apache/cassandra/tools/nodetool/TableHistogramsTest.java
View File

@ -17,19 +17,19 @@
*/
package org.apache.cassandra.tools.nodetool;
import org.apache.cassandra.auth.AuthKeyspace;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.schema.SchemaKeyspace;
import org.apache.cassandra.schema.SystemDistributedKeyspace;
import org.apache.cassandra.tracing.TraceKeyspace;
import org.apache.commons.lang3.StringUtils;
import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.auth.AuthKeyspace;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.schema.SchemaKeyspace;
import org.apache.cassandra.schema.SystemDistributedKeyspace;
import org.apache.cassandra.service.accord.AccordKeyspace;
import org.apache.cassandra.tools.ToolRunner;
import org.apache.cassandra.tracing.TraceKeyspace;
import static org.apache.cassandra.tools.ToolRunner.invokeNodetool;
import static org.assertj.core.api.Assertions.assertThat;
@ -44,6 +44,7 @@ public class TableHistogramsTest extends CQLTester
TraceKeyspace.TABLE_NAMES.size() +
AuthKeyspace.TABLE_NAMES.size() +
SystemDistributedKeyspace.TABLE_NAMES.size() +
AccordKeyspace.tables().size() +
1; // DistributedMetadataLogKeyspace contains a single table
@BeforeClass