This is an automated email from the ASF dual-hosted git repository.
belliottsmith pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from dc7935be80 Merge branch 'cassandra-6.0' into trunk
add 7623a59b31 Accord: Deterministic time integration - now() functions
must be deterministic (and derived from Accord timestamp) - tombstone GC and
TTL evaluation must be deterministic and based on both Accord timestamp and
Accord GC mechanisms (that guarantee completeness of execution)
add 5eba832793 Merge branch 'cassandra-6.0' into trunk
No new revisions were added by this update.
Summary of changes:
src/java/org/apache/cassandra/cql3/Attributes.java | 8 +-
.../apache/cassandra/cql3/ColumnsExpression.java | 4 +-
.../apache/cassandra/cql3/ElementExpression.java | 6 +-
.../org/apache/cassandra/cql3/FunctionContext.java | 96 +++++++++++++++++++
src/java/org/apache/cassandra/cql3/Json.java | 6 +-
src/java/org/apache/cassandra/cql3/Operation.java | 4 +-
.../org/apache/cassandra/cql3/QueryOptions.java | 9 +-
.../org/apache/cassandra/cql3/QueryProcessor.java | 2 +-
...UpdateParameters.java => RowUpdateBuilder.java} | 52 +++++++----
.../cassandra/cql3/conditions/ColumnCondition.java | 24 ++---
.../cassandra/cql3/functions/AggregateFcts.java | 60 ++++++------
.../cql3/functions/AggregateFunction.java | 6 +-
.../apache/cassandra/cql3/functions/Arguments.java | 3 +
.../cql3/functions/BytesConversionFcts.java | 6 +-
.../apache/cassandra/cql3/functions/CastFcts.java | 6 +-
.../cassandra/cql3/functions/CollectionFcts.java | 14 +--
.../apache/cassandra/cql3/functions/Function.java | 6 +-
.../cql3/functions/FunctionArguments.java | 58 +++++-------
.../cassandra/cql3/functions/FunctionCall.java | 12 +--
.../cassandra/cql3/functions/LengthFcts.java | 6 +-
.../cassandra/cql3/functions/NativeFunction.java | 7 +-
.../cql3/functions/PartialScalarFunction.java | 2 +-
.../functions/PartiallyAppliedScalarFunction.java | 17 +++-
.../cql3/functions/PreComputedScalarFunction.java | 7 +-
.../cassandra/cql3/functions/ScalarFunction.java | 3 +-
.../apache/cassandra/cql3/functions/TimeFcts.java | 2 +-
.../apache/cassandra/cql3/functions/ToJsonFct.java | 6 +-
.../apache/cassandra/cql3/functions/TokenFct.java | 6 +-
.../cassandra/cql3/functions/UDAggregate.java | 10 +-
.../cassandra/cql3/functions/UDFunction.java | 5 +-
.../cassandra/cql3/functions/VectorFcts.java | 6 +-
.../cql3/functions/masking/ColumnMask.java | 17 +++-
.../functions/masking/DefaultMaskingFunction.java | 6 +-
.../functions/masking/HashMaskingFunction.java | 6 +-
.../functions/masking/NullMaskingFunction.java | 6 +-
.../functions/masking/PartialMaskingFunction.java | 6 +-
.../functions/masking/ReplaceMaskingFunction.java | 6 +-
.../restrictions/ClusteringColumnRestrictions.java | 5 +-
.../cql3/restrictions/MergedRestriction.java | 16 ++--
.../cassandra/cql3/restrictions/Restriction.java | 8 +-
.../cql3/restrictions/RestrictionSet.java | 6 +-
.../cql3/restrictions/RestrictionSetWrapper.java | 6 +-
.../cql3/restrictions/SimpleRestriction.java | 52 +++++------
.../cql3/restrictions/SingleRestriction.java | 12 +--
.../cql3/selection/AbstractFunctionSelector.java | 21 +++--
.../cql3/selection/AggregateFunctionSelector.java | 17 +++-
.../cassandra/cql3/selection/ElementsSelector.java | 8 ++
.../cassandra/cql3/selection/FieldSelector.java | 8 ++
.../cassandra/cql3/selection/ListSelector.java | 9 ++
.../cassandra/cql3/selection/MapSelector.java | 13 ++-
.../cassandra/cql3/selection/ResultSetBuilder.java | 8 +-
.../cql3/selection/ScalarFunctionSelector.java | 6 +-
.../apache/cassandra/cql3/selection/Selection.java | 10 ++
.../apache/cassandra/cql3/selection/Selector.java | 3 +
.../cassandra/cql3/selection/SetSelector.java | 9 ++
.../cassandra/cql3/selection/SimpleSelector.java | 21 +++--
.../cassandra/cql3/selection/TupleSelector.java | 9 ++
.../cassandra/cql3/selection/UserTypeSelector.java | 9 ++
.../cassandra/cql3/selection/VectorSelector.java | 9 ++
.../cql3/selection/WritetimeOrTTLSelector.java | 8 ++
.../cassandra/cql3/statements/CQL3CasRequest.java | 38 +++++---
.../cassandra/cql3/statements/DeleteStatement.java | 6 +-
.../cql3/statements/ModificationStatement.java | 63 ++++++-------
.../cassandra/cql3/statements/SelectStatement.java | 2 +-
.../cql3/statements/TransactionStatement.java | 22 +++--
.../cassandra/cql3/statements/UpdateStatement.java | 6 +-
.../org/apache/cassandra/cql3/terms/Constants.java | 64 ++++++-------
.../org/apache/cassandra/cql3/terms/InMarker.java | 14 +--
.../org/apache/cassandra/cql3/terms/Lists.java | 78 ++++++++--------
src/java/org/apache/cassandra/cql3/terms/Maps.java | 48 +++++-----
.../org/apache/cassandra/cql3/terms/Marker.java | 20 ++--
.../apache/cassandra/cql3/terms/MultiElements.java | 6 +-
src/java/org/apache/cassandra/cql3/terms/Sets.java | 48 +++++-----
src/java/org/apache/cassandra/cql3/terms/Term.java | 27 +++---
.../org/apache/cassandra/cql3/terms/Terms.java | 56 +++++------
.../org/apache/cassandra/cql3/terms/Tuples.java | 4 +-
.../org/apache/cassandra/cql3/terms/UserTypes.java | 30 +++---
.../org/apache/cassandra/cql3/terms/Vectors.java | 4 +-
.../cql3/transactions/ReferenceValue.java | 12 +--
.../cql3/transactions/RowDataReference.java | 12 +--
.../org/apache/cassandra/db/ColumnFamilyStore.java | 13 ++-
src/java/org/apache/cassandra/db/ReadCommand.java | 3 +
.../cassandra/db/aggregation/GroupMaker.java | 3 +-
.../db/compaction/CompactionIterator.java | 56 +++++------
.../cassandra/db/compaction/CompactionManager.java | 26 ++----
.../cassandra/db/compaction/CompactionTask.java | 50 ++++++++--
.../cassandra/db/compaction/SSTableSplitter.java | 2 +-
.../db/compaction/TimeWindowCompactionTask.java | 2 +-
.../cassandra/db/marshal/AbstractTimeUUIDType.java | 6 +-
.../apache/cassandra/db/marshal/TemporalType.java | 7 +-
.../org/apache/cassandra/db/marshal/TimeType.java | 6 +-
.../db/partitions/AbstractBTreePartition.java | 1 -
.../db/repair/CassandraValidationIterator.java | 9 +-
.../cassandra/io/sstable/CQLSSTableWriter.java | 21 +++--
.../org/apache/cassandra/repair/RepairSession.java | 1 +
.../accord/AccordExecutorAbstractLockLoop.java | 1 -
.../service/accord/AccordObjectSizes.java | 5 +-
.../cassandra/service/accord/api/TokenKey.java | 5 +
.../accord/journal/CommandChangeWriter.java | 4 +-
.../service/accord/journal/CommandChanges.java | 9 +-
.../accord/serializers/ApplySerializers.java | 3 +-
.../accord/serializers/CheckStatusSerializers.java | 3 +-
.../accord/serializers/ReadDataSerializer.java | 3 +-
.../accord/serializers/RecoverySerializers.java | 3 +-
.../serializers/RemoteSuccessSerializers.java | 8 +-
.../accord/serializers/ResultSerializers.java | 45 ---------
.../service/accord/txn/AccordUpdateParameters.java | 16 +++-
.../accord/txn/RetryWithNewProtocolResult.java | 6 --
.../cassandra/service/accord/txn/TxnData.java | 33 ++-----
.../service/accord/txn/TxnDataResult.java | 103 +++++++++++++++++++++
.../cassandra/service/accord/txn/TxnQuery.java | 45 +++++----
.../service/accord/txn/TxnRangeReadResult.java | 27 +-----
.../service/accord/txn/TxnReferenceOperation.java | 4 +-
.../cassandra/service/accord/txn/TxnResult.java | 9 +-
.../service/accord/txn/TxnValidationRejection.java | 6 --
.../cassandra/service/accord/txn/TxnWrite.java | 6 +-
.../cassandra/transport/ProtocolVersion.java | 10 +-
src/java/org/apache/cassandra/utils/Clock.java | 17 +++-
src/java/org/apache/cassandra/utils/TimeUUID.java | 2 +-
.../cassandra/utils/concurrent/SignalLock.java | 10 +-
.../AccordCommandStoreTryExecuteListeningTest.java | 4 +-
.../accord/AccordWriteInteroperabilityTest.java | 2 +
.../accord/journal/AccordJournalReplayTest.java | 4 +-
.../accord/journal/AccordJournalBurnTest.java | 6 +-
.../cassandra/io/sstable/HarrySSTableWriter.java | 17 ++--
.../cql3/functions/FunctionFactoryTest.java | 6 +-
.../cassandra/cql3/functions/TimeFctsTest.java | 4 +-
.../org/apache/cassandra/cql3/terms/ListsTest.java | 18 ++--
.../miscellaneous/CrcCheckChanceTest.java | 2 +-
.../cql3/validation/operations/CQLVectorTest.java | 10 +-
.../db/compaction/CompactionsCQLTest.java | 2 +-
.../apache/cassandra/hints/HintsServiceTest.java | 4 +-
.../service/accord/AccordCommandStoreTest.java | 4 +-
.../serializers/CommandsForKeySerializerTest.java | 3 +-
.../apache/cassandra/utils/AccordGenerators.java | 4 +-
.../io/sstable/StressCQLSSTableWriter.java | 19 ++--
136 files changed, 1199 insertions(+), 838 deletions(-)
create mode 100644 src/java/org/apache/cassandra/cql3/FunctionContext.java
rename src/java/org/apache/cassandra/cql3/{UpdateParameters.java =>
RowUpdateBuilder.java} (91%)
delete mode 100644
src/java/org/apache/cassandra/service/accord/serializers/ResultSerializers.java
create mode 100644
src/java/org/apache/cassandra/service/accord/txn/TxnDataResult.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
