This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 2e602ec972 Merge branch 'CASSANDRA-19631e' into trunk new 95c6fd481a Serialization improvements - Share TableMetadatas and PartitionKey for PartialTxn serialization Also: - TxnReference et al should reference uniqueId, and avoid serializing ksName/cfName - Don't double count shared keys when estimating size on heap add f327b63db0 Introduce SSTableSimpleScanner for compaction add 17cb89208c Fix marking an SSTable as suspected and BufferPool leakage in case of a corrupted SSTable read during a compaction new d4d858d382 Updating a column with a new TTL but same expiration time is non-deterministic and causes repair mismatches. new 2ac701629b Merge branch 'cassandra-4.0' into cassandra-4.1 new 32cfd477df Merge branch 'cassandra-4.1' into cassandra-5.0 new 4805123eb8 Merge branch 'cassandra-5.0' into trunk The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGES.txt | 1 + modules/accord | 2 +- .../apache/cassandra/cql3/ColumnsExpression.java | 20 +- src/java/org/apache/cassandra/cql3/Operations.java | 17 +- src/java/org/apache/cassandra/cql3/Ordering.java | 18 +- .../cassandra/cql3/conditions/ColumnCondition.java | 59 +-- .../cassandra/cql3/statements/BatchStatement.java | 2 +- .../cassandra/cql3/statements/CQL3CasRequest.java | 32 +- .../cassandra/cql3/statements/DeleteStatement.java | 2 +- .../cql3/statements/ModificationStatement.java | 42 ++- .../cql3/statements/TransactionStatement.java | 124 +++--- .../cassandra/cql3/statements/UpdateStatement.java | 8 +- .../cql3/transactions/ReferenceOperation.java | 12 +- .../cql3/transactions/RowDataReference.java | 20 +- .../cql3/transactions/SelectReferenceSource.java | 6 + src/java/org/apache/cassandra/db/LivenessInfo.java | 11 +- .../cassandra/db/PartitionRangeReadCommand.java | 5 + src/java/org/apache/cassandra/db/ReadCommand.java | 121 ++++-- .../cassandra/db/SinglePartitionReadCommand.java | 45 +++ .../cassandra/db/partitions/PartitionUpdate.java | 40 ++ src/java/org/apache/cassandra/db/rows/Cells.java | 10 + .../db/rows/UnfilteredRowIteratorSerializer.java | 22 +- ...mmetricParameterisedUnversionedSerializer.java} | 32 +- ...symmetricParameterisedVersionedSerializer.java} | 45 +-- ...ava => ParameterisedUnversionedSerializer.java} | 3 +- ....java => ParameterisedVersionedSerializer.java} | 3 +- .../org/apache/cassandra/schema/TableMetadata.java | 14 + .../org/apache/cassandra/service/StorageProxy.java | 16 +- .../service/accord/AccordFetchCoordinator.java | 27 +- .../service/accord/AccordObjectSizes.java | 5 +- .../service/accord/AccordSerializers.java | 51 +-- .../cassandra/service/accord/AccordService.java | 4 +- .../cassandra/service/accord/api/AccordAgent.java | 3 +- .../service/accord/api/AccordRoutableKey.java | 1 + .../accord/interop/AccordInteropExecution.java | 43 +-- .../serializers/AbstractSortedCollector.java | 137 +++++++ .../accord/serializers/CommandSerializers.java | 123 +++--- .../serializers/IVersionedWithKeysSerializer.java | 280 ++++++-------- .../service/accord/serializers/KeySerializers.java | 6 +- .../service/accord/serializers/TableMetadatas.java | 415 +++++++++++++++++++++ .../accord/serializers/TableMetadatasAndKeys.java | 253 +++++++++++++ ...VersionedSerializer.java => TxnSerializer.java} | 4 +- .../service/accord/txn/AbstractKeySorted.java | 7 +- .../service/accord/txn/AbstractSerialized.java | 96 ++--- .../cassandra/service/accord/txn/AccordUpdate.java | 25 +- .../cassandra/service/accord/txn/TxnCondition.java | 186 ++++++--- .../cassandra/service/accord/txn/TxnNamedRead.java | 104 ++++-- .../cassandra/service/accord/txn/TxnQuery.java | 4 +- .../cassandra/service/accord/txn/TxnRead.java | 79 ++-- .../cassandra/service/accord/txn/TxnReference.java | 59 ++- .../service/accord/txn/TxnReferenceOperation.java | 39 +- .../service/accord/txn/TxnReferenceOperations.java | 44 ++- .../service/accord/txn/TxnReferenceValue.java | 55 +-- .../cassandra/service/accord/txn/TxnUpdate.java | 113 +++--- .../cassandra/service/accord/txn/TxnWrite.java | 206 ++++++---- .../accord/txn/UnrecoverableRepairUpdate.java | 7 +- .../ConsensusMigrationMutationHelper.java | 28 +- .../service/reads/repair/BlockingReadRepair.java | 9 +- .../apache/cassandra/utils/ArraySerializers.java | 25 ++ .../cassandra/utils/CollectionSerializers.java | 87 +++++ .../apache/cassandra/utils/FastByteOperations.java | 4 +- .../service/accord/AccordJournalBurnTest.java | 3 +- .../service/accord/BurnTestKeySerializers.java | 66 ++-- .../cql3/conditions/ColumnConditionTest.java | 44 ++- .../ClusteringColumnRestrictionsTest.java | 8 +- test/unit/org/apache/cassandra/db/CellTest.java | 84 +++++ .../org/apache/cassandra/db/LivenessInfoTest.java | 5 + .../org/apache/cassandra/db/rows/RowsTest.java | 54 +++ test/unit/org/apache/cassandra/io/Serializers.java | 30 ++ .../cassandra/service/accord/AccordTestUtils.java | 13 +- .../serializers/CommandsForKeySerializerTest.java | 2 +- .../IVersionedWithKeysSerializerTest.java | 160 ++++++++ .../accord/serializers/KeySerializersTest.java | 2 +- .../serializers/TableMetadatasAndKeysTest.java | 163 ++++++++ .../accord/serializers/TableMetadatasTest.java | 153 ++++++++ .../service/accord/txn/AbstractKeySortedTest.java | 6 - .../service/accord/txn/AccordUpdateTest.java | 6 +- .../service/accord/txn/TxnConditionTest.java | 22 +- .../apache/cassandra/utils/AccordGenerators.java | 78 +++- .../cassandra/utils/CassandraGenerators.java | 3 +- 80 files changed, 3110 insertions(+), 1053 deletions(-) copy src/java/org/apache/cassandra/io/{AsymmetricUnversionedSerializer.java => AsymmetricParameterisedUnversionedSerializer.java} (71%) copy src/java/org/apache/cassandra/io/{AsymmetricVersionedSerializer.java => AsymmetricParameterisedVersionedSerializer.java} (56%) copy src/java/org/apache/cassandra/io/{MessageVersionProvider.java => ParameterisedUnversionedSerializer.java} (87%) copy src/java/org/apache/cassandra/io/{MessageVersionProvider.java => ParameterisedVersionedSerializer.java} (86%) create mode 100644 src/java/org/apache/cassandra/service/accord/serializers/AbstractSortedCollector.java create mode 100644 src/java/org/apache/cassandra/service/accord/serializers/TableMetadatas.java create mode 100644 src/java/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeys.java copy src/java/org/apache/cassandra/service/accord/serializers/{AsymmetricVersionedSerializer.java => TxnSerializer.java} (83%) create mode 100644 test/unit/org/apache/cassandra/service/accord/serializers/IVersionedWithKeysSerializerTest.java create mode 100644 test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasAndKeysTest.java create mode 100644 test/unit/org/apache/cassandra/service/accord/serializers/TableMetadatasTest.java --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org