You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2022/03/10 20:22:48 UTC
[cassandra] branch trunk updated (eb960b1 -> d292327)
This is an automated email from the ASF dual-hosted git repository.
benedict pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from eb960b1 Merge branch 'cassandra-4.0' into trunk
new 5a0d615 [CASSANDRA-17176] Introduce TimeUUID
new 8960b4d [CASSANDRA-17177] List Appends Are Not Linearizable
new d292327 CEP-14: Paxos Improvements
The 3 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:
.build/build-rat.xml | 1 +
.circleci/config.yml | 6 +-
.circleci/config.yml.HIGHRES | 6 +-
.circleci/config.yml.LOWRES | 6 +-
.circleci/config.yml.MIDRES | 6 +-
NEWS.txt | 24 +
build.xml | 44 +-
.../apache/cassandra/auth/FunctionResource.java | 2 +-
src/java/org/apache/cassandra/batchlog/Batch.java | 16 +-
.../cassandra/batchlog/BatchRemoveVerbHandler.java | 7 +-
.../apache/cassandra/batchlog/BatchlogManager.java | 36 +-
.../apache/cassandra/cache/AutoSavingCache.java | 5 +-
.../cassandra/concurrent/ExecutorFactory.java | 26 +-
.../apache/cassandra/concurrent/FutureTask.java | 4 +-
.../cassandra/concurrent/InfiniteLoopExecutor.java | 73 +-
.../org/apache/cassandra/concurrent/Stage.java | 14 +-
.../cassandra/concurrent/SyncFutureTask.java | 3 +-
.../config/CassandraRelevantProperties.java | 15 +-
src/java/org/apache/cassandra/config/Config.java | 202 +++-
.../apache/cassandra/config/DataStorageSpec.java | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 199 +++-
.../org/apache/cassandra/config/DurationSpec.java | 4 +-
.../apache/cassandra/config/EncryptionOptions.java | 17 +-
src/java/org/apache/cassandra/cql3/CQL3Type.java | 6 +
src/java/org/apache/cassandra/cql3/Lists.java | 7 +-
.../org/apache/cassandra/cql3/QueryOptions.java | 16 +
.../org/apache/cassandra/cql3/QueryProcessor.java | 40 +-
src/java/org/apache/cassandra/cql3/Sets.java | 2 +-
.../apache/cassandra/cql3/UntypedResultSet.java | 18 +
.../apache/cassandra/cql3/UpdateParameters.java | 6 +
.../cassandra/cql3/functions/AggregateFcts.java | 28 +-
.../cql3/functions/BytesConversionFcts.java | 16 +-
.../cassandra/cql3/functions/FunctionCall.java | 4 +-
.../cassandra/cql3/functions/FunctionResolver.java | 5 +-
.../apache/cassandra/cql3/functions/TimeFcts.java | 16 +-
.../cassandra/cql3/statements/CQL3CasRequest.java | 50 +-
.../cql3/statements/ModificationStatement.java | 12 +-
.../cassandra/cql3/statements/SelectStatement.java | 50 +-
.../schema/CreateAggregateStatement.java | 4 +-
.../statements/schema/CreateFunctionStatement.java | 6 +-
.../statements/schema/DropAggregateStatement.java | 2 +-
.../statements/schema/DropFunctionStatement.java | 2 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 84 +-
.../org/apache/cassandra/db/ConsistencyLevel.java | 6 +-
.../org/apache/cassandra/db/CounterMutation.java | 7 +
src/java/org/apache/cassandra/db/IMutation.java | 2 +
src/java/org/apache/cassandra/db/Keyspace.java | 5 +
src/java/org/apache/cassandra/db/Mutation.java | 25 +-
.../apache/cassandra/db/MutationVerbHandler.java | 16 +-
.../cassandra/db/PartitionRangeReadCommand.java | 4 +-
src/java/org/apache/cassandra/db/ReadCommand.java | 3 +-
src/java/org/apache/cassandra/db/ReadQuery.java | 8 +-
src/java/org/apache/cassandra/db/ReadResponse.java | 12 +
.../org/apache/cassandra/db/SimpleBuilders.java | 5 +-
.../cassandra/db/SinglePartitionReadCommand.java | 17 +-
.../org/apache/cassandra/db/SystemKeyspace.java | 242 +++-
.../cassandra/db/SystemKeyspaceMigrator40.java | 3 +-
.../cassandra/db/commitlog/CommitLogReplayer.java | 1 -
.../db/compaction/AbstractCompactionStrategy.java | 4 +-
.../db/compaction/AbstractCompactionTask.java | 4 +-
.../db/compaction/AbstractStrategyHolder.java | 4 +-
.../cassandra/db/compaction/CompactionInfo.java | 12 +-
.../compaction/CompactionInterruptedException.java | 10 +-
.../db/compaction/CompactionIterator.java | 103 +-
.../cassandra/db/compaction/CompactionManager.java | 29 +-
.../db/compaction/CompactionStrategyHolder.java | 4 +-
.../db/compaction/CompactionStrategyManager.java | 16 +-
.../cassandra/db/compaction/CompactionTask.java | 8 +-
.../db/compaction/PendingRepairHolder.java | 8 +-
.../db/compaction/PendingRepairManager.java | 86 +-
.../apache/cassandra/db/compaction/Scrubber.java | 6 +-
.../apache/cassandra/db/compaction/Upgrader.java | 5 +-
.../apache/cassandra/db/compaction/Verifier.java | 8 +-
.../compaction/writers/CompactionAwareWriter.java | 4 +-
.../db/lifecycle/LifecycleTransaction.java | 3 +-
.../org/apache/cassandra/db/lifecycle/LogFile.java | 11 +-
.../cassandra/db/lifecycle/LogTransaction.java | 6 +-
...TimeUUIDType.java => AbstractTimeUUIDType.java} | 37 +-
.../apache/cassandra/db/marshal/AbstractType.java | 10 +
.../cassandra/db/marshal/ByteArrayAccessor.java | 14 +
.../cassandra/db/marshal/ByteBufferAccessor.java | 14 +
.../marshal/LegacyTimeUUIDType.java} | 15 +-
.../org/apache/cassandra/db/marshal/ListType.java | 3 +-
.../apache/cassandra/db/marshal/TimeUUIDType.java | 135 +--
.../org/apache/cassandra/db/marshal/TupleType.java | 14 +-
.../apache/cassandra/db/marshal/ValueAccessor.java | 8 +
.../db/partitions/AbstractBTreePartition.java | 44 +-
.../cassandra/db/partitions/PartitionUpdate.java | 49 +-
.../db/repair/CassandraKeyspaceRepairManager.java | 3 +-
.../db/repair/CassandraTableRepairManager.java | 6 +-
.../db/repair/CassandraValidationIterator.java | 11 +-
.../cassandra/db/repair/PendingAntiCompaction.java | 26 +-
.../org/apache/cassandra/db/rows/AbstractCell.java | 5 +
.../org/apache/cassandra/db/rows/BTreeRow.java | 12 +
.../org/apache/cassandra/db/rows/BufferCell.java | 9 -
src/java/org/apache/cassandra/db/rows/Cell.java | 4 +
.../org/apache/cassandra/db/rows/CellPath.java | 2 +
.../org/apache/cassandra/db/rows/ColumnData.java | 3 +
.../cassandra/db/rows/ComplexColumnData.java | 13 +-
.../org/apache/cassandra/db/rows/NativeCell.java | 1 -
src/java/org/apache/cassandra/db/rows/Row.java | 8 +-
.../db/rows/UnfilteredRowIteratorSerializer.java | 2 +-
.../db/streaming/CassandraOutgoingFile.java | 4 +-
.../db/streaming/CassandraStreamManager.java | 4 +-
.../db/streaming/CassandraStreamReader.java | 6 +-
.../apache/cassandra/db/view/ViewBuilderTask.java | 8 +-
.../org/apache/cassandra/db/view/ViewUtils.java | 1 -
.../cassandra/db/virtual/SSTableTasksTable.java | 4 +-
.../apache/cassandra/db/virtual/SimpleDataSet.java | 5 +-
.../db/virtual/StreamingVirtualTable.java | 6 +-
.../cassandra/db/virtual/VirtualMutation.java | 8 +
.../apache/cassandra/dht/Murmur3Partitioner.java | 11 +-
src/java/org/apache/cassandra/dht/Range.java | 2 +-
.../exceptions/CasWriteTimeoutException.java | 3 +-
.../exceptions/RequestFailureException.java | 2 +-
.../cassandra/exceptions/RequestFailureReason.java | 5 +-
.../org/apache/cassandra/gms/EndpointState.java | 18 +-
.../org/apache/cassandra/gms/GossipDigestAck2.java | 5 -
.../cassandra/gms/GossipDigestAck2VerbHandler.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 15 +-
.../org/apache/cassandra/gms/VersionedValue.java | 8 +
.../cassandra/hadoop/cql3/CqlInputFormat.java | 2 +-
src/java/org/apache/cassandra/index/Index.java | 22 +-
.../cassandra/index/SecondaryIndexManager.java | 59 +-
.../index/internal/CollatedViewIndexBuilder.java | 9 +-
.../cassandra/index/sasi/SASIIndexBuilder.java | 6 +-
.../apache/cassandra/io/FSDiskFullWriteError.java | 6 -
src/java/org/apache/cassandra/io/FSError.java | 21 +-
.../io/FSNoDiskAvailableForWriteError.java | 6 -
src/java/org/apache/cassandra/io/FSReadError.java | 20 +-
src/java/org/apache/cassandra/io/FSWriteError.java | 20 +-
.../cassandra/io/sstable/CQLSSTableWriter.java | 2 +-
.../apache/cassandra/io/sstable/Descriptor.java | 4 +-
.../cassandra/io/sstable/IndexSummaryManager.java | 7 +-
.../io/sstable/IndexSummaryRedistribution.java | 7 +-
.../org/apache/cassandra/io/sstable/SSTable.java | 3 +-
.../cassandra/io/sstable/SSTableTxnWriter.java | 10 +-
.../io/sstable/SimpleSSTableMultiWriter.java | 4 +-
.../io/sstable/format/RangeAwareSSTableWriter.java | 6 +-
.../cassandra/io/sstable/format/SSTableReader.java | 5 +-
.../cassandra/io/sstable/format/SSTableWriter.java | 15 +-
.../cassandra/io/sstable/format/big/BigFormat.java | 4 +-
.../io/sstable/format/big/BigTableWriter.java | 4 +-
.../io/sstable/metadata/IMetadataSerializer.java | 4 +-
.../io/sstable/metadata/MetadataCollector.java | 3 +-
.../io/sstable/metadata/MetadataSerializer.java | 3 +-
.../io/sstable/metadata/StatsMetadata.java | 17 +-
.../io/util/ChecksummedSequentialWriter.java | 2 -
src/java/org/apache/cassandra/io/util/File.java | 183 ++-
.../org/apache/cassandra/io/util/PathUtils.java | 40 +-
.../cassandra/io/util/SequentialWriterOption.java | 1 +
.../locator/AbstractReplicaCollection.java | 133 ++-
.../locator/AbstractReplicationStrategy.java | 18 +-
.../org/apache/cassandra/locator/Endpoints.java | 24 +-
.../cassandra/locator/EndpointsForToken.java | 39 +
.../locator/{InOurDcTester.java => InOurDc.java} | 31 +-
.../cassandra/locator/ReplicaCollection.java | 12 +-
.../apache/cassandra/locator/ReplicaLayout.java | 12 +-
.../org/apache/cassandra/locator/ReplicaPlan.java | 171 +--
.../org/apache/cassandra/locator/ReplicaPlans.java | 36 +-
.../org/apache/cassandra/locator/Replicas.java | 2 +-
.../apache/cassandra/locator/TokenMetadata.java | 2 +-
.../metrics/ClientRequestsMetricsHolder.java | 4 +-
.../DecayingEstimatedHistogramReservoir.java | 51 +-
.../cassandra/metrics/HintedHandoffMetrics.java | 5 +-
.../PaxosMetrics.java} | 19 +-
src/java/org/apache/cassandra/net/Message.java | 39 +-
.../org/apache/cassandra/net/MessagingService.java | 18 +
.../apache/cassandra/net/OutboundMessageQueue.java | 1 -
src/java/org/apache/cassandra/net/ParamType.java | 3 +-
.../org/apache/cassandra/net/RequestCallback.java | 7 +
.../cassandra/net/RequestCallbackWithFailure.java | 24 +-
.../org/apache/cassandra/net/RequestCallbacks.java | 22 +-
src/java/org/apache/cassandra/net/Verb.java | 47 +-
.../cassandra/repair/AbstractRepairTask.java | 8 +-
.../cassandra/repair/IncrementalRepairTask.java | 5 +-
.../cassandra/repair/KeyspaceRepairManager.java | 4 +-
.../org/apache/cassandra/repair/LocalSyncTask.java | 6 +-
.../repair/NoSuchRepairSessionException.java | 4 +-
.../apache/cassandra/repair/NormalRepairTask.java | 6 +-
.../apache/cassandra/repair/PreviewRepairTask.java | 7 +-
.../org/apache/cassandra/repair/RepairJob.java | 75 +-
.../org/apache/cassandra/repair/RepairJobDesc.java | 23 +-
.../cassandra/repair/RepairMessageVerbHandler.java | 5 +-
.../apache/cassandra/repair/RepairRunnable.java | 21 +-
.../org/apache/cassandra/repair/RepairSession.java | 26 +-
.../cassandra/repair/RepairSessionResult.java | 6 +-
.../cassandra/repair/StreamingRepairTask.java | 6 +-
.../cassandra/repair/TableRepairManager.java | 6 +-
.../repair/consistent/ConsistentSession.java | 9 +-
.../repair/consistent/CoordinatorSessions.java | 8 +-
.../cassandra/repair/consistent/LocalSessions.java | 65 +-
.../repair/consistent/admin/CleanupSummary.java | 24 +-
.../repair/consistent/admin/PendingStat.java | 16 +-
.../cassandra/repair/messages/CleanupMessage.java | 13 +-
.../cassandra/repair/messages/FailSession.java | 13 +-
.../cassandra/repair/messages/FinalizeCommit.java | 13 +-
.../cassandra/repair/messages/FinalizePromise.java | 13 +-
.../cassandra/repair/messages/FinalizePropose.java | 13 +-
.../repair/messages/PrepareConsistentRequest.java | 13 +-
.../repair/messages/PrepareConsistentResponse.java | 13 +-
.../cassandra/repair/messages/PrepareMessage.java | 13 +-
.../cassandra/repair/messages/RepairOption.java | 33 +-
.../cassandra/repair/messages/StatusRequest.java | 13 +-
.../cassandra/repair/messages/StatusResponse.java | 13 +-
.../cassandra/schema/MigrationCoordinator.java | 3 +
.../apache/cassandra/schema/SchemaKeyspace.java | 10 +-
.../schema/SystemDistributedKeyspace.java | 15 +-
src/java/org/apache/cassandra/schema/TableId.java | 7 +-
.../DisableSslContextFactory.java} | 33 +-
.../cassandra/serializers/TimeUUIDSerializer.java | 38 -
.../service/AbstractWriteResponseHandler.java | 25 +-
.../cassandra/service/ActiveRepairService.java | 128 +-
.../service/ActiveRepairServiceMBean.java | 2 +
.../cassandra/service/BatchlogResponseHandler.java | 2 +-
.../org/apache/cassandra/service/CASRequest.java | 7 +-
.../apache/cassandra/service/CassandraDaemon.java | 13 +
.../org/apache/cassandra/service/ClientState.java | 19 +-
.../DatacenterSyncWriteResponseHandler.java | 7 +-
.../service/DatacenterWriteResponseHandler.java | 11 +-
.../service/FailureRecordingCallback.java | 153 +++
.../service/PendingRangeCalculatorService.java | 6 +
.../org/apache/cassandra/service/StorageProxy.java | 193 +--
.../cassandra/service/StorageProxyMBean.java | 6 +
.../apache/cassandra/service/StorageService.java | 326 ++++-
.../cassandra/service/StorageServiceMBean.java | 42 +
.../cassandra/service/WriteResponseHandler.java | 11 +-
.../service/paxos/AbstractPaxosRepair.java | 290 +++++
.../org/apache/cassandra/service/paxos/Ballot.java | 151 +++
.../cassandra/service/paxos/BallotGenerator.java | 44 +-
.../org/apache/cassandra/service/paxos/Commit.java | 400 ++++++-
.../cassandra/service/paxos/CommitVerbHandler.java | 39 -
.../service/paxos/ContentionStrategy.java | 651 ++++++++++
.../org/apache/cassandra/service/paxos/Paxos.java | 1195 ++++++++++++++++++-
.../org/apache/cassandra/service/paxos/Paxos.md | 345 ++++++
.../cassandra/service/paxos/PaxosCommit.java | 325 +++++
.../service/paxos/PaxosCommitAndPrepare.java | 145 +++
.../paxos/PaxosOperationLock.java} | 12 +-
.../cassandra/service/paxos/PaxosPrepare.java | 1253 ++++++++++++++++++++
.../service/paxos/PaxosPrepareRefresh.java | 245 ++++
.../cassandra/service/paxos/PaxosPropose.java | 479 ++++++++
.../cassandra/service/paxos/PaxosRepair.java | 706 +++++++++++
.../service/paxos/PaxosRepairHistory.java | 480 ++++++++
.../service/paxos/PaxosRequestCallback.java | 76 ++
.../apache/cassandra/service/paxos/PaxosState.java | 813 +++++++++++--
.../service/paxos/TablePaxosRepairHistory.java | 80 ++
.../service/paxos/cleanup/PaxosCleanup.java | 156 +++
.../paxos/cleanup/PaxosCleanupComplete.java | 144 +++
.../paxos/cleanup/PaxosCleanupException.java | 9 +-
.../service/paxos/cleanup/PaxosCleanupHistory.java | 68 ++
.../cleanup/PaxosCleanupLocalCoordinator.java | 189 +++
.../service/paxos/cleanup/PaxosCleanupRequest.java | 142 +++
.../paxos/cleanup/PaxosCleanupResponse.java | 87 ++
.../service/paxos/cleanup/PaxosCleanupSession.java | 267 +++++
.../paxos/cleanup/PaxosFinishPrepareCleanup.java | 169 +++
.../paxos/cleanup/PaxosStartPrepareCleanup.java | 192 +++
.../service/paxos/cleanup/PaxosTableRepairs.java | 235 ++++
.../paxos/uncommitted/PaxosBallotTracker.java | 207 ++++
.../service/paxos/uncommitted/PaxosKeyState.java | 168 +++
.../service/paxos/uncommitted/PaxosRows.java | 359 ++++++
.../paxos/uncommitted/PaxosStateTracker.java | 322 +++++
.../paxos/uncommitted/PaxosUncommittedIndex.java | 264 +++++
.../paxos/uncommitted/PaxosUncommittedTracker.java | 376 ++++++
.../paxos/uncommitted/UncommittedDataFile.java | 384 ++++++
.../paxos/uncommitted/UncommittedPaxosKey.java} | 15 +-
.../paxos/uncommitted/UncommittedTableData.java | 617 ++++++++++
.../paxos/{ => v1}/AbstractPaxosCallback.java | 23 +-
.../service/paxos/{ => v1}/PrepareCallback.java | 51 +-
.../service/paxos/{ => v1}/PrepareVerbHandler.java | 27 +-
.../service/paxos/{ => v1}/ProposeCallback.java | 22 +-
.../service/paxos/{ => v1}/ProposeVerbHandler.java | 29 +-
.../service/reads/AbstractReadExecutor.java | 6 +-
.../cassandra/service/reads/DataResolver.java | 30 +-
.../cassandra/service/reads/DigestResolver.java | 2 +-
.../cassandra/service/reads/ReadCallback.java | 4 +-
.../cassandra/service/reads/ResponseResolver.java | 11 +-
.../reads/ShortReadPartitionsProtection.java | 2 +-
.../service/reads/repair/AbstractReadRepair.java | 5 +-
.../reads/repair/BlockingPartitionRepair.java | 14 +-
.../service/reads/repair/BlockingReadRepair.java | 4 +-
.../service/reads/repair/NoopReadRepair.java | 4 +-
.../repair/PartitionIteratorMergeListener.java | 4 +-
.../service/reads/repair/ReadOnlyReadRepair.java | 4 +-
.../cassandra/service/reads/repair/ReadRepair.java | 8 +-
.../reads/repair/ReadRepairDiagnostics.java | 8 +-
.../service/reads/repair/ReadRepairStrategy.java | 4 +-
.../reads/repair/RowIteratorMergeListener.java | 6 +-
.../apache/cassandra/streaming/OutgoingStream.java | 4 +-
.../apache/cassandra/streaming/PreviewKind.java | 5 +-
.../cassandra/streaming/StreamCoordinator.java | 7 +-
.../apache/cassandra/streaming/StreamEvent.java | 10 +-
.../apache/cassandra/streaming/StreamManager.java | 19 +-
.../org/apache/cassandra/streaming/StreamPlan.java | 9 +-
.../cassandra/streaming/StreamResultFuture.java | 16 +-
.../apache/cassandra/streaming/StreamSession.java | 11 +-
.../apache/cassandra/streaming/StreamState.java | 7 +-
.../cassandra/streaming/StreamTransferTask.java | 6 +-
.../apache/cassandra/streaming/StreamingState.java | 12 +-
.../cassandra/streaming/TableStreamManager.java | 4 +-
.../async/StreamCompressionSerializer.java | 1 -
.../management/ProgressInfoCompositeData.java | 4 +-
.../management/SessionInfoCompositeData.java | 3 +-
.../management/StreamStateCompositeData.java | 3 +-
.../streaming/messages/StreamInitMessage.java | 28 +-
.../streaming/messages/StreamMessageHeader.java | 24 +-
.../apache/cassandra/tools/nodetool/Repair.java | 8 +
.../apache/cassandra/tracing/TraceKeyspace.java | 4 +-
.../org/apache/cassandra/tracing/TraceState.java | 9 +-
.../apache/cassandra/tracing/TraceStateImpl.java | 6 +-
src/java/org/apache/cassandra/tracing/Tracing.java | 31 +-
.../org/apache/cassandra/tracing/TracingImpl.java | 4 +-
.../org/apache/cassandra/transport/CBUtil.java | 14 +
.../org/apache/cassandra/transport/Message.java | 21 +-
.../apache/cassandra/utils/BiLongAccumulator.java | 2 +-
.../apache/cassandra/utils/CassandraVersion.java | 26 +-
.../apache/cassandra/utils/CloseableIterator.java | 45 +
.../cassandra/utils/CollectionSerializer.java | 125 ++
src/java/org/apache/cassandra/utils/CounterId.java | 4 +-
.../apache/cassandra/utils/EstimatedHistogram.java | 9 +-
.../org/apache/cassandra/utils/MonotonicClock.java | 4 +-
src/java/org/apache/cassandra/utils/Nemesis.java | 2 +-
.../apache/cassandra/utils/NullableSerializer.java | 70 ++
src/java/org/apache/cassandra/utils/TimeUUID.java | 574 +++++++++
src/java/org/apache/cassandra/utils/UUIDGen.java | 451 +------
...{BiLongAccumulator.java => VoidSerializer.java} | 14 +-
.../cassandra/utils/binlog/ExternalArchiver.java | 2 +-
.../cassandra/utils/concurrent/AbstractFuture.java | 1 -
.../concurrent/ConditionAsConsumer.java} | 17 +-
.../cassandra/utils/concurrent/IntrusiveStack.java | 58 +-
.../org/apache/cassandra/utils/concurrent/Ref.java | 3 +-
.../cassandra/utils/concurrent/SyncFuture.java | 2 +-
.../cassandra/utils/concurrent/SyncPromise.java | 269 +++++
.../apache/cassandra/utils/memory/BufferPool.java | 3 +-
.../cassandra/utils/memory/LongBufferPoolTest.java | 1 +
test/conf/cassandra.yaml | 2 +-
test/conf/logback-simulator.xml | 4 +
test/data/serialization/4.1/gms.EndpointState.bin | Bin 0 -> 73 bytes
test/data/serialization/4.1/gms.Gossip.bin | Bin 0 -> 166 bytes
.../serialization/4.1/service.SyncComplete.bin | Bin 0 -> 256 bytes
.../data/serialization/4.1/service.SyncRequest.bin | Bin 0 -> 111 bytes
.../4.1/service.ValidationComplete.bin | Bin 0 -> 597 bytes
.../4.1/service.ValidationRequest.bin | Bin 0 -> 74 bytes
.../{4.0 => 4.1}/utils.EstimatedHistogram.bin | Bin
.../distributed/api/ConsistencyLevel.java} | 26 +-
.../distributed/api/IClassTransformer.java | 21 +-
.../cassandra/distributed/api/ICoordinator.java | 72 ++
.../apache/cassandra/distributed/api/IMessage.java | 46 +-
.../cassandra/distributed/api/QueryResult.java | 86 ++
.../cassandra/distributed/api/QueryResults.java | 224 ++++
.../org/apache/cassandra/distributed/api/Row.java | 219 ++++
.../distributed/api/SimpleQueryResult.java | 163 +++
.../distributed/impl/AbstractCluster.java | 38 +-
.../cassandra/distributed/impl/Coordinator.java | 41 +-
.../impl/DelegatingInvokableInstance.java | 2 +-
.../impl/DirectStreamingConnectionFactory.java | 38 +-
.../cassandra/distributed/impl/Instance.java | 60 +-
.../distributed/impl/IsolatedExecutor.java | 85 +-
.../cassandra/distributed/impl/MessageFilters.java | 207 ++++
.../cassandra/distributed/impl/MessageImpl.java | 10 +-
.../distributed/impl/ShutdownExecutor.java} | 22 +-
.../cassandra/distributed/impl/TracingUtil.java | 6 +-
.../distributed/impl/UnsafeGossipHelper.java | 24 +-
.../distributed/test/CASCommonTestCases.java | 204 ++++
.../distributed/test/CASContentionTest.java | 110 ++
.../cassandra/distributed/test/CASMultiDCTest.java | 150 +++
.../apache/cassandra/distributed/test/CASTest.java | 891 +++++++-------
.../cassandra/distributed/test/CASTestBase.java | 221 ++++
.../distributed/test/CasCriticalSectionTest.java | 218 ++++
.../distributed/test/IncRepairAdminTest.java | 12 +-
.../cassandra/distributed/test/LegacyCASTest.java | 118 ++
.../distributed/test/MessageForwardingTest.java | 11 +-
.../cassandra/distributed/test/MoveTest.java | 90 ++
.../distributed/test/PaxosRepairTest.java | 620 ++++++++++
.../distributed/test/PaxosRepairTest2.java | 612 ++++++++++
.../test/PaxosUncommittedIndexTest.java | 54 +
.../test/ReadDigestConsistencyTest.java | 3 +-
.../cassandra/distributed/test/ReadRepairTest.java | 2 +-
.../distributed/test/SecondaryIndexTest.java | 3 +-
.../io/sstable/format/ForwardingSSTableReader.java | 4 +-
.../cassandra/test/microbench/MessageOutBench.java | 8 +-
.../test/microbench/TimedMonitorBench.java | 198 ++++
.../microbench/ZeroCopyStreamingBenchmark.java | 5 +-
.../cassandra/simulator/asm/ClassTransformer.java | 81 +-
.../org/apache/cassandra/simulator/asm/Flag.java | 2 +-
.../simulator/asm/GlobalMethodTransformer.java | 8 +
.../cassandra/simulator/asm/InterceptAgent.java | 15 +-
.../cassandra/simulator/asm/InterceptClasses.java | 216 +++-
.../cassandra/simulator/asm/MethodLogger.java | 10 +-
.../simulator/asm/ShadowingTransformer.java | 2 +-
.../asm/ThreadLocalRandomCheckTransformer.java | 56 +
.../org/apache/cassandra/simulator/asm/Utils.java | 25 +
.../systems/InterceptorOfSystemMethods.java | 46 +-
.../org/apache/cassandra/simulator/Action.java | 158 ++-
.../org/apache/cassandra/simulator/ActionList.java | 6 +
.../org/apache/cassandra/simulator/ActionPlan.java | 13 +-
.../apache/cassandra/simulator/ActionSchedule.java | 86 +-
.../cassandra/simulator/ClusterSimulation.java | 136 ++-
.../main/org/apache/cassandra/simulator/Debug.java | 3 +-
.../cassandra/simulator/FutureActionScheduler.java | 4 +-
.../org/apache/cassandra/simulator/OrderOns.java | 5 +
.../org/apache/cassandra/simulator/Ordered.java | 7 +-
.../simulator/RunnableActionScheduler.java | 2 +-
.../cassandra/simulator/SimulationRunner.java | 54 +-
.../simulator/asm/InterceptAsClassTransformer.java | 49 +
.../simulator/cluster/ClusterActions.java | 14 +-
.../simulator/cluster/KeyspaceActions.java | 10 +-
.../simulator/cluster/OnClusterChangeTopology.java | 3 +-
.../cassandra/simulator/cluster/OnClusterJoin.java | 1 +
.../simulator/cluster/OnClusterLeave.java | 4 +-
.../simulator/cluster/OnClusterReplace.java | 1 +
.../simulator/cluster/OnInstanceRepair.java | 2 +-
.../OnInstanceTopologyChangePaxosRepair.java | 71 ++
.../cassandra/simulator/debug/Reconcile.java | 134 ++-
.../apache/cassandra/simulator/debug/Record.java | 121 +-
.../cassandra/simulator/debug/SelfReconcile.java | 76 +-
.../apache/cassandra/simulator/package-info.java | 1 +
.../apache/cassandra/simulator/paxos/Ballots.java | 67 +-
.../paxos/PairOfSequencesPaxosSimulation.java | 20 +-
.../simulator/paxos/PaxosClusterSimulation.java | 7 +-
.../simulator/paxos/PaxosRepairValidator.java | 5 +-
.../cassandra/simulator/paxos/PaxosSimulation.java | 78 +-
.../simulator/paxos/PaxosSimulationRunner.java | 9 +-
.../paxos/PaxosTopologyChangeVerifier.java | 9 +-
.../simulator/systems/InterceptedExecution.java | 3 +-
.../simulator/systems/InterceptedWait.java | 127 +-
.../simulator/systems/InterceptibleThread.java | 110 +-
.../simulator/systems/InterceptingAwaitable.java | 45 +-
.../simulator/systems/InterceptingExecutor.java | 326 ++++-
.../systems/InterceptingExecutorFactory.java | 35 +-
.../systems/InterceptingGlobalMethods.java | 157 ++-
.../simulator/systems/InterceptingMonitors.java | 273 +++--
.../simulator/systems/InterceptingWaitQueue.java | 15 +-
.../systems/InterceptorOfConsequences.java | 43 +-
.../simulator/systems/InterceptorOfExecution.java | 5 +-
.../systems/InterceptorOfGlobalMethods.java | 96 ++
.../simulator/systems/InterceptorOfWaits.java | 46 -
.../simulator/systems/NonInterceptible.java | 46 +-
.../simulator/systems/SimulatedAction.java | 134 ++-
.../simulator/systems/SimulatedActionCallable.java | 1 -
.../simulator/systems/SimulatedActionTask.java | 27 +-
.../simulator/systems/SimulatedBallots.java | 30 +-
.../simulator/systems/SimulatedExecution.java | 1 +
.../systems/SimulatedFutureActionScheduler.java | 12 +-
.../simulator/systems/SimulatedSystems.java | 10 +-
.../cassandra/simulator/systems/SimulatedTime.java | 267 ++++-
.../simulator/systems/SimulatedWaits.java | 156 ---
.../simulator/test/ShortPaxosSimulationTest.java | 25 +-
.../simulator/test/SimulationTestBase.java | 32 +-
...ulationTest.java => TrivialSimulationTest.java} | 2 +-
.../cassandra/AbstractSerializationsTester.java | 3 +-
test/unit/org/apache/cassandra/Util.java | 1 +
.../cassandra/batchlog/BatchlogManagerTest.java | 16 +-
.../apache/cassandra/batchlog/BatchlogTest.java | 6 +-
.../DebuggableThreadPoolExecutorTest.java | 6 +-
.../config/DatabaseDescriptorRefTest.java | 2 +
.../LoadOldYAMLBackwardCompatibilityTest.java | 2 +-
.../cassandra/config/ParseAndConvertUnitsTest.java | 2 +-
.../apache/cassandra/cql3/CQL3TypeLiteralTest.java | 6 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 6 +-
.../cassandra/cql3/PstmtPersistenceTest.java | 1 -
.../cql3/conditions/ColumnConditionTest.java | 7 +-
.../cassandra/cql3/functions/CastFctsTest.java | 4 +-
.../cassandra/cql3/functions/TimeFctsTest.java | 21 +-
.../cql3/validation/entities/TimeuuidTest.java | 6 +-
.../cql3/validation/entities/UFScriptTest.java | 6 +-
.../cql3/validation/entities/UFTypesTest.java | 5 +-
.../unit/org/apache/cassandra/db/CellSpecTest.java | 5 +-
test/unit/org/apache/cassandra/db/DigestTest.java | 4 +-
.../org/apache/cassandra/db/ReadCommandTest.java | 9 +-
.../cassandra/db/ReadCommandVerbHandlerTest.java | 4 +-
test/unit/org/apache/cassandra/db/ScrubTest.java | 4 +-
.../cassandra/db/SystemKeyspaceMigrator40Test.java | 13 +-
test/unit/org/apache/cassandra/db/VerifyTest.java | 16 +-
.../db/compaction/AbstractPendingRepairTest.java | 6 +-
.../db/compaction/AntiCompactionBytemanTest.java | 4 +-
.../db/compaction/AntiCompactionTest.java | 28 +-
.../db/compaction/CancelCompactionsTest.java | 7 +-
.../db/compaction/CompactionInfoTest.java | 7 +-
...CompactionStrategyManagerPendingRepairTest.java | 24 +-
.../compaction/CompactionStrategyManagerTest.java | 9 +-
.../db/compaction/CompactionTaskTest.java | 12 +-
.../compaction/LeveledCompactionStrategyTest.java | 6 +-
.../db/compaction/PendingRepairManagerTest.java | 33 +-
.../writers/CompactionAwareWriterTest.java | 5 +-
.../cassandra/db/filter/ColumnFilterTest.java | 1 +
.../cassandra/db/marshal/CompositeTypeTest.java | 22 +-
.../db/marshal/DynamicCompositeTypeTest.java | 4 +-
.../cassandra/db/marshal/JsonConversionTest.java | 5 +-
.../apache/cassandra/db/marshal/RoundTripTest.java | 15 +-
.../cassandra/db/marshal/TimeUUIDTypeTest.java | 54 +-
.../cassandra/db/marshal/TypeValidationTest.java | 3 +-
.../apache/cassandra/db/marshal/UUIDTypeTest.java | 19 +-
.../db/partition/PartitionUpdateTest.java | 2 +-
.../repair/AbstractPendingAntiCompactionTest.java | 6 +-
...pactionManagerGetSSTablesForValidationTest.java | 12 +-
.../repair/PendingAntiCompactionBytemanTest.java | 4 +-
.../db/repair/PendingAntiCompactionTest.java | 75 +-
.../CassandraEntireSSTableStreamWriterTest.java | 4 +-
.../db/streaming/CassandraStreamManagerTest.java | 15 +-
...TableStreamConcurrentComponentMutationTest.java | 6 +-
.../db/virtual/SSTableTasksTableTest.java | 5 +-
.../db/virtual/StreamingVirtualTableTest.java | 4 +-
.../org/apache/cassandra/hints/AlteredHints.java | 3 +-
.../apache/cassandra/hints/HintWriteTTLTest.java | 4 +-
.../index/internal/CassandraIndexTest.java | 8 +-
.../io/sstable/IndexSummaryManagerTest.java | 3 +-
.../cassandra/io/sstable/LegacySSTableTest.java | 13 +-
.../cassandra/io/sstable/SSTableRewriterTest.java | 35 +-
.../cassandra/io/sstable/SSTableWriterTest.java | 13 +-
.../io/sstable/SSTableWriterTestBase.java | 4 +-
.../sstable/metadata/MetadataSerializerTest.java | 3 -
.../apache/cassandra/locator/ReplicaPlansTest.java | 4 +-
.../DecayingEstimatedHistogramReservoirTest.java | 50 +-
.../unit/org/apache/cassandra/net/MessageTest.java | 13 +-
.../cassandra/net/WriteCallbackInfoTest.java | 4 +-
.../cassandra/repair/AbstractRepairTest.java | 9 +-
.../apache/cassandra/repair/LocalSyncTaskTest.java | 26 +-
.../org/apache/cassandra/repair/RepairJobTest.java | 103 +-
.../apache/cassandra/repair/RepairSessionTest.java | 9 +-
.../cassandra/repair/StreamingRepairTaskTest.java | 14 +-
.../repair/SymmetricRemoteSyncTaskTest.java | 5 +-
.../cassandra/repair/ValidationTaskTest.java | 5 +-
.../org/apache/cassandra/repair/ValidatorTest.java | 25 +-
.../consistent/AbstractConsistentSessionTest.java | 9 +-
.../consistent/CoordinatorMessagingTest.java | 13 +-
.../repair/consistent/CoordinatorSessionTest.java | 8 +-
.../repair/consistent/CoordinatorSessionsTest.java | 25 +-
.../repair/consistent/LocalSessionAccessor.java | 10 +-
.../repair/consistent/LocalSessionTest.java | 95 +-
.../repair/consistent/PendingRepairStatTest.java | 8 +-
.../messages/RepairMessageSerializationsTest.java | 13 +-
.../messages/RepairMessageSerializerTest.java | 18 +-
.../cassandra/service/ActiveRepairServiceTest.java | 8 +-
.../apache/cassandra/service/PaxosStateTest.java | 177 +++
.../cassandra/service/SerializationsTest.java | 10 +-
.../service/WriteResponseHandlerTest.java | 2 +-
.../service/WriteResponseHandlerTransientTest.java | 12 +-
.../service/paxos/AbstractPaxosRepairTest.java | 174 +++
.../service/paxos/ContentionStrategyTest.java | 430 +++++++
.../cassandra/service/paxos/PaxosProposeTest.java | 97 ++
.../service/paxos/PaxosRepairHistoryTest.java | 531 +++++++++
.../cassandra/service/paxos/PaxosRepairTest.java | 172 +++
.../cassandra/service/paxos/PaxosStateTest.java | 323 +++++
.../paxos/cleanup/PaxosTableRepairsTest.java | 262 ++++
.../paxos/uncommitted/PaxosBallotTrackerTest.java | 258 ++++
.../paxos/uncommitted/PaxosMockUpdateSupplier.java | 113 ++
.../service/paxos/uncommitted/PaxosRowsTest.java | 165 +++
.../paxos/uncommitted/PaxosStateTrackerTest.java | 242 ++++
.../paxos/uncommitted/PaxosUncommittedTests.java | 94 ++
.../PaxosUncommittedTrackerIntegrationTest.java | 141 +++
.../uncommitted/PaxosUncommittedTrackerTest.java | 248 ++++
.../uncommitted/UncommittedTableDataTest.java | 650 ++++++++++
.../reads/repair/AbstractReadRepairTest.java | 10 +-
.../reads/repair/BlockingReadRepairTest.java | 10 +-
.../repair/DiagEventsBlockingReadRepairTest.java | 8 +-
.../reads/repair/InstrumentedReadRepair.java | 4 +-
.../reads/repair/ReadOnlyReadRepairTest.java | 4 +-
.../service/reads/repair/ReadRepairTest.java | 6 +-
.../service/reads/repair/TestableReadRepair.java | 4 +-
...ntireSSTableStreamingCorrectFilesCountTest.java | 4 +-
.../streaming/StreamTransferTaskTest.java | 10 +-
.../cassandra/streaming/StreamingTransferTest.java | 5 +-
.../async/StreamingInboundHandlerTest.java | 16 +-
.../async/StreamingMultiplexedChannelTest.java | 7 +-
.../tools/nodetool/CompactionStatsTest.java | 6 +-
.../org/apache/cassandra/tracing/TracingTest.java | 8 +-
.../cassandra/transport/ErrorMessageTest.java | 6 +-
.../cassandra/utils/CassandraVersionTest.java | 12 +-
.../utils/MergeIteratorComparisonTest.java | 14 +-
.../unit/org/apache/cassandra/utils/UUIDTests.java | 26 +-
.../utils/concurrent/AbstractTestAsyncPromise.java | 56 +-
.../utils/concurrent/AbstractTestAwaitable.java | 40 +-
.../cassandra/utils/concurrent/SemaphoreTest.java | 21 +-
.../stress/generate/PartitionGenerator.java | 6 +-
.../stress/generate/PartitionIterator.java | 9 +-
.../stress/generate/values/Generator.java | 4 +-
.../stress/generate/values/TimeUUIDs.java | 4 +-
577 files changed, 28975 insertions(+), 4537 deletions(-)
copy src/java/org/apache/cassandra/db/marshal/{TimeUUIDType.java => AbstractTimeUUIDType.java} (81%)
copy src/java/org/apache/cassandra/{batchlog/BatchRemoveVerbHandler.java => db/marshal/LegacyTimeUUIDType.java} (64%)
rename src/java/org/apache/cassandra/locator/{InOurDcTester.java => InOurDc.java} (71%)
copy src/java/org/apache/cassandra/{batchlog/BatchRemoveVerbHandler.java => metrics/PaxosMetrics.java} (65%)
copy test/unit/org/apache/cassandra/service/reads/repair/InstrumentedReadRepair.java => src/java/org/apache/cassandra/net/RequestCallbackWithFailure.java (63%)
copy src/java/org/apache/cassandra/{io/FSWriteError.java => security/DisableSslContextFactory.java} (55%)
delete mode 100644 src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java
create mode 100644 src/java/org/apache/cassandra/service/FailureRecordingCallback.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/AbstractPaxosRepair.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/Ballot.java
delete mode 100644 src/java/org/apache/cassandra/service/paxos/CommitVerbHandler.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/ContentionStrategy.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/Paxos.md
create mode 100644 src/java/org/apache/cassandra/service/paxos/PaxosCommit.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/PaxosCommitAndPrepare.java
copy src/java/org/apache/cassandra/{utils/CloseableIterator.java => service/paxos/PaxosOperationLock.java} (80%)
create mode 100644 src/java/org/apache/cassandra/service/paxos/PaxosPrepare.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/PaxosPrepareRefresh.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/PaxosPropose.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/PaxosRepair.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/PaxosRepairHistory.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/PaxosRequestCallback.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/TablePaxosRepairHistory.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanup.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupComplete.java
copy test/simulator/asm/org/apache/cassandra/simulator/asm/Flag.java => src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupException.java (81%)
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupHistory.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupLocalCoordinator.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupRequest.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupResponse.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosCleanupSession.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosFinishPrepareCleanup.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosStartPrepareCleanup.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/cleanup/PaxosTableRepairs.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosBallotTracker.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosKeyState.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosRows.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTracker.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedIndex.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTracker.java
create mode 100644 src/java/org/apache/cassandra/service/paxos/uncommitted/UncommittedDataFile.java
copy src/java/org/apache/cassandra/{repair/NoSuchRepairSessionException.java => service/paxos/uncommitted/UncommittedPaxosKey.java} (71%)
create mode 100644 src/java/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableData.java
rename src/java/org/apache/cassandra/service/paxos/{ => v1}/AbstractPaxosCallback.java (81%)
rename src/java/org/apache/cassandra/service/paxos/{ => v1}/PrepareCallback.java (57%)
rename src/java/org/apache/cassandra/service/paxos/{ => v1}/PrepareVerbHandler.java (60%)
rename src/java/org/apache/cassandra/service/paxos/{ => v1}/ProposeCallback.java (86%)
rename src/java/org/apache/cassandra/service/paxos/{ => v1}/ProposeVerbHandler.java (56%)
create mode 100644 src/java/org/apache/cassandra/utils/CollectionSerializer.java
create mode 100644 src/java/org/apache/cassandra/utils/NullableSerializer.java
create mode 100644 src/java/org/apache/cassandra/utils/TimeUUID.java
copy src/java/org/apache/cassandra/utils/{BiLongAccumulator.java => VoidSerializer.java} (58%)
copy src/java/org/apache/cassandra/{batchlog/BatchRemoveVerbHandler.java => utils/concurrent/ConditionAsConsumer.java} (66%)
create mode 100644 src/java/org/apache/cassandra/utils/concurrent/SyncPromise.java
create mode 100644 test/data/serialization/4.1/gms.EndpointState.bin
create mode 100644 test/data/serialization/4.1/gms.Gossip.bin
create mode 100644 test/data/serialization/4.1/service.SyncComplete.bin
create mode 100644 test/data/serialization/4.1/service.SyncRequest.bin
create mode 100644 test/data/serialization/4.1/service.ValidationComplete.bin
create mode 100644 test/data/serialization/4.1/service.ValidationRequest.bin
copy test/data/serialization/{4.0 => 4.1}/utils.EstimatedHistogram.bin (100%)
copy test/{simulator/main/org/apache/cassandra/simulator/debug/Capture.java => distributed/org/apache/cassandra/distributed/api/ConsistencyLevel.java} (69%)
copy src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java => test/distributed/org/apache/cassandra/distributed/api/IClassTransformer.java (62%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/api/ICoordinator.java
copy src/java/org/apache/cassandra/io/FSReadError.java => test/distributed/org/apache/cassandra/distributed/api/IMessage.java (60%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/api/QueryResult.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/api/QueryResults.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/api/Row.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/api/SimpleQueryResult.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/impl/MessageFilters.java
rename test/{simulator/main/org/apache/cassandra/simulator/debug/Capture.java => distributed/org/apache/cassandra/distributed/impl/ShutdownExecutor.java} (68%)
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/CASCommonTestCases.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/CASContentionTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/CASMultiDCTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/CASTestBase.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/CasCriticalSectionTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/LegacyCASTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/MoveTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/PaxosRepairTest.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/PaxosRepairTest2.java
create mode 100644 test/distributed/org/apache/cassandra/distributed/test/PaxosUncommittedIndexTest.java
create mode 100644 test/microbench/org/apache/cassandra/test/microbench/TimedMonitorBench.java
create mode 100644 test/simulator/asm/org/apache/cassandra/simulator/asm/ThreadLocalRandomCheckTransformer.java
create mode 100644 test/simulator/main/org/apache/cassandra/simulator/asm/InterceptAsClassTransformer.java
create mode 100644 test/simulator/main/org/apache/cassandra/simulator/cluster/OnInstanceTopologyChangePaxosRepair.java
delete mode 100644 test/simulator/main/org/apache/cassandra/simulator/systems/InterceptorOfWaits.java
delete mode 100644 test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedWaits.java
copy src/java/org/apache/cassandra/io/FSNoDiskAvailableForWriteError.java => test/simulator/test/org/apache/cassandra/simulator/test/ShortPaxosSimulationTest.java (56%)
rename test/simulator/test/org/apache/cassandra/simulator/test/{SimulationTest.java => TrivialSimulationTest.java} (98%)
create mode 100644 test/unit/org/apache/cassandra/service/PaxosStateTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/AbstractPaxosRepairTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/ContentionStrategyTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/PaxosProposeTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/PaxosRepairHistoryTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/PaxosRepairTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/PaxosStateTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/cleanup/PaxosTableRepairsTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosBallotTrackerTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosMockUpdateSupplier.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosRowsTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosStateTrackerTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTests.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerIntegrationTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedTrackerTest.java
create mode 100644 test/unit/org/apache/cassandra/service/paxos/uncommitted/UncommittedTableDataTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/03: [CASSANDRA-17176] Introduce TimeUUID
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benedict pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5a0d6154d144b958404a4d7117602d35157848ba
Author: Benedict Elliott Smith <be...@apple.com>
AuthorDate: Tue Nov 30 12:12:32 2021 +0000
[CASSANDRA-17176] Introduce TimeUUID
patch by Benedict; reviewed by Blake Eggleston for CASSANDRA-17176
---
build.xml | 2 +-
.../apache/cassandra/auth/FunctionResource.java | 2 +-
src/java/org/apache/cassandra/batchlog/Batch.java | 16 +-
.../cassandra/batchlog/BatchRemoveVerbHandler.java | 7 +-
.../apache/cassandra/batchlog/BatchlogManager.java | 23 +-
.../apache/cassandra/cache/AutoSavingCache.java | 5 +-
src/java/org/apache/cassandra/cql3/CQL3Type.java | 6 +
src/java/org/apache/cassandra/cql3/Lists.java | 7 +-
src/java/org/apache/cassandra/cql3/Sets.java | 2 +-
.../apache/cassandra/cql3/UntypedResultSet.java | 12 +
.../apache/cassandra/cql3/UpdateParameters.java | 6 +
.../cassandra/cql3/functions/AggregateFcts.java | 28 +-
.../cql3/functions/BytesConversionFcts.java | 16 +-
.../cassandra/cql3/functions/FunctionCall.java | 4 +-
.../cassandra/cql3/functions/FunctionResolver.java | 5 +-
.../apache/cassandra/cql3/functions/TimeFcts.java | 12 +-
.../cassandra/cql3/statements/CQL3CasRequest.java | 3 +
.../cql3/statements/ModificationStatement.java | 4 +-
.../schema/CreateAggregateStatement.java | 4 +-
.../statements/schema/CreateFunctionStatement.java | 6 +-
.../statements/schema/DropAggregateStatement.java | 2 +-
.../statements/schema/DropFunctionStatement.java | 2 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 20 +-
src/java/org/apache/cassandra/db/ReadCommand.java | 3 +-
.../org/apache/cassandra/db/SimpleBuilders.java | 4 +-
.../org/apache/cassandra/db/SystemKeyspace.java | 24 +-
.../cassandra/db/SystemKeyspaceMigrator40.java | 3 +-
.../db/compaction/AbstractCompactionStrategy.java | 3 +-
.../db/compaction/AbstractCompactionTask.java | 4 +-
.../db/compaction/AbstractStrategyHolder.java | 4 +-
.../cassandra/db/compaction/CompactionInfo.java | 12 +-
.../db/compaction/CompactionIterator.java | 7 +-
.../cassandra/db/compaction/CompactionManager.java | 29 +-
.../db/compaction/CompactionStrategyHolder.java | 4 +-
.../db/compaction/CompactionStrategyManager.java | 16 +-
.../cassandra/db/compaction/CompactionTask.java | 8 +-
.../db/compaction/PendingRepairHolder.java | 8 +-
.../db/compaction/PendingRepairManager.java | 86 +--
.../apache/cassandra/db/compaction/Scrubber.java | 6 +-
.../apache/cassandra/db/compaction/Upgrader.java | 5 +-
.../apache/cassandra/db/compaction/Verifier.java | 8 +-
.../compaction/writers/CompactionAwareWriter.java | 4 +-
.../db/lifecycle/LifecycleTransaction.java | 3 +-
.../org/apache/cassandra/db/lifecycle/LogFile.java | 11 +-
.../cassandra/db/lifecycle/LogTransaction.java | 6 +-
...TimeUUIDType.java => AbstractTimeUUIDType.java} | 37 +-
.../apache/cassandra/db/marshal/AbstractType.java | 10 +
.../cassandra/db/marshal/ByteArrayAccessor.java | 7 +
.../cassandra/db/marshal/ByteBufferAccessor.java | 7 +
.../marshal/LegacyTimeUUIDType.java} | 15 +-
.../org/apache/cassandra/db/marshal/ListType.java | 3 +-
.../apache/cassandra/db/marshal/TimeUUIDType.java | 135 +----
.../apache/cassandra/db/marshal/ValueAccessor.java | 4 +
.../db/repair/CassandraKeyspaceRepairManager.java | 3 +-
.../db/repair/CassandraTableRepairManager.java | 6 +-
.../db/repair/CassandraValidationIterator.java | 11 +-
.../cassandra/db/repair/PendingAntiCompaction.java | 26 +-
.../db/streaming/CassandraOutgoingFile.java | 4 +-
.../db/streaming/CassandraStreamManager.java | 4 +-
.../db/streaming/CassandraStreamReader.java | 6 +-
.../apache/cassandra/db/view/ViewBuilderTask.java | 8 +-
.../cassandra/db/virtual/SSTableTasksTable.java | 4 +-
.../apache/cassandra/db/virtual/SimpleDataSet.java | 5 +-
.../index/internal/CollatedViewIndexBuilder.java | 9 +-
.../cassandra/index/sasi/SASIIndexBuilder.java | 6 +-
.../apache/cassandra/io/sstable/Descriptor.java | 4 +-
.../io/sstable/IndexSummaryRedistribution.java | 7 +-
.../org/apache/cassandra/io/sstable/SSTable.java | 3 +-
.../cassandra/io/sstable/SSTableTxnWriter.java | 10 +-
.../io/sstable/SimpleSSTableMultiWriter.java | 4 +-
.../io/sstable/format/RangeAwareSSTableWriter.java | 6 +-
.../cassandra/io/sstable/format/SSTableReader.java | 4 +-
.../cassandra/io/sstable/format/SSTableWriter.java | 15 +-
.../cassandra/io/sstable/format/big/BigFormat.java | 3 +-
.../io/sstable/format/big/BigTableWriter.java | 2 +-
.../io/sstable/metadata/IMetadataSerializer.java | 4 +-
.../io/sstable/metadata/MetadataCollector.java | 3 +-
.../io/sstable/metadata/MetadataSerializer.java | 3 +-
.../io/sstable/metadata/StatsMetadata.java | 16 +-
.../cassandra/metrics/HintedHandoffMetrics.java | 3 +-
src/java/org/apache/cassandra/net/Message.java | 8 +-
src/java/org/apache/cassandra/net/ParamType.java | 3 +-
.../cassandra/repair/AbstractRepairTask.java | 6 +-
.../cassandra/repair/IncrementalRepairTask.java | 5 +-
.../cassandra/repair/KeyspaceRepairManager.java | 4 +-
.../org/apache/cassandra/repair/LocalSyncTask.java | 6 +-
.../repair/NoSuchRepairSessionException.java | 4 +-
.../apache/cassandra/repair/NormalRepairTask.java | 6 +-
.../apache/cassandra/repair/PreviewRepairTask.java | 7 +-
.../org/apache/cassandra/repair/RepairJobDesc.java | 23 +-
.../cassandra/repair/RepairMessageVerbHandler.java | 5 +-
.../apache/cassandra/repair/RepairRunnable.java | 17 +-
.../org/apache/cassandra/repair/RepairSession.java | 11 +-
.../cassandra/repair/RepairSessionResult.java | 6 +-
.../cassandra/repair/StreamingRepairTask.java | 6 +-
.../cassandra/repair/TableRepairManager.java | 6 +-
.../repair/consistent/ConsistentSession.java | 9 +-
.../repair/consistent/CoordinatorSessions.java | 8 +-
.../cassandra/repair/consistent/LocalSessions.java | 66 +--
.../repair/consistent/admin/CleanupSummary.java | 23 +-
.../repair/consistent/admin/PendingStat.java | 16 +-
.../cassandra/repair/messages/CleanupMessage.java | 13 +-
.../cassandra/repair/messages/FailSession.java | 13 +-
.../cassandra/repair/messages/FinalizeCommit.java | 13 +-
.../cassandra/repair/messages/FinalizePromise.java | 13 +-
.../cassandra/repair/messages/FinalizePropose.java | 13 +-
.../repair/messages/PrepareConsistentRequest.java | 13 +-
.../repair/messages/PrepareConsistentResponse.java | 13 +-
.../cassandra/repair/messages/PrepareMessage.java | 12 +-
.../cassandra/repair/messages/StatusRequest.java | 13 +-
.../cassandra/repair/messages/StatusResponse.java | 13 +-
.../apache/cassandra/schema/SchemaKeyspace.java | 10 +-
.../schema/SystemDistributedKeyspace.java | 15 +-
src/java/org/apache/cassandra/schema/TableId.java | 7 +-
.../cassandra/service/ActiveRepairService.java | 34 +-
.../org/apache/cassandra/service/StorageProxy.java | 22 +-
.../cassandra/service/paxos/BallotGenerator.java | 19 +-
.../org/apache/cassandra/service/paxos/Commit.java | 31 +-
.../apache/cassandra/service/paxos/PaxosState.java | 8 +-
.../cassandra/service/paxos/PrepareCallback.java | 5 +-
.../apache/cassandra/streaming/OutgoingStream.java | 4 +-
.../apache/cassandra/streaming/PreviewKind.java | 5 +-
.../cassandra/streaming/StreamCoordinator.java | 7 +-
.../apache/cassandra/streaming/StreamEvent.java | 10 +-
.../apache/cassandra/streaming/StreamManager.java | 17 +-
.../org/apache/cassandra/streaming/StreamPlan.java | 9 +-
.../cassandra/streaming/StreamResultFuture.java | 16 +-
.../apache/cassandra/streaming/StreamSession.java | 11 +-
.../apache/cassandra/streaming/StreamState.java | 7 +-
.../apache/cassandra/streaming/StreamingState.java | 12 +-
.../cassandra/streaming/TableStreamManager.java | 4 +-
.../management/ProgressInfoCompositeData.java | 4 +-
.../management/SessionInfoCompositeData.java | 3 +-
.../management/StreamStateCompositeData.java | 3 +-
.../streaming/messages/StreamInitMessage.java | 28 +-
.../streaming/messages/StreamMessageHeader.java | 24 +-
.../apache/cassandra/tracing/TraceKeyspace.java | 4 +-
.../org/apache/cassandra/tracing/TraceState.java | 9 +-
.../apache/cassandra/tracing/TraceStateImpl.java | 4 +-
src/java/org/apache/cassandra/tracing/Tracing.java | 31 +-
.../org/apache/cassandra/tracing/TracingImpl.java | 4 +-
.../org/apache/cassandra/transport/CBUtil.java | 14 +
.../org/apache/cassandra/transport/Message.java | 21 +-
src/java/org/apache/cassandra/utils/CounterId.java | 4 +-
src/java/org/apache/cassandra/utils/TimeUUID.java | 579 +++++++++++++++++++++
src/java/org/apache/cassandra/utils/UUIDGen.java | 452 +---------------
.../org/apache/cassandra/distributed/api/Row.java | 219 ++++++++
.../cassandra/distributed/impl/Coordinator.java | 3 +-
.../cassandra/distributed/impl/Instance.java | 3 +-
.../cassandra/distributed/impl/TracingUtil.java | 6 +-
.../apache/cassandra/distributed/test/CASTest.java | 21 -
.../distributed/test/IncRepairAdminTest.java | 12 +-
.../distributed/test/MessageForwardingTest.java | 11 +-
.../io/sstable/format/ForwardingSSTableReader.java | 4 +-
.../cassandra/test/microbench/MessageOutBench.java | 4 +-
.../microbench/ZeroCopyStreamingBenchmark.java | 5 +-
.../apache/cassandra/simulator/paxos/Ballots.java | 11 +-
.../simulator/systems/SimulatedBallots.java | 9 +-
.../cassandra/batchlog/BatchlogManagerTest.java | 16 +-
.../apache/cassandra/batchlog/BatchlogTest.java | 6 +-
.../DebuggableThreadPoolExecutorTest.java | 6 +-
.../apache/cassandra/cql3/CQL3TypeLiteralTest.java | 6 +-
test/unit/org/apache/cassandra/cql3/CQLTester.java | 6 +-
.../cql3/conditions/ColumnConditionTest.java | 7 +-
.../cassandra/cql3/functions/CastFctsTest.java | 4 +-
.../cassandra/cql3/functions/TimeFctsTest.java | 21 +-
.../cql3/validation/entities/TimeuuidTest.java | 6 +-
.../cql3/validation/entities/UFScriptTest.java | 6 +-
.../cql3/validation/entities/UFTypesTest.java | 5 +-
.../unit/org/apache/cassandra/db/CellSpecTest.java | 5 +-
test/unit/org/apache/cassandra/db/DigestTest.java | 4 +-
.../org/apache/cassandra/db/ReadCommandTest.java | 9 +-
.../cassandra/db/ReadCommandVerbHandlerTest.java | 4 +-
test/unit/org/apache/cassandra/db/ScrubTest.java | 4 +-
.../cassandra/db/SystemKeyspaceMigrator40Test.java | 13 +-
test/unit/org/apache/cassandra/db/VerifyTest.java | 16 +-
.../db/compaction/AbstractPendingRepairTest.java | 6 +-
.../db/compaction/AntiCompactionBytemanTest.java | 4 +-
.../db/compaction/AntiCompactionTest.java | 28 +-
.../db/compaction/CancelCompactionsTest.java | 7 +-
.../db/compaction/CompactionInfoTest.java | 7 +-
...CompactionStrategyManagerPendingRepairTest.java | 24 +-
.../compaction/CompactionStrategyManagerTest.java | 9 +-
.../db/compaction/CompactionTaskTest.java | 12 +-
.../compaction/LeveledCompactionStrategyTest.java | 6 +-
.../db/compaction/PendingRepairManagerTest.java | 33 +-
.../writers/CompactionAwareWriterTest.java | 5 +-
.../cassandra/db/marshal/CompositeTypeTest.java | 22 +-
.../db/marshal/DynamicCompositeTypeTest.java | 4 +-
.../cassandra/db/marshal/JsonConversionTest.java | 5 +-
.../apache/cassandra/db/marshal/RoundTripTest.java | 15 +-
.../cassandra/db/marshal/TimeUUIDTypeTest.java | 54 +-
.../cassandra/db/marshal/TypeValidationTest.java | 3 +-
.../apache/cassandra/db/marshal/UUIDTypeTest.java | 19 +-
.../repair/AbstractPendingAntiCompactionTest.java | 6 +-
...pactionManagerGetSSTablesForValidationTest.java | 12 +-
.../repair/PendingAntiCompactionBytemanTest.java | 4 +-
.../db/repair/PendingAntiCompactionTest.java | 75 +--
.../CassandraEntireSSTableStreamWriterTest.java | 4 +-
.../db/streaming/CassandraStreamManagerTest.java | 15 +-
...TableStreamConcurrentComponentMutationTest.java | 6 +-
.../db/virtual/SSTableTasksTableTest.java | 5 +-
.../db/virtual/StreamingVirtualTableTest.java | 4 +-
.../org/apache/cassandra/hints/AlteredHints.java | 3 +-
.../apache/cassandra/hints/HintWriteTTLTest.java | 4 +-
.../io/sstable/IndexSummaryManagerTest.java | 3 +-
.../cassandra/io/sstable/LegacySSTableTest.java | 13 +-
.../cassandra/io/sstable/SSTableRewriterTest.java | 35 +-
.../cassandra/io/sstable/SSTableWriterTest.java | 13 +-
.../io/sstable/SSTableWriterTestBase.java | 4 +-
.../unit/org/apache/cassandra/net/MessageTest.java | 13 +-
.../cassandra/net/WriteCallbackInfoTest.java | 3 +-
.../cassandra/repair/AbstractRepairTest.java | 9 +-
.../apache/cassandra/repair/LocalSyncTaskTest.java | 26 +-
.../org/apache/cassandra/repair/RepairJobTest.java | 14 +-
.../apache/cassandra/repair/RepairSessionTest.java | 7 +-
.../cassandra/repair/StreamingRepairTaskTest.java | 14 +-
.../repair/SymmetricRemoteSyncTaskTest.java | 5 +-
.../cassandra/repair/ValidationTaskTest.java | 5 +-
.../org/apache/cassandra/repair/ValidatorTest.java | 25 +-
.../consistent/AbstractConsistentSessionTest.java | 9 +-
.../consistent/CoordinatorMessagingTest.java | 13 +-
.../repair/consistent/CoordinatorSessionTest.java | 8 +-
.../repair/consistent/CoordinatorSessionsTest.java | 25 +-
.../repair/consistent/LocalSessionAccessor.java | 10 +-
.../repair/consistent/LocalSessionTest.java | 95 ++--
.../repair/consistent/PendingRepairStatTest.java | 8 +-
.../messages/RepairMessageSerializationsTest.java | 13 +-
.../messages/RepairMessageSerializerTest.java | 17 +-
.../cassandra/service/ActiveRepairServiceTest.java | 7 +-
.../cassandra/service/SerializationsTest.java | 10 +-
...ntireSSTableStreamingCorrectFilesCountTest.java | 4 +-
.../streaming/StreamTransferTaskTest.java | 10 +-
.../cassandra/streaming/StreamingTransferTest.java | 5 +-
.../async/StreamingInboundHandlerTest.java | 16 +-
.../async/StreamingMultiplexedChannelTest.java | 7 +-
.../tools/nodetool/CompactionStatsTest.java | 6 +-
.../org/apache/cassandra/tracing/TracingTest.java | 8 +-
.../utils/MergeIteratorComparisonTest.java | 14 +-
.../unit/org/apache/cassandra/utils/UUIDTests.java | 26 +-
.../stress/generate/PartitionGenerator.java | 6 +-
.../stress/generate/PartitionIterator.java | 9 +-
.../stress/generate/values/Generator.java | 4 +-
.../stress/generate/values/TimeUUIDs.java | 4 +-
244 files changed, 2252 insertions(+), 1784 deletions(-)
diff --git a/build.xml b/build.xml
index 2cfb124..46e8f62 100644
--- a/build.xml
+++ b/build.xml
@@ -1499,8 +1499,8 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${stress.build.classes}"/>
<pathelement location="${fqltool.build.classes}"/>
- <path refid="cassandra.classpath.test" />
<pathelement location="${test.classes}"/>
+ <path refid="cassandra.classpath.test" />
<pathelement location="${stress.test.classes}"/>
<pathelement location="${fqltool.test.classes}"/>
<pathelement location="${test.conf}"/>
diff --git a/src/java/org/apache/cassandra/auth/FunctionResource.java b/src/java/org/apache/cassandra/auth/FunctionResource.java
index bdec768..4709190 100644
--- a/src/java/org/apache/cassandra/auth/FunctionResource.java
+++ b/src/java/org/apache/cassandra/auth/FunctionResource.java
@@ -158,7 +158,7 @@ public class FunctionResource implements IResource
"explictly qualified by a keyspace");
List<AbstractType<?>> abstractTypes = new ArrayList<>(argTypes.size());
for (CQL3Type.Raw cqlType : argTypes)
- abstractTypes.add(cqlType.prepare(keyspace).getType());
+ abstractTypes.add(cqlType.prepare(keyspace).getType().udfType());
return new FunctionResource(keyspace, name, abstractTypes);
}
diff --git a/src/java/org/apache/cassandra/batchlog/Batch.java b/src/java/org/apache/cassandra/batchlog/Batch.java
index 7b205e0..b5a6288 100644
--- a/src/java/org/apache/cassandra/batchlog/Batch.java
+++ b/src/java/org/apache/cassandra/batchlog/Batch.java
@@ -29,7 +29,7 @@ import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.db.TypeSizes.sizeof;
import static org.apache.cassandra.db.TypeSizes.sizeofUnsignedVInt;
@@ -38,14 +38,14 @@ public final class Batch
{
public static final Serializer serializer = new Serializer();
- public final UUID id;
+ public final TimeUUID id;
public final long creationTime; // time of batch creation (in microseconds)
// one of these will always be empty
final Collection<Mutation> decodedMutations;
final Collection<ByteBuffer> encodedMutations;
- private Batch(UUID id, long creationTime, Collection<Mutation> decodedMutations, Collection<ByteBuffer> encodedMutations)
+ private Batch(TimeUUID id, long creationTime, Collection<Mutation> decodedMutations, Collection<ByteBuffer> encodedMutations)
{
this.id = id;
this.creationTime = creationTime;
@@ -57,7 +57,7 @@ public final class Batch
/**
* Creates a 'local' batch - with all enclosed mutations in decoded form (as Mutation instances)
*/
- public static Batch createLocal(UUID id, long creationTime, Collection<Mutation> mutations)
+ public static Batch createLocal(TimeUUID id, long creationTime, Collection<Mutation> mutations)
{
return new Batch(id, creationTime, mutations, Collections.emptyList());
}
@@ -68,7 +68,7 @@ public final class Batch
* The mutations will always be encoded using the current messaging version.
*/
@SuppressWarnings("RedundantTypeArguments")
- public static Batch createRemote(UUID id, long creationTime, Collection<ByteBuffer> mutations)
+ public static Batch createRemote(TimeUUID id, long creationTime, Collection<ByteBuffer> mutations)
{
return new Batch(id, creationTime, Collections.<Mutation>emptyList(), mutations);
}
@@ -105,7 +105,7 @@ public final class Batch
{
assert batch.isLocal() : "attempted to serialize a 'remote' batch";
- long size = UUIDSerializer.serializer.serializedSize(batch.id, version);
+ long size = TimeUUID.sizeInBytes();
size += sizeof(batch.creationTime);
size += sizeofUnsignedVInt(batch.decodedMutations.size());
@@ -123,7 +123,7 @@ public final class Batch
{
assert batch.isLocal() : "attempted to serialize a 'remote' batch";
- UUIDSerializer.serializer.serialize(batch.id, out, version);
+ batch.id.serialize(out);
out.writeLong(batch.creationTime);
out.writeUnsignedVInt(batch.decodedMutations.size());
@@ -136,7 +136,7 @@ public final class Batch
public Batch deserialize(DataInputPlus in, int version) throws IOException
{
- UUID id = UUIDSerializer.serializer.deserialize(in, version);
+ TimeUUID id = TimeUUID.deserialize(in);
long creationTime = in.readLong();
/*
diff --git a/src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java b/src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java
index 3443cab..89b8aa8 100644
--- a/src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java
@@ -17,16 +17,15 @@
*/
package org.apache.cassandra.batchlog;
-import java.util.UUID;
-
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
+import org.apache.cassandra.utils.TimeUUID;
-public final class BatchRemoveVerbHandler implements IVerbHandler<UUID>
+public final class BatchRemoveVerbHandler implements IVerbHandler<TimeUUID>
{
public static final BatchRemoveVerbHandler instance = new BatchRemoveVerbHandler();
- public void doVerb(Message<UUID> message)
+ public void doVerb(Message<TimeUUID> message)
{
BatchlogManager.remove(message.payload);
}
diff --git a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
index 420d559..34f5326 100644
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
@@ -35,6 +35,8 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.RateLimiter;
import org.apache.cassandra.concurrent.ScheduledExecutorPlus;
+import org.apache.cassandra.db.marshal.TimeUUIDType;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +75,6 @@ import org.apache.cassandra.service.WriteResponseHandler;
import org.apache.cassandra.utils.ExecutorUtils;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MBeanWrapper;
-import org.apache.cassandra.utils.UUIDGen;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
@@ -94,7 +95,7 @@ public class BatchlogManager implements BatchlogManagerMBean
public static final long BATCHLOG_REPLAY_TIMEOUT = Long.getLong("cassandra.batchlog.replay_timeout_in_ms", DatabaseDescriptor.getWriteRpcTimeout(MILLISECONDS) * 2);
private volatile long totalBatchesReplayed = 0; // no concurrency protection necessary as only written by replay thread.
- private volatile UUID lastReplayedUuid = UUIDGen.minTimeUUID(0);
+ private volatile TimeUUID lastReplayedUuid = TimeUUID.minAtUnixMillis(0);
// Single-thread executor service for scheduling and serializing log replay.
private final ScheduledExecutorPlus batchlogTasks;
@@ -121,10 +122,10 @@ public class BatchlogManager implements BatchlogManagerMBean
ExecutorUtils.shutdownAndWait(timeout, unit, batchlogTasks);
}
- public static void remove(UUID id)
+ public static void remove(TimeUUID id)
{
new Mutation(PartitionUpdate.fullPartitionDelete(SystemKeyspace.Batches,
- UUIDType.instance.decompose(id),
+ id.toBytes(),
FBUtilities.timestampMicros(),
FBUtilities.nowInSeconds()))
.apply();
@@ -210,7 +211,7 @@ public class BatchlogManager implements BatchlogManagerMBean
}
setRate(DatabaseDescriptor.getBatchlogReplayThrottleInKiB());
- UUID limitUuid = UUIDGen.maxTimeUUID(currentTimeMillis() - getBatchlogTimeout());
+ TimeUUID limitUuid = TimeUUID.maxAtUnixMillis(currentTimeMillis() - getBatchlogTimeout());
ColumnFamilyStore store = Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(SystemKeyspace.BATCHES);
int pageSize = calculatePageSize(store);
// There cannot be any live content where token(id) <= token(lastReplayedUuid) as every processed batch is
@@ -262,14 +263,14 @@ public class BatchlogManager implements BatchlogManagerMBean
ArrayList<ReplayingBatch> unfinishedBatches = new ArrayList<>(pageSize);
Set<UUID> hintedNodes = new HashSet<>();
- Set<UUID> replayedBatches = new HashSet<>();
+ Set<TimeUUID> replayedBatches = new HashSet<>();
Exception caughtException = null;
int skipped = 0;
// Sending out batches for replay without waiting for them, so that one stuck batch doesn't affect others
for (UntypedResultSet.Row row : batches)
{
- UUID id = row.getUUID("id");
+ TimeUUID id = row.getTimeUUID("id");
int version = row.getInt("version");
try
{
@@ -315,7 +316,7 @@ public class BatchlogManager implements BatchlogManagerMBean
replayedBatches.forEach(BatchlogManager::remove);
}
- private void finishAndClearBatches(ArrayList<ReplayingBatch> batches, Set<UUID> hintedNodes, Set<UUID> replayedBatches)
+ private void finishAndClearBatches(ArrayList<ReplayingBatch> batches, Set<UUID> hintedNodes, Set<TimeUUID> replayedBatches)
{
// schedule hints for timed out deliveries
for (ReplayingBatch batch : batches)
@@ -335,17 +336,17 @@ public class BatchlogManager implements BatchlogManagerMBean
private static class ReplayingBatch
{
- private final UUID id;
+ private final TimeUUID id;
private final long writtenAt;
private final List<Mutation> mutations;
private final int replayedBytes;
private List<ReplayWriteResponseHandler<Mutation>> replayHandlers;
- ReplayingBatch(UUID id, int version, List<ByteBuffer> serializedMutations) throws IOException
+ ReplayingBatch(TimeUUID id, int version, List<ByteBuffer> serializedMutations) throws IOException
{
this.id = id;
- this.writtenAt = UUIDGen.unixTimestamp(id);
+ this.writtenAt = id.unix(MILLISECONDS);
this.mutations = new ArrayList<>(serializedMutations.size());
this.replayedBytes = addMutations(version, serializedMutations);
}
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index 66736d1..f6172ae 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -49,12 +49,11 @@ import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus;
import org.apache.cassandra.service.CacheService;
import org.apache.cassandra.utils.JVMStabilityInspector;
import org.apache.cassandra.utils.Pair;
-import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.utils.concurrent.Future;
import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
-
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K, V>
{
@@ -314,7 +313,7 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K
0,
keysEstimate,
Unit.KEYS,
- UUIDGen.getTimeUUID());
+ nextTimeUUID());
}
public CacheService.CacheType cacheType()
diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java b/src/java/org/apache/cassandra/cql3/CQL3Type.java
index f23ff14..1d792b2 100644
--- a/src/java/org/apache/cassandra/cql3/CQL3Type.java
+++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java
@@ -54,6 +54,7 @@ public interface CQL3Type
}
public AbstractType<?> getType();
+ default public AbstractType<?> getUDFType() { return getType(); }
/**
* Generates CQL literal from a binary value of this type.
@@ -100,6 +101,11 @@ public interface CQL3Type
return type;
}
+ public AbstractType<?> getUDFType()
+ {
+ return this == TIMEUUID ? UUID.type : type;
+ }
+
/**
* Delegate to
* {@link org.apache.cassandra.serializers.TypeSerializer#toCQLLiteral(ByteBuffer)}
diff --git a/src/java/org/apache/cassandra/cql3/Lists.java b/src/java/org/apache/cassandra/cql3/Lists.java
index cc14e76..08de949 100644
--- a/src/java/org/apache/cassandra/cql3/Lists.java
+++ b/src/java/org/apache/cassandra/cql3/Lists.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.cql3;
import static org.apache.cassandra.cql3.Constants.UNSET_VALUE;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
+import static org.apache.cassandra.utils.TimeUUID.Generator.atUnixMillisAsBytes;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -45,7 +46,6 @@ import org.apache.cassandra.serializers.CollectionSerializer;
import org.apache.cassandra.serializers.MarshalException;
import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDGen;
/**
* Static helper methods and classes for lists.
@@ -501,7 +501,7 @@ public abstract class Lists
for (ByteBuffer buffer : ((Value) value).elements)
{
- ByteBuffer uuid = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes());
+ ByteBuffer uuid = ByteBuffer.wrap(params.nextTimeUUIDAsBytes());
params.addCell(column, CellPath.create(uuid), buffer);
}
}
@@ -546,7 +546,8 @@ public abstract class Lists
pt = PrecisionTime.getNext(time, remainingInBatch);
}
- ByteBuffer uuid = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes(pt.millis, (pt.nanos + remainingInBatch--)));
+ // TODO: is this safe as part of LWTs?
+ ByteBuffer uuid = ByteBuffer.wrap(atUnixMillisAsBytes(pt.millis, (pt.nanos + remainingInBatch--)));
params.addCell(column, CellPath.create(uuid), toAdd.get(i));
}
}
diff --git a/src/java/org/apache/cassandra/cql3/Sets.java b/src/java/org/apache/cassandra/cql3/Sets.java
index aab4192..6b53d55 100644
--- a/src/java/org/apache/cassandra/cql3/Sets.java
+++ b/src/java/org/apache/cassandra/cql3/Sets.java
@@ -217,7 +217,7 @@ public abstract class Sets
Set<?> s = type.getSerializer().deserializeForNativeProtocol(value, ByteBufferAccessor.instance, version);
SortedSet<ByteBuffer> elements = new TreeSet<>(type.getElementsType());
for (Object element : s)
- elements.add(type.getElementsType().decompose(element));
+ elements.add(type.getElementsType().decomposeUntyped(element));
return new Value(elements);
}
catch (MarshalException e)
diff --git a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
index a1dba5b..020d27f 100644
--- a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
@@ -38,6 +38,7 @@ import org.apache.cassandra.service.pager.QueryPager;
import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.AbstractIterator;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
@@ -403,6 +404,17 @@ public abstract class UntypedResultSet implements Iterable<UntypedResultSet.Row>
return UUIDType.instance.compose(data.get(column));
}
+ public UUID getUUID(String column, UUID ifNull)
+ {
+ ByteBuffer bytes = data.get(column);
+ return bytes == null ? ifNull : UUIDType.instance.compose(bytes);
+ }
+
+ public TimeUUID getTimeUUID(String column)
+ {
+ return TimeUUID.deserialize(data.get(column));
+ }
+
public Date getTimestamp(String column)
{
return TimestampType.instance.compose(data.get(column));
diff --git a/src/java/org/apache/cassandra/cql3/UpdateParameters.java b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
index cbf9d51..8f3eb37 100644
--- a/src/java/org/apache/cassandra/cql3/UpdateParameters.java
+++ b/src/java/org/apache/cassandra/cql3/UpdateParameters.java
@@ -28,6 +28,7 @@ import org.apache.cassandra.db.partitions.Partition;
import org.apache.cassandra.db.rows.*;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.service.ClientState;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Groups the parameters of an update query, and make building updates easier.
@@ -209,6 +210,11 @@ public class UpdateParameters
return new RangeTombstone(slice, deletionTime);
}
+ public byte[] nextTimeUUIDAsBytes()
+ {
+ return TimeUUID.Generator.nextTimeUUIDAsBytes();
+ }
+
/**
* Returns the prefetched row with the already performed modifications.
* <p>If no modification have yet been performed this method will return the fetched row or {@code null} if
diff --git a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
index 85d3763..5797de4 100644
--- a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
+++ b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java
@@ -23,7 +23,9 @@ import java.math.RoundingMode;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.db.marshal.*;
@@ -64,21 +66,23 @@ public abstract class AggregateFcts
functions.add(avgFunctionForCounter);
// count, max, and min for all standard types
+ Set<AbstractType<?>> types = new HashSet<>();
for (CQL3Type type : CQL3Type.Native.values())
{
- if (type != CQL3Type.Native.VARCHAR) // varchar and text both mapping to UTF8Type
+ AbstractType<?> udfType = type.getType().udfType();
+ if (!types.add(udfType))
+ continue;
+
+ functions.add(AggregateFcts.makeCountFunction(udfType));
+ if (type != CQL3Type.Native.COUNTER)
{
- functions.add(AggregateFcts.makeCountFunction(type.getType()));
- if (type != CQL3Type.Native.COUNTER)
- {
- functions.add(AggregateFcts.makeMaxFunction(type.getType()));
- functions.add(AggregateFcts.makeMinFunction(type.getType()));
- }
- else
- {
- functions.add(AggregateFcts.maxFunctionForCounter);
- functions.add(AggregateFcts.minFunctionForCounter);
- }
+ functions.add(AggregateFcts.makeMaxFunction(udfType));
+ functions.add(AggregateFcts.makeMinFunction(udfType));
+ }
+ else
+ {
+ functions.add(AggregateFcts.maxFunctionForCounter);
+ functions.add(AggregateFcts.minFunctionForCounter);
}
}
diff --git a/src/java/org/apache/cassandra/cql3/functions/BytesConversionFcts.java b/src/java/org/apache/cassandra/cql3/functions/BytesConversionFcts.java
index 33771b7..7e9708a 100644
--- a/src/java/org/apache/cassandra/cql3/functions/BytesConversionFcts.java
+++ b/src/java/org/apache/cassandra/cql3/functions/BytesConversionFcts.java
@@ -20,7 +20,9 @@ package org.apache.cassandra.cql3.functions;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.db.marshal.AbstractType;
@@ -39,13 +41,17 @@ public abstract class BytesConversionFcts
// because text and varchar ends up being synonymous, our automatic makeToBlobFunction doesn't work
// for varchar, so we special case it below. We also skip blob for obvious reasons.
+ Set<AbstractType<?>> types = new HashSet<>();
for (CQL3Type type : CQL3Type.Native.values())
{
- if (type != CQL3Type.Native.VARCHAR && type != CQL3Type.Native.BLOB)
- {
- functions.add(makeToBlobFunction(type.getType()));
- functions.add(makeFromBlobFunction(type.getType()));
- }
+ if (type == CQL3Type.Native.BLOB)
+ continue;
+ AbstractType<?> udfType = type.getType().udfType();
+ if (!types.add(udfType))
+ continue;
+
+ functions.add(makeToBlobFunction(type.getType().udfType()));
+ functions.add(makeFromBlobFunction(type.getType().udfType()));
}
functions.add(VarcharAsBlobFct);
diff --git a/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java b/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java
index 4761d66..4fb1ba3 100644
--- a/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java
+++ b/src/java/org/apache/cassandra/cql3/functions/FunctionCall.java
@@ -208,9 +208,9 @@ public class FunctionCall extends Term.NonTerminal
if (fun != null && fun.name().equals(FromJsonFct.NAME))
return TestResult.WEAKLY_ASSIGNABLE;
- if (fun != null && receiver.type.equals(fun.returnType()))
+ if (fun != null && receiver.type.udfType().equals(fun.returnType()))
return AssignmentTestable.TestResult.EXACT_MATCH;
- else if (fun == null || receiver.type.isValueCompatibleWith(fun.returnType()))
+ else if (fun == null || receiver.type.udfType().isValueCompatibleWith(fun.returnType()))
return AssignmentTestable.TestResult.WEAKLY_ASSIGNABLE;
else
return AssignmentTestable.TestResult.NOT_ASSIGNABLE;
diff --git a/src/java/org/apache/cassandra/cql3/functions/FunctionResolver.java b/src/java/org/apache/cassandra/cql3/functions/FunctionResolver.java
index ae5d17e..ea484ab 100644
--- a/src/java/org/apache/cassandra/cql3/functions/FunctionResolver.java
+++ b/src/java/org/apache/cassandra/cql3/functions/FunctionResolver.java
@@ -131,7 +131,8 @@ public final class FunctionResolver
FunctionName name,
List<? extends AssignmentTestable> providedArgs,
String receiverKs,
- String receiverCf, AbstractType<?> receiverType,
+ String receiverCf,
+ AbstractType<?> receiverType,
Collection<Function> candidates)
{
List<Function> compatibles = null;
@@ -212,7 +213,7 @@ public final class FunctionResolver
*/
private static boolean matchReturnType(Function fun, AbstractType<?> receiverType)
{
- return receiverType == null || fun.returnType().testAssignment(receiverType).isAssignable();
+ return receiverType == null || fun.returnType().testAssignment(receiverType.udfType()).isAssignable();
}
// This method and matchArguments are somewhat duplicate, but this method allows us to provide more precise errors in the common
diff --git a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java
index f029e59..d9c706a 100644
--- a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java
+++ b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java
@@ -28,7 +28,9 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
public abstract class TimeFcts
{
@@ -74,7 +76,7 @@ public abstract class TimeFcts
if (bb == null)
return null;
- return UUIDGen.toByteBuffer(UUIDGen.minTimeUUID(TimestampType.instance.compose(bb).getTime()));
+ return TimeUUID.minAtUnixMillis(TimestampType.instance.compose(bb).getTime()).toBytes();
}
};
@@ -86,7 +88,7 @@ public abstract class TimeFcts
if (bb == null)
return null;
- return UUIDGen.toByteBuffer(UUIDGen.maxTimeUUID(TimestampType.instance.compose(bb).getTime()));
+ return TimeUUID.maxAtUnixMillis(TimestampType.instance.compose(bb).getTime()).toBytes();
}
};
@@ -111,7 +113,7 @@ public abstract class TimeFcts
if (bb == null)
return null;
- long timeInMillis = UUIDGen.unixTimestamp(UUIDGen.getUUID(bb));
+ long timeInMillis = TimeUUID.deserialize(bb).unix(MILLISECONDS);
return ByteBufferUtil.bytes(timeInMillis);
}
};
@@ -137,7 +139,7 @@ public abstract class TimeFcts
if (bb == null)
return null;
- return ByteBufferUtil.bytes(UUIDGen.unixTimestamp(UUIDGen.getUUID(bb)));
+ return ByteBufferUtil.bytes(TimeUUID.deserialize(bb).unix(MILLISECONDS));
}
};
diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
index cc02650..2a87592 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
@@ -22,6 +22,7 @@ import java.util.*;
import com.google.common.collect.*;
+import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.index.IndexRegistry;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.cql3.*;
@@ -36,6 +37,8 @@ import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.service.CASRequest;
import org.apache.cassandra.service.ClientState;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.TimeUUID;
+
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index e5b99a9..42b4d45 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -51,12 +51,14 @@ import org.apache.cassandra.exceptions.*;
import org.apache.cassandra.service.ClientState;
import org.apache.cassandra.service.QueryState;
import org.apache.cassandra.service.StorageProxy;
+import org.apache.cassandra.service.paxos.BallotGenerator;
import org.apache.cassandra.service.paxos.Commit;
import org.apache.cassandra.transport.messages.ResultMessage;
import org.apache.cassandra.triggers.TriggerExecutor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MD5Digest;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.UUIDGen;
import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse;
@@ -658,7 +660,7 @@ public abstract class ModificationStatement implements CQLStatement.SingleKeyspa
static RowIterator casInternal(ClientState state, CQL3CasRequest request, long timestamp, int nowInSeconds)
{
- UUID ballot = UUIDGen.getTimeUUIDFromMicros(timestamp);
+ TimeUUID ballot = BallotGenerator.Global.randomBallot(timestamp, false);
SinglePartitionReadQuery readCommand = request.readCommand(nowInSeconds);
FilteredPartition current;
diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateAggregateStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateAggregateStatement.java
index cc9a96b..48eb63a 100644
--- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateAggregateStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateAggregateStatement.java
@@ -109,9 +109,9 @@ public final class CreateAggregateStatement extends AlterSchemaStatement
List<AbstractType<?>> argumentTypes =
rawArgumentTypes.stream()
- .map(t -> t.prepare(keyspaceName, keyspace.types).getType())
+ .map(t -> t.prepare(keyspaceName, keyspace.types).getType().udfType())
.collect(toList());
- AbstractType<?> stateType = rawStateType.prepare(keyspaceName, keyspace.types).getType();
+ AbstractType<?> stateType = rawStateType.prepare(keyspaceName, keyspace.types).getType().udfType();
List<AbstractType<?>> stateFunctionArguments = Lists.newArrayList(concat(singleton(stateType), argumentTypes));
Function stateFunction =
diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/CreateFunctionStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/CreateFunctionStatement.java
index 9c2bba9..bf297aa 100644
--- a/src/java/org/apache/cassandra/cql3/statements/schema/CreateFunctionStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/schema/CreateFunctionStatement.java
@@ -106,9 +106,9 @@ public final class CreateFunctionStatement extends AlterSchemaStatement
List<AbstractType<?>> argumentTypes =
rawArgumentTypes.stream()
- .map(t -> t.prepare(keyspaceName, keyspace.types).getType())
+ .map(t -> t.prepare(keyspaceName, keyspace.types).getType().udfType())
.collect(toList());
- AbstractType<?> returnType = rawReturnType.prepare(keyspaceName, keyspace.types).getType();
+ AbstractType<?> returnType = rawReturnType.prepare(keyspaceName, keyspace.types).getType().udfType();
UDFunction function =
UDFunction.create(new FunctionName(keyspaceName, functionName),
@@ -171,7 +171,7 @@ public final class CreateFunctionStatement extends AlterSchemaStatement
{
FunctionName name = new FunctionName(keyspaceName, functionName);
- if (Schema.instance.findFunction(name, Lists.transform(rawArgumentTypes, t -> t.prepare(keyspaceName).getType())).isPresent() && orReplace)
+ if (Schema.instance.findFunction(name, Lists.transform(rawArgumentTypes, t -> t.prepare(keyspaceName).getType().udfType())).isPresent() && orReplace)
client.ensurePermission(Permission.ALTER, FunctionResource.functionFromCql(keyspaceName, functionName, rawArgumentTypes));
else
client.ensurePermission(Permission.CREATE, FunctionResource.keyspace(keyspaceName));
diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropAggregateStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropAggregateStatement.java
index 7302158..0cb1cbe 100644
--- a/src/java/org/apache/cassandra/cql3/statements/schema/DropAggregateStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropAggregateStatement.java
@@ -148,7 +148,7 @@ public final class DropAggregateStatement extends AlterSchemaStatement
{
return arguments.stream()
.map(t -> t.prepare(keyspaceName, types))
- .map(CQL3Type::getType)
+ .map(t -> t.getType().udfType())
.collect(toList());
}
diff --git a/src/java/org/apache/cassandra/cql3/statements/schema/DropFunctionStatement.java b/src/java/org/apache/cassandra/cql3/statements/schema/DropFunctionStatement.java
index 99bfd64..d9d637d 100644
--- a/src/java/org/apache/cassandra/cql3/statements/schema/DropFunctionStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/schema/DropFunctionStatement.java
@@ -156,7 +156,7 @@ public final class DropFunctionStatement extends AlterSchemaStatement
{
return arguments.stream()
.map(t -> t.prepare(keyspaceName, types))
- .map(CQL3Type::getType)
+ .map(t -> t.getType().udfType())
.collect(toList());
}
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index cc0c294..9e2338a 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -44,6 +44,8 @@ import com.google.common.base.Throwables;
import com.google.common.collect.*;
import com.google.common.util.concurrent.*;
+import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.AsyncPromise;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
import org.apache.cassandra.io.util.File;
@@ -523,13 +525,13 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
return dataPaths;
}
- public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor, long keyCount, long repairedAt, UUID pendingRepair, boolean isTransient, int sstableLevel, SerializationHeader header, LifecycleNewTracker lifecycleNewTracker)
+ public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor, long keyCount, long repairedAt, TimeUUID pendingRepair, boolean isTransient, int sstableLevel, SerializationHeader header, LifecycleNewTracker lifecycleNewTracker)
{
MetadataCollector collector = new MetadataCollector(metadata().comparator).sstableLevel(sstableLevel);
return createSSTableMultiWriter(descriptor, keyCount, repairedAt, pendingRepair, isTransient, collector, header, lifecycleNewTracker);
}
- public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor, long keyCount, long repairedAt, UUID pendingRepair, boolean isTransient, MetadataCollector metadataCollector, SerializationHeader header, LifecycleNewTracker lifecycleNewTracker)
+ public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor, long keyCount, long repairedAt, TimeUUID pendingRepair, boolean isTransient, MetadataCollector metadataCollector, SerializationHeader header, LifecycleNewTracker lifecycleNewTracker)
{
return getCompactionStrategyManager().createSSTableMultiWriter(descriptor, keyCount, repairedAt, pendingRepair, isTransient, metadataCollector, header, indexManager.listIndexes(), lifecycleNewTracker);
}
@@ -1654,12 +1656,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
return data.getUncompacting();
}
- public Map<UUID, PendingStat> getPendingRepairStats()
+ public Map<TimeUUID, PendingStat> getPendingRepairStats()
{
- Map<UUID, PendingStat.Builder> builders = new HashMap<>();
+ Map<TimeUUID, PendingStat.Builder> builders = new HashMap<>();
for (SSTableReader sstable : getLiveSSTables())
{
- UUID session = sstable.getPendingRepair();
+ TimeUUID session = sstable.getPendingRepair();
if (session == null)
continue;
@@ -1669,8 +1671,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
builders.get(session).addSSTable(sstable);
}
- Map<UUID, PendingStat> stats = new HashMap<>();
- for (Map.Entry<UUID, PendingStat.Builder> entry : builders.entrySet())
+ Map<TimeUUID, PendingStat> stats = new HashMap<>();
+ for (Map.Entry<TimeUUID, PendingStat.Builder> entry : builders.entrySet())
{
stats.put(entry.getKey(), entry.getValue().build());
}
@@ -1683,12 +1685,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
*
* @return session ids whose data could not be released
*/
- public CleanupSummary releaseRepairData(Collection<UUID> sessions, boolean force)
+ public CleanupSummary releaseRepairData(Collection<TimeUUID> sessions, boolean force)
{
if (force)
{
Predicate<SSTableReader> predicate = sst -> {
- UUID session = sst.getPendingRepair();
+ TimeUUID session = sst.getPendingRepair();
return session != null && sessions.contains(session);
};
return runWithCompactionsDisabled(() -> compactionStrategyManager.releaseRepairData(sessions),
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 3bf0d6d..2ea90ee 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -68,6 +68,7 @@ import org.apache.cassandra.service.ClientWarn;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.ObjectSizes;
+import org.apache.cassandra.utils.TimeUUID;
import static com.google.common.collect.Iterables.any;
import static com.google.common.collect.Iterables.filter;
@@ -924,7 +925,7 @@ public abstract class ReadCommand extends AbstractReadQuery
if (!isTrackingRepairedStatus)
return false;
- UUID pendingRepair = sstable.getPendingRepair();
+ TimeUUID pendingRepair = sstable.getPendingRepair();
if (pendingRepair != ActiveRepairService.NO_PENDING_REPAIR)
{
if (ActiveRepairService.instance.consistent.local.isSessionFinalized(pendingRepair))
diff --git a/src/java/org/apache/cassandra/db/SimpleBuilders.java b/src/java/org/apache/cassandra/db/SimpleBuilders.java
index 6f609ec..c63703a 100644
--- a/src/java/org/apache/cassandra/db/SimpleBuilders.java
+++ b/src/java/org/apache/cassandra/db/SimpleBuilders.java
@@ -38,6 +38,8 @@ import org.apache.cassandra.utils.CounterId;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.UUIDGen;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUIDAsBytes;
+
public abstract class SimpleBuilders
{
private SimpleBuilders()
@@ -391,7 +393,7 @@ public abstract class SimpleBuilders
ListType lt = (ListType)column.type;
assert value instanceof List;
for (Object elt : (List)value)
- builder.addCell(cell(column, toByteBuffer(elt, lt.getElementsType()), CellPath.create(ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes()))));
+ builder.addCell(cell(column, toByteBuffer(elt, lt.getElementsType()), CellPath.create(ByteBuffer.wrap(nextTimeUUIDAsBytes()))));
break;
case SET:
SetType st = (SetType)column.type;
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index e68a788..69ed5e2 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -76,6 +76,8 @@ import static org.apache.cassandra.cql3.QueryProcessor.executeOnceInternal;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
import static org.apache.cassandra.utils.FBUtilities.now;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeAsUUID;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public final class SystemKeyspace
{
@@ -224,7 +226,7 @@ public final class SystemKeyspace
"CREATE TABLE %s ("
+ "peer inet,"
+ "peer_port int,"
- + "hints_dropped map<uuid, int>,"
+ + "hints_dropped map<timeuuid, int>,"
+ "PRIMARY KEY ((peer), peer_port))")
.build();
@@ -232,7 +234,7 @@ public final class SystemKeyspace
parse(COMPACTION_HISTORY,
"week-long compaction history",
"CREATE TABLE %s ("
- + "id uuid,"
+ + "id timeuuid,"
+ "bytes_in bigint,"
+ "bytes_out bigint,"
+ "columnfamily_name text,"
@@ -378,7 +380,7 @@ public final class SystemKeyspace
"events related to peers",
"CREATE TABLE %s ("
+ "peer inet,"
- + "hints_dropped map<uuid, int>,"
+ + "hints_dropped map<timeuuid, int>,"
+ "PRIMARY KEY ((peer)))")
.build();
@@ -517,7 +519,7 @@ public final class SystemKeyspace
return;
String req = "INSERT INTO system.%s (id, keyspace_name, columnfamily_name, compacted_at, bytes_in, bytes_out, rows_merged) VALUES (?, ?, ?, ?, ?, ?, ?)";
executeInternal(format(req, COMPACTION_HISTORY),
- UUIDGen.getTimeUUID(),
+ nextTimeUUID(),
ksname,
cfname,
ByteBufferUtil.bytes(compactedAt),
@@ -763,7 +765,7 @@ public final class SystemKeyspace
}
- public static synchronized void updateHintsDropped(InetAddressAndPort ep, UUID timePeriod, int value)
+ public static synchronized void updateHintsDropped(InetAddressAndPort ep, TimeUUID timePeriod, int value)
{
// with 30 day TTL
String req = "UPDATE system.%s USING TTL 2592000 SET hints_dropped[ ? ] = ? WHERE peer = ?";
@@ -1186,16 +1188,16 @@ public final class SystemKeyspace
UntypedResultSet.Row row = results.one();
Commit promised = row.has("in_progress_ballot")
- ? new Commit(row.getUUID("in_progress_ballot"), new PartitionUpdate.Builder(metadata, key, metadata.regularAndStaticColumns(), 1).build())
+ ? new Commit(row.getTimeUUID("in_progress_ballot"), new PartitionUpdate.Builder(metadata, key, metadata.regularAndStaticColumns(), 1).build())
: Commit.emptyCommit(key, metadata);
// either we have both a recently accepted ballot and update or we have neither
Commit accepted = row.has("proposal_version") && row.has("proposal")
- ? new Commit(row.getUUID("proposal_ballot"),
+ ? new Commit(row.getTimeUUID("proposal_ballot"),
PartitionUpdate.fromBytes(row.getBytes("proposal"), row.getInt("proposal_version")))
: Commit.emptyCommit(key, metadata);
// either most_recent_commit and most_recent_commit_at will both be set, or neither
Commit mostRecent = row.has("most_recent_commit_version") && row.has("most_recent_commit")
- ? new Commit(row.getUUID("most_recent_commit_at"),
+ ? new Commit(row.getTimeUUID("most_recent_commit_at"),
PartitionUpdate.fromBytes(row.getBytes("most_recent_commit"), row.getInt("most_recent_commit_version")))
: Commit.emptyCommit(key, metadata);
return new PaxosState(promised, accepted, mostRecent);
@@ -1205,7 +1207,7 @@ public final class SystemKeyspace
{
String req = "UPDATE system.%s USING TIMESTAMP ? AND TTL ? SET in_progress_ballot = ? WHERE row_key = ? AND cf_id = ?";
executeInternal(format(req, PAXOS),
- UUIDGen.microsTimestamp(promise.ballot),
+ promise.ballot.unixMicros(),
paxosTtlSec(promise.update.metadata()),
promise.ballot,
promise.update.partitionKey().getKey(),
@@ -1215,7 +1217,7 @@ public final class SystemKeyspace
public static void savePaxosProposal(Commit proposal)
{
executeInternal(format("UPDATE system.%s USING TIMESTAMP ? AND TTL ? SET proposal_ballot = ?, proposal = ?, proposal_version = ? WHERE row_key = ? AND cf_id = ?", PAXOS),
- UUIDGen.microsTimestamp(proposal.ballot),
+ proposal.ballot.unixMicros(),
paxosTtlSec(proposal.update.metadata()),
proposal.ballot,
PartitionUpdate.toBytes(proposal.update, MessagingService.current_version),
@@ -1236,7 +1238,7 @@ public final class SystemKeyspace
// even though that's really just an optimization since SP.beginAndRepairPaxos will exclude accepted proposal older than the mrc.
String cql = "UPDATE system.%s USING TIMESTAMP ? AND TTL ? SET proposal_ballot = null, proposal = null, most_recent_commit_at = ?, most_recent_commit = ?, most_recent_commit_version = ? WHERE row_key = ? AND cf_id = ?";
executeInternal(format(cql, PAXOS),
- UUIDGen.microsTimestamp(commit.ballot),
+ commit.ballot.unixMicros(),
paxosTtlSec(commit.update.metadata()),
commit.ballot,
PartitionUpdate.toBytes(commit.update, MessagingService.current_version),
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspaceMigrator40.java b/src/java/org/apache/cassandra/db/SystemKeyspaceMigrator40.java
index e0a58ba..595a2a8 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspaceMigrator40.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspaceMigrator40.java
@@ -27,6 +27,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.cql3.QueryProcessor;
import org.apache.cassandra.cql3.UntypedResultSet;
@@ -146,7 +147,7 @@ public class SystemKeyspaceMigrator40
QueryProcessor.executeInternal(insert,
row.has("peer") ? row.getInetAddress("peer") : null,
DatabaseDescriptor.getStoragePort(),
- row.has("hints_dropped") ? row.getMap("hints_dropped", UUIDType.instance, Int32Type.instance) : null);
+ row.has("hints_dropped") ? row.getMap("hints_dropped", TimeUUIDType.instance, Int32Type.instance) : null);
transferred++;
}
logger.info("Migrated {} rows from legacy {} to {}", transferred, legacyPeerEventsName, peerEventsName);
diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
index c0c4a95..4aec19f 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
@@ -43,6 +43,7 @@ import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
import org.apache.cassandra.schema.CompactionParams;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.io.sstable.Component.DATA;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
@@ -545,7 +546,7 @@ public abstract class AbstractCompactionStrategy
public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
MetadataCollector meta,
SerializationHeader header,
diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java
index 989c21c..40c4cb4 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java
@@ -19,7 +19,6 @@ package org.apache.cassandra.db.compaction;
import java.util.Iterator;
import java.util.Set;
-import java.util.UUID;
import com.google.common.base.Preconditions;
@@ -28,6 +27,7 @@ import org.apache.cassandra.db.Directories;
import org.apache.cassandra.db.compaction.writers.CompactionAwareWriter;
import org.apache.cassandra.io.FSDiskFullWriteError;
import org.apache.cassandra.io.sstable.format.SSTableReader;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
@@ -67,7 +67,7 @@ public abstract class AbstractCompactionTask extends WrappedRunnable
Iterator<SSTableReader> iter = sstables.iterator();
SSTableReader first = iter.next();
boolean isRepaired = first.isRepaired();
- UUID pendingRepair = first.getPendingRepair();
+ TimeUUID pendingRepair = first.getPendingRepair();
while (iter.hasNext())
{
SSTableReader next = iter.next();
diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractStrategyHolder.java b/src/java/org/apache/cassandra/db/compaction/AbstractStrategyHolder.java
index 4efc75a..de6ff71 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractStrategyHolder.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractStrategyHolder.java
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.function.Supplier;
import com.google.common.base.Preconditions;
@@ -40,6 +39,7 @@ import org.apache.cassandra.io.sstable.SSTableMultiWriter;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.schema.CompactionParams;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Wrapper that's aware of how sstables are divided between separate strategies,
@@ -192,7 +192,7 @@ public abstract class AbstractStrategyHolder
public abstract SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
MetadataCollector collector,
SerializationHeader header,
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
index bdddaab..513adfa 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
-import java.util.UUID;
import java.util.function.Predicate;
import com.google.common.base.Joiner;
@@ -30,6 +29,7 @@ import com.google.common.collect.ImmutableSet;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.schema.TableMetadata;
+import org.apache.cassandra.utils.TimeUUID;
public final class CompactionInfo
{
@@ -48,15 +48,15 @@ public final class CompactionInfo
private final long completed;
private final long total;
private final Unit unit;
- private final UUID compactionId;
+ private final TimeUUID compactionId;
private final ImmutableSet<SSTableReader> sstables;
- public CompactionInfo(TableMetadata metadata, OperationType tasktype, long bytesComplete, long totalBytes, UUID compactionId, Collection<SSTableReader> sstables)
+ public CompactionInfo(TableMetadata metadata, OperationType tasktype, long bytesComplete, long totalBytes, TimeUUID compactionId, Collection<SSTableReader> sstables)
{
this(metadata, tasktype, bytesComplete, totalBytes, Unit.BYTES, compactionId, sstables);
}
- private CompactionInfo(TableMetadata metadata, OperationType tasktype, long completed, long total, Unit unit, UUID compactionId, Collection<SSTableReader> sstables)
+ private CompactionInfo(TableMetadata metadata, OperationType tasktype, long completed, long total, Unit unit, TimeUUID compactionId, Collection<SSTableReader> sstables)
{
this.tasktype = tasktype;
this.completed = completed;
@@ -71,7 +71,7 @@ public final class CompactionInfo
* Special compaction info where we always need to cancel the compaction - for example ViewBuilderTask and AutoSavingCache where we don't know
* the sstables at construction
*/
- public static CompactionInfo withoutSSTables(TableMetadata metadata, OperationType tasktype, long completed, long total, Unit unit, UUID compactionId)
+ public static CompactionInfo withoutSSTables(TableMetadata metadata, OperationType tasktype, long completed, long total, Unit unit, TimeUUID compactionId)
{
return new CompactionInfo(metadata, tasktype, completed, total, unit, compactionId, ImmutableSet.of());
}
@@ -112,7 +112,7 @@ public final class CompactionInfo
return tasktype;
}
- public UUID getTaskId()
+ public TimeUUID getTaskId()
{
return compactionId;
}
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
index ec6a4d4..fc4dc9c 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
@@ -37,6 +37,7 @@ import org.apache.cassandra.db.transform.Transformation;
import org.apache.cassandra.index.transactions.CompactionTransaction;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.schema.CompactionParams.TombstoneOption;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Merge multiple iterators over the content of sstable into a "compacted" iterator.
@@ -63,7 +64,7 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
private final List<ISSTableScanner> scanners;
private final ImmutableSet<SSTableReader> sstables;
private final int nowInSec;
- private final UUID compactionId;
+ private final TimeUUID compactionId;
private final long totalBytes;
private long bytesRead;
@@ -79,13 +80,13 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
private final UnfilteredPartitionIterator compacted;
private final ActiveCompactionsTracker activeCompactions;
- public CompactionIterator(OperationType type, List<ISSTableScanner> scanners, AbstractCompactionController controller, int nowInSec, UUID compactionId)
+ public CompactionIterator(OperationType type, List<ISSTableScanner> scanners, AbstractCompactionController controller, int nowInSec, TimeUUID compactionId)
{
this(type, scanners, controller, nowInSec, compactionId, ActiveCompactionsTracker.NOOP);
}
@SuppressWarnings("resource") // We make sure to close mergedIterator in close() and CompactionIterator is itself an AutoCloseable
- public CompactionIterator(OperationType type, List<ISSTableScanner> scanners, AbstractCompactionController controller, int nowInSec, UUID compactionId, ActiveCompactionsTracker activeCompactions)
+ public CompactionIterator(OperationType type, List<ISSTableScanner> scanners, AbstractCompactionController controller, int nowInSec, TimeUUID compactionId, ActiveCompactionsTracker activeCompactions)
{
this.controller = controller;
this.type = type;
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 6b82321..1592237 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -94,6 +94,7 @@ import static org.apache.cassandra.db.compaction.CompactionManager.CompactionExe
import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR;
import static org.apache.cassandra.service.ActiveRepairService.UNREPAIRED_SSTABLE;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
/**
* <p>
@@ -720,7 +721,7 @@ public class CompactionManager implements CompactionManagerMBean
RangesAtEndpoint tokenRanges,
Refs<SSTableReader> sstables,
LifecycleTransaction txn,
- UUID sessionId,
+ TimeUUID sessionId,
BooleanSupplier isCancelled)
{
Runnable runnable = new WrappedRunnable()
@@ -759,7 +760,7 @@ public class CompactionManager implements CompactionManagerMBean
Iterator<SSTableReader> sstableIterator,
Collection<Range<Token>> ranges,
LifecycleTransaction txn,
- UUID sessionID,
+ TimeUUID sessionID,
boolean isTransient) throws IOException
{
if (ranges.isEmpty())
@@ -794,7 +795,7 @@ public class CompactionManager implements CompactionManagerMBean
RangesAtEndpoint replicas,
Refs<SSTableReader> validatedForRepair,
LifecycleTransaction txn,
- UUID sessionID,
+ TimeUUID sessionID,
BooleanSupplier isCancelled) throws IOException
{
try
@@ -835,7 +836,7 @@ public class CompactionManager implements CompactionManagerMBean
logger.info("{} Completed anticompaction successfully", PreviewKind.NONE.logPrefix(sessionID));
}
- static void validateSSTableBoundsForAnticompaction(UUID sessionID,
+ static void validateSSTableBoundsForAnticompaction(TimeUUID sessionID,
Collection<SSTableReader> sstables,
RangesAtEndpoint ranges)
{
@@ -857,7 +858,7 @@ public class CompactionManager implements CompactionManagerMBean
}
@VisibleForTesting
- static Set<SSTableReader> findSSTablesToAnticompact(Iterator<SSTableReader> sstableIterator, List<Range<Token>> normalizedRanges, UUID parentRepairSession)
+ static Set<SSTableReader> findSSTablesToAnticompact(Iterator<SSTableReader> sstableIterator, List<Range<Token>> normalizedRanges, TimeUUID parentRepairSession)
{
Set<SSTableReader> fullyContainedSSTables = new HashSet<>();
while (sstableIterator.hasNext())
@@ -1285,7 +1286,7 @@ public class CompactionManager implements CompactionManagerMBean
ISSTableScanner scanner = cleanupStrategy.getScanner(sstable);
CompactionController controller = new CompactionController(cfs, txn.originals(), getDefaultGcBefore(cfs, nowInSec));
Refs<SSTableReader> refs = Refs.ref(Collections.singleton(sstable));
- CompactionIterator ci = new CompactionIterator(OperationType.CLEANUP, Collections.singletonList(scanner), controller, nowInSec, UUIDGen.getTimeUUID(), active))
+ CompactionIterator ci = new CompactionIterator(OperationType.CLEANUP, Collections.singletonList(scanner), controller, nowInSec, nextTimeUUID(), active))
{
StatsMetadata metadata = sstable.getSSTableMetadata();
writer.switchWriter(createWriter(cfs, compactionFileLocation, expectedBloomFilterSize, metadata.repairedAt, metadata.pendingRepair, metadata.isTransient, sstable, txn));
@@ -1449,7 +1450,7 @@ public class CompactionManager implements CompactionManagerMBean
File compactionFileLocation,
long expectedBloomFilterSize,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
SSTableReader sstable,
LifecycleTransaction txn)
@@ -1472,7 +1473,7 @@ public class CompactionManager implements CompactionManagerMBean
File compactionFileLocation,
int expectedBloomFilterSize,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
Collection<SSTableReader> sstables,
ILifecycleTransaction txn)
@@ -1519,7 +1520,7 @@ public class CompactionManager implements CompactionManagerMBean
private void doAntiCompaction(ColumnFamilyStore cfs,
RangesAtEndpoint ranges,
LifecycleTransaction txn,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
BooleanSupplier isCancelled)
{
int originalCount = txn.originals().size();
@@ -1554,7 +1555,7 @@ public class CompactionManager implements CompactionManagerMBean
int antiCompactGroup(ColumnFamilyStore cfs,
RangesAtEndpoint ranges,
LifecycleTransaction txn,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
BooleanSupplier isCancelled)
{
Preconditions.checkArgument(!ranges.isEmpty(), "need at least one full or transient range");
@@ -1622,7 +1623,7 @@ public class CompactionManager implements CompactionManagerMBean
AbstractCompactionStrategy.ScannerList scanners = strategy.getScanners(txn.originals());
CompactionController controller = new CompactionController(cfs, sstableAsSet, getDefaultGcBefore(cfs, nowInSec));
- CompactionIterator ci = getAntiCompactionIterator(scanners.scanners, controller, nowInSec, UUIDGen.getTimeUUID(), active, isCancelled))
+ CompactionIterator ci = getAntiCompactionIterator(scanners.scanners, controller, nowInSec, nextTimeUUID(), active, isCancelled))
{
int expectedBloomFilterSize = Math.max(cfs.metadata().params.minIndexInterval, (int)(SSTableReader.getApproximateKeyCount(sstableAsSet)));
@@ -1705,7 +1706,7 @@ public class CompactionManager implements CompactionManagerMBean
}
@VisibleForTesting
- public static CompactionIterator getAntiCompactionIterator(List<ISSTableScanner> scanners, CompactionController controller, int nowInSec, UUID timeUUID, ActiveCompactionsTracker activeCompactions, BooleanSupplier isCancelled)
+ public static CompactionIterator getAntiCompactionIterator(List<ISSTableScanner> scanners, CompactionController controller, int nowInSec, TimeUUID timeUUID, ActiveCompactionsTracker activeCompactions, BooleanSupplier isCancelled)
{
return new CompactionIterator(OperationType.ANTICOMPACTION, scanners, controller, nowInSec, timeUUID, activeCompactions) {
@@ -2043,8 +2044,8 @@ public class CompactionManager implements CompactionManagerMBean
{
for (Holder holder : active.getCompactions())
{
- UUID holderId = holder.getCompactionInfo().getTaskId();
- if (holderId != null && holderId.equals(UUID.fromString(compactionId)))
+ TimeUUID holderId = holder.getCompactionInfo().getTaskId();
+ if (holderId != null && holderId.equals(TimeUUID.fromString(compactionId)))
holder.stop();
}
}
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyHolder.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyHolder.java
index 72c0f3a..cab0af0 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyHolder.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyHolder.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.db.compaction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.UUID;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
@@ -39,6 +38,7 @@ import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.schema.CompactionParams;
import org.apache.cassandra.service.ActiveRepairService;
+import org.apache.cassandra.utils.TimeUUID;
public class CompactionStrategyHolder extends AbstractStrategyHolder
{
@@ -218,7 +218,7 @@ public class CompactionStrategyHolder extends AbstractStrategyHolder
public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
MetadataCollector collector,
SerializationHeader header,
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
index 9ee1a97..65359b1 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java
@@ -28,7 +28,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@@ -74,6 +73,7 @@ import org.apache.cassandra.repair.consistent.admin.CleanupSummary;
import org.apache.cassandra.schema.CompactionParams;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.service.ActiveRepairService;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.db.compaction.AbstractStrategyHolder.GroupedSSTableContainer;
@@ -421,7 +421,7 @@ public class CompactionStrategyManager implements INotificationConsumer
return transientRepairs;
}
- public boolean hasDataForPendingRepair(UUID sessionID)
+ public boolean hasDataForPendingRepair(TimeUUID sessionID)
{
readLock.lock();
try
@@ -671,7 +671,7 @@ public class CompactionStrategyManager implements INotificationConsumer
throw new IllegalStateException("No holder claimed " + sstable);
}
- private AbstractStrategyHolder getHolder(long repairedAt, UUID pendingRepair, boolean isTransient)
+ private AbstractStrategyHolder getHolder(long repairedAt, TimeUUID pendingRepair, boolean isTransient)
{
return getHolder(repairedAt != ActiveRepairService.UNREPAIRED_SSTABLE,
pendingRepair != ActiveRepairService.NO_PENDING_REPAIR,
@@ -941,7 +941,7 @@ public class CompactionStrategyManager implements INotificationConsumer
boolean repaired = firstSSTable.isRepaired();
int firstIndex = compactionStrategyIndexFor(firstSSTable);
boolean isPending = firstSSTable.isPendingRepair();
- UUID pendingRepair = firstSSTable.getSSTableMetadata().pendingRepair;
+ TimeUUID pendingRepair = firstSSTable.getSSTableMetadata().pendingRepair;
for (SSTableReader sstable : input)
{
if (sstable.isRepaired() != repaired)
@@ -1099,7 +1099,7 @@ public class CompactionStrategyManager implements INotificationConsumer
public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
MetadataCollector collector,
SerializationHeader header,
@@ -1184,7 +1184,7 @@ public class CompactionStrategyManager implements INotificationConsumer
* Mutates sstable repairedAt times and notifies listeners of the change with the writeLock held. Prevents races
* with other processes between when the metadata is changed and when sstables are moved between strategies.
*/
- public void mutateRepaired(Collection<SSTableReader> sstables, long repairedAt, UUID pendingRepair, boolean isTransient) throws IOException
+ public void mutateRepaired(Collection<SSTableReader> sstables, long repairedAt, TimeUUID pendingRepair, boolean isTransient) throws IOException
{
Set<SSTableReader> changed = new HashSet<>();
@@ -1213,7 +1213,7 @@ public class CompactionStrategyManager implements INotificationConsumer
}
}
- private static void verifyMetadata(SSTableReader sstable, long repairedAt, UUID pendingRepair, boolean isTransient)
+ private static void verifyMetadata(SSTableReader sstable, long repairedAt, TimeUUID pendingRepair, boolean isTransient)
{
if (!Objects.equals(pendingRepair, sstable.getPendingRepair()))
throw new IllegalStateException(String.format("Failed setting pending repair to %s on %s (pending repair is %s)", pendingRepair, sstable, sstable.getPendingRepair()));
@@ -1223,7 +1223,7 @@ public class CompactionStrategyManager implements INotificationConsumer
throw new IllegalStateException(String.format("Failed setting isTransient to %b on %s (isTransient is %b)", isTransient, sstable, sstable.isTransient()));
}
- public CleanupSummary releaseRepairData(Collection<UUID> sessions)
+ public CleanupSummary releaseRepairData(Collection<TimeUUID> sessions)
{
List<CleanupTask> cleanupTasks = new ArrayList<>();
readLock.lock();
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 002f0c3..caa249b 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Predicate;
@@ -45,6 +44,7 @@ import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Refs;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
@@ -143,7 +143,7 @@ public class CompactionTask extends AbstractCompactionTask
}
});
- UUID taskId = transaction.opId();
+ TimeUUID taskId = transaction.opId();
// new sstables from flush can be added during a compaction, but only the compaction can remove them,
// so in our single-threaded compaction world this is a valid way of determining if we're compacting
@@ -314,13 +314,13 @@ public class CompactionTask extends AbstractCompactionTask
return minRepairedAt;
}
- public static UUID getPendingRepair(Set<SSTableReader> sstables)
+ public static TimeUUID getPendingRepair(Set<SSTableReader> sstables)
{
if (sstables.isEmpty())
{
return ActiveRepairService.NO_PENDING_REPAIR;
}
- Set<UUID> ids = new HashSet<>();
+ Set<TimeUUID> ids = new HashSet<>();
for (SSTableReader sstable: sstables)
ids.add(sstable.getSSTableMetadata().pendingRepair);
diff --git a/src/java/org/apache/cassandra/db/compaction/PendingRepairHolder.java b/src/java/org/apache/cassandra/db/compaction/PendingRepairHolder.java
index e3d4c3d..314df9e 100644
--- a/src/java/org/apache/cassandra/db/compaction/PendingRepairHolder.java
+++ b/src/java/org/apache/cassandra/db/compaction/PendingRepairHolder.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.UUID;
import com.google.common.base.Preconditions;
import com.google.common.collect.Iterables;
@@ -40,6 +39,7 @@ import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.schema.CompactionParams;
import org.apache.cassandra.service.ActiveRepairService;
+import org.apache.cassandra.utils.TimeUUID;
public class PendingRepairHolder extends AbstractStrategyHolder
{
@@ -93,7 +93,7 @@ public class PendingRepairHolder extends AbstractStrategyHolder
return Iterables.concat(Iterables.transform(managers, PendingRepairManager::getStrategies));
}
- Iterable<AbstractCompactionStrategy> getStrategiesFor(UUID session)
+ Iterable<AbstractCompactionStrategy> getStrategiesFor(TimeUUID session)
{
List<AbstractCompactionStrategy> strategies = new ArrayList<>(managers.size());
for (PendingRepairManager manager : managers)
@@ -236,7 +236,7 @@ public class PendingRepairHolder extends AbstractStrategyHolder
public SSTableMultiWriter createSSTableMultiWriter(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
MetadataCollector collector,
SerializationHeader header,
@@ -271,7 +271,7 @@ public class PendingRepairHolder extends AbstractStrategyHolder
return -1;
}
- public boolean hasDataForSession(UUID sessionID)
+ public boolean hasDataForSession(TimeUUID sessionID)
{
return Iterables.any(managers, prm -> prm.hasDataForSession(sessionID));
}
diff --git a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java
index aefa40b..11d6fe8 100644
--- a/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/PendingRepairManager.java
@@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import java.util.stream.Collectors;
import com.google.common.annotations.VisibleForTesting;
@@ -50,6 +49,7 @@ import org.apache.cassandra.repair.consistent.admin.CleanupSummary;
import org.apache.cassandra.schema.CompactionParams;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Companion to CompactionStrategyManager which manages the sstables marked pending repair.
@@ -66,7 +66,7 @@ class PendingRepairManager
private final ColumnFamilyStore cfs;
private final CompactionParams params;
private final boolean isTransient;
- private volatile ImmutableMap<UUID, AbstractCompactionStrategy> strategies = ImmutableMap.of();
+ private volatile ImmutableMap<TimeUUID, AbstractCompactionStrategy> strategies = ImmutableMap.of();
/**
* Indicates we're being asked to do something with an sstable that isn't marked pending repair
@@ -86,12 +86,12 @@ class PendingRepairManager
this.isTransient = isTransient;
}
- private ImmutableMap.Builder<UUID, AbstractCompactionStrategy> mapBuilder()
+ private ImmutableMap.Builder<TimeUUID, AbstractCompactionStrategy> mapBuilder()
{
return ImmutableMap.builder();
}
- AbstractCompactionStrategy get(UUID id)
+ AbstractCompactionStrategy get(TimeUUID id)
{
return strategies.get(id);
}
@@ -102,7 +102,7 @@ class PendingRepairManager
return get(sstable.getSSTableMetadata().pendingRepair);
}
- AbstractCompactionStrategy getOrCreate(UUID id)
+ AbstractCompactionStrategy getOrCreate(TimeUUID id)
{
checkPendingID(id);
assert id != null;
@@ -124,7 +124,7 @@ class PendingRepairManager
return strategy;
}
- private static void checkPendingID(UUID pendingID)
+ private static void checkPendingID(TimeUUID pendingID)
{
if (pendingID == null)
{
@@ -137,7 +137,7 @@ class PendingRepairManager
return getOrCreate(sstable.getSSTableMetadata().pendingRepair);
}
- private synchronized void removeSessionIfEmpty(UUID sessionID)
+ private synchronized void removeSessionIfEmpty(TimeUUID sessionID)
{
if (!strategies.containsKey(sessionID) || !strategies.get(sessionID).getSSTables().isEmpty())
return;
@@ -148,7 +148,7 @@ class PendingRepairManager
synchronized void removeSSTable(SSTableReader sstable)
{
- for (Map.Entry<UUID, AbstractCompactionStrategy> entry : strategies.entrySet())
+ for (Map.Entry<TimeUUID, AbstractCompactionStrategy> entry : strategies.entrySet())
{
entry.getValue().removeSSTable(sstable);
removeSessionIfEmpty(entry.getKey());
@@ -180,10 +180,10 @@ class PendingRepairManager
return;
// left=removed, right=added
- Map<UUID, Pair<Set<SSTableReader>, Set<SSTableReader>>> groups = new HashMap<>();
+ Map<TimeUUID, Pair<Set<SSTableReader>, Set<SSTableReader>>> groups = new HashMap<>();
for (SSTableReader sstable : removed)
{
- UUID sessionID = sstable.getSSTableMetadata().pendingRepair;
+ TimeUUID sessionID = sstable.getSSTableMetadata().pendingRepair;
if (!groups.containsKey(sessionID))
{
groups.put(sessionID, Pair.create(new HashSet<>(), new HashSet<>()));
@@ -193,7 +193,7 @@ class PendingRepairManager
for (SSTableReader sstable : added)
{
- UUID sessionID = sstable.getSSTableMetadata().pendingRepair;
+ TimeUUID sessionID = sstable.getSSTableMetadata().pendingRepair;
if (!groups.containsKey(sessionID))
{
groups.put(sessionID, Pair.create(new HashSet<>(), new HashSet<>()));
@@ -201,7 +201,7 @@ class PendingRepairManager
groups.get(sessionID).right.add(sstable);
}
- for (Map.Entry<UUID, Pair<Set<SSTableReader>, Set<SSTableReader>>> entry : groups.entrySet())
+ for (Map.Entry<TimeUUID, Pair<Set<SSTableReader>, Set<SSTableReader>>> entry : groups.entrySet())
{
AbstractCompactionStrategy strategy = getOrCreate(entry.getKey());
Set<SSTableReader> groupRemoved = entry.getValue().left;
@@ -226,7 +226,7 @@ class PendingRepairManager
strategies.values().forEach(AbstractCompactionStrategy::shutdown);
}
- private int getEstimatedRemainingTasks(UUID sessionID, AbstractCompactionStrategy strategy)
+ private int getEstimatedRemainingTasks(TimeUUID sessionID, AbstractCompactionStrategy strategy)
{
if (canCleanup(sessionID))
{
@@ -241,7 +241,7 @@ class PendingRepairManager
int getEstimatedRemainingTasks()
{
int tasks = 0;
- for (Map.Entry<UUID, AbstractCompactionStrategy> entry : strategies.entrySet())
+ for (Map.Entry<TimeUUID, AbstractCompactionStrategy> entry : strategies.entrySet())
{
tasks += getEstimatedRemainingTasks(entry.getKey(), entry.getValue());
}
@@ -254,7 +254,7 @@ class PendingRepairManager
int getMaxEstimatedRemainingTasks()
{
int tasks = 0;
- for (Map.Entry<UUID, AbstractCompactionStrategy> entry : strategies.entrySet())
+ for (Map.Entry<TimeUUID, AbstractCompactionStrategy> entry : strategies.entrySet())
{
tasks = Math.max(tasks, getEstimatedRemainingTasks(entry.getKey(), entry.getValue()));
}
@@ -262,7 +262,7 @@ class PendingRepairManager
}
@SuppressWarnings("resource")
- private RepairFinishedCompactionTask getRepairFinishedCompactionTask(UUID sessionID)
+ private RepairFinishedCompactionTask getRepairFinishedCompactionTask(TimeUUID sessionID)
{
Preconditions.checkState(canCleanup(sessionID));
AbstractCompactionStrategy compactionStrategy = get(sessionID);
@@ -277,9 +277,9 @@ class PendingRepairManager
public static class CleanupTask
{
private final ColumnFamilyStore cfs;
- private final List<Pair<UUID, RepairFinishedCompactionTask>> tasks;
+ private final List<Pair<TimeUUID, RepairFinishedCompactionTask>> tasks;
- public CleanupTask(ColumnFamilyStore cfs, List<Pair<UUID, RepairFinishedCompactionTask>> tasks)
+ public CleanupTask(ColumnFamilyStore cfs, List<Pair<TimeUUID, RepairFinishedCompactionTask>> tasks)
{
this.cfs = cfs;
this.tasks = tasks;
@@ -287,11 +287,11 @@ class PendingRepairManager
public CleanupSummary cleanup()
{
- Set<UUID> successful = new HashSet<>();
- Set<UUID> unsuccessful = new HashSet<>();
- for (Pair<UUID, RepairFinishedCompactionTask> pair : tasks)
+ Set<TimeUUID> successful = new HashSet<>();
+ Set<TimeUUID> unsuccessful = new HashSet<>();
+ for (Pair<TimeUUID, RepairFinishedCompactionTask> pair : tasks)
{
- UUID session = pair.left;
+ TimeUUID session = pair.left;
RepairFinishedCompactionTask task = pair.right;
if (task != null)
@@ -318,16 +318,16 @@ class PendingRepairManager
public Throwable abort(Throwable accumulate)
{
- for (Pair<UUID, RepairFinishedCompactionTask> pair : tasks)
+ for (Pair<TimeUUID, RepairFinishedCompactionTask> pair : tasks)
accumulate = pair.right.transaction.abort(accumulate);
return accumulate;
}
}
- public CleanupTask releaseSessionData(Collection<UUID> sessionIDs)
+ public CleanupTask releaseSessionData(Collection<TimeUUID> sessionIDs)
{
- List<Pair<UUID, RepairFinishedCompactionTask>> tasks = new ArrayList<>(sessionIDs.size());
- for (UUID session : sessionIDs)
+ List<Pair<TimeUUID, RepairFinishedCompactionTask>> tasks = new ArrayList<>(sessionIDs.size());
+ for (TimeUUID session : sessionIDs)
{
if (hasDataForSession(session))
{
@@ -340,7 +340,7 @@ class PendingRepairManager
synchronized int getNumPendingRepairFinishedTasks()
{
int count = 0;
- for (UUID sessionID : strategies.keySet())
+ for (TimeUUID sessionID : strategies.keySet())
{
if (canCleanup(sessionID))
{
@@ -352,7 +352,7 @@ class PendingRepairManager
synchronized AbstractCompactionTask getNextRepairFinishedTask()
{
- for (UUID sessionID : strategies.keySet())
+ for (TimeUUID sessionID : strategies.keySet())
{
if (canCleanup(sessionID))
{
@@ -367,9 +367,9 @@ class PendingRepairManager
if (strategies.isEmpty())
return null;
- Map<UUID, Integer> numTasks = new HashMap<>(strategies.size());
- ArrayList<UUID> sessions = new ArrayList<>(strategies.size());
- for (Map.Entry<UUID, AbstractCompactionStrategy> entry : strategies.entrySet())
+ Map<TimeUUID, Integer> numTasks = new HashMap<>(strategies.size());
+ ArrayList<TimeUUID> sessions = new ArrayList<>(strategies.size());
+ for (Map.Entry<TimeUUID, AbstractCompactionStrategy> entry : strategies.entrySet())
{
if (canCleanup(entry.getKey()))
{
@@ -385,7 +385,7 @@ class PendingRepairManager
// we want the session with the most compactions at the head of the list
sessions.sort((o1, o2) -> numTasks.get(o2) - numTasks.get(o1));
- UUID sessionID = sessions.get(0);
+ TimeUUID sessionID = sessions.get(0);
return get(sessionID).getNextBackgroundTask(gcBefore);
}
@@ -395,7 +395,7 @@ class PendingRepairManager
return null;
List<AbstractCompactionTask> maximalTasks = new ArrayList<>(strategies.size());
- for (Map.Entry<UUID, AbstractCompactionStrategy> entry : strategies.entrySet())
+ for (Map.Entry<TimeUUID, AbstractCompactionStrategy> entry : strategies.entrySet())
{
if (canCleanup(entry.getKey()))
{
@@ -416,12 +416,12 @@ class PendingRepairManager
return strategies.values();
}
- Set<UUID> getSessions()
+ Set<TimeUUID> getSessions()
{
return strategies.keySet();
}
- boolean canCleanup(UUID sessionID)
+ boolean canCleanup(TimeUUID sessionID)
{
return !ActiveRepairService.instance.consistent.local.isSessionInProgress(sessionID);
}
@@ -434,10 +434,10 @@ class PendingRepairManager
return Collections.emptySet();
}
- Map<UUID, Set<SSTableReader>> sessionSSTables = new HashMap<>();
+ Map<TimeUUID, Set<SSTableReader>> sessionSSTables = new HashMap<>();
for (SSTableReader sstable : sstables)
{
- UUID sessionID = sstable.getSSTableMetadata().pendingRepair;
+ TimeUUID sessionID = sstable.getSSTableMetadata().pendingRepair;
checkPendingID(sessionID);
sessionSSTables.computeIfAbsent(sessionID, k -> new HashSet<>()).add(sstable);
}
@@ -445,7 +445,7 @@ class PendingRepairManager
Set<ISSTableScanner> scanners = new HashSet<>(sessionSSTables.size());
try
{
- for (Map.Entry<UUID, Set<SSTableReader>> entry : sessionSSTables.entrySet())
+ for (Map.Entry<TimeUUID, Set<SSTableReader>> entry : sessionSSTables.entrySet())
{
scanners.addAll(getOrCreate(entry.getKey()).getScanners(entry.getValue(), ranges).scanners);
}
@@ -462,7 +462,7 @@ class PendingRepairManager
return strategies.values().contains(strategy);
}
- public synchronized boolean hasDataForSession(UUID sessionID)
+ public synchronized boolean hasDataForSession(TimeUUID sessionID)
{
return strategies.keySet().contains(sessionID);
}
@@ -478,7 +478,7 @@ class PendingRepairManager
public Collection<AbstractCompactionTask> createUserDefinedTasks(Collection<SSTableReader> sstables, int gcBefore)
{
- Map<UUID, List<SSTableReader>> group = sstables.stream().collect(Collectors.groupingBy(s -> s.getSSTableMetadata().pendingRepair));
+ Map<TimeUUID, List<SSTableReader>> group = sstables.stream().collect(Collectors.groupingBy(s -> s.getSSTableMetadata().pendingRepair));
return group.entrySet().stream().map(g -> strategies.get(g.getKey()).getUserDefinedTask(g.getValue(), gcBefore)).collect(Collectors.toList());
}
@@ -487,10 +487,10 @@ class PendingRepairManager
*/
class RepairFinishedCompactionTask extends AbstractCompactionTask
{
- private final UUID sessionID;
+ private final TimeUUID sessionID;
private final long repairedAt;
- RepairFinishedCompactionTask(ColumnFamilyStore cfs, LifecycleTransaction transaction, UUID sessionID, long repairedAt)
+ RepairFinishedCompactionTask(ColumnFamilyStore cfs, LifecycleTransaction transaction, TimeUUID sessionID, long repairedAt)
{
super(cfs, transaction);
this.sessionID = sessionID;
@@ -498,7 +498,7 @@ class PendingRepairManager
}
@VisibleForTesting
- UUID getSessionID()
+ TimeUUID getSessionID()
{
return sessionID;
}
diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
index ebb2303..77e5ef3 100644
--- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java
+++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java
@@ -47,6 +47,8 @@ import org.apache.cassandra.utils.*;
import org.apache.cassandra.utils.concurrent.Refs;
import org.apache.cassandra.utils.memory.HeapAllocator;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
+
public class Scrubber implements Closeable
{
private final ColumnFamilyStore cfs;
@@ -489,7 +491,7 @@ public class Scrubber implements Closeable
{
private final RandomAccessReader dataFile;
private final SSTableReader sstable;
- private final UUID scrubCompactionId;
+ private final TimeUUID scrubCompactionId;
private final Lock fileReadLock;
public ScrubInfo(RandomAccessReader dataFile, SSTableReader sstable, Lock fileReadLock)
@@ -497,7 +499,7 @@ public class Scrubber implements Closeable
this.dataFile = dataFile;
this.sstable = sstable;
this.fileReadLock = fileReadLock;
- scrubCompactionId = UUIDGen.getTimeUUID();
+ scrubCompactionId = nextTimeUUID();
}
public CompactionInfo getCompactionInfo()
diff --git a/src/java/org/apache/cassandra/db/compaction/Upgrader.java b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
index 7f3b0f1..87bf5b8 100644
--- a/src/java/org/apache/cassandra/db/compaction/Upgrader.java
+++ b/src/java/org/apache/cassandra/db/compaction/Upgrader.java
@@ -35,7 +35,8 @@ import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
import org.apache.cassandra.io.util.File;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.OutputHandler;
-import org.apache.cassandra.utils.UUIDGen;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class Upgrader
{
@@ -89,7 +90,7 @@ public class Upgrader
int nowInSec = FBUtilities.nowInSeconds();
try (SSTableRewriter writer = SSTableRewriter.construct(cfs, transaction, keepOriginals, CompactionTask.getMaxDataAge(transaction.originals()));
AbstractCompactionStrategy.ScannerList scanners = strategyManager.getScanners(transaction.originals());
- CompactionIterator iter = new CompactionIterator(transaction.opType(), scanners.scanners, controller, nowInSec, UUIDGen.getTimeUUID()))
+ CompactionIterator iter = new CompactionIterator(transaction.opType(), scanners.scanners, controller, nowInSec, nextTimeUUID()))
{
writer.switchWriter(createCompactionWriter(sstable.getSSTableMetadata()));
while (iter.hasNext())
diff --git a/src/java/org/apache/cassandra/db/compaction/Verifier.java b/src/java/org/apache/cassandra/db/compaction/Verifier.java
index 5a73416..29eb299 100644
--- a/src/java/org/apache/cassandra/db/compaction/Verifier.java
+++ b/src/java/org/apache/cassandra/db/compaction/Verifier.java
@@ -49,7 +49,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.IFilter;
import org.apache.cassandra.utils.OutputHandler;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import java.io.Closeable;
import java.io.DataInputStream;
@@ -66,6 +66,8 @@ import java.util.function.LongPredicate;
import org.apache.cassandra.io.util.File;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
+
public class Verifier implements Closeable
{
private final ColumnFamilyStore cfs;
@@ -508,7 +510,7 @@ public class Verifier implements Closeable
{
private final RandomAccessReader dataFile;
private final SSTableReader sstable;
- private final UUID verificationCompactionId;
+ private final TimeUUID verificationCompactionId;
private final Lock fileReadLock;
public VerifyInfo(RandomAccessReader dataFile, SSTableReader sstable, Lock fileReadLock)
@@ -516,7 +518,7 @@ public class Verifier implements Closeable
this.dataFile = dataFile;
this.sstable = sstable;
this.fileReadLock = fileReadLock;
- verificationCompactionId = UUIDGen.getTimeUUID();
+ verificationCompactionId = nextTimeUUID();
}
public CompactionInfo getCompactionInfo()
diff --git a/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java
index 3da7281..02c7b6c 100644
--- a/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java
+++ b/src/java/org/apache/cassandra/db/compaction/writers/CompactionAwareWriter.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.db.compaction.writers;
import java.util.Collection;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +37,7 @@ import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.SSTableRewriter;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Transactional;
import org.apache.cassandra.db.compaction.OperationType;
@@ -56,7 +56,7 @@ public abstract class CompactionAwareWriter extends Transactional.AbstractTransa
protected final long estimatedTotalKeys;
protected final long maxAge;
protected final long minRepairedAt;
- protected final UUID pendingRepair;
+ protected final TimeUUID pendingRepair;
protected final boolean isTransient;
protected final SSTableRewriter sstableWriter;
diff --git a/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java b/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java
index ff935f8..4c16ef7 100644
--- a/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.io.sstable.SSTable;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.format.SSTableReader.UniqueIdentifier;
import org.apache.cassandra.utils.Throwables;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Transactional;
import static com.google.common.base.Functions.compose;
@@ -187,7 +188,7 @@ public class LifecycleTransaction extends Transactional.AbstractTransactional im
return log.type();
}
- public UUID opId()
+ public TimeUUID opId()
{
return log.id();
}
diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
index 767cb1c..11e3ffb 100644
--- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java
@@ -40,6 +40,7 @@ import org.apache.cassandra.io.sstable.SSTable;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.format.big.BigFormat;
import org.apache.cassandra.utils.Throwables;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.apache.cassandra.utils.Throwables.merge;
@@ -74,7 +75,7 @@ final class LogFile implements AutoCloseable
private final OperationType type;
// The unique id of the transaction
- private final UUID id;
+ private final TimeUUID id;
static LogFile make(File logReplica)
{
@@ -92,7 +93,7 @@ final class LogFile implements AutoCloseable
//String version = matcher.group(1);
OperationType operationType = OperationType.fromFileName(matcher.group(2));
- UUID id = UUID.fromString(matcher.group(3));
+ TimeUUID id = TimeUUID.fromString(matcher.group(3));
return new LogFile(operationType, id, logReplicas);
}
@@ -107,7 +108,7 @@ final class LogFile implements AutoCloseable
return type;
}
- UUID id()
+ TimeUUID id()
{
return id;
}
@@ -143,13 +144,13 @@ final class LogFile implements AutoCloseable
return LogFile.FILE_REGEX.matcher(file.name()).matches();
}
- LogFile(OperationType type, UUID id, List<File> replicas)
+ LogFile(OperationType type, TimeUUID id, List<File> replicas)
{
this(type, id);
this.replicas.addReplicas(replicas);
}
- LogFile(OperationType type, UUID id)
+ LogFile(OperationType type, TimeUUID id)
{
this.type = type;
this.id = id;
diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
index 8436f5a..c46a8ed 100644
--- a/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
+++ b/src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
@@ -54,6 +54,8 @@ import org.apache.cassandra.utils.concurrent.Ref;
import org.apache.cassandra.utils.concurrent.RefCounted;
import org.apache.cassandra.utils.concurrent.Transactional;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
+
/**
* IMPORTANT: When this object is involved in a transactional graph, and is not encapsulated in a LifecycleTransaction,
* for correct behaviour its commit MUST occur before any others, since it may legitimately fail. This is consistent
@@ -126,7 +128,7 @@ class LogTransaction extends Transactional.AbstractTransactional implements Tran
LogTransaction(OperationType opType, Tracker tracker)
{
this.tracker = tracker;
- this.txnFile = new LogFile(opType, UUIDGen.getTimeUUID());
+ this.txnFile = new LogFile(opType, nextTimeUUID());
this.lock = new Object();
this.selfRef = new Ref<>(this, new TransactionTidier(txnFile, lock));
@@ -209,7 +211,7 @@ class LogTransaction extends Transactional.AbstractTransactional implements Tran
return txnFile.type();
}
- UUID id()
+ TimeUUID id()
{
return txnFile.id();
}
diff --git a/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java b/src/java/org/apache/cassandra/db/marshal/AbstractTimeUUIDType.java
similarity index 81%
copy from src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
copy to src/java/org/apache/cassandra/db/marshal/AbstractTimeUUIDType.java
index 5b2443b..b6b10d5 100644
--- a/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
+++ b/src/java/org/apache/cassandra/db/marshal/AbstractTimeUUIDType.java
@@ -23,16 +23,18 @@ import java.util.UUID;
import org.apache.cassandra.cql3.CQL3Type;
import org.apache.cassandra.cql3.Constants;
import org.apache.cassandra.cql3.Term;
-import org.apache.cassandra.serializers.TypeSerializer;
-import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.serializers.MarshalException;
-import org.apache.cassandra.serializers.TimeUUIDSerializer;
+import org.apache.cassandra.serializers.TypeSerializer;
+import org.apache.cassandra.serializers.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
-public class TimeUUIDType extends TemporalType<UUID>
-{
- public static final TimeUUIDType instance = new TimeUUIDType();
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUIDAsBytes;
- TimeUUIDType()
+// Fully compatible with UUID, and indeed is interpreted as UUID for UDF
+public abstract class AbstractTimeUUIDType<T> extends TemporalType<T>
+{
+ AbstractTimeUUIDType()
{
super(ComparisonType.CUSTOM);
} // singleton
@@ -76,7 +78,7 @@ public class TimeUUIDType extends TemporalType<UUID>
// takes as input 8 signed bytes in native machine order
// returns the first byte unchanged, and the following 7 bytes converted to an unsigned representation
// which is the same as a 2's complement long in native format
- private static long signedBytesToNativeLong(long signedBytes)
+ public static long signedBytesToNativeLong(long signedBytes)
{
return signedBytes ^ 0x0080808080808080L;
}
@@ -122,9 +124,14 @@ public class TimeUUIDType extends TemporalType<UUID>
return CQL3Type.Native.TIMEUUID;
}
- public TypeSerializer<UUID> getSerializer()
+ @Override
+ public ByteBuffer decomposeUntyped(Object value)
{
- return TimeUUIDSerializer.instance;
+ if (value instanceof UUID)
+ return UUIDSerializer.instance.serialize((UUID) value);
+ if (value instanceof TimeUUID)
+ return TimeUUID.Serializer.instance.serialize((TimeUUID) value);
+ return super.decomposeUntyped(value);
}
@Override
@@ -136,7 +143,7 @@ public class TimeUUIDType extends TemporalType<UUID>
@Override
public long toTimeInMillis(ByteBuffer value)
{
- return UUIDGen.unixTimestamp(UUIDGen.getUUID(value));
+ return TimeUUID.deserialize(value).unix(MILLISECONDS);
}
@Override
@@ -154,6 +161,12 @@ public class TimeUUIDType extends TemporalType<UUID>
@Override
public ByteBuffer now()
{
- return ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes());
+ return ByteBuffer.wrap(nextTimeUUIDAsBytes());
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ return obj instanceof AbstractTimeUUIDType<?>;
}
}
diff --git a/src/java/org/apache/cassandra/db/marshal/AbstractType.java b/src/java/org/apache/cassandra/db/marshal/AbstractType.java
index c8eca39..74d4006 100644
--- a/src/java/org/apache/cassandra/db/marshal/AbstractType.java
+++ b/src/java/org/apache/cassandra/db/marshal/AbstractType.java
@@ -127,6 +127,11 @@ public abstract class AbstractType<T> implements Comparator<ByteBuffer>, Assignm
return getSerializer().deserialize(value, accessor);
}
+ public ByteBuffer decomposeUntyped(Object value)
+ {
+ return decompose((T) value);
+ }
+
public ByteBuffer decompose(T value)
{
return getSerializer().serialize(value);
@@ -240,6 +245,11 @@ public abstract class AbstractType<T> implements Comparator<ByteBuffer>, Assignm
return new CQL3Type.Custom(this);
}
+ public AbstractType<?> udfType()
+ {
+ return this;
+ }
+
/**
* Same as compare except that this ignore ReversedType. This is to be use when
* comparing 2 values to decide for a CQL condition (see Operator.isSatisfiedBy) as
diff --git a/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java b/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java
index 7d13844..bb26cba 100644
--- a/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java
+++ b/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java
@@ -29,6 +29,7 @@ import org.apache.cassandra.db.Digest;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.ByteArrayUtil;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FastByteOperations;
@@ -235,6 +236,12 @@ public class ByteArrayAccessor implements ValueAccessor<byte[]>
}
@Override
+ public TimeUUID toTimeUUID(byte[] value)
+ {
+ return TimeUUID.fromBytes(getLong(value, 0), getLong(value, 8));
+ }
+
+ @Override
public int putShort(byte[] dst, int offset, short value)
{
ByteArrayUtil.putShort(dst, offset, value);
diff --git a/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java b/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java
index a0f9c1d..e428b7c 100644
--- a/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java
+++ b/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java
@@ -28,6 +28,7 @@ import org.apache.cassandra.db.Digest;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FastByteOperations;
import org.apache.cassandra.utils.UUIDGen;
@@ -239,6 +240,12 @@ public class ByteBufferAccessor implements ValueAccessor<ByteBuffer>
}
@Override
+ public TimeUUID toTimeUUID(ByteBuffer value)
+ {
+ return TimeUUID.fromBytes(value.getLong(value.position()), value.getLong(value.position() + 8));
+ }
+
+ @Override
public int putShort(ByteBuffer dst, int offset, short value)
{
dst.putShort(dst.position() + offset, value);
diff --git a/src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java b/src/java/org/apache/cassandra/db/marshal/LegacyTimeUUIDType.java
similarity index 64%
copy from src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java
copy to src/java/org/apache/cassandra/db/marshal/LegacyTimeUUIDType.java
index 3443cab..528a3e8 100644
--- a/src/java/org/apache/cassandra/batchlog/BatchRemoveVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/marshal/LegacyTimeUUIDType.java
@@ -15,19 +15,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.batchlog;
+package org.apache.cassandra.db.marshal;
import java.util.UUID;
-import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
+import org.apache.cassandra.serializers.TypeSerializer;
+import org.apache.cassandra.serializers.UUIDSerializer;
-public final class BatchRemoveVerbHandler implements IVerbHandler<UUID>
+// Fully compatible with UUID, and indeed is interpreted as UUID for UDF
+public class LegacyTimeUUIDType extends AbstractTimeUUIDType<UUID>
{
- public static final BatchRemoveVerbHandler instance = new BatchRemoveVerbHandler();
+ public static final LegacyTimeUUIDType instance = new LegacyTimeUUIDType();
- public void doVerb(Message<UUID> message)
+ public TypeSerializer<UUID> getSerializer()
{
- BatchlogManager.remove(message.payload);
+ return UUIDSerializer.instance;
}
}
diff --git a/src/java/org/apache/cassandra/db/marshal/ListType.java b/src/java/org/apache/cassandra/db/marshal/ListType.java
index cc63937..281f7ee 100644
--- a/src/java/org/apache/cassandra/db/marshal/ListType.java
+++ b/src/java/org/apache/cassandra/db/marshal/ListType.java
@@ -31,6 +31,7 @@ import org.apache.cassandra.exceptions.SyntaxException;
import org.apache.cassandra.serializers.CollectionSerializer;
import org.apache.cassandra.serializers.ListSerializer;
import org.apache.cassandra.serializers.MarshalException;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.transport.ProtocolVersion;
public class ListType<T> extends CollectionType<List<T>>
@@ -103,7 +104,7 @@ public class ListType<T> extends CollectionType<List<T>>
return elements;
}
- public AbstractType<UUID> nameComparator()
+ public AbstractType<TimeUUID> nameComparator()
{
return TimeUUIDType.instance;
}
diff --git a/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java b/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
index 5b2443b..d3b0dec 100644
--- a/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TimeUUIDType.java
@@ -17,143 +17,22 @@
*/
package org.apache.cassandra.db.marshal;
-import java.nio.ByteBuffer;
-import java.util.UUID;
-
-import org.apache.cassandra.cql3.CQL3Type;
-import org.apache.cassandra.cql3.Constants;
-import org.apache.cassandra.cql3.Term;
import org.apache.cassandra.serializers.TypeSerializer;
-import org.apache.cassandra.utils.UUIDGen;
-import org.apache.cassandra.serializers.MarshalException;
-import org.apache.cassandra.serializers.TimeUUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
-public class TimeUUIDType extends TemporalType<UUID>
+// Fully compatible with UUID, and indeed is interpreted as UUID for UDF
+public class TimeUUIDType extends AbstractTimeUUIDType<TimeUUID>
{
public static final TimeUUIDType instance = new TimeUUIDType();
- TimeUUIDType()
- {
- super(ComparisonType.CUSTOM);
- } // singleton
-
- public boolean isEmptyValueMeaningless()
- {
- return true;
- }
-
- public <VL, VR> int compareCustom(VL left, ValueAccessor<VL> accessorL, VR right, ValueAccessor<VR> accessorR)
- {
- // Compare for length
- boolean p1 = accessorL.size(left) == 16, p2 = accessorR.size(right) == 16;
- if (!(p1 & p2))
- {
- // should we assert exactly 16 bytes (or 0)? seems prudent
- assert p1 || accessorL.isEmpty(left);
- assert p2 || accessorR.isEmpty(right);
- return p1 ? 1 : p2 ? -1 : 0;
- }
-
- long msb1 = accessorL.getLong(left, 0);
- long msb2 = accessorR.getLong(right, 0);
- msb1 = reorderTimestampBytes(msb1);
- msb2 = reorderTimestampBytes(msb2);
-
- assert (msb1 & topbyte(0xf0L)) == topbyte(0x10L);
- assert (msb2 & topbyte(0xf0L)) == topbyte(0x10L);
-
- int c = Long.compare(msb1, msb2);
- if (c != 0)
- return c;
-
- // this has to be a signed per-byte comparison for compatibility
- // so we transform the bytes so that a simple long comparison is equivalent
- long lsb1 = signedBytesToNativeLong(accessorL.getLong(left, 8));
- long lsb2 = signedBytesToNativeLong(accessorR.getLong(right, 8));
- return Long.compare(lsb1, lsb2);
- }
-
- // takes as input 8 signed bytes in native machine order
- // returns the first byte unchanged, and the following 7 bytes converted to an unsigned representation
- // which is the same as a 2's complement long in native format
- private static long signedBytesToNativeLong(long signedBytes)
- {
- return signedBytes ^ 0x0080808080808080L;
- }
-
- private static long topbyte(long topbyte)
- {
- return topbyte << 56;
- }
-
- protected static long reorderTimestampBytes(long input)
- {
- return (input << 48)
- | ((input << 16) & 0xFFFF00000000L)
- | (input >>> 32);
- }
-
- public ByteBuffer fromString(String source) throws MarshalException
- {
- ByteBuffer parsed = UUIDType.parse(source);
- if (parsed == null)
- throw new MarshalException(String.format("Unknown timeuuid representation: %s", source));
- if (parsed.remaining() == 16 && UUIDType.version(parsed) != 1)
- throw new MarshalException("TimeUUID supports only version 1 UUIDs");
- return parsed;
- }
-
- @Override
- public Term fromJSONObject(Object parsed) throws MarshalException
- {
- try
- {
- return new Constants.Value(fromString((String) parsed));
- }
- catch (ClassCastException exc)
- {
- throw new MarshalException(
- String.format("Expected a string representation of a timeuuid, but got a %s: %s", parsed.getClass().getSimpleName(), parsed));
- }
- }
-
- public CQL3Type asCQL3Type()
- {
- return CQL3Type.Native.TIMEUUID;
- }
-
- public TypeSerializer<UUID> getSerializer()
- {
- return TimeUUIDSerializer.instance;
- }
-
- @Override
- public int valueLengthIfFixed()
- {
- return 16;
- }
-
- @Override
- public long toTimeInMillis(ByteBuffer value)
- {
- return UUIDGen.unixTimestamp(UUIDGen.getUUID(value));
- }
-
- @Override
- public ByteBuffer addDuration(ByteBuffer temporal, ByteBuffer duration)
- {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public ByteBuffer substractDuration(ByteBuffer temporal, ByteBuffer duration)
+ public TypeSerializer<TimeUUID> getSerializer()
{
- throw new UnsupportedOperationException();
+ return TimeUUID.Serializer.instance;
}
@Override
- public ByteBuffer now()
+ public AbstractType<?> udfType()
{
- return ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes());
+ return LegacyTimeUUIDType.instance;
}
}
diff --git a/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java b/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java
index 10532ff..2f089a6 100644
--- a/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java
+++ b/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java
@@ -37,6 +37,7 @@ import org.apache.cassandra.db.rows.CellPath;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.schema.ColumnMetadata;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.db.ClusteringPrefix.Kind.*;
@@ -322,6 +323,9 @@ public interface ValueAccessor<V>
/** returns a UUID from offset 0 */
UUID toUUID(V value);
+ /** returns a TimeUUID from offset 0 */
+ TimeUUID toTimeUUID(V value);
+
/**
* writes the short value {@param value} to {@param dst} at offset {@param offset}
* @return the number of bytes written to {@param value}
diff --git a/src/java/org/apache/cassandra/db/repair/CassandraKeyspaceRepairManager.java b/src/java/org/apache/cassandra/db/repair/CassandraKeyspaceRepairManager.java
index 29950fc..b870cfe 100644
--- a/src/java/org/apache/cassandra/db/repair/CassandraKeyspaceRepairManager.java
+++ b/src/java/org/apache/cassandra/db/repair/CassandraKeyspaceRepairManager.java
@@ -28,6 +28,7 @@ import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.locator.RangesAtEndpoint;
import org.apache.cassandra.repair.KeyspaceRepairManager;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
public class CassandraKeyspaceRepairManager implements KeyspaceRepairManager
@@ -40,7 +41,7 @@ public class CassandraKeyspaceRepairManager implements KeyspaceRepairManager
}
@Override
- public Future<List<Void>> prepareIncrementalRepair(UUID sessionID,
+ public Future<List<Void>> prepareIncrementalRepair(TimeUUID sessionID,
Collection<ColumnFamilyStore> tables,
RangesAtEndpoint tokenRanges,
ExecutorService executor,
diff --git a/src/java/org/apache/cassandra/db/repair/CassandraTableRepairManager.java b/src/java/org/apache/cassandra/db/repair/CassandraTableRepairManager.java
index ad4927f..d656b04 100644
--- a/src/java/org/apache/cassandra/db/repair/CassandraTableRepairManager.java
+++ b/src/java/org/apache/cassandra/db/repair/CassandraTableRepairManager.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.db.repair;
import java.io.IOException;
import java.util.Collection;
-import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
@@ -35,6 +34,7 @@ import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.repair.TableRepairManager;
import org.apache.cassandra.repair.ValidationPartitionIterator;
import org.apache.cassandra.repair.NoSuchRepairSessionException;
+import org.apache.cassandra.utils.TimeUUID;
public class CassandraTableRepairManager implements TableRepairManager
{
@@ -46,7 +46,7 @@ public class CassandraTableRepairManager implements TableRepairManager
}
@Override
- public ValidationPartitionIterator getValidationIterator(Collection<Range<Token>> ranges, UUID parentId, UUID sessionID, boolean isIncremental, int nowInSec) throws IOException, NoSuchRepairSessionException
+ public ValidationPartitionIterator getValidationIterator(Collection<Range<Token>> ranges, TimeUUID parentId, TimeUUID sessionID, boolean isIncremental, int nowInSec) throws IOException, NoSuchRepairSessionException
{
return new CassandraValidationIterator(cfs, ranges, parentId, sessionID, isIncremental, nowInSec);
}
@@ -58,7 +58,7 @@ public class CassandraTableRepairManager implements TableRepairManager
}
@Override
- public void incrementalSessionCompleted(UUID sessionID)
+ public void incrementalSessionCompleted(TimeUUID sessionID)
{
CompactionManager.instance.submitBackground(cfs);
}
diff --git a/src/java/org/apache/cassandra/db/repair/CassandraValidationIterator.java b/src/java/org/apache/cassandra/db/repair/CassandraValidationIterator.java
index 04e916d..99245be 100644
--- a/src/java/org/apache/cassandra/db/repair/CassandraValidationIterator.java
+++ b/src/java/org/apache/cassandra/db/repair/CassandraValidationIterator.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import java.util.function.LongPredicate;
import com.google.common.annotations.VisibleForTesting;
@@ -57,9 +56,11 @@ import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.repair.NoSuchRepairSessionException;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Refs;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
+
public class CassandraValidationIterator extends ValidationPartitionIterator
{
private static final Logger logger = LoggerFactory.getLogger(CassandraValidationIterator.class);
@@ -106,12 +107,12 @@ public class CassandraValidationIterator extends ValidationPartitionIterator
{
public ValidationCompactionIterator(List<ISSTableScanner> scanners, ValidationCompactionController controller, int nowInSec, ActiveCompactionsTracker activeCompactions)
{
- super(OperationType.VALIDATION, scanners, controller, nowInSec, UUIDGen.getTimeUUID(), activeCompactions);
+ super(OperationType.VALIDATION, scanners, controller, nowInSec, nextTimeUUID(), activeCompactions);
}
}
@VisibleForTesting
- public static synchronized Refs<SSTableReader> getSSTablesToValidate(ColumnFamilyStore cfs, Collection<Range<Token>> ranges, UUID parentId, boolean isIncremental) throws NoSuchRepairSessionException
+ public static synchronized Refs<SSTableReader> getSSTablesToValidate(ColumnFamilyStore cfs, Collection<Range<Token>> ranges, TimeUUID parentId, boolean isIncremental) throws NoSuchRepairSessionException
{
Refs<SSTableReader> sstables;
@@ -171,7 +172,7 @@ public class CassandraValidationIterator extends ValidationPartitionIterator
private final long estimatedPartitions;
private final Map<Range<Token>, Long> rangePartitionCounts;
- public CassandraValidationIterator(ColumnFamilyStore cfs, Collection<Range<Token>> ranges, UUID parentId, UUID sessionID, boolean isIncremental, int nowInSec) throws IOException, NoSuchRepairSessionException
+ public CassandraValidationIterator(ColumnFamilyStore cfs, Collection<Range<Token>> ranges, TimeUUID parentId, TimeUUID sessionID, boolean isIncremental, int nowInSec) throws IOException, NoSuchRepairSessionException
{
this.cfs = cfs;
diff --git a/src/java/org/apache/cassandra/db/repair/PendingAntiCompaction.java b/src/java/org/apache/cassandra/db/repair/PendingAntiCompaction.java
index 0007bbe..b96532d 100644
--- a/src/java/org/apache/cassandra/db/repair/PendingAntiCompaction.java
+++ b/src/java/org/apache/cassandra/db/repair/PendingAntiCompaction.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
@@ -36,6 +35,7 @@ import com.google.common.collect.Iterables;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.cassandra.concurrent.FutureTask;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
import org.apache.cassandra.utils.concurrent.FutureCombiner;
import org.apache.cassandra.utils.concurrent.ImmediateFuture;
@@ -105,9 +105,9 @@ public class PendingAntiCompaction
static class AntiCompactionPredicate implements Predicate<SSTableReader>
{
private final Collection<Range<Token>> ranges;
- private final UUID prsid;
+ private final TimeUUID prsid;
- public AntiCompactionPredicate(Collection<Range<Token>> ranges, UUID prsid)
+ public AntiCompactionPredicate(Collection<Range<Token>> ranges, TimeUUID prsid)
{
this.ranges = ranges;
this.prsid = prsid;
@@ -167,19 +167,19 @@ public class PendingAntiCompaction
public static class AcquisitionCallable implements Callable<AcquireResult>
{
private final ColumnFamilyStore cfs;
- private final UUID sessionID;
+ private final TimeUUID sessionID;
private final AntiCompactionPredicate predicate;
private final int acquireRetrySeconds;
private final int acquireSleepMillis;
@VisibleForTesting
- public AcquisitionCallable(ColumnFamilyStore cfs, Collection<Range<Token>> ranges, UUID sessionID, int acquireRetrySeconds, int acquireSleepMillis)
+ public AcquisitionCallable(ColumnFamilyStore cfs, Collection<Range<Token>> ranges, TimeUUID sessionID, int acquireRetrySeconds, int acquireSleepMillis)
{
this(cfs, sessionID, acquireRetrySeconds, acquireSleepMillis, new AntiCompactionPredicate(ranges, sessionID));
}
@VisibleForTesting
- AcquisitionCallable(ColumnFamilyStore cfs, UUID sessionID, int acquireRetrySeconds, int acquireSleepMillis, AntiCompactionPredicate predicate)
+ AcquisitionCallable(ColumnFamilyStore cfs, TimeUUID sessionID, int acquireRetrySeconds, int acquireSleepMillis, AntiCompactionPredicate predicate)
{
this.cfs = cfs;
this.sessionID = sessionID;
@@ -258,11 +258,11 @@ public class PendingAntiCompaction
static class AcquisitionCallback implements Function<List<AcquireResult>, Future<List<Void>>>
{
- private final UUID parentRepairSession;
+ private final TimeUUID parentRepairSession;
private final RangesAtEndpoint tokenRanges;
private final BooleanSupplier isCancelled;
- public AcquisitionCallback(UUID parentRepairSession, RangesAtEndpoint tokenRanges, BooleanSupplier isCancelled)
+ public AcquisitionCallback(TimeUUID parentRepairSession, RangesAtEndpoint tokenRanges, BooleanSupplier isCancelled)
{
this.parentRepairSession = parentRepairSession;
this.tokenRanges = tokenRanges;
@@ -325,7 +325,7 @@ public class PendingAntiCompaction
}
}
- private final UUID prsId;
+ private final TimeUUID prsId;
private final Collection<ColumnFamilyStore> tables;
private final RangesAtEndpoint tokenRanges;
private final ExecutorService executor;
@@ -333,7 +333,7 @@ public class PendingAntiCompaction
private final int acquireSleepMillis;
private final BooleanSupplier isCancelled;
- public PendingAntiCompaction(UUID prsId,
+ public PendingAntiCompaction(TimeUUID prsId,
Collection<ColumnFamilyStore> tables,
RangesAtEndpoint tokenRanges,
ExecutorService executor,
@@ -343,7 +343,7 @@ public class PendingAntiCompaction
}
@VisibleForTesting
- PendingAntiCompaction(UUID prsId,
+ PendingAntiCompaction(TimeUUID prsId,
Collection<ColumnFamilyStore> tables,
RangesAtEndpoint tokenRanges,
int acquireRetrySeconds,
@@ -376,13 +376,13 @@ public class PendingAntiCompaction
}
@VisibleForTesting
- protected AcquisitionCallable getAcquisitionCallable(ColumnFamilyStore cfs, Set<Range<Token>> ranges, UUID prsId, int acquireRetrySeconds, int acquireSleepMillis)
+ protected AcquisitionCallable getAcquisitionCallable(ColumnFamilyStore cfs, Set<Range<Token>> ranges, TimeUUID prsId, int acquireRetrySeconds, int acquireSleepMillis)
{
return new AcquisitionCallable(cfs, ranges, prsId, acquireRetrySeconds, acquireSleepMillis);
}
@VisibleForTesting
- protected AcquisitionCallback getAcquisitionCallback(UUID prsId, RangesAtEndpoint tokenRanges)
+ protected AcquisitionCallback getAcquisitionCallback(TimeUUID prsId, RangesAtEndpoint tokenRanges)
{
return new AcquisitionCallback(prsId, tokenRanges, isCancelled);
}
diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraOutgoingFile.java b/src/java/org/apache/cassandra/db/streaming/CassandraOutgoingFile.java
index db6b7fe..367c304 100644
--- a/src/java/org/apache/cassandra/db/streaming/CassandraOutgoingFile.java
+++ b/src/java/org/apache/cassandra/db/streaming/CassandraOutgoingFile.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.db.streaming;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
-import java.util.UUID;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
@@ -35,6 +34,7 @@ import org.apache.cassandra.streaming.OutgoingStream;
import org.apache.cassandra.streaming.StreamingDataOutputPlus;
import org.apache.cassandra.streaming.StreamOperation;
import org.apache.cassandra.streaming.StreamSession;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Ref;
/**
@@ -141,7 +141,7 @@ public class CassandraOutgoingFile implements OutgoingStream
}
@Override
- public UUID getPendingRepair()
+ public TimeUUID getPendingRepair()
{
return ref.get().getPendingRepair();
}
diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraStreamManager.java b/src/java/org/apache/cassandra/db/streaming/CassandraStreamManager.java
index a84fd27..11c859d 100644
--- a/src/java/org/apache/cassandra/db/streaming/CassandraStreamManager.java
+++ b/src/java/org/apache/cassandra/db/streaming/CassandraStreamManager.java
@@ -40,6 +40,7 @@ import org.apache.cassandra.streaming.StreamReceiver;
import org.apache.cassandra.streaming.StreamSession;
import org.apache.cassandra.streaming.TableStreamManager;
import org.apache.cassandra.streaming.messages.StreamMessageHeader;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Ref;
import org.apache.cassandra.utils.concurrent.Refs;
import org.slf4j.Logger;
@@ -49,7 +50,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
/**
* Implements the streaming interface for the native cassandra storage engine.
@@ -82,7 +82,7 @@ public class CassandraStreamManager implements TableStreamManager
}
@Override
- public Collection<OutgoingStream> createOutgoingStreams(StreamSession session, RangesAtEndpoint replicas, UUID pendingRepair, PreviewKind previewKind)
+ public Collection<OutgoingStream> createOutgoingStreams(StreamSession session, RangesAtEndpoint replicas, TimeUUID pendingRepair, PreviewKind previewKind)
{
Refs<SSTableReader> refs = new Refs<>();
try
diff --git a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java
index 7d39e83..2cccee3 100644
--- a/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java
+++ b/src/java/org/apache/cassandra/db/streaming/CassandraStreamReader.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.db.streaming;
import java.io.IOError;
import java.io.IOException;
import java.util.Collection;
-import java.util.UUID;
import com.google.common.base.Preconditions;
import com.google.common.collect.UnmodifiableIterator;
@@ -57,6 +56,7 @@ import org.apache.cassandra.streaming.compress.StreamCompressionInputStream;
import org.apache.cassandra.streaming.messages.StreamMessageHeader;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.net.MessagingService.current_version;
@@ -72,7 +72,7 @@ public class CassandraStreamReader implements IStreamReader
protected final StreamSession session;
protected final Version inputVersion;
protected final long repairedAt;
- protected final UUID pendingRepair;
+ protected final TimeUUID pendingRepair;
protected final SSTableFormat.Type format;
protected final int sstableLevel;
protected final SerializationHeader.Component header;
@@ -152,7 +152,7 @@ public class CassandraStreamReader implements IStreamReader
return header != null? header.toHeader(metadata) : null; //pre-3.0 sstable have no SerializationHeader
}
@SuppressWarnings("resource")
- protected SSTableMultiWriter createWriter(ColumnFamilyStore cfs, long totalSize, long repairedAt, UUID pendingRepair, SSTableFormat.Type format) throws IOException
+ protected SSTableMultiWriter createWriter(ColumnFamilyStore cfs, long totalSize, long repairedAt, TimeUUID pendingRepair, SSTableFormat.Type format) throws IOException
{
Directories.DataDirectory localDir = cfs.getDirectories().getWriteableLocation(totalSize);
if (localDir == null)
diff --git a/src/java/org/apache/cassandra/db/view/ViewBuilderTask.java b/src/java/org/apache/cassandra/db/view/ViewBuilderTask.java
index 2f32db0..dac96f6 100644
--- a/src/java/org/apache/cassandra/db/view/ViewBuilderTask.java
+++ b/src/java/org/apache/cassandra/db/view/ViewBuilderTask.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.db.view;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
@@ -58,10 +57,11 @@ import org.apache.cassandra.io.sstable.ReducingKeyIterator;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Refs;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class ViewBuilderTask extends CompactionInfo.Holder implements Callable<Long>
{
@@ -72,7 +72,7 @@ public class ViewBuilderTask extends CompactionInfo.Holder implements Callable<L
private final ColumnFamilyStore baseCfs;
private final View view;
private final Range<Token> range;
- private final UUID compactionId;
+ private final TimeUUID compactionId;
private volatile Token prevToken;
private volatile long keysBuilt = 0;
private volatile boolean isStopped = false;
@@ -84,7 +84,7 @@ public class ViewBuilderTask extends CompactionInfo.Holder implements Callable<L
this.baseCfs = baseCfs;
this.view = view;
this.range = range;
- this.compactionId = UUIDGen.getTimeUUID();
+ this.compactionId = nextTimeUUID();
this.prevToken = lastToken;
this.keysBuilt = keysBuilt;
}
diff --git a/src/java/org/apache/cassandra/db/virtual/SSTableTasksTable.java b/src/java/org/apache/cassandra/db/virtual/SSTableTasksTable.java
index 720516c..488b580 100644
--- a/src/java/org/apache/cassandra/db/virtual/SSTableTasksTable.java
+++ b/src/java/org/apache/cassandra/db/virtual/SSTableTasksTable.java
@@ -22,8 +22,8 @@ import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.marshal.DoubleType;
import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.db.marshal.LongType;
+import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.db.marshal.UUIDType;
import org.apache.cassandra.dht.LocalPartitioner;
import org.apache.cassandra.schema.TableMetadata;
@@ -47,7 +47,7 @@ final class SSTableTasksTable extends AbstractVirtualTable
.partitioner(new LocalPartitioner(UTF8Type.instance))
.addPartitionKeyColumn(KEYSPACE_NAME, UTF8Type.instance)
.addClusteringColumn(TABLE_NAME, UTF8Type.instance)
- .addClusteringColumn(TASK_ID, UUIDType.instance)
+ .addClusteringColumn(TASK_ID, TimeUUIDType.instance)
.addRegularColumn(COMPLETION_RATIO, DoubleType.instance)
.addRegularColumn(KIND, UTF8Type.instance)
.addRegularColumn(PROGRESS, LongType.instance)
diff --git a/src/java/org/apache/cassandra/db/virtual/SimpleDataSet.java b/src/java/org/apache/cassandra/db/virtual/SimpleDataSet.java
index 4150783..ff44ba9 100644
--- a/src/java/org/apache/cassandra/db/virtual/SimpleDataSet.java
+++ b/src/java/org/apache/cassandra/db/virtual/SimpleDataSet.java
@@ -204,9 +204,8 @@ public class SimpleDataSet extends AbstractVirtualTable.AbstractDataSet
}
}
- @SuppressWarnings("unchecked")
- private static <T> ByteBuffer decompose(AbstractType<?> type, T value)
+ private static ByteBuffer decompose(AbstractType<?> type, Object value)
{
- return ((AbstractType<T>) type).decompose(value);
+ return type.decomposeUntyped(value);
}
}
diff --git a/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java b/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java
index 7acfc6d..07bdc42 100644
--- a/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java
+++ b/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java
@@ -19,7 +19,6 @@ package org.apache.cassandra.index.internal;
import java.util.Collection;
import java.util.Set;
-import java.util.UUID;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
@@ -32,7 +31,9 @@ import org.apache.cassandra.index.SecondaryIndexBuilder;
import org.apache.cassandra.io.sstable.ReducingKeyIterator;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.schema.ColumnMetadata;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
/**
* Manages building an entire index from column family data. Runs on to compaction manager.
@@ -42,7 +43,7 @@ public class CollatedViewIndexBuilder extends SecondaryIndexBuilder
private final ColumnFamilyStore cfs;
private final Set<Index> indexers;
private final ReducingKeyIterator iter;
- private final UUID compactionId;
+ private final TimeUUID compactionId;
private final Collection<SSTableReader> sstables;
public CollatedViewIndexBuilder(ColumnFamilyStore cfs, Set<Index> indexers, ReducingKeyIterator iter, Collection<SSTableReader> sstables)
@@ -50,7 +51,7 @@ public class CollatedViewIndexBuilder extends SecondaryIndexBuilder
this.cfs = cfs;
this.indexers = indexers;
this.iter = iter;
- this.compactionId = UUIDGen.getTimeUUID();
+ this.compactionId = nextTimeUUID();
this.sstables = sstables;
}
diff --git a/src/java/org/apache/cassandra/index/sasi/SASIIndexBuilder.java b/src/java/org/apache/cassandra/index/sasi/SASIIndexBuilder.java
index 2171653..57a3f51 100644
--- a/src/java/org/apache/cassandra/index/sasi/SASIIndexBuilder.java
+++ b/src/java/org/apache/cassandra/index/sasi/SASIIndexBuilder.java
@@ -42,12 +42,14 @@ import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.util.RandomAccessReader;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
class SASIIndexBuilder extends SecondaryIndexBuilder
{
private final ColumnFamilyStore cfs;
- private final UUID compactionId = UUIDGen.getTimeUUID();
+ private final TimeUUID compactionId = nextTimeUUID();
private final SortedMap<SSTableReader, Map<ColumnMetadata, ColumnIndex>> sstables;
diff --git a/src/java/org/apache/cassandra/io/sstable/Descriptor.java b/src/java/org/apache/cassandra/io/sstable/Descriptor.java
index 7c70b5a..c96e906 100644
--- a/src/java/org/apache/cassandra/io/sstable/Descriptor.java
+++ b/src/java/org/apache/cassandra/io/sstable/Descriptor.java
@@ -31,9 +31,9 @@ import org.apache.cassandra.io.sstable.metadata.IMetadataSerializer;
import org.apache.cassandra.io.sstable.metadata.MetadataSerializer;
import org.apache.cassandra.io.util.File;
import org.apache.cassandra.utils.Pair;
-import org.apache.cassandra.utils.UUIDGen;
import static org.apache.cassandra.io.sstable.Component.separator;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
/**
* A SSTable is described by the keyspace and column family it contains data
@@ -120,7 +120,7 @@ public class Descriptor
{
// Use UUID to handle concurrent streamings on the same sstable.
// TMP_EXT allows temp file to be removed by {@link ColumnFamilyStore#scrubDataDirectories}
- return String.format("%s.%s%s", filenameFor(component), UUIDGen.getTimeUUID(), TMP_EXT);
+ return String.format("%s.%s%s", filenameFor(component), nextTimeUUID(), TMP_EXT);
}
public String filenameFor(Component component)
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java b/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
index 91a3b54..8bbe709 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
@@ -25,7 +25,6 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import com.google.common.annotations.VisibleForTesting;
@@ -44,10 +43,12 @@ import org.apache.cassandra.metrics.StorageMetrics;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Refs;
import static org.apache.cassandra.io.sstable.Downsampling.BASE_SAMPLING_LEVEL;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class IndexSummaryRedistribution extends CompactionInfo.Holder
{
@@ -63,7 +64,7 @@ public class IndexSummaryRedistribution extends CompactionInfo.Holder
private final Map<TableId, LifecycleTransaction> transactions;
private final long nonRedistributingOffHeapSize;
private final long memoryPoolBytes;
- private final UUID compactionId;
+ private final TimeUUID compactionId;
private volatile long remainingSpace;
/**
@@ -77,7 +78,7 @@ public class IndexSummaryRedistribution extends CompactionInfo.Holder
this.transactions = transactions;
this.nonRedistributingOffHeapSize = nonRedistributingOffHeapSize;
this.memoryPoolBytes = memoryPoolBytes;
- this.compactionId = UUID.randomUUID();
+ this.compactionId = nextTimeUUID();
}
public List<SSTableReader> redistributeSummaries() throws IOException
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTable.java b/src/java/org/apache/cassandra/io/sstable/SSTable.java
index 04f22d9..fbeff81 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTable.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTable.java
@@ -50,6 +50,7 @@ import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.schema.TableMetadataRef;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.memory.HeapAllocator;
import static org.apache.cassandra.io.util.File.WriteMode.APPEND;
@@ -371,7 +372,7 @@ public abstract class SSTable
return AbstractBounds.bounds(first.getToken(), true, last.getToken(), true);
}
- public static void validateRepairedMetadata(long repairedAt, UUID pendingRepair, boolean isTransient)
+ public static void validateRepairedMetadata(long repairedAt, TimeUUID pendingRepair, boolean isTransient)
{
Preconditions.checkArgument((pendingRepair == NO_PENDING_REPAIR) || (repairedAt == UNREPAIRED_SSTABLE),
"pendingRepair cannot be set on a repaired sstable");
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java
index cfb1365..83c5542 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.io.sstable;
import java.io.IOException;
import java.util.Collection;
-import java.util.UUID;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Keyspace;
@@ -34,6 +33,7 @@ import org.apache.cassandra.io.sstable.format.SSTableFormat;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.schema.TableMetadataRef;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Transactional;
/**
@@ -99,7 +99,7 @@ public class SSTableTxnWriter extends Transactional.AbstractTransactional implem
}
@SuppressWarnings("resource") // log and writer closed during doPostCleanup
- public static SSTableTxnWriter create(ColumnFamilyStore cfs, Descriptor descriptor, long keyCount, long repairedAt, UUID pendingRepair, boolean isTransient, int sstableLevel, SerializationHeader header)
+ public static SSTableTxnWriter create(ColumnFamilyStore cfs, Descriptor descriptor, long keyCount, long repairedAt, TimeUUID pendingRepair, boolean isTransient, int sstableLevel, SerializationHeader header)
{
LifecycleTransaction txn = LifecycleTransaction.offline(OperationType.WRITE);
SSTableMultiWriter writer = cfs.createSSTableMultiWriter(descriptor, keyCount, repairedAt, pendingRepair, isTransient, sstableLevel, header, txn);
@@ -111,7 +111,7 @@ public class SSTableTxnWriter extends Transactional.AbstractTransactional implem
public static SSTableTxnWriter createRangeAware(TableMetadataRef metadata,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
SSTableFormat.Type type,
int sstableLevel,
@@ -140,7 +140,7 @@ public class SSTableTxnWriter extends Transactional.AbstractTransactional implem
Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
int sstableLevel,
SerializationHeader header,
@@ -153,7 +153,7 @@ public class SSTableTxnWriter extends Transactional.AbstractTransactional implem
return new SSTableTxnWriter(txn, writer);
}
- public static SSTableTxnWriter create(ColumnFamilyStore cfs, Descriptor desc, long keyCount, long repairedAt, UUID pendingRepair, boolean isTransient, SerializationHeader header)
+ public static SSTableTxnWriter create(ColumnFamilyStore cfs, Descriptor desc, long keyCount, long repairedAt, TimeUUID pendingRepair, boolean isTransient, SerializationHeader header)
{
return create(cfs, desc, keyCount, repairedAt, pendingRepair, isTransient, 0, header);
}
diff --git a/src/java/org/apache/cassandra/io/sstable/SimpleSSTableMultiWriter.java b/src/java/org/apache/cassandra/io/sstable/SimpleSSTableMultiWriter.java
index a84f07e..ec28528 100644
--- a/src/java/org/apache/cassandra/io/sstable/SimpleSSTableMultiWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SimpleSSTableMultiWriter.java
@@ -19,7 +19,6 @@ package org.apache.cassandra.io.sstable;
import java.util.Collection;
import java.util.Collections;
-import java.util.UUID;
import org.apache.cassandra.db.RowIndexEntry;
import org.apache.cassandra.db.SerializationHeader;
@@ -31,6 +30,7 @@ import org.apache.cassandra.io.sstable.format.SSTableWriter;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.schema.TableMetadataRef;
+import org.apache.cassandra.utils.TimeUUID;
public class SimpleSSTableMultiWriter implements SSTableMultiWriter
{
@@ -110,7 +110,7 @@ public class SimpleSSTableMultiWriter implements SSTableMultiWriter
public static SSTableMultiWriter create(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
TableMetadataRef metadata,
MetadataCollector metadataCollector,
diff --git a/src/java/org/apache/cassandra/io/sstable/format/RangeAwareSSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/RangeAwareSSTableWriter.java
index 43b1957..e9b15b1 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/RangeAwareSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/RangeAwareSSTableWriter.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.UUID;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
@@ -35,6 +34,7 @@ import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.SSTableMultiWriter;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
public class RangeAwareSSTableWriter implements SSTableMultiWriter
{
@@ -43,7 +43,7 @@ public class RangeAwareSSTableWriter implements SSTableMultiWriter
private final int sstableLevel;
private final long estimatedKeys;
private final long repairedAt;
- private final UUID pendingRepair;
+ private final TimeUUID pendingRepair;
private final boolean isTransient;
private final SSTableFormat.Type format;
private final SerializationHeader header;
@@ -54,7 +54,7 @@ public class RangeAwareSSTableWriter implements SSTableMultiWriter
private final List<SSTableReader> finishedReaders = new ArrayList<>();
private SSTableMultiWriter currentWriter = null;
- public RangeAwareSSTableWriter(ColumnFamilyStore cfs, long estimatedKeys, long repairedAt, UUID pendingRepair, boolean isTransient, SSTableFormat.Type format, int sstableLevel, long totalSize, LifecycleNewTracker lifecycleNewTracker, SerializationHeader header) throws IOException
+ public RangeAwareSSTableWriter(ColumnFamilyStore cfs, long estimatedKeys, long repairedAt, TimeUUID pendingRepair, boolean isTransient, SSTableFormat.Type format, int sstableLevel, long totalSize, LifecycleNewTracker lifecycleNewTracker, SerializationHeader header) throws IOException
{
DiskBoundaries db = cfs.getDiskBoundaries();
directories = db.directories;
diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index 998d374..8fb5ad5 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@ -1669,7 +1669,7 @@ public abstract class SSTableReader extends SSTable implements SelfRefCounted<SS
return sstableMetadata.pendingRepair != ActiveRepairService.NO_PENDING_REPAIR;
}
- public UUID getPendingRepair()
+ public TimeUUID getPendingRepair()
{
return sstableMetadata.pendingRepair;
}
@@ -1862,7 +1862,7 @@ public abstract class SSTableReader extends SSTable implements SelfRefCounted<SS
/**
* Mutate sstable repair metadata with a lock to avoid racing with entire-sstable-streaming and then reload sstable metadata
*/
- public void mutateRepairedAndReload(long newRepairedAt, UUID newPendingRepair, boolean isTransient) throws IOException
+ public void mutateRepairedAndReload(long newRepairedAt, TimeUUID newPendingRepair, boolean isTransient) throws IOException
{
synchronized (tidy.global)
{
diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java
index 43c50c5..1d9603e 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java
@@ -43,6 +43,7 @@ import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.schema.Schema;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.schema.TableMetadataRef;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Transactional;
/**
@@ -54,7 +55,7 @@ import org.apache.cassandra.utils.concurrent.Transactional;
public abstract class SSTableWriter extends SSTable implements Transactional
{
protected long repairedAt;
- protected UUID pendingRepair;
+ protected TimeUUID pendingRepair;
protected boolean isTransient;
protected long maxDataAge = -1;
protected final long keyCount;
@@ -77,7 +78,7 @@ public abstract class SSTableWriter extends SSTable implements Transactional
protected SSTableWriter(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
TableMetadataRef metadata,
MetadataCollector metadataCollector,
@@ -98,7 +99,7 @@ public abstract class SSTableWriter extends SSTable implements Transactional
public static SSTableWriter create(Descriptor descriptor,
Long keyCount,
Long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
TableMetadataRef metadata,
MetadataCollector metadataCollector,
@@ -113,7 +114,7 @@ public abstract class SSTableWriter extends SSTable implements Transactional
public static SSTableWriter create(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
int sstableLevel,
SerializationHeader header,
@@ -128,7 +129,7 @@ public abstract class SSTableWriter extends SSTable implements Transactional
Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
int sstableLevel,
SerializationHeader header,
@@ -143,7 +144,7 @@ public abstract class SSTableWriter extends SSTable implements Transactional
public static SSTableWriter create(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
SerializationHeader header,
Collection<Index> indexes,
@@ -377,7 +378,7 @@ public abstract class SSTableWriter extends SSTable implements Transactional
public abstract SSTableWriter open(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
TableMetadataRef metadata,
MetadataCollector metadataCollector,
diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
index ff0d791..e25b0a9 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
@@ -30,6 +30,7 @@ import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.format.*;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.net.MessagingService;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Legacy bigtable format
@@ -82,7 +83,7 @@ public class BigFormat implements SSTableFormat
public SSTableWriter open(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
TableMetadataRef metadata,
MetadataCollector metadataCollector,
diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index 85eb8ed..0e20f28 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@ -77,7 +77,7 @@ public class BigTableWriter extends SSTableWriter
public BigTableWriter(Descriptor descriptor,
long keyCount,
long repairedAt,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient,
TableMetadataRef metadata,
MetadataCollector metadataCollector,
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java
index fc1ce42..ff1e604 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java
@@ -20,13 +20,13 @@ package org.apache.cassandra.io.sstable.metadata;
import java.io.IOException;
import java.util.EnumSet;
import java.util.Map;
-import java.util.UUID;
import java.util.function.UnaryOperator;
import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.sstable.format.Version;
import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Interface for SSTable metadata serializer
@@ -94,7 +94,7 @@ public interface IMetadataSerializer
* NOTE: mutating stats metadata of a live sstable will race with entire-sstable-streaming, please use
* {@link SSTableReader#mutateLevelAndReload} instead on live sstable.
*/
- public void mutateRepairMetadata(Descriptor descriptor, long newRepairedAt, UUID newPendingRepair, boolean isTransient) throws IOException;
+ public void mutateRepairMetadata(Descriptor descriptor, long newRepairedAt, TimeUUID newPendingRepair, boolean isTransient) throws IOException;
/**
* Replace the sstable metadata file ({@code -Statistics.db}) with the given components.
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
index 1e2d121..1375331 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java
@@ -41,6 +41,7 @@ import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.EstimatedHistogram;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MurmurHash;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.streamhist.TombstoneHistogram;
import org.apache.cassandra.utils.streamhist.StreamingTombstoneHistogramBuilder;
@@ -261,7 +262,7 @@ public class MetadataCollector implements PartitionStatisticsCollector
this.hasLegacyCounterShards = this.hasLegacyCounterShards || hasLegacyCounterShards;
}
- public Map<MetadataType, MetadataComponent> finalizeMetadata(String partitioner, double bloomFilterFPChance, long repairedAt, UUID pendingRepair, boolean isTransient, SerializationHeader header)
+ public Map<MetadataType, MetadataComponent> finalizeMetadata(String partitioner, double bloomFilterFPChance, long repairedAt, TimeUUID pendingRepair, boolean isTransient, SerializationHeader header)
{
Preconditions.checkState((minClustering == null && maxClustering == null)
|| comparator.compare(maxClustering, minClustering) >= 0);
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
index 66c0beb..f13daa4 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.io.sstable.Component;
import org.apache.cassandra.io.sstable.CorruptSSTableException;
import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.format.Version;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.utils.FBUtilities.updateChecksumInt;
@@ -236,7 +237,7 @@ public class MetadataSerializer implements IMetadataSerializer
}
@Override
- public void mutateRepairMetadata(Descriptor descriptor, long newRepairedAt, UUID newPendingRepair, boolean isTransient) throws IOException
+ public void mutateRepairMetadata(Descriptor descriptor, long newRepairedAt, TimeUUID newPendingRepair, boolean isTransient) throws IOException
{
if (logger.isTraceEnabled())
logger.trace("Mutating {} to repairedAt time {} and pendingRepair {}",
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
index 69ca455..9efcfa6 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
@@ -39,9 +39,9 @@ import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.EstimatedHistogram;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.streamhist.TombstoneHistogram;
import org.apache.cassandra.utils.UUIDSerializer;
-import org.apache.cassandra.utils.UUIDSerializer;
/**
* SSTable metadata that always stay on heap.
@@ -70,7 +70,7 @@ public class StatsMetadata extends MetadataComponent
public final long totalColumnsSet;
public final long totalRows;
public final UUID originatingHostId;
- public final UUID pendingRepair;
+ public final TimeUUID pendingRepair;
public final boolean isTransient;
// just holds the current encoding stats to avoid allocating - it is not serialized
public final EncodingStats encodingStats;
@@ -94,7 +94,7 @@ public class StatsMetadata extends MetadataComponent
long totalColumnsSet,
long totalRows,
UUID originatingHostId,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
boolean isTransient)
{
this.estimatedPartitionSize = estimatedPartitionSize;
@@ -175,7 +175,7 @@ public class StatsMetadata extends MetadataComponent
isTransient);
}
- public StatsMetadata mutateRepairedMetadata(long newRepairedAt, UUID newPendingRepair, boolean newIsTransient)
+ public StatsMetadata mutateRepairedMetadata(long newRepairedAt, TimeUUID newPendingRepair, boolean newIsTransient)
{
return new StatsMetadata(estimatedPartitionSize,
estimatedCellPerPartitionCount,
@@ -290,7 +290,7 @@ public class StatsMetadata extends MetadataComponent
{
size += 1;
if (component.pendingRepair != null)
- size += UUIDSerializer.serializer.serializedSize(component.pendingRepair, 0);
+ size += TimeUUID.sizeInBytes();
}
if (version.hasIsTransient())
@@ -344,7 +344,7 @@ public class StatsMetadata extends MetadataComponent
if (component.pendingRepair != null)
{
out.writeByte(1);
- UUIDSerializer.serializer.serialize(component.pendingRepair, out, 0);
+ component.pendingRepair.serialize(out);
}
else
{
@@ -441,10 +441,10 @@ public class StatsMetadata extends MetadataComponent
else
commitLogIntervals = new IntervalSet<CommitLogPosition>(commitLogLowerBound, commitLogUpperBound);
- UUID pendingRepair = null;
+ TimeUUID pendingRepair = null;
if (version.hasPendingRepair() && in.readByte() != 0)
{
- pendingRepair = UUIDSerializer.serializer.deserialize(in, 0);
+ pendingRepair = TimeUUID.deserialize(in);
}
boolean isTransient = version.hasIsTransient() && in.readBoolean();
diff --git a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
index 2a5fa9a..c611bd0 100644
--- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
@@ -33,6 +33,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
/**
* Metrics for {@link org.apache.cassandra.hints.HintsService}.
@@ -71,7 +72,7 @@ public class HintedHandoffMetrics
if (difference == 0)
continue;
logger.warn("{} has {} dropped hints, because node is down past configured hint window.", entry.getKey(), difference);
- SystemKeyspace.updateHintsDropped(entry.getKey(), UUIDGen.getTimeUUID(), (int) difference);
+ SystemKeyspace.updateHintsDropped(entry.getKey(), nextTimeUUID(), (int) difference);
}
}
diff --git a/src/java/org/apache/cassandra/net/Message.java b/src/java/org/apache/cassandra/net/Message.java
index 8fe8971..cbe258d 100644
--- a/src/java/org/apache/cassandra/net/Message.java
+++ b/src/java/org/apache/cassandra/net/Message.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.EnumMap;
import java.util.Map;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -47,6 +46,7 @@ import org.apache.cassandra.tracing.Tracing.TraceType;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MonotonicClockTranslation;
import org.apache.cassandra.utils.NoSpamLogger;
+import org.apache.cassandra.utils.TimeUUID;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -170,7 +170,7 @@ public class Message<T>
}
@Nullable
- public UUID traceSession()
+ public TimeUUID traceSession()
{
return header.traceSession();
}
@@ -456,9 +456,9 @@ public class Message<T>
}
@Nullable
- public UUID traceSession()
+ public TimeUUID traceSession()
{
- return (UUID) params.get(ParamType.TRACE_SESSION);
+ return (TimeUUID) params.get(ParamType.TRACE_SESSION);
}
@Nullable
diff --git a/src/java/org/apache/cassandra/net/ParamType.java b/src/java/org/apache/cassandra/net/ParamType.java
index 038530b..3417d76 100644
--- a/src/java/org/apache/cassandra/net/ParamType.java
+++ b/src/java/org/apache/cassandra/net/ParamType.java
@@ -26,6 +26,7 @@ import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.Int32Serializer;
import org.apache.cassandra.utils.Int64Serializer;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.UUIDSerializer;
import static java.lang.Math.max;
@@ -51,7 +52,7 @@ public enum ParamType
@Deprecated
FAILURE_CALLBACK (4, "CAL_BAC", LegacyFlag.serializer),
- TRACE_SESSION (5, "TraceSession", UUIDSerializer.serializer),
+ TRACE_SESSION (5, "TraceSession", TimeUUID.Serializer.instance),
TRACE_TYPE (6, "TraceType", Tracing.traceTypeSerializer),
@Deprecated
diff --git a/src/java/org/apache/cassandra/repair/AbstractRepairTask.java b/src/java/org/apache/cassandra/repair/AbstractRepairTask.java
index c729cda..2446c04 100644
--- a/src/java/org/apache/cassandra/repair/AbstractRepairTask.java
+++ b/src/java/org/apache/cassandra/repair/AbstractRepairTask.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
-import java.util.UUID;
import com.google.common.collect.Lists;
import com.google.common.util.concurrent.FutureCallback;
@@ -34,6 +33,7 @@ import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.repair.messages.RepairOption;
import org.apache.cassandra.service.ActiveRepairService;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
import org.apache.cassandra.utils.concurrent.FutureCombiner;
@@ -52,7 +52,7 @@ public abstract class AbstractRepairTask implements RepairTask
this.notifier = Objects.requireNonNull(notifier);
}
- private List<RepairSession> submitRepairSessions(UUID parentSession,
+ private List<RepairSession> submitRepairSessions(TimeUUID parentSession,
boolean isIncremental,
ExecutorPlus executor,
List<CommonRange> commonRanges,
@@ -81,7 +81,7 @@ public abstract class AbstractRepairTask implements RepairTask
return futures;
}
- protected Future<CoordinatedRepairResult> runRepair(UUID parentSession,
+ protected Future<CoordinatedRepairResult> runRepair(TimeUUID parentSession,
boolean isIncremental,
ExecutorPlus executor,
List<CommonRange> commonRanges,
diff --git a/src/java/org/apache/cassandra/repair/IncrementalRepairTask.java b/src/java/org/apache/cassandra/repair/IncrementalRepairTask.java
index c2951d5..b9b9e3a 100644
--- a/src/java/org/apache/cassandra/repair/IncrementalRepairTask.java
+++ b/src/java/org/apache/cassandra/repair/IncrementalRepairTask.java
@@ -29,18 +29,19 @@ import org.apache.cassandra.repair.consistent.CoordinatorSession;
import org.apache.cassandra.repair.messages.RepairOption;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
public class IncrementalRepairTask extends AbstractRepairTask
{
- private final UUID parentSession;
+ private final TimeUUID parentSession;
private final RepairRunnable.NeighborsAndRanges neighborsAndRanges;
private final String[] cfnames;
protected IncrementalRepairTask(RepairOption options,
String keyspace,
RepairNotifier notifier,
- UUID parentSession,
+ TimeUUID parentSession,
RepairRunnable.NeighborsAndRanges neighborsAndRanges,
String[] cfnames)
{
diff --git a/src/java/org/apache/cassandra/repair/KeyspaceRepairManager.java b/src/java/org/apache/cassandra/repair/KeyspaceRepairManager.java
index c8131cb..9042ebe 100644
--- a/src/java/org/apache/cassandra/repair/KeyspaceRepairManager.java
+++ b/src/java/org/apache/cassandra/repair/KeyspaceRepairManager.java
@@ -20,12 +20,12 @@ package org.apache.cassandra.repair;
import java.util.Collection;
import java.util.List;
-import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.function.BooleanSupplier;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.locator.RangesAtEndpoint;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
/**
@@ -38,7 +38,7 @@ public interface KeyspaceRepairManager
* been notified that the repair session has been completed, the data associated with the given session id must
* not be combined with repaired or unrepaired data, or data from other repair sessions.
*/
- Future<List<Void>> prepareIncrementalRepair(UUID sessionID,
+ Future<List<Void>> prepareIncrementalRepair(TimeUUID sessionID,
Collection<ColumnFamilyStore> tables,
RangesAtEndpoint tokenRanges,
ExecutorService executor,
diff --git a/src/java/org/apache/cassandra/repair/LocalSyncTask.java b/src/java/org/apache/cassandra/repair/LocalSyncTask.java
index dee5d98..a721a87 100644
--- a/src/java/org/apache/cassandra/repair/LocalSyncTask.java
+++ b/src/java/org/apache/cassandra/repair/LocalSyncTask.java
@@ -19,7 +19,6 @@ package org.apache.cassandra.repair;
import java.util.Collections;
import java.util.List;
-import java.util.UUID;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
@@ -40,6 +39,7 @@ import org.apache.cassandra.streaming.StreamState;
import org.apache.cassandra.tracing.TraceState;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
/**
* LocalSyncTask performs streaming between local(coordinator) node and remote replica.
@@ -50,7 +50,7 @@ public class LocalSyncTask extends SyncTask implements StreamEventHandler
private static final Logger logger = LoggerFactory.getLogger(LocalSyncTask.class);
- private final UUID pendingRepair;
+ private final TimeUUID pendingRepair;
@VisibleForTesting
public final boolean requestRanges;
@@ -58,7 +58,7 @@ public class LocalSyncTask extends SyncTask implements StreamEventHandler
public final boolean transferRanges;
public LocalSyncTask(RepairJobDesc desc, InetAddressAndPort local, InetAddressAndPort remote,
- List<Range<Token>> diff, UUID pendingRepair,
+ List<Range<Token>> diff, TimeUUID pendingRepair,
boolean requestRanges, boolean transferRanges, PreviewKind previewKind)
{
super(desc, local, remote, diff, previewKind);
diff --git a/src/java/org/apache/cassandra/repair/NoSuchRepairSessionException.java b/src/java/org/apache/cassandra/repair/NoSuchRepairSessionException.java
index e256172..0beb74c 100644
--- a/src/java/org/apache/cassandra/repair/NoSuchRepairSessionException.java
+++ b/src/java/org/apache/cassandra/repair/NoSuchRepairSessionException.java
@@ -18,11 +18,11 @@
package org.apache.cassandra.repair;
-import java.util.UUID;
+import org.apache.cassandra.utils.TimeUUID;
public class NoSuchRepairSessionException extends Exception
{
- public NoSuchRepairSessionException(UUID parentSessionId)
+ public NoSuchRepairSessionException(TimeUUID parentSessionId)
{
super(String.format("Parent repair session with id = %s has failed.", parentSessionId));
}
diff --git a/src/java/org/apache/cassandra/repair/NormalRepairTask.java b/src/java/org/apache/cassandra/repair/NormalRepairTask.java
index 532271c..56a03f8 100644
--- a/src/java/org/apache/cassandra/repair/NormalRepairTask.java
+++ b/src/java/org/apache/cassandra/repair/NormalRepairTask.java
@@ -18,22 +18,22 @@
package org.apache.cassandra.repair;
import java.util.List;
-import java.util.UUID;
import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.repair.messages.RepairOption;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
public class NormalRepairTask extends AbstractRepairTask
{
- private final UUID parentSession;
+ private final TimeUUID parentSession;
private final List<CommonRange> commonRanges;
private final String[] cfnames;
protected NormalRepairTask(RepairOption options,
String keyspace,
RepairNotifier notifier,
- UUID parentSession,
+ TimeUUID parentSession,
List<CommonRange> commonRanges,
String[] cfnames)
{
diff --git a/src/java/org/apache/cassandra/repair/PreviewRepairTask.java b/src/java/org/apache/cassandra/repair/PreviewRepairTask.java
index e2eb08c..b71e3ff 100644
--- a/src/java/org/apache/cassandra/repair/PreviewRepairTask.java
+++ b/src/java/org/apache/cassandra/repair/PreviewRepairTask.java
@@ -34,15 +34,16 @@ import org.apache.cassandra.repair.consistent.SyncStatSummary;
import org.apache.cassandra.repair.messages.RepairOption;
import org.apache.cassandra.streaming.PreviewKind;
import org.apache.cassandra.utils.DiagnosticSnapshotService;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
public class PreviewRepairTask extends AbstractRepairTask
{
- private final UUID parentSession;
+ private final TimeUUID parentSession;
private final List<CommonRange> commonRanges;
private final String[] cfnames;
- protected PreviewRepairTask(RepairOption options, String keyspace, RepairNotifier notifier, UUID parentSession, List<CommonRange> commonRanges, String[] cfnames)
+ protected PreviewRepairTask(RepairOption options, String keyspace, RepairNotifier notifier, TimeUUID parentSession, List<CommonRange> commonRanges, String[] cfnames)
{
super(options, keyspace, notifier);
this.parentSession = parentSession;
@@ -87,7 +88,7 @@ public class PreviewRepairTask extends AbstractRepairTask
});
}
- private void maybeSnapshotReplicas(UUID parentSession, String keyspace, List<RepairSessionResult> results)
+ private void maybeSnapshotReplicas(TimeUUID parentSession, String keyspace, List<RepairSessionResult> results)
{
if (!DatabaseDescriptor.snapshotOnRepairedDataMismatch())
return;
diff --git a/src/java/org/apache/cassandra/repair/RepairJobDesc.java b/src/java/org/apache/cassandra/repair/RepairJobDesc.java
index 97fd06a..00d1c02 100644
--- a/src/java/org/apache/cassandra/repair/RepairJobDesc.java
+++ b/src/java/org/apache/cassandra/repair/RepairJobDesc.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.repair;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.UUID;
import com.google.common.base.Objects;
@@ -33,7 +32,7 @@ import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.streaming.PreviewKind;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
/**
* RepairJobDesc is used from various repair processes to distinguish one RepairJob to another.
@@ -44,15 +43,15 @@ public class RepairJobDesc
{
public static final IVersionedSerializer<RepairJobDesc> serializer = new RepairJobDescSerializer();
- public final UUID parentSessionId;
+ public final TimeUUID parentSessionId;
/** RepairSession id */
- public final UUID sessionId;
+ public final TimeUUID sessionId;
public final String keyspace;
public final String columnFamily;
/** repairing range */
public final Collection<Range<Token>> ranges;
- public RepairJobDesc(UUID parentSessionId, UUID sessionId, String keyspace, String columnFamily, Collection<Range<Token>> ranges)
+ public RepairJobDesc(TimeUUID parentSessionId, TimeUUID sessionId, String keyspace, String columnFamily, Collection<Range<Token>> ranges)
{
this.parentSessionId = parentSessionId;
this.sessionId = sessionId;
@@ -101,9 +100,9 @@ public class RepairJobDesc
{
out.writeBoolean(desc.parentSessionId != null);
if (desc.parentSessionId != null)
- UUIDSerializer.serializer.serialize(desc.parentSessionId, out, version);
+ desc.parentSessionId.serialize(out);
- UUIDSerializer.serializer.serialize(desc.sessionId, out, version);
+ desc.sessionId.serialize(out);
out.writeUTF(desc.keyspace);
out.writeUTF(desc.columnFamily);
IPartitioner.validate(desc.ranges);
@@ -114,10 +113,10 @@ public class RepairJobDesc
public RepairJobDesc deserialize(DataInputPlus in, int version) throws IOException
{
- UUID parentSessionId = null;
+ TimeUUID parentSessionId = null;
if (in.readBoolean())
- parentSessionId = UUIDSerializer.serializer.deserialize(in, version);
- UUID sessionId = UUIDSerializer.serializer.deserialize(in, version);
+ parentSessionId = TimeUUID.deserialize(in);
+ TimeUUID sessionId = TimeUUID.deserialize(in);
String keyspace = in.readUTF();
String columnFamily = in.readUTF();
@@ -139,8 +138,8 @@ public class RepairJobDesc
{
int size = TypeSizes.sizeof(desc.parentSessionId != null);
if (desc.parentSessionId != null)
- size += UUIDSerializer.serializer.serializedSize(desc.parentSessionId, version);
- size += UUIDSerializer.serializer.serializedSize(desc.sessionId, version);
+ size += TimeUUID.sizeInBytes();
+ size += TimeUUID.sizeInBytes();
size += TypeSizes.sizeof(desc.keyspace);
size += TypeSizes.sizeof(desc.columnFamily);
size += TypeSizes.sizeof(desc.ranges.size());
diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
index 36769b9..8984cab 100644
--- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
+++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java
@@ -31,6 +31,7 @@ import org.apache.cassandra.repair.messages.*;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.streaming.PreviewKind;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.net.Verb.VALIDATION_RSP;
@@ -45,12 +46,12 @@ public class RepairMessageVerbHandler implements IVerbHandler<RepairMessage>
private static final Logger logger = LoggerFactory.getLogger(RepairMessageVerbHandler.class);
- private boolean isIncremental(UUID sessionID)
+ private boolean isIncremental(TimeUUID sessionID)
{
return ActiveRepairService.instance.consistent.local.isSessionInProgress(sessionID);
}
- private PreviewKind previewKind(UUID sessionID) throws NoSuchRepairSessionException
+ private PreviewKind previewKind(TimeUUID sessionID) throws NoSuchRepairSessionException
{
ActiveRepairService.ParentRepairSession prs = ActiveRepairService.instance.getParentRepairSession(sessionID);
return prs != null ? prs.previewKind : PreviewKind.NONE;
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index cc9c770..b58d4f6 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -37,6 +37,9 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+
+import org.apache.cassandra.utils.TimeUUID;
+import org.apache.cassandra.utils.concurrent.Future;
import org.apache.commons.lang3.time.DurationFormatUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,7 +76,6 @@ import org.apache.cassandra.transport.messages.ResultMessage;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Throwables;
-import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.cassandra.utils.concurrent.Future;
import org.apache.cassandra.utils.progress.ProgressEvent;
@@ -85,6 +87,7 @@ import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFac
import static org.apache.cassandra.service.QueryState.forInternalCalls;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class RepairRunnable implements Runnable, ProgressEventNotifier, RepairNotifier
{
@@ -100,7 +103,7 @@ public class RepairRunnable implements Runnable, ProgressEventNotifier, RepairNo
private final int totalProgress;
private final long creationTimeMillis = currentTimeMillis();
- private final UUID parentSession = UUIDGen.getTimeUUID();
+ private final TimeUUID parentSession = nextTimeUUID();
private final List<ProgressListener> listeners = new ArrayList<>();
@@ -305,7 +308,7 @@ public class RepairRunnable implements Runnable, ProgressEventNotifier, RepairNo
for (ColumnFamilyStore cfs : columnFamilyStores)
cfsb.append(", ").append(cfs.keyspace.getName()).append(".").append(cfs.name);
- UUID sessionId = Tracing.instance.newSession(Tracing.TraceType.REPAIR);
+ TimeUUID sessionId = Tracing.instance.newSession(Tracing.TraceType.REPAIR);
TraceState traceState = Tracing.instance.begin("repair", ImmutableMap.of("keyspace", keyspace, "columnFamilies",
cfsb.substring(2)));
traceState.enableActivityNotification(tag);
@@ -482,7 +485,7 @@ public class RepairRunnable implements Runnable, ProgressEventNotifier, RepairNo
neighborRangeList.add(new CommonRange(endpoints, transEndpoints, ranges));
}
- private Thread createQueryThread(final UUID sessionId)
+ private Thread createQueryThread(final TimeUUID sessionId)
{
return executorFactory().startThread("Repair-Runnable-" + threadCounter.incrementAndGet(), new WrappedRunnable()
{
@@ -498,7 +501,7 @@ public class RepairRunnable implements Runnable, ProgressEventNotifier, RepairNo
String query = String.format(format, SchemaConstants.TRACE_KEYSPACE_NAME, TraceKeyspace.EVENTS);
SelectStatement statement = (SelectStatement) QueryProcessor.parseStatement(query).prepare(ClientState.forInternalCalls());
- ByteBuffer sessionIdBytes = ByteBufferUtil.bytes(sessionId);
+ ByteBuffer sessionIdBytes = sessionId.toBytes();
InetAddressAndPort source = FBUtilities.getBroadcastAddressAndPort();
HashSet<UUID>[] seen = new HashSet[]{ new HashSet<>(), new HashSet<>() };
@@ -525,8 +528,8 @@ public class RepairRunnable implements Runnable, ProgressEventNotifier, RepairNo
timeout = minWaitMillis;
shouldDouble = false;
}
- ByteBuffer tminBytes = ByteBufferUtil.bytes(UUIDGen.minTimeUUID(tlast - 1000));
- ByteBuffer tmaxBytes = ByteBufferUtil.bytes(UUIDGen.maxTimeUUID(tcur = currentTimeMillis()));
+ ByteBuffer tminBytes = TimeUUID.minAtUnixMillis(tlast - 1000).toBytes();
+ ByteBuffer tmaxBytes = TimeUUID.maxAtUnixMillis(tcur = currentTimeMillis()).toBytes();
QueryOptions options = QueryOptions.forInternalCalls(ConsistencyLevel.ONE, Lists.newArrayList(sessionIdBytes,
tminBytes,
tmaxBytes));
diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java
index 2e2b36b..4bce9ea 100644
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@ -35,6 +35,7 @@ import com.google.common.collect.Lists;
import com.google.common.util.concurrent.*;
import org.apache.cassandra.concurrent.ExecutorFactory;
import org.apache.cassandra.concurrent.ExecutorPlus;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.AsyncFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -102,9 +103,9 @@ public class RepairSession extends AsyncFuture<RepairSessionResult> implements I
{
private static final Logger logger = LoggerFactory.getLogger(RepairSession.class);
- public final UUID parentRepairSession;
+ public final TimeUUID parentRepairSession;
/** Repair session ID */
- private final UUID id;
+ private final TimeUUID id;
public final String keyspace;
private final String[] cfnames;
public final RepairParallelism parallelismDegree;
@@ -138,8 +139,8 @@ public class RepairSession extends AsyncFuture<RepairSessionResult> implements I
* @param pullRepair true if the repair should be one way (from remote host to this host and only applicable between two hosts--see RepairOption)
* @param cfnames names of columnfamilies
*/
- public RepairSession(UUID parentRepairSession,
- UUID id,
+ public RepairSession(TimeUUID parentRepairSession,
+ TimeUUID id,
CommonRange commonRange,
String keyspace,
RepairParallelism parallelismDegree,
@@ -169,7 +170,7 @@ public class RepairSession extends AsyncFuture<RepairSessionResult> implements I
return ExecutorFactory.Global.executorFactory().pooled("RepairJobTask", Integer.MAX_VALUE);
}
- public UUID getId()
+ public TimeUUID getId()
{
return id;
}
diff --git a/src/java/org/apache/cassandra/repair/RepairSessionResult.java b/src/java/org/apache/cassandra/repair/RepairSessionResult.java
index 491ab2f..6217ef4 100644
--- a/src/java/org/apache/cassandra/repair/RepairSessionResult.java
+++ b/src/java/org/apache/cassandra/repair/RepairSessionResult.java
@@ -18,23 +18,23 @@
package org.apache.cassandra.repair;
import java.util.Collection;
-import java.util.UUID;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Repair session result
*/
public class RepairSessionResult
{
- public final UUID sessionId;
+ public final TimeUUID sessionId;
public final String keyspace;
public final Collection<Range<Token>> ranges;
public final Collection<RepairResult> repairJobResults;
public final boolean skippedReplicas;
- public RepairSessionResult(UUID sessionId, String keyspace, Collection<Range<Token>> ranges, Collection<RepairResult> repairJobResults, boolean skippedReplicas)
+ public RepairSessionResult(TimeUUID sessionId, String keyspace, Collection<Range<Token>> ranges, Collection<RepairResult> repairJobResults, boolean skippedReplicas)
{
this.sessionId = sessionId;
this.keyspace = keyspace;
diff --git a/src/java/org/apache/cassandra/repair/StreamingRepairTask.java b/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
index fbfbac8..02697b6 100644
--- a/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
+++ b/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
@@ -17,7 +17,6 @@
*/
package org.apache.cassandra.repair;
-import java.util.UUID;
import java.util.Collections;
import java.util.Collection;
@@ -38,6 +37,7 @@ import org.apache.cassandra.streaming.StreamEventHandler;
import org.apache.cassandra.streaming.StreamPlan;
import org.apache.cassandra.streaming.StreamState;
import org.apache.cassandra.streaming.StreamOperation;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.net.Verb.SYNC_RSP;
@@ -55,10 +55,10 @@ public class StreamingRepairTask implements Runnable, StreamEventHandler
private final InetAddressAndPort src;
private final InetAddressAndPort dst;
private final Collection<Range<Token>> ranges;
- private final UUID pendingRepair;
+ private final TimeUUID pendingRepair;
private final PreviewKind previewKind;
- public StreamingRepairTask(RepairJobDesc desc, InetAddressAndPort initiator, InetAddressAndPort src, InetAddressAndPort dst, Collection<Range<Token>> ranges, UUID pendingRepair, PreviewKind previewKind, boolean asymmetric)
+ public StreamingRepairTask(RepairJobDesc desc, InetAddressAndPort initiator, InetAddressAndPort src, InetAddressAndPort dst, Collection<Range<Token>> ranges, TimeUUID pendingRepair, PreviewKind previewKind, boolean asymmetric)
{
this.desc = desc;
this.initiator = initiator;
diff --git a/src/java/org/apache/cassandra/repair/TableRepairManager.java b/src/java/org/apache/cassandra/repair/TableRepairManager.java
index 102ded8..0210afd 100644
--- a/src/java/org/apache/cassandra/repair/TableRepairManager.java
+++ b/src/java/org/apache/cassandra/repair/TableRepairManager.java
@@ -20,12 +20,12 @@ package org.apache.cassandra.repair;
import java.io.IOException;
import java.util.Collection;
-import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Table level hook for repair
@@ -37,7 +37,7 @@ public interface TableRepairManager
* data previously isolated for repair with the given parentId. nowInSec should determine whether tombstones should
* be purged or not.
*/
- ValidationPartitionIterator getValidationIterator(Collection<Range<Token>> ranges, UUID parentId, UUID sessionID, boolean isIncremental, int nowInSec) throws IOException, NoSuchRepairSessionException;
+ ValidationPartitionIterator getValidationIterator(Collection<Range<Token>> ranges, TimeUUID parentId, TimeUUID sessionID, boolean isIncremental, int nowInSec) throws IOException, NoSuchRepairSessionException;
/**
* Begin execution of the given validation callable. Which thread pool a validation should run in is an implementation detail.
@@ -54,7 +54,7 @@ public interface TableRepairManager
* time. If the repairedAt time is zero, the data for the given session should be demoted back to unrepaired. Otherwise,
* it should be promoted to repaired with the given repaired time.
*/
- void incrementalSessionCompleted(UUID sessionID);
+ void incrementalSessionCompleted(TimeUUID sessionID);
/**
* For snapshot repairs. A snapshot of the current data for the given ranges should be taken with the given name.
diff --git a/src/java/org/apache/cassandra/repair/consistent/ConsistentSession.java b/src/java/org/apache/cassandra/repair/consistent/ConsistentSession.java
index 4384bfa..86ecfb7 100644
--- a/src/java/org/apache/cassandra/repair/consistent/ConsistentSession.java
+++ b/src/java/org/apache/cassandra/repair/consistent/ConsistentSession.java
@@ -47,6 +47,7 @@ import org.apache.cassandra.repair.messages.ValidationRequest;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.tools.nodetool.RepairAdmin;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Base class for consistent Local and Coordinator sessions
@@ -55,7 +56,7 @@ import org.apache.cassandra.tools.nodetool.RepairAdmin;
* There are 4 stages to a consistent incremental repair.
*
* <h1>Repair prepare</h1>
- * First, the normal {@link ActiveRepairService#prepareForRepair(UUID, InetAddressAndPort, Set, RepairOption, boolean, List)} stuff
+ * First, the normal {@link ActiveRepairService#prepareForRepair(TimeUUID, InetAddressAndPort, Set, RepairOption, boolean, List)} stuff
* happens, which sends out {@link PrepareMessage} and creates a {@link ActiveRepairService.ParentRepairSession}
* on the coordinator and each of the neighbors.
*
@@ -186,7 +187,7 @@ public abstract class ConsistentSession
}
private volatile State state;
- public final UUID sessionID;
+ public final TimeUUID sessionID;
public final InetAddressAndPort coordinator;
public final ImmutableSet<TableId> tableIds;
public final long repairedAt;
@@ -264,7 +265,7 @@ public abstract class ConsistentSession
abstract static class AbstractBuilder
{
private State state;
- private UUID sessionID;
+ private TimeUUID sessionID;
private InetAddressAndPort coordinator;
private Set<TableId> ids;
private long repairedAt;
@@ -276,7 +277,7 @@ public abstract class ConsistentSession
this.state = state;
}
- void withSessionID(UUID sessionID)
+ void withSessionID(TimeUUID sessionID)
{
this.sessionID = sessionID;
}
diff --git a/src/java/org/apache/cassandra/repair/consistent/CoordinatorSessions.java b/src/java/org/apache/cassandra/repair/consistent/CoordinatorSessions.java
index ecd52e6..328c16e 100644
--- a/src/java/org/apache/cassandra/repair/consistent/CoordinatorSessions.java
+++ b/src/java/org/apache/cassandra/repair/consistent/CoordinatorSessions.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.repair.consistent;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import com.google.common.base.Preconditions;
@@ -31,20 +30,21 @@ import org.apache.cassandra.repair.messages.FinalizePromise;
import org.apache.cassandra.repair.messages.PrepareConsistentResponse;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.repair.NoSuchRepairSessionException;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Container for all consistent repair sessions a node is coordinating
*/
public class CoordinatorSessions
{
- private final Map<UUID, CoordinatorSession> sessions = new HashMap<>();
+ private final Map<TimeUUID, CoordinatorSession> sessions = new HashMap<>();
protected CoordinatorSession buildSession(CoordinatorSession.Builder builder)
{
return new CoordinatorSession(builder);
}
- public synchronized CoordinatorSession registerSession(UUID sessionId, Set<InetAddressAndPort> participants, boolean isForced) throws NoSuchRepairSessionException
+ public synchronized CoordinatorSession registerSession(TimeUUID sessionId, Set<InetAddressAndPort> participants, boolean isForced) throws NoSuchRepairSessionException
{
ActiveRepairService.ParentRepairSession prs = ActiveRepairService.instance.getParentRepairSession(sessionId);
@@ -67,7 +67,7 @@ public class CoordinatorSessions
return session;
}
- public synchronized CoordinatorSession getSession(UUID sessionId)
+ public synchronized CoordinatorSession getSession(TimeUUID sessionId)
{
return sessions.get(sessionId);
}
diff --git a/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java b/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
index 29a744d..bdd8e95 100644
--- a/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
+++ b/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
@@ -94,6 +94,7 @@ import org.apache.cassandra.repair.NoSuchRepairSessionException;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Throwables;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
@@ -154,7 +155,7 @@ public class LocalSessions
private final String keyspace = SchemaConstants.SYSTEM_KEYSPACE_NAME;
private final String table = SystemKeyspace.REPAIRS;
private boolean started = false;
- private volatile ImmutableMap<UUID, LocalSession> sessions = ImmutableMap.of();
+ private volatile ImmutableMap<TimeUUID, LocalSession> sessions = ImmutableMap.of();
private volatile ImmutableMap<TableId, RepairedState> repairedStates = ImmutableMap.of();
@VisibleForTesting
@@ -274,10 +275,10 @@ public class LocalSessions
PendingStat.Builder finalized = new PendingStat.Builder();
PendingStat.Builder failed = new PendingStat.Builder();
- Map<UUID, PendingStat> stats = cfs.getPendingRepairStats();
- for (Map.Entry<UUID, PendingStat> entry : stats.entrySet())
+ Map<TimeUUID, PendingStat> stats = cfs.getPendingRepairStats();
+ for (Map.Entry<TimeUUID, PendingStat> entry : stats.entrySet())
{
- UUID sessionID = entry.getKey();
+ TimeUUID sessionID = entry.getKey();
PendingStat stat = entry.getValue();
Verify.verify(sessionID.equals(Iterables.getOnlyElement(stat.sessions)));
@@ -311,7 +312,7 @@ public class LocalSessions
&& Range.intersects(ls.ranges, ranges));
ColumnFamilyStore cfs = Schema.instance.getColumnFamilyStoreInstance(tid);
- Set<UUID> sessionIds = Sets.newHashSet(Iterables.transform(candidates, s -> s.sessionID));
+ Set<TimeUUID> sessionIds = Sets.newHashSet(Iterables.transform(candidates, s -> s.sessionID));
return cfs.releaseRepairData(sessionIds, force);
@@ -321,7 +322,7 @@ public class LocalSessions
* hook for operators to cancel sessions, cancelling from a non-coordinator is an error, unless
* force is set to true. Messages are sent out to other participants, but we don't wait for a response
*/
- public void cancelSession(UUID sessionID, boolean force)
+ public void cancelSession(TimeUUID sessionID, boolean force)
{
logger.info("Cancelling local repair session {}", sessionID);
LocalSession session = getSession(sessionID);
@@ -347,7 +348,7 @@ public class LocalSessions
Preconditions.checkArgument(!started, "LocalSessions.start can only be called once");
Preconditions.checkArgument(sessions.isEmpty(), "No sessions should be added before start");
UntypedResultSet rows = QueryProcessor.executeInternalWithPaging(String.format("SELECT * FROM %s.%s", keyspace, table), 1000);
- Map<UUID, LocalSession> loadedSessions = new HashMap<>();
+ Map<TimeUUID, LocalSession> loadedSessions = new HashMap<>();
Map<TableId, List<RepairedState.Level>> initialLevels = new HashMap<>();
for (UntypedResultSet.Row row : rows)
{
@@ -364,9 +365,9 @@ public class LocalSessions
}
catch (IllegalArgumentException | NullPointerException e)
{
- logger.warn("Unable to load malformed repair session {}, removing", row.has("parent_id") ? row.getUUID("parent_id") : null);
+ logger.warn("Unable to load malformed repair session {}, removing", row.has("parent_id") ? row.getTimeUUID("parent_id") : null);
if (row.has("parent_id"))
- deleteRow(row.getUUID("parent_id"));
+ deleteRow(row.getTimeUUID("parent_id"));
}
}
for (Map.Entry<TableId, List<RepairedState.Level>> entry : initialLevels.entrySet())
@@ -565,7 +566,7 @@ public class LocalSessions
{
LocalSession.Builder builder = LocalSession.builder();
builder.withState(ConsistentSession.State.valueOf(row.getInt("state")));
- builder.withSessionID(row.getUUID("parent_id"));
+ builder.withSessionID(row.getTimeUUID("parent_id"));
InetAddressAndPort coordinator = InetAddressAndPort.getByAddressOverrideDefaults(
row.getInetAddress("coordinator"),
row.getInt("coordinator_port"));
@@ -593,7 +594,7 @@ public class LocalSessions
return buildSession(builder);
}
- private void deleteRow(UUID sessionID)
+ private void deleteRow(TimeUUID sessionID)
{
String query = "DELETE FROM %s.%s WHERE parent_id=?";
QueryProcessor.executeInternal(String.format(query, keyspace, table), sessionID);
@@ -610,7 +611,7 @@ public class LocalSessions
* Loads a session directly from the table. Should be used for testing only
*/
@VisibleForTesting
- LocalSession loadUnsafe(UUID sessionId)
+ LocalSession loadUnsafe(TimeUUID sessionId)
{
String query = "SELECT * FROM %s.%s WHERE parent_id=?";
UntypedResultSet result = QueryProcessor.executeInternal(String.format(query, keyspace, table), sessionId);
@@ -627,7 +628,7 @@ public class LocalSessions
return new LocalSession(builder);
}
- public LocalSession getSession(UUID sessionID)
+ public LocalSession getSession(TimeUUID sessionID)
{
return sessions.get(sessionID);
}
@@ -644,22 +645,22 @@ public class LocalSessions
Preconditions.checkArgument(!sessions.containsKey(session.sessionID),
"LocalSession %s already exists", session.sessionID);
Preconditions.checkArgument(started, "sessions cannot be added before LocalSessions is started");
- sessions = ImmutableMap.<UUID, LocalSession>builder()
+ sessions = ImmutableMap.<TimeUUID, LocalSession>builder()
.putAll(sessions)
.put(session.sessionID, session)
.build();
}
- private synchronized void removeSession(UUID sessionID)
+ private synchronized void removeSession(TimeUUID sessionID)
{
Preconditions.checkArgument(sessionID != null);
- Map<UUID, LocalSession> temp = new HashMap<>(sessions);
+ Map<TimeUUID, LocalSession> temp = new HashMap<>(sessions);
temp.remove(sessionID);
sessions = ImmutableMap.copyOf(temp);
}
@VisibleForTesting
- LocalSession createSessionUnsafe(UUID sessionId, ActiveRepairService.ParentRepairSession prs, Set<InetAddressAndPort> peers)
+ LocalSession createSessionUnsafe(TimeUUID sessionId, ActiveRepairService.ParentRepairSession prs, Set<InetAddressAndPort> peers)
{
LocalSession.Builder builder = LocalSession.builder();
builder.withState(ConsistentSession.State.PREPARING);
@@ -678,7 +679,7 @@ public class LocalSessions
return buildSession(builder);
}
- protected ActiveRepairService.ParentRepairSession getParentRepairSession(UUID sessionID) throws NoSuchRepairSessionException
+ protected ActiveRepairService.ParentRepairSession getParentRepairSession(TimeUUID sessionID) throws NoSuchRepairSessionException
{
return ActiveRepairService.instance.getParentRepairSession(sessionID);
}
@@ -712,12 +713,12 @@ public class LocalSessions
}
}
- public void failSession(UUID sessionID)
+ public void failSession(TimeUUID sessionID)
{
failSession(sessionID, true);
}
- public void failSession(UUID sessionID, boolean sendMessage)
+ public void failSession(TimeUUID sessionID, boolean sendMessage)
{
failSession(getSession(sessionID), sendMessage);
}
@@ -741,7 +742,7 @@ public class LocalSessions
}
}
- public synchronized void deleteSession(UUID sessionID)
+ public synchronized void deleteSession(TimeUUID sessionID)
{
logger.info("Deleting local repair session {}", sessionID);
LocalSession session = getSession(sessionID);
@@ -753,7 +754,7 @@ public class LocalSessions
@VisibleForTesting
Future<List<Void>> prepareSession(KeyspaceRepairManager repairManager,
- UUID sessionID,
+ TimeUUID sessionID,
Collection<ColumnFamilyStore> tables,
RangesAtEndpoint tokenRanges,
ExecutorService executor,
@@ -795,7 +796,7 @@ public class LocalSessions
public void handlePrepareMessage(InetAddressAndPort from, PrepareConsistentRequest request)
{
logger.trace("received {} from {}", request, from);
- UUID sessionID = request.parentSession;
+ TimeUUID sessionID = request.parentSession;
InetAddressAndPort coordinator = request.coordinator;
Set<InetAddressAndPort> peers = request.participants;
@@ -865,6 +866,7 @@ public class LocalSessions
});
}
+<<<<<<< HEAD
/**
* Checks for the session state, and sets it to prepared unless it is on a failed state.
* Making the checks inside a synchronized block to prevent the session state from
@@ -884,7 +886,7 @@ public class LocalSessions
}
}
- public void maybeSetRepairing(UUID sessionID)
+ public void maybeSetRepairing(TimeUUID sessionID)
{
LocalSession session = getSession(sessionID);
if (session != null && session.getState() != REPAIRING)
@@ -897,7 +899,7 @@ public class LocalSessions
public void handleFinalizeProposeMessage(InetAddressAndPort from, FinalizePropose propose)
{
logger.trace("received {} from {}", propose, from);
- UUID sessionID = propose.sessionID;
+ TimeUUID sessionID = propose.sessionID;
LocalSession session = getSession(sessionID);
if (session == null)
{
@@ -952,7 +954,7 @@ public class LocalSessions
public void handleFinalizeCommitMessage(InetAddressAndPort from, FinalizeCommit commit)
{
logger.trace("received {} from {}", commit, from);
- UUID sessionID = commit.sessionID;
+ TimeUUID sessionID = commit.sessionID;
LocalSession session = getSession(sessionID);
if (session == null)
{
@@ -987,7 +989,7 @@ public class LocalSessions
public void handleStatusRequest(InetAddressAndPort from, StatusRequest request)
{
logger.trace("received {} from {}", request, from);
- UUID sessionID = request.sessionID;
+ TimeUUID sessionID = request.sessionID;
LocalSession session = getSession(sessionID);
if (session == null)
{
@@ -1004,7 +1006,7 @@ public class LocalSessions
public void handleStatusResponse(InetAddressAndPort from, StatusResponse response)
{
logger.trace("received {} from {}", response, from);
- UUID sessionID = response.sessionID;
+ TimeUUID sessionID = response.sessionID;
LocalSession session = getSession(sessionID);
if (session == null)
{
@@ -1028,7 +1030,7 @@ public class LocalSessions
/**
* determines if a local session exists, and if it's not finalized or failed
*/
- public boolean isSessionInProgress(UUID sessionID)
+ public boolean isSessionInProgress(TimeUUID sessionID)
{
LocalSession session = getSession(sessionID);
return session != null && session.getState() != FINALIZED && session.getState() != FAILED;
@@ -1037,7 +1039,7 @@ public class LocalSessions
/**
* determines if a local session exists, and if it's in the finalized state
*/
- public boolean isSessionFinalized(UUID sessionID)
+ public boolean isSessionFinalized(TimeUUID sessionID)
{
LocalSession session = getSession(sessionID);
return session != null && session.getState() == FINALIZED;
@@ -1046,7 +1048,7 @@ public class LocalSessions
/**
* determines if a local session exists
*/
- public boolean sessionExists(UUID sessionID)
+ public boolean sessionExists(TimeUUID sessionID)
{
return getSession(sessionID) != null;
}
@@ -1066,7 +1068,7 @@ public class LocalSessions
* Returns the repairedAt time for a sessions which is unknown, failed, or finalized
* calling this for a session which is in progress throws an exception
*/
- public long getFinalSessionRepairedAt(UUID sessionID)
+ public long getFinalSessionRepairedAt(TimeUUID sessionID)
{
LocalSession session = getSession(sessionID);
if (session == null || session.getState() == FAILED)
diff --git a/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java b/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
index f984411..1605fae 100644
--- a/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
+++ b/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
@@ -37,6 +37,7 @@ import com.google.common.base.Throwables;
import com.google.common.collect.Sets;
import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.utils.TimeUUID;
public class CleanupSummary
{
@@ -64,10 +65,10 @@ public class CleanupSummary
public final String keyspace;
public final String table;
- public final Set<UUID> successful;
- public final Set<UUID> unsuccessful;
+ public final Set<TimeUUID> successful;
+ public final Set<TimeUUID> unsuccessful;
- public CleanupSummary(String keyspace, String table, Set<UUID> successful, Set<UUID> unsuccessful)
+ public CleanupSummary(String keyspace, String table, Set<TimeUUID> successful, Set<TimeUUID> unsuccessful)
{
this.keyspace = keyspace;
this.table = table;
@@ -75,7 +76,7 @@ public class CleanupSummary
this.unsuccessful = unsuccessful;
}
- public CleanupSummary(ColumnFamilyStore cfs, Set<UUID> successful, Set<UUID> unsuccessful)
+ public CleanupSummary(ColumnFamilyStore cfs, Set<TimeUUID> successful, Set<TimeUUID> unsuccessful)
{
this(cfs.keyspace.getName(), cfs.name, successful, unsuccessful);
}
@@ -85,30 +86,30 @@ public class CleanupSummary
Preconditions.checkArgument(l.keyspace.equals(r.keyspace));
Preconditions.checkArgument(l.table.equals(r.table));
- Set<UUID> unsuccessful = new HashSet<>(l.unsuccessful);
+ Set<TimeUUID> unsuccessful = new HashSet<>(l.unsuccessful);
unsuccessful.addAll(r.unsuccessful);
- Set<UUID> successful = new HashSet<>(l.successful);
+ Set<TimeUUID> successful = new HashSet<>(l.successful);
successful.addAll(r.successful);
successful.removeAll(unsuccessful);
return new CleanupSummary(l.keyspace, l.table, successful, unsuccessful);
}
- private static String[] uuids2Strings(Set<UUID> uuids)
+ private static String[] uuids2Strings(Set<TimeUUID> uuids)
{
String[] strings = new String[uuids.size()];
int idx = 0;
- for (UUID uuid : uuids)
+ for (TimeUUID uuid : uuids)
strings[idx++] = uuid.toString();
return strings;
}
- private static Set<UUID> strings2Uuids(String[] strings)
+ private static Set<TimeUUID> strings2Uuids(String[] strings)
{
- Set<UUID> uuids = Sets.newHashSetWithExpectedSize(strings.length);
+ Set<TimeUUID> uuids = Sets.newHashSetWithExpectedSize(strings.length);
for (String string : strings)
- uuids.add(UUID.fromString(string));
+ uuids.add(TimeUUID.fromString(string));
return uuids;
}
diff --git a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java
index f10f96d..b7d4fea 100644
--- a/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java
+++ b/src/java/org/apache/cassandra/repair/consistent/admin/PendingStat.java
@@ -23,7 +23,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import javax.management.openmbean.ArrayType;
import javax.management.openmbean.CompositeData;
import javax.management.openmbean.CompositeDataSupport;
@@ -37,6 +36,7 @@ import com.google.common.base.Throwables;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.utils.TimeUUID;
public class PendingStat
{
@@ -63,9 +63,9 @@ public class PendingStat
public final long dataSize;
public final int numSSTables;
- public final Set<UUID> sessions;
+ public final Set<TimeUUID> sessions;
- public PendingStat(long dataSize, int numSSTables, Set<UUID> sessions)
+ public PendingStat(long dataSize, int numSSTables, Set<TimeUUID> sessions)
{
this.dataSize = dataSize;
this.numSSTables = numSSTables;
@@ -84,7 +84,7 @@ public class PendingStat
values.put(COMPOSITE_NAMES[1], numSSTables);
String[] sessionIds = new String[sessions.size()];
int idx = 0;
- for (UUID session : sessions)
+ for (TimeUUID session : sessions)
sessionIds[idx++] = session.toString();
values.put(COMPOSITE_NAMES[2], sessionIds);
@@ -102,9 +102,9 @@ public class PendingStat
{
Preconditions.checkArgument(cd.getCompositeType().equals(COMPOSITE_TYPE));
Object[] values = cd.getAll(COMPOSITE_NAMES);
- Set<UUID> sessions = new HashSet<>();
+ Set<TimeUUID> sessions = new HashSet<>();
for (String session : (String[]) values[2])
- sessions.add(UUID.fromString(session));
+ sessions.add(TimeUUID.fromString(session));
return new PendingStat((long) values[0], (int) values[1], sessions);
}
@@ -112,11 +112,11 @@ public class PendingStat
{
public long dataSize = 0;
public int numSSTables = 0;
- public Set<UUID> sessions = new HashSet<>();
+ public Set<TimeUUID> sessions = new HashSet<>();
public Builder addSSTable(SSTableReader sstable)
{
- UUID sessionID = sstable.getPendingRepair();
+ TimeUUID sessionID = sstable.getPendingRepair();
if (sessionID == null)
return this;
dataSize += sstable.onDiskLength();
diff --git a/src/java/org/apache/cassandra/repair/messages/CleanupMessage.java b/src/java/org/apache/cassandra/repair/messages/CleanupMessage.java
index 5ec7fc6..0e1a74f 100644
--- a/src/java/org/apache/cassandra/repair/messages/CleanupMessage.java
+++ b/src/java/org/apache/cassandra/repair/messages/CleanupMessage.java
@@ -19,12 +19,11 @@ package org.apache.cassandra.repair.messages;
import java.io.IOException;
import java.util.Objects;
-import java.util.UUID;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Message to cleanup repair resources on replica nodes.
@@ -33,9 +32,9 @@ import org.apache.cassandra.utils.UUIDSerializer;
*/
public class CleanupMessage extends RepairMessage
{
- public final UUID parentRepairSession;
+ public final TimeUUID parentRepairSession;
- public CleanupMessage(UUID parentRepairSession)
+ public CleanupMessage(TimeUUID parentRepairSession)
{
super(null);
this.parentRepairSession = parentRepairSession;
@@ -60,18 +59,18 @@ public class CleanupMessage extends RepairMessage
{
public void serialize(CleanupMessage message, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(message.parentRepairSession, out, version);
+ message.parentRepairSession.serialize(out);
}
public CleanupMessage deserialize(DataInputPlus in, int version) throws IOException
{
- UUID parentRepairSession = UUIDSerializer.serializer.deserialize(in, version);
+ TimeUUID parentRepairSession = TimeUUID.deserialize(in);
return new CleanupMessage(parentRepairSession);
}
public long serializedSize(CleanupMessage message, int version)
{
- return UUIDSerializer.serializer.serializedSize(message.parentRepairSession, version);
+ return TimeUUID.sizeInBytes();
}
};
}
diff --git a/src/java/org/apache/cassandra/repair/messages/FailSession.java b/src/java/org/apache/cassandra/repair/messages/FailSession.java
index b8c7ad3..f6826ee 100644
--- a/src/java/org/apache/cassandra/repair/messages/FailSession.java
+++ b/src/java/org/apache/cassandra/repair/messages/FailSession.java
@@ -19,18 +19,17 @@
package org.apache.cassandra.repair.messages;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
public class FailSession extends RepairMessage
{
- public final UUID sessionID;
+ public final TimeUUID sessionID;
- public FailSession(UUID sessionID)
+ public FailSession(TimeUUID sessionID)
{
super(null);
assert sessionID != null;
@@ -56,17 +55,17 @@ public class FailSession extends RepairMessage
{
public void serialize(FailSession msg, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(msg.sessionID, out, version);
+ msg.sessionID.serialize(out);
}
public FailSession deserialize(DataInputPlus in, int version) throws IOException
{
- return new FailSession(UUIDSerializer.serializer.deserialize(in, version));
+ return new FailSession(TimeUUID.deserialize(in));
}
public long serializedSize(FailSession msg, int version)
{
- return UUIDSerializer.serializer.serializedSize(msg.sessionID, version);
+ return TimeUUID.sizeInBytes();
}
};
}
diff --git a/src/java/org/apache/cassandra/repair/messages/FinalizeCommit.java b/src/java/org/apache/cassandra/repair/messages/FinalizeCommit.java
index bb5cca7..ca4e6d8 100644
--- a/src/java/org/apache/cassandra/repair/messages/FinalizeCommit.java
+++ b/src/java/org/apache/cassandra/repair/messages/FinalizeCommit.java
@@ -19,18 +19,17 @@
package org.apache.cassandra.repair.messages;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
public class FinalizeCommit extends RepairMessage
{
- public final UUID sessionID;
+ public final TimeUUID sessionID;
- public FinalizeCommit(UUID sessionID)
+ public FinalizeCommit(TimeUUID sessionID)
{
super(null);
assert sessionID != null;
@@ -63,17 +62,17 @@ public class FinalizeCommit extends RepairMessage
{
public void serialize(FinalizeCommit msg, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(msg.sessionID, out, version);
+ msg.sessionID.serialize(out);
}
public FinalizeCommit deserialize(DataInputPlus in, int version) throws IOException
{
- return new FinalizeCommit(UUIDSerializer.serializer.deserialize(in, version));
+ return new FinalizeCommit(TimeUUID.deserialize(in));
}
public long serializedSize(FinalizeCommit msg, int version)
{
- return UUIDSerializer.serializer.serializedSize(msg.sessionID, version);
+ return TimeUUID.sizeInBytes();
}
};
}
diff --git a/src/java/org/apache/cassandra/repair/messages/FinalizePromise.java b/src/java/org/apache/cassandra/repair/messages/FinalizePromise.java
index cfdc07c..c45f46d 100644
--- a/src/java/org/apache/cassandra/repair/messages/FinalizePromise.java
+++ b/src/java/org/apache/cassandra/repair/messages/FinalizePromise.java
@@ -19,24 +19,23 @@
package org.apache.cassandra.repair.messages;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.locator.InetAddressAndPort.Serializer.inetAddressAndPortSerializer;
public class FinalizePromise extends RepairMessage
{
- public final UUID sessionID;
+ public final TimeUUID sessionID;
public final InetAddressAndPort participant;
public final boolean promised;
- public FinalizePromise(UUID sessionID, InetAddressAndPort participant, boolean promised)
+ public FinalizePromise(TimeUUID sessionID, InetAddressAndPort participant, boolean promised)
{
super(null);
assert sessionID != null;
@@ -70,21 +69,21 @@ public class FinalizePromise extends RepairMessage
{
public void serialize(FinalizePromise msg, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(msg.sessionID, out, version);
+ msg.sessionID.serialize(out);
inetAddressAndPortSerializer.serialize(msg.participant, out, version);
out.writeBoolean(msg.promised);
}
public FinalizePromise deserialize(DataInputPlus in, int version) throws IOException
{
- return new FinalizePromise(UUIDSerializer.serializer.deserialize(in, version),
+ return new FinalizePromise(TimeUUID.deserialize(in),
inetAddressAndPortSerializer.deserialize(in, version),
in.readBoolean());
}
public long serializedSize(FinalizePromise msg, int version)
{
- long size = UUIDSerializer.serializer.serializedSize(msg.sessionID, version);
+ long size = TimeUUID.sizeInBytes();
size += inetAddressAndPortSerializer.serializedSize(msg.participant, version);
size += TypeSizes.sizeof(msg.promised);
return size;
diff --git a/src/java/org/apache/cassandra/repair/messages/FinalizePropose.java b/src/java/org/apache/cassandra/repair/messages/FinalizePropose.java
index c21dd78..b3c4bfd 100644
--- a/src/java/org/apache/cassandra/repair/messages/FinalizePropose.java
+++ b/src/java/org/apache/cassandra/repair/messages/FinalizePropose.java
@@ -19,18 +19,17 @@
package org.apache.cassandra.repair.messages;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
public class FinalizePropose extends RepairMessage
{
- public final UUID sessionID;
+ public final TimeUUID sessionID;
- public FinalizePropose(UUID sessionID)
+ public FinalizePropose(TimeUUID sessionID)
{
super(null);
assert sessionID != null;
@@ -63,17 +62,17 @@ public class FinalizePropose extends RepairMessage
{
public void serialize(FinalizePropose msg, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(msg.sessionID, out, version);
+ msg.sessionID.serialize(out);
}
public FinalizePropose deserialize(DataInputPlus in, int version) throws IOException
{
- return new FinalizePropose(UUIDSerializer.serializer.deserialize(in, version));
+ return new FinalizePropose(TimeUUID.deserialize(in));
}
public long serializedSize(FinalizePropose msg, int version)
{
- return UUIDSerializer.serializer.serializedSize(msg.sessionID, version);
+ return TimeUUID.sizeInBytes();
}
};
}
diff --git a/src/java/org/apache/cassandra/repair/messages/PrepareConsistentRequest.java b/src/java/org/apache/cassandra/repair/messages/PrepareConsistentRequest.java
index c1be082..9ac1461 100644
--- a/src/java/org/apache/cassandra/repair/messages/PrepareConsistentRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/PrepareConsistentRequest.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.repair.messages;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import java.util.UUID;
import com.google.common.collect.ImmutableSet;
@@ -30,17 +29,17 @@ import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.locator.InetAddressAndPort.Serializer.inetAddressAndPortSerializer;
public class PrepareConsistentRequest extends RepairMessage
{
- public final UUID parentSession;
+ public final TimeUUID parentSession;
public final InetAddressAndPort coordinator;
public final Set<InetAddressAndPort> participants;
- public PrepareConsistentRequest(UUID parentSession, InetAddressAndPort coordinator, Set<InetAddressAndPort> participants)
+ public PrepareConsistentRequest(TimeUUID parentSession, InetAddressAndPort coordinator, Set<InetAddressAndPort> participants)
{
super(null);
assert parentSession != null;
@@ -84,7 +83,7 @@ public class PrepareConsistentRequest extends RepairMessage
{
public void serialize(PrepareConsistentRequest request, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(request.parentSession, out, version);
+ request.parentSession.serialize(out);
inetAddressAndPortSerializer.serialize(request.coordinator, out, version);
out.writeInt(request.participants.size());
for (InetAddressAndPort peer : request.participants)
@@ -95,7 +94,7 @@ public class PrepareConsistentRequest extends RepairMessage
public PrepareConsistentRequest deserialize(DataInputPlus in, int version) throws IOException
{
- UUID sessionId = UUIDSerializer.serializer.deserialize(in, version);
+ TimeUUID sessionId = TimeUUID.deserialize(in);
InetAddressAndPort coordinator = inetAddressAndPortSerializer.deserialize(in, version);
int numPeers = in.readInt();
Set<InetAddressAndPort> peers = new HashSet<>(numPeers);
@@ -109,7 +108,7 @@ public class PrepareConsistentRequest extends RepairMessage
public long serializedSize(PrepareConsistentRequest request, int version)
{
- long size = UUIDSerializer.serializer.serializedSize(request.parentSession, version);
+ long size = TimeUUID.sizeInBytes();
size += inetAddressAndPortSerializer.serializedSize(request.coordinator, version);
size += TypeSizes.sizeof(request.participants.size());
for (InetAddressAndPort peer : request.participants)
diff --git a/src/java/org/apache/cassandra/repair/messages/PrepareConsistentResponse.java b/src/java/org/apache/cassandra/repair/messages/PrepareConsistentResponse.java
index 00de77d..a422d7f 100644
--- a/src/java/org/apache/cassandra/repair/messages/PrepareConsistentResponse.java
+++ b/src/java/org/apache/cassandra/repair/messages/PrepareConsistentResponse.java
@@ -19,24 +19,23 @@
package org.apache.cassandra.repair.messages;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.locator.InetAddressAndPort.Serializer.inetAddressAndPortSerializer;
public class PrepareConsistentResponse extends RepairMessage
{
- public final UUID parentSession;
+ public final TimeUUID parentSession;
public final InetAddressAndPort participant;
public final boolean success;
- public PrepareConsistentResponse(UUID parentSession, InetAddressAndPort participant, boolean success)
+ public PrepareConsistentResponse(TimeUUID parentSession, InetAddressAndPort participant, boolean success)
{
super(null);
assert parentSession != null;
@@ -70,21 +69,21 @@ public class PrepareConsistentResponse extends RepairMessage
{
public void serialize(PrepareConsistentResponse response, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(response.parentSession, out, version);
+ response.parentSession.serialize(out);
inetAddressAndPortSerializer.serialize(response.participant, out, version);
out.writeBoolean(response.success);
}
public PrepareConsistentResponse deserialize(DataInputPlus in, int version) throws IOException
{
- return new PrepareConsistentResponse(UUIDSerializer.serializer.deserialize(in, version),
+ return new PrepareConsistentResponse(TimeUUID.deserialize(in),
inetAddressAndPortSerializer.deserialize(in, version),
in.readBoolean());
}
public long serializedSize(PrepareConsistentResponse response, int version)
{
- long size = UUIDSerializer.serializer.serializedSize(response.parentSession, version);
+ long size = TimeUUID.sizeInBytes();
size += inetAddressAndPortSerializer.serializedSize(response.participant, version);
size += TypeSizes.sizeof(response.success);
return size;
diff --git a/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java b/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
index 7c8db93..49380d7 100644
--- a/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
+++ b/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
@@ -36,7 +36,7 @@ import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.streaming.PreviewKind;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
public class PrepareMessage extends RepairMessage
@@ -44,13 +44,13 @@ public class PrepareMessage extends RepairMessage
public final List<TableId> tableIds;
public final Collection<Range<Token>> ranges;
- public final UUID parentRepairSession;
+ public final TimeUUID parentRepairSession;
public final boolean isIncremental;
public final long timestamp;
public final boolean isGlobal;
public final PreviewKind previewKind;
- public PrepareMessage(UUID parentRepairSession, List<TableId> tableIds, Collection<Range<Token>> ranges, boolean isIncremental, long timestamp, boolean isGlobal, PreviewKind previewKind)
+ public PrepareMessage(TimeUUID parentRepairSession, List<TableId> tableIds, Collection<Range<Token>> ranges, boolean isIncremental, long timestamp, boolean isGlobal, PreviewKind previewKind)
{
super(null);
this.parentRepairSession = parentRepairSession;
@@ -95,7 +95,7 @@ public class PrepareMessage extends RepairMessage
out.writeInt(message.tableIds.size());
for (TableId tableId : message.tableIds)
tableId.serialize(out);
- UUIDSerializer.serializer.serialize(message.parentRepairSession, out, version);
+ message.parentRepairSession.serialize(out);
out.writeInt(message.ranges.size());
for (Range<Token> r : message.ranges)
{
@@ -116,7 +116,7 @@ public class PrepareMessage extends RepairMessage
List<TableId> tableIds = new ArrayList<>(tableIdCount);
for (int i = 0; i < tableIdCount; i++)
tableIds.add(TableId.deserialize(in));
- UUID parentRepairSession = UUIDSerializer.serializer.deserialize(in, version);
+ TimeUUID parentRepairSession = TimeUUID.deserialize(in);
int rangeCount = in.readInt();
List<Range<Token>> ranges = new ArrayList<>(rangeCount);
for (int i = 0; i < rangeCount; i++)
@@ -134,7 +134,7 @@ public class PrepareMessage extends RepairMessage
size = TypeSizes.sizeof(message.tableIds.size());
for (TableId tableId : message.tableIds)
size += tableId.serializedSize();
- size += UUIDSerializer.serializer.serializedSize(message.parentRepairSession, version);
+ size += TimeUUID.sizeInBytes();
size += TypeSizes.sizeof(message.ranges.size());
for (Range<Token> r : message.ranges)
size += Range.tokenSerializer.serializedSize(r, version);
diff --git a/src/java/org/apache/cassandra/repair/messages/StatusRequest.java b/src/java/org/apache/cassandra/repair/messages/StatusRequest.java
index 09354e6..ec325ad 100644
--- a/src/java/org/apache/cassandra/repair/messages/StatusRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/StatusRequest.java
@@ -19,18 +19,17 @@
package org.apache.cassandra.repair.messages;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
public class StatusRequest extends RepairMessage
{
- public final UUID sessionID;
+ public final TimeUUID sessionID;
- public StatusRequest(UUID sessionID)
+ public StatusRequest(TimeUUID sessionID)
{
super(null);
this.sessionID = sessionID;
@@ -62,17 +61,17 @@ public class StatusRequest extends RepairMessage
{
public void serialize(StatusRequest msg, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(msg.sessionID, out, version);
+ msg.sessionID.serialize(out);
}
public StatusRequest deserialize(DataInputPlus in, int version) throws IOException
{
- return new StatusRequest(UUIDSerializer.serializer.deserialize(in, version));
+ return new StatusRequest(TimeUUID.deserialize(in));
}
public long serializedSize(StatusRequest msg, int version)
{
- return UUIDSerializer.serializer.serializedSize(msg.sessionID, version);
+ return TimeUUID.sizeInBytes();
}
};
}
diff --git a/src/java/org/apache/cassandra/repair/messages/StatusResponse.java b/src/java/org/apache/cassandra/repair/messages/StatusResponse.java
index e62d337..7e7d6e0 100644
--- a/src/java/org/apache/cassandra/repair/messages/StatusResponse.java
+++ b/src/java/org/apache/cassandra/repair/messages/StatusResponse.java
@@ -19,21 +19,20 @@
package org.apache.cassandra.repair.messages;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.repair.consistent.ConsistentSession;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
public class StatusResponse extends RepairMessage
{
- public final UUID sessionID;
+ public final TimeUUID sessionID;
public final ConsistentSession.State state;
- public StatusResponse(UUID sessionID, ConsistentSession.State state)
+ public StatusResponse(TimeUUID sessionID, ConsistentSession.State state)
{
super(null);
assert sessionID != null;
@@ -72,19 +71,19 @@ public class StatusResponse extends RepairMessage
{
public void serialize(StatusResponse msg, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(msg.sessionID, out, version);
+ msg.sessionID.serialize(out);
out.writeInt(msg.state.ordinal());
}
public StatusResponse deserialize(DataInputPlus in, int version) throws IOException
{
- return new StatusResponse(UUIDSerializer.serializer.deserialize(in, version),
+ return new StatusResponse(TimeUUID.deserialize(in),
ConsistentSession.State.valueOf(in.readInt()));
}
public long serializedSize(StatusResponse msg, int version)
{
- return UUIDSerializer.serializer.serializedSize(msg.sessionID, version)
+ return TimeUUID.sizeInBytes()
+ TypeSizes.sizeof(msg.state.ordinal());
}
};
diff --git a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
index 90859ce..890bd15 100644
--- a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
@@ -441,7 +441,7 @@ public final class SchemaKeyspace
@SuppressWarnings("unchecked")
private static DecoratedKey decorate(TableMetadata metadata, Object value)
{
- return metadata.partitioner.decorateKey(((AbstractType) metadata.partitionKeyType).decompose(value));
+ return metadata.partitioner.decorateKey(metadata.partitionKeyType.decomposeUntyped(value));
}
static Mutation.SimpleBuilder makeCreateKeyspaceMutation(String name, KeyspaceParams params, long timestamp)
@@ -1147,9 +1147,9 @@ public final class SchemaKeyspace
List<AbstractType<?>> argTypes = new ArrayList<>();
for (String type : row.getFrozenList("argument_types", UTF8Type.instance))
- argTypes.add(CQLTypeParser.parse(ksName, type, types));
+ argTypes.add(CQLTypeParser.parse(ksName, type, types).udfType());
- AbstractType<?> returnType = CQLTypeParser.parse(ksName, row.getString("return_type"), types);
+ AbstractType<?> returnType = CQLTypeParser.parse(ksName, row.getString("return_type"), types).udfType();
String language = row.getString("language");
String body = row.getString("body");
@@ -1209,10 +1209,10 @@ public final class SchemaKeyspace
List<AbstractType<?>> argTypes =
row.getFrozenList("argument_types", UTF8Type.instance)
.stream()
- .map(t -> CQLTypeParser.parse(ksName, t, types))
+ .map(t -> CQLTypeParser.parse(ksName, t, types).udfType())
.collect(toList());
- AbstractType<?> returnType = CQLTypeParser.parse(ksName, row.getString("return_type"), types);
+ AbstractType<?> returnType = CQLTypeParser.parse(ksName, row.getString("return_type"), types).udfType();
FunctionName stateFunc = new FunctionName(ksName, (row.getString("state_func")));
diff --git a/src/java/org/apache/cassandra/schema/SystemDistributedKeyspace.java b/src/java/org/apache/cassandra/schema/SystemDistributedKeyspace.java
index 6206fca..5f5ccb9 100644
--- a/src/java/org/apache/cassandra/schema/SystemDistributedKeyspace.java
+++ b/src/java/org/apache/cassandra/schema/SystemDistributedKeyspace.java
@@ -52,6 +52,7 @@ import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.repair.CommonRange;
import org.apache.cassandra.repair.messages.RepairOption;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
import static java.lang.String.format;
@@ -168,7 +169,7 @@ public final class SystemDistributedKeyspace
return KeyspaceMetadata.create(SchemaConstants.DISTRIBUTED_KEYSPACE_NAME, KeyspaceParams.simple(Math.max(DEFAULT_RF, DatabaseDescriptor.getDefaultKeyspaceRF())), Tables.of(RepairHistory, ParentRepairHistory, ViewBuildStatus, PartitionDenylistTable));
}
- public static void startParentRepair(UUID parent_id, String keyspaceName, String[] cfnames, RepairOption options)
+ public static void startParentRepair(TimeUUID parent_id, String keyspaceName, String[] cfnames, RepairOption options)
{
Collection<Range<Token>> ranges = options.getRanges();
String query = "INSERT INTO %s.%s (parent_id, keyspace_name, columnfamily_names, requested_ranges, started_at, options)"+
@@ -202,7 +203,7 @@ public final class SystemDistributedKeyspace
return map.toString();
}
- public static void failParentRepair(UUID parent_id, Throwable t)
+ public static void failParentRepair(TimeUUID parent_id, Throwable t)
{
String query = "UPDATE %s.%s SET finished_at = toTimestamp(now()), exception_message=?, exception_stacktrace=? WHERE parent_id=%s";
@@ -214,14 +215,14 @@ public final class SystemDistributedKeyspace
processSilent(fmtQuery, message != null ? message : "", sw.toString());
}
- public static void successfulParentRepair(UUID parent_id, Collection<Range<Token>> successfulRanges)
+ public static void successfulParentRepair(TimeUUID parent_id, Collection<Range<Token>> successfulRanges)
{
String query = "UPDATE %s.%s SET finished_at = toTimestamp(now()), successful_ranges = {'%s'} WHERE parent_id=%s";
String fmtQuery = format(query, SchemaConstants.DISTRIBUTED_KEYSPACE_NAME, PARENT_REPAIR_HISTORY, Joiner.on("','").join(successfulRanges), parent_id.toString());
processSilent(fmtQuery);
}
- public static void startRepairs(UUID id, UUID parent_id, String keyspaceName, String[] cfnames, CommonRange commonRange)
+ public static void startRepairs(TimeUUID id, TimeUUID parent_id, String keyspaceName, String[] cfnames, CommonRange commonRange)
{
// Don't record repair history if an upgrade is in progress as version 3 nodes generates errors
// due to schema differences
@@ -282,13 +283,13 @@ public final class SystemDistributedKeyspace
}
}
- public static void failRepairs(UUID id, String keyspaceName, String[] cfnames, Throwable t)
+ public static void failRepairs(TimeUUID id, String keyspaceName, String[] cfnames, Throwable t)
{
for (String cfname : cfnames)
failedRepairJob(id, keyspaceName, cfname, t);
}
- public static void successfulRepairJob(UUID id, String keyspaceName, String cfname)
+ public static void successfulRepairJob(TimeUUID id, String keyspaceName, String cfname)
{
String query = "UPDATE %s.%s SET status = '%s', finished_at = toTimestamp(now()) WHERE keyspace_name = '%s' AND columnfamily_name = '%s' AND id = %s";
String fmtQuery = format(query, SchemaConstants.DISTRIBUTED_KEYSPACE_NAME, REPAIR_HISTORY,
@@ -299,7 +300,7 @@ public final class SystemDistributedKeyspace
processSilent(fmtQuery);
}
- public static void failedRepairJob(UUID id, String keyspaceName, String cfname, Throwable t)
+ public static void failedRepairJob(TimeUUID id, String keyspaceName, String cfname, Throwable t)
{
String query = "UPDATE %s.%s SET status = '%s', finished_at = toTimestamp(now()), exception_message=?, exception_stacktrace=? WHERE keyspace_name = '%s' AND columnfamily_name = '%s' AND id = %s";
StringWriter sw = new StringWriter();
diff --git a/src/java/org/apache/cassandra/schema/TableId.java b/src/java/org/apache/cassandra/schema/TableId.java
index 8645dc2..cefc95f 100644
--- a/src/java/org/apache/cassandra/schema/TableId.java
+++ b/src/java/org/apache/cassandra/schema/TableId.java
@@ -25,7 +25,8 @@ import java.util.UUID;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDGen;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
/**
* The unique identifier of a table.
@@ -35,6 +36,7 @@ import org.apache.cassandra.utils.UUIDGen;
*/
public class TableId
{
+ // TODO: should this be a TimeUUID?
private final UUID id;
private TableId(UUID id)
@@ -47,9 +49,10 @@ public class TableId
return new TableId(id);
}
+ // TODO: should we be using UUID.randomUUID()?
public static TableId generate()
{
- return new TableId(UUIDGen.getTimeUUID());
+ return new TableId(nextTimeUUID().asUUID());
}
public static TableId fromString(String idString)
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index ae57bf9..da86529 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -44,6 +44,8 @@ import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.locator.EndpointsByRange;
import org.apache.cassandra.locator.EndpointsForRange;
import org.apache.cassandra.utils.Simulate;
+import org.apache.cassandra.streaming.PreviewKind;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -94,7 +96,6 @@ import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MBeanWrapper;
import org.apache.cassandra.utils.MerkleTrees;
import org.apache.cassandra.utils.Pair;
-import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.utils.concurrent.Future;
import static com.google.common.collect.Iterables.concat;
@@ -109,6 +110,7 @@ import static org.apache.cassandra.net.Verb.PREPARE_MSG;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.apache.cassandra.utils.Simulate.With.MONITORS;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.apache.cassandra.utils.concurrent.CountDownLatch.newCountDownLatch;
/**
@@ -149,14 +151,14 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
public static final ActiveRepairService instance = new ActiveRepairService(FailureDetector.instance, Gossiper.instance);
public static final long UNREPAIRED_SSTABLE = 0;
- public static final UUID NO_PENDING_REPAIR = null;
+ public static final TimeUUID NO_PENDING_REPAIR = null;
/**
* A map of active coordinator session.
*/
- private final ConcurrentMap<UUID, RepairSession> sessions = new ConcurrentHashMap<>();
+ private final ConcurrentMap<TimeUUID, RepairSession> sessions = new ConcurrentHashMap<>();
- private final ConcurrentMap<UUID, ParentRepairSession> parentRepairSessions = new ConcurrentHashMap<>();
+ private final ConcurrentMap<TimeUUID, ParentRepairSession> parentRepairSessions = new ConcurrentHashMap<>();
static
{
@@ -234,7 +236,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
@Override
public void failSession(String session, boolean force)
{
- UUID sessionID = UUID.fromString(session);
+ TimeUUID sessionID = TimeUUID.fromString(session);
consistent.local.cancelSession(sessionID, force);
}
@@ -332,7 +334,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
*
* @return Future for asynchronous call or null if there is no need to repair
*/
- public RepairSession submitRepairSession(UUID parentRepairSession,
+ public RepairSession submitRepairSession(TimeUUID parentRepairSession,
CommonRange range,
String keyspace,
RepairParallelism parallelismDegree,
@@ -349,7 +351,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
if (cfnames.length == 0)
return null;
- final RepairSession session = new RepairSession(parentRepairSession, UUIDGen.getTimeUUID(), range, keyspace,
+ final RepairSession session = new RepairSession(parentRepairSession, nextTimeUUID(), range, keyspace,
parallelismDegree, isIncremental, pullRepair,
previewKind, optimiseStreams, cfnames);
@@ -520,7 +522,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
}
}
- public static boolean verifyCompactionsPendingThreshold(UUID parentRepairSession, PreviewKind previewKind)
+ public static boolean verifyCompactionsPendingThreshold(TimeUUID parentRepairSession, PreviewKind previewKind)
{
// Snapshot values so failure message is consistent with decision
int pendingCompactions = CompactionManager.instance.getPendingTasks();
@@ -534,7 +536,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
return true;
}
- public UUID prepareForRepair(UUID parentRepairSession, InetAddressAndPort coordinator, Set<InetAddressAndPort> endpoints, RepairOption options, boolean isForcedRepair, List<ColumnFamilyStore> columnFamilyStores)
+ public TimeUUID prepareForRepair(TimeUUID parentRepairSession, InetAddressAndPort coordinator, Set<InetAddressAndPort> endpoints, RepairOption options, boolean isForcedRepair, List<ColumnFamilyStore> columnFamilyStores)
{
if (!verifyCompactionsPendingThreshold(parentRepairSession, options.getPreviewKind()))
failRepair(parentRepairSession, "Rejecting incoming repair, pending compactions above threshold"); // failRepair throws exception
@@ -621,7 +623,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
* endpoint's cache.
* This method does not throw an exception in case of a messaging failure.
*/
- public void cleanUp(UUID parentRepairSession, Set<InetAddressAndPort> endpoints)
+ public void cleanUp(TimeUUID parentRepairSession, Set<InetAddressAndPort> endpoints)
{
for (InetAddressAndPort endpoint : endpoints)
{
@@ -659,12 +661,12 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
}
}
- private void failRepair(UUID parentRepairSession, String errorMsg) {
+ private void failRepair(TimeUUID parentRepairSession, String errorMsg) {
removeParentRepairSession(parentRepairSession);
throw new RuntimeException(errorMsg);
}
- public synchronized void registerParentRepairSession(UUID parentRepairSession, InetAddressAndPort coordinator, List<ColumnFamilyStore> columnFamilyStores, Collection<Range<Token>> ranges, boolean isIncremental, long repairedAt, boolean isGlobal, PreviewKind previewKind)
+ public synchronized void registerParentRepairSession(TimeUUID parentRepairSession, InetAddressAndPort coordinator, List<ColumnFamilyStore> columnFamilyStores, Collection<Range<Token>> ranges, boolean isIncremental, long repairedAt, boolean isGlobal, PreviewKind previewKind)
{
assert isIncremental || repairedAt == ActiveRepairService.UNREPAIRED_SSTABLE;
if (!registeredForEndpointChanges)
@@ -691,7 +693,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
*
* @throws NoSuchRepairSessionException if the provided identifier does not map to an active parent session
*/
- public ParentRepairSession getParentRepairSession(UUID parentSessionId) throws NoSuchRepairSessionException
+ public ParentRepairSession getParentRepairSession(TimeUUID parentSessionId) throws NoSuchRepairSessionException
{
ParentRepairSession session = parentRepairSessions.get(parentSessionId);
if (session == null)
@@ -709,7 +711,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
*
* @return the {@link ParentRepairSession} associated with the provided identifier
*/
- public synchronized ParentRepairSession removeParentRepairSession(UUID parentSessionId)
+ public synchronized ParentRepairSession removeParentRepairSession(TimeUUID parentSessionId)
{
String snapshotName = parentSessionId.toString();
ParentRepairSession session = parentRepairSessions.remove(parentSessionId);
@@ -904,8 +906,8 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
*/
public void abort(Predicate<ParentRepairSession> predicate, String message)
{
- Set<UUID> parentSessionsToRemove = new HashSet<>();
- for (Map.Entry<UUID, ParentRepairSession> repairSessionEntry : parentRepairSessions.entrySet())
+ Set<TimeUUID> parentSessionsToRemove = new HashSet<>();
+ for (Map.Entry<TimeUUID, ParentRepairSession> repairSessionEntry : parentRepairSessions.entrySet())
{
if (predicate.test(repairSessionEntry.getValue()))
parentSessionsToRemove.add(repairSessionEntry.getKey());
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index a66ccc2..10785a9 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -47,6 +47,7 @@ import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.cassandra.config.Config;
import org.apache.cassandra.service.paxos.*;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
import org.slf4j.Logger;
@@ -159,6 +160,7 @@ import static org.apache.cassandra.service.paxos.PrepareVerbHandler.doPrepare;
import static org.apache.cassandra.service.paxos.ProposeVerbHandler.doPropose;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.apache.cassandra.utils.concurrent.CountDownLatch.newCountDownLatch;
import static org.apache.commons.lang3.StringUtils.join;
@@ -459,7 +461,7 @@ public class StorageProxy implements StorageProxyMBean
consistencyForReplayCommits,
casMetrics);
- final UUID ballot = pair.ballot;
+ final TimeUUID ballot = pair.ballot;
contentions += pair.contentions;
Pair<PartitionUpdate, RowIterator> proposalPair = createUpdateProposal.get();
@@ -537,11 +539,11 @@ public class StorageProxy implements StorageProxyMBean
// already we also want to make sure we pick a timestamp that has a chance to be promised, i.e. one that is greater that the most recently known
// in progress (#5667). Lastly, we don't want to use a timestamp that is older than the last one assigned by ClientState or operations may appear
// out-of-order (#7801).
- long minTimestampMicrosToUse = summary == null ? Long.MIN_VALUE : 1 + UUIDGen.microsTimestamp(summary.mostRecentInProgressCommit.ballot);
+ long minTimestampMicrosToUse = summary == null ? Long.MIN_VALUE : 1 + summary.mostRecentInProgressCommit.ballot.unixMicros();
long ballotMicros = nextBallotTimestampMicros(minTimestampMicrosToUse);
// Note that ballotMicros is not guaranteed to be unique if two proposal are being handled concurrently by the same coordinator. But we still
// need ballots to be unique for each proposal so we have to use getRandomTimeUUIDFromMicros.
- UUID ballot = randomBallot(ballotMicros, consistencyForPaxos == SERIAL);
+ TimeUUID ballot = randomBallot(ballotMicros, consistencyForPaxos == SERIAL);
// prepare
try
@@ -974,7 +976,7 @@ public class StorageProxy implements StorageProxyMBean
try
{
// if we haven't joined the ring, write everything to batchlog because paired replicas may be stale
- final UUID batchUUID = UUIDGen.getTimeUUID();
+ final TimeUUID batchUUID = nextTimeUUID();
if (StorageService.instance.isStarting() || StorageService.instance.isJoining() || StorageService.instance.isMoving())
{
@@ -1162,7 +1164,7 @@ public class StorageProxy implements StorageProxyMBean
ReplicaPlan.ForTokenWrite replicaPlan = ReplicaPlans.forBatchlogWrite(batchConsistencyLevel == ConsistencyLevel.ANY);
- final UUID batchUUID = UUIDGen.getTimeUUID();
+ final TimeUUID batchUUID = nextTimeUUID();
BatchlogCleanup cleanup = new BatchlogCleanup(mutations.size(),
() -> asyncRemoveFromBatchlog(replicaPlan, batchUUID));
@@ -1242,7 +1244,7 @@ public class StorageProxy implements StorageProxyMBean
}
}
- private static void syncWriteToBatchlog(Collection<Mutation> mutations, ReplicaPlan.ForTokenWrite replicaPlan, UUID uuid, long queryStartNanoTime)
+ private static void syncWriteToBatchlog(Collection<Mutation> mutations, ReplicaPlan.ForTokenWrite replicaPlan, TimeUUID uuid, long queryStartNanoTime)
throws WriteTimeoutException, WriteFailureException
{
WriteResponseHandler<?> handler = new WriteResponseHandler(replicaPlan,
@@ -1263,9 +1265,9 @@ public class StorageProxy implements StorageProxyMBean
handler.get();
}
- private static void asyncRemoveFromBatchlog(ReplicaPlan.ForTokenWrite replicaPlan, UUID uuid)
+ private static void asyncRemoveFromBatchlog(ReplicaPlan.ForTokenWrite replicaPlan, TimeUUID uuid)
{
- Message<UUID> message = Message.out(Verb.BATCH_REMOVE_REQ, uuid);
+ Message<TimeUUID> message = Message.out(Verb.BATCH_REMOVE_REQ, uuid);
for (Replica target : replicaPlan.contacts())
{
if (logger.isTraceEnabled())
@@ -2808,10 +2810,10 @@ public class StorageProxy implements StorageProxyMBean
static class PaxosBallotAndContention
{
- final UUID ballot;
+ final TimeUUID ballot;
final int contentions;
- PaxosBallotAndContention(UUID ballot, int contentions)
+ PaxosBallotAndContention(TimeUUID ballot, int contentions)
{
this.ballot = ballot;
this.contentions = contentions;
diff --git a/src/java/org/apache/cassandra/service/paxos/BallotGenerator.java b/src/java/org/apache/cassandra/service/paxos/BallotGenerator.java
index d031f38..2355bbe 100644
--- a/src/java/org/apache/cassandra/service/paxos/BallotGenerator.java
+++ b/src/java/org/apache/cassandra/service/paxos/BallotGenerator.java
@@ -18,12 +18,13 @@
package org.apache.cassandra.service.paxos;
+import java.security.SecureRandom;
import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.cassandra.service.ClientState;
import org.apache.cassandra.utils.Shared;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.utils.Shared.Scope.SIMULATION;
@@ -32,12 +33,14 @@ public interface BallotGenerator
{
static class Default implements BallotGenerator
{
- public UUID randomBallot(long whenInMicros, boolean isSerial)
+ private static final SecureRandom secureRandom = new SecureRandom();
+
+ public TimeUUID randomBallot(long whenInMicros, boolean isSerial)
{
- return UUIDGen.getRandomTimeUUIDFromMicros(whenInMicros, isSerial ? 2 : 1);
+ return TimeUUID.atUnixMicrosWithLsb(whenInMicros, secureRandom.nextLong(), isSerial);
}
- public UUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial)
+ public TimeUUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial)
{
long timestampMicros = ThreadLocalRandom.current().nextLong(fromInMicros, toInMicros);
return randomBallot(timestampMicros, isSerial);
@@ -57,8 +60,8 @@ public interface BallotGenerator
static class Global
{
private static BallotGenerator instance = new Default();
- public static UUID randomBallot(long whenInMicros, boolean isSerial) { return instance.randomBallot(whenInMicros, isSerial); }
- public static UUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial) { return instance.randomBallot(fromInMicros, toInMicros, isSerial); }
+ public static TimeUUID randomBallot(long whenInMicros, boolean isSerial) { return instance.randomBallot(whenInMicros, isSerial); }
+ public static TimeUUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial) { return instance.randomBallot(fromInMicros, toInMicros, isSerial); }
public static long nextBallotTimestampMicros(long minWhenInMicros) { return instance.nextBallotTimestampMicros(minWhenInMicros); }
public static long prevBallotTimestampMicros() { return instance.prevBallotTimestampMicros(); }
@@ -68,8 +71,8 @@ public interface BallotGenerator
}
}
- UUID randomBallot(long whenInMicros, boolean isSerial);
- UUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial);
+ TimeUUID randomBallot(long whenInMicros, boolean isSerial);
+ TimeUUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial);
long nextBallotTimestampMicros(long minWhenInMicros);
long prevBallotTimestampMicros();
}
\ No newline at end of file
diff --git a/src/java/org/apache/cassandra/service/paxos/Commit.java b/src/java/org/apache/cassandra/service/paxos/Commit.java
index 134e312..2ada45b 100644
--- a/src/java/org/apache/cassandra/service/paxos/Commit.java
+++ b/src/java/org/apache/cassandra/service/paxos/Commit.java
@@ -35,6 +35,7 @@ import org.apache.cassandra.db.partitions.PartitionUpdate;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.utils.UUIDSerializer;
@@ -42,10 +43,10 @@ public class Commit
{
public static final CommitSerializer serializer = new CommitSerializer();
- public final UUID ballot;
+ public final TimeUUID ballot;
public final PartitionUpdate update;
- public Commit(UUID ballot, PartitionUpdate update)
+ public Commit(TimeUUID ballot, PartitionUpdate update)
{
assert ballot != null;
assert update != null;
@@ -54,28 +55,28 @@ public class Commit
this.update = update;
}
- public static Commit newPrepare(DecoratedKey key, TableMetadata metadata, UUID ballot)
+ public static Commit newPrepare(DecoratedKey key, TableMetadata metadata, TimeUUID ballot)
{
return new Commit(ballot, PartitionUpdate.emptyUpdate(metadata, key));
}
- public static Commit newProposal(UUID ballot, PartitionUpdate update)
+ public static Commit newProposal(TimeUUID ballot, PartitionUpdate update)
{
- PartitionUpdate withNewTimestamp = new PartitionUpdate.Builder(update, 0).updateAllTimestamp(UUIDGen.microsTimestamp(ballot)).build();
+ PartitionUpdate withNewTimestamp = new PartitionUpdate.Builder(update, 0).updateAllTimestamp(ballot.unixMicros()).build();
return new Commit(ballot, withNewTimestamp);
}
public static Commit emptyCommit(DecoratedKey key, TableMetadata metadata)
{
- return new Commit(UUIDGen.minTimeUUID(0), PartitionUpdate.emptyUpdate(metadata, key));
+ return new Commit(TimeUUID.minAtUnixMillis(0), PartitionUpdate.emptyUpdate(metadata, key));
}
public boolean isAfter(Commit other)
{
- return ballot.timestamp() > other.ballot.timestamp();
+ return ballot.rawTimestamp() > other.ballot.rawTimestamp();
}
- public boolean hasBallot(UUID ballot)
+ public boolean hasBallot(TimeUUID ballot)
{
return this.ballot.equals(ballot);
}
@@ -125,17 +126,17 @@ public class Commit
/**
* @return testIfAfter.isAfter(testIfBefore), with non-null > null
*/
- public static boolean isAfter(@Nullable UUID testIsAfter, @Nullable Commit testIsBefore)
+ public static boolean isAfter(@Nullable TimeUUID testIsAfter, @Nullable Commit testIsBefore)
{
- return testIsAfter != null && (testIsBefore == null || testIsAfter.timestamp() > testIsBefore.ballot.timestamp());
+ return testIsAfter != null && (testIsBefore == null || testIsAfter.rawTimestamp() > testIsBefore.ballot.rawTimestamp());
}
/**
* @return testIfAfter.isAfter(testIfBefore), with non-null > null
*/
- public static boolean isAfter(@Nullable Commit testIsAfter, @Nullable UUID testIsBefore)
+ public static boolean isAfter(@Nullable Commit testIsAfter, @Nullable TimeUUID testIsBefore)
{
- return testIsAfter != null && (testIsBefore == null || testIsAfter.ballot.timestamp() > testIsBefore.timestamp());
+ return testIsAfter != null && (testIsBefore == null || testIsAfter.ballot.rawTimestamp() > testIsBefore.rawTimestamp());
}
/**
@@ -150,20 +151,20 @@ public class Commit
{
public void serialize(Commit commit, DataOutputPlus out, int version) throws IOException
{
- UUIDSerializer.serializer.serialize(commit.ballot, out, version);
+ commit.ballot.serialize(out);
PartitionUpdate.serializer.serialize(commit.update, out, version);
}
public Commit deserialize(DataInputPlus in, int version) throws IOException
{
- UUID ballot = UUIDSerializer.serializer.deserialize(in, version);
+ TimeUUID ballot = TimeUUID.deserialize(in);
PartitionUpdate update = PartitionUpdate.serializer.deserialize(in, version, DeserializationHelper.Flag.LOCAL);
return new Commit(ballot, update);
}
public long serializedSize(Commit commit, int version)
{
- return UUIDSerializer.serializer.serializedSize(commit.ballot, version)
+ return TimeUUID.sizeInBytes()
+ PartitionUpdate.serializer.serializedSize(commit.update, version);
}
}
diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
index 4d57ef4..4c5665c 100644
--- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java
+++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java
@@ -26,8 +26,8 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.db.*;
import org.apache.cassandra.tracing.Tracing;
-import org.apache.cassandra.utils.UUIDGen;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
public class PaxosState
@@ -87,7 +87,7 @@ public class PaxosState
// on some replica and not others during a new proposal (in StorageProxy.beginAndRepairPaxos()), and no
// amount of re-submit will fix this (because the node on which the commit has expired will have a
// tombstone that hides any re-submit). See CASSANDRA-12043 for details.
- int nowInSec = UUIDGen.unixTimestampInSec(toPrepare.ballot);
+ int nowInSec = (int) toPrepare.ballot.unix(SECONDS);
PaxosState state = SystemKeyspace.loadPaxosState(toPrepare.update.partitionKey(), toPrepare.update.metadata(), nowInSec);
if (toPrepare.isAfter(state.promised))
{
@@ -126,7 +126,7 @@ public class PaxosState
synchronized (lock)
{
- int nowInSec = UUIDGen.unixTimestampInSec(proposal.ballot);
+ int nowInSec = (int) proposal.ballot.unix(SECONDS);
PaxosState state = SystemKeyspace.loadPaxosState(proposal.update.partitionKey(), proposal.update.metadata(), nowInSec);
if (proposal.hasBallot(state.promised.ballot) || proposal.isAfter(state.promised))
{
@@ -164,7 +164,7 @@ public class PaxosState
// erase the in-progress update.
// The table may have been truncated since the proposal was initiated. In that case, we
// don't want to perform the mutation and potentially resurrect truncated data
- if (UUIDGen.unixTimestamp(proposal.ballot) >= SystemKeyspace.getTruncatedAt(proposal.update.metadata().id))
+ if (proposal.ballot.unixMicros() >= SystemKeyspace.getTruncatedAt(proposal.update.metadata().id))
{
Tracing.trace("Committing proposal {}", proposal);
Mutation mutation = proposal.makeMutation();
diff --git a/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java b/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java
index 72a93a7..79be30e 100644
--- a/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java
+++ b/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java
@@ -24,6 +24,7 @@ package org.apache.cassandra.service.paxos;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
@@ -39,6 +40,8 @@ import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.utils.UUIDGen;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
public class PrepareCallback extends AbstractPaxosCallback<PrepareResponse>
{
private static final Logger logger = LoggerFactory.getLogger(PrepareCallback.class);
@@ -94,7 +97,7 @@ public class PrepareCallback extends AbstractPaxosCallback<PrepareResponse>
// on paxos tables. For such old commit, we rely on hints and repair to ensure the commit has indeed be
// propagated to all nodes.
long paxosTtlSec = SystemKeyspace.paxosTtlSec(metadata);
- if (UUIDGen.unixTimestampInSec(mostRecentCommit.ballot) + paxosTtlSec < nowInSec)
+ if (mostRecentCommit.ballot.unix(SECONDS) + paxosTtlSec < nowInSec)
return Collections.emptySet();
return Iterables.filter(commitsByReplica.keySet(), new Predicate<InetAddressAndPort>()
diff --git a/src/java/org/apache/cassandra/streaming/OutgoingStream.java b/src/java/org/apache/cassandra/streaming/OutgoingStream.java
index 276e5a3..cc42ab6 100644
--- a/src/java/org/apache/cassandra/streaming/OutgoingStream.java
+++ b/src/java/org/apache/cassandra/streaming/OutgoingStream.java
@@ -19,9 +19,9 @@
package org.apache.cassandra.streaming;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.schema.TableId;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Some subset of data to be streamed. Implementations handle writing out their data via the write method.
@@ -43,7 +43,7 @@ public interface OutgoingStream
void finish();
long getRepairedAt();
- UUID getPendingRepair();
+ TimeUUID getPendingRepair();
String getName();
diff --git a/src/java/org/apache/cassandra/streaming/PreviewKind.java b/src/java/org/apache/cassandra/streaming/PreviewKind.java
index 3d0bff9..8d7ad8a 100644
--- a/src/java/org/apache/cassandra/streaming/PreviewKind.java
+++ b/src/java/org/apache/cassandra/streaming/PreviewKind.java
@@ -18,8 +18,6 @@
package org.apache.cassandra.streaming;
-import java.util.UUID;
-
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -29,6 +27,7 @@ import org.apache.cassandra.repair.PreviewRepairConflictWithIncrementalRepairExc
import org.apache.cassandra.repair.consistent.ConsistentSession;
import org.apache.cassandra.repair.consistent.LocalSession;
import org.apache.cassandra.service.ActiveRepairService;
+import org.apache.cassandra.utils.TimeUUID;
public enum PreviewKind
{
@@ -69,7 +68,7 @@ public enum PreviewKind
return isPreview() ? "preview repair" : "repair";
}
- public String logPrefix(UUID sessionId)
+ public String logPrefix(TimeUUID sessionId)
{
return '[' + logPrefix() + " #" + sessionId.toString() + ']';
}
diff --git a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
index 6b97416..ca238ba 100644
--- a/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
+++ b/src/java/org/apache/cassandra/streaming/StreamCoordinator.java
@@ -25,6 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.net.MessagingService.current_version;
@@ -48,11 +49,11 @@ public class StreamCoordinator
private final boolean follower;
private StreamingChannel.Factory factory;
private Iterator<StreamSession> sessionsToConnect = null;
- private final UUID pendingRepair;
+ private final TimeUUID pendingRepair;
private final PreviewKind previewKind;
public StreamCoordinator(StreamOperation streamOperation, int connectionsPerHost, StreamingChannel.Factory factory,
- boolean follower, boolean connectSequentially, UUID pendingRepair, PreviewKind previewKind)
+ boolean follower, boolean connectSequentially, TimeUUID pendingRepair, PreviewKind previewKind)
{
this.streamOperation = streamOperation;
this.connectionsPerHost = connectionsPerHost;
@@ -255,7 +256,7 @@ public class StreamCoordinator
return data;
}
- public UUID getPendingRepair()
+ public TimeUUID getPendingRepair()
{
return pendingRepair;
}
diff --git a/src/java/org/apache/cassandra/streaming/StreamEvent.java b/src/java/org/apache/cassandra/streaming/StreamEvent.java
index 7ecd081..be7ad3d 100644
--- a/src/java/org/apache/cassandra/streaming/StreamEvent.java
+++ b/src/java/org/apache/cassandra/streaming/StreamEvent.java
@@ -20,13 +20,13 @@ package org.apache.cassandra.streaming;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import com.google.common.collect.ImmutableSet;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.utils.TimeUUID;
public abstract class StreamEvent
{
@@ -38,9 +38,9 @@ public abstract class StreamEvent
}
public final Type eventType;
- public final UUID planId;
+ public final TimeUUID planId;
- protected StreamEvent(Type eventType, UUID planId)
+ protected StreamEvent(Type eventType, TimeUUID planId)
{
this.eventType = eventType;
this.planId = planId;
@@ -71,7 +71,7 @@ public abstract class StreamEvent
{
public final ProgressInfo progress;
- public ProgressEvent(UUID planId, ProgressInfo progress)
+ public ProgressEvent(TimeUUID planId, ProgressInfo progress)
{
super(Type.FILE_PROGRESS, planId);
this.progress = progress;
@@ -88,7 +88,7 @@ public abstract class StreamEvent
{
public final SessionInfo session;
- public SessionPreparedEvent(UUID planId, SessionInfo session)
+ public SessionPreparedEvent(TimeUUID planId, SessionInfo session)
{
super(Type.STREAM_PREPARED, planId);
this.session = session;
diff --git a/src/java/org/apache/cassandra/streaming/StreamManager.java b/src/java/org/apache/cassandra/streaming/StreamManager.java
index 86b42ce..8dcf2dd 100644
--- a/src/java/org/apache/cassandra/streaming/StreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/StreamManager.java
@@ -45,6 +45,7 @@ import org.apache.cassandra.config.DurationSpec;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.streaming.management.StreamEventJMXNotifier;
import org.apache.cassandra.streaming.management.StreamStateCompositeData;
+import org.apache.cassandra.utils.TimeUUID;
/**
* StreamManager manages currently running {@link StreamResultFuture}s and provides status of all operation invoked.
@@ -221,10 +222,10 @@ public class StreamManager implements StreamManagerMBean
* We manage them in two different maps to distinguish plan from initiated ones to
* receiving ones withing the same JVM.
*/
- private final Map<UUID, StreamResultFuture> initiatorStreams = new NonBlockingHashMap<>();
- private final Map<UUID, StreamResultFuture> followerStreams = new NonBlockingHashMap<>();
+ private final Map<TimeUUID, StreamResultFuture> initiatorStreams = new NonBlockingHashMap<>();
+ private final Map<TimeUUID, StreamResultFuture> followerStreams = new NonBlockingHashMap<>();
- private final Cache<UUID, StreamingState> states;
+ private final Cache<TimeUUID, StreamingState> states;
private final StreamListener listener = new StreamListener()
{
@Override
@@ -376,12 +377,12 @@ public class StreamManager implements StreamManagerMBean
}
}
- public StreamResultFuture getReceivingStream(UUID planId)
+ public StreamResultFuture getReceivingStream(TimeUUID planId)
{
return followerStreams.get(planId);
}
- public StreamResultFuture getInitiatorStream(UUID planId)
+ public StreamResultFuture getInitiatorStream(TimeUUID planId)
{
return initiatorStreams.get(planId);
}
@@ -406,13 +407,13 @@ public class StreamManager implements StreamManagerMBean
return notifier.getNotificationInfo();
}
- public StreamSession findSession(InetAddressAndPort peer, UUID planId, int sessionIndex, boolean searchInitiatorSessions)
+ public StreamSession findSession(InetAddressAndPort peer, TimeUUID planId, int sessionIndex, boolean searchInitiatorSessions)
{
- Map<UUID, StreamResultFuture> streams = searchInitiatorSessions ? initiatorStreams : followerStreams;
+ Map<TimeUUID, StreamResultFuture> streams = searchInitiatorSessions ? initiatorStreams : followerStreams;
return findSession(streams, peer, planId, sessionIndex);
}
- private StreamSession findSession(Map<UUID, StreamResultFuture> streams, InetAddressAndPort peer, UUID planId, int sessionIndex)
+ private StreamSession findSession(Map<TimeUUID, StreamResultFuture> streams, InetAddressAndPort peer, TimeUUID planId, int sessionIndex)
{
StreamResultFuture streamResultFuture = streams.get(planId);
if (streamResultFuture == null)
diff --git a/src/java/org/apache/cassandra/streaming/StreamPlan.java b/src/java/org/apache/cassandra/streaming/StreamPlan.java
index 47016ce..9e79a5d 100644
--- a/src/java/org/apache/cassandra/streaming/StreamPlan.java
+++ b/src/java/org/apache/cassandra/streaming/StreamPlan.java
@@ -24,11 +24,12 @@ import com.google.common.annotations.VisibleForTesting;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.locator.RangesAtEndpoint;
import org.apache.cassandra.locator.Replica;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import static com.google.common.collect.Iterables.all;
import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR;
import static org.apache.cassandra.streaming.StreamingChannel.Factory.Global.streamingFactory;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
/**
* {@link StreamPlan} is a helper class that builds StreamOperation of given configuration.
@@ -38,7 +39,7 @@ import static org.apache.cassandra.streaming.StreamingChannel.Factory.Global.str
public class StreamPlan
{
private static final String[] EMPTY_COLUMN_FAMILIES = new String[0];
- private final UUID planId = UUIDGen.getTimeUUID();
+ private final TimeUUID planId = nextTimeUUID();
private final StreamOperation streamOperation;
private final List<StreamEventHandler> handlers = new ArrayList<>();
private final StreamCoordinator coordinator;
@@ -61,7 +62,7 @@ public class StreamPlan
}
public StreamPlan(StreamOperation streamOperation, int connectionsPerHost,
- boolean connectSequentially, UUID pendingRepair, PreviewKind previewKind)
+ boolean connectSequentially, TimeUUID pendingRepair, PreviewKind previewKind)
{
this.streamOperation = streamOperation;
this.coordinator = new StreamCoordinator(streamOperation, connectionsPerHost, streamingFactory(),
@@ -193,7 +194,7 @@ public class StreamPlan
return this;
}
- public UUID getPendingRepair()
+ public TimeUUID getPendingRepair()
{
return coordinator.getPendingRepair();
}
diff --git a/src/java/org/apache/cassandra/streaming/StreamResultFuture.java b/src/java/org/apache/cassandra/streaming/StreamResultFuture.java
index 8f11587..d54b607 100644
--- a/src/java/org/apache/cassandra/streaming/StreamResultFuture.java
+++ b/src/java/org/apache/cassandra/streaming/StreamResultFuture.java
@@ -18,11 +18,11 @@
package org.apache.cassandra.streaming;
import java.util.Collection;
-import java.util.UUID;
import java.util.concurrent.ConcurrentLinkedQueue;
import com.google.common.annotations.VisibleForTesting;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.AsyncFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@ public final class StreamResultFuture extends AsyncFuture<StreamState>
{
private static final Logger logger = LoggerFactory.getLogger(StreamResultFuture.class);
- public final UUID planId;
+ public final TimeUUID planId;
public final StreamOperation streamOperation;
private final StreamCoordinator coordinator;
private final Collection<StreamEventHandler> eventListeners = new ConcurrentLinkedQueue<>();
@@ -62,7 +62,7 @@ public final class StreamResultFuture extends AsyncFuture<StreamState>
* @param planId Stream plan ID
* @param streamOperation Stream streamOperation
*/
- public StreamResultFuture(UUID planId, StreamOperation streamOperation, StreamCoordinator coordinator)
+ public StreamResultFuture(TimeUUID planId, StreamOperation streamOperation, StreamCoordinator coordinator)
{
this.planId = planId;
this.streamOperation = streamOperation;
@@ -74,12 +74,12 @@ public final class StreamResultFuture extends AsyncFuture<StreamState>
}
@VisibleForTesting
- public StreamResultFuture(UUID planId, StreamOperation streamOperation, UUID pendingRepair, PreviewKind previewKind)
+ public StreamResultFuture(TimeUUID planId, StreamOperation streamOperation, TimeUUID pendingRepair, PreviewKind previewKind)
{
this(planId, streamOperation, new StreamCoordinator(streamOperation, 0, streamingFactory(), true, false, pendingRepair, previewKind));
}
- public static StreamResultFuture createInitiator(UUID planId, StreamOperation streamOperation, Collection<StreamEventHandler> listeners,
+ public static StreamResultFuture createInitiator(TimeUUID planId, StreamOperation streamOperation, Collection<StreamEventHandler> listeners,
StreamCoordinator coordinator)
{
StreamResultFuture future = createAndRegisterInitiator(planId, streamOperation, coordinator);
@@ -103,12 +103,12 @@ public final class StreamResultFuture extends AsyncFuture<StreamState>
}
public static synchronized StreamResultFuture createFollower(int sessionIndex,
- UUID planId,
+ TimeUUID planId,
StreamOperation streamOperation,
InetAddressAndPort from,
StreamingChannel channel,
int messagingVersion,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
PreviewKind previewKind)
{
StreamResultFuture future = StreamManager.instance.getReceivingStream(planId);
@@ -127,7 +127,7 @@ public final class StreamResultFuture extends AsyncFuture<StreamState>
return future;
}
- private static StreamResultFuture createAndRegisterInitiator(UUID planId, StreamOperation streamOperation, StreamCoordinator coordinator)
+ private static StreamResultFuture createAndRegisterInitiator(TimeUUID planId, StreamOperation streamOperation, StreamCoordinator coordinator)
{
StreamResultFuture future = new StreamResultFuture(planId, streamOperation, coordinator);
StreamManager.instance.registerInitiator(future);
diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java
index 00e3bf1..5ac783b 100644
--- a/src/java/org/apache/cassandra/streaming/StreamSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamSession.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.concurrent.ScheduledExecutors;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.locator.RangesAtEndpoint;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.FutureCombiner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -179,7 +180,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
private boolean maybeCompleted = false;
private Future<?> closeFuture;
- private final UUID pendingRepair;
+ private final TimeUUID pendingRepair;
private final PreviewKind previewKind;
/**
@@ -233,7 +234,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
* Create new streaming session with the peer.
*/
public StreamSession(StreamOperation streamOperation, InetAddressAndPort peer, StreamingChannel.Factory factory, @Nullable StreamingChannel controlChannel, int messagingVersion,
- boolean isFollower, int index, UUID pendingRepair, PreviewKind previewKind)
+ boolean isFollower, int index, TimeUUID pendingRepair, PreviewKind previewKind)
{
this.streamOperation = streamOperation;
this.peer = peer;
@@ -251,7 +252,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
return isFollower;
}
- public UUID planId()
+ public TimeUUID planId()
{
return streamResult == null ? null : streamResult.planId;
}
@@ -271,7 +272,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
return streamOperation;
}
- public UUID getPendingRepair()
+ public TimeUUID getPendingRepair()
{
return pendingRepair;
}
@@ -447,7 +448,7 @@ public class StreamSession implements IEndpointStateChangeSubscriber
}
@VisibleForTesting
- public List<OutgoingStream> getOutgoingStreamsForRanges(RangesAtEndpoint replicas, Collection<ColumnFamilyStore> stores, UUID pendingRepair, PreviewKind previewKind)
+ public List<OutgoingStream> getOutgoingStreamsForRanges(RangesAtEndpoint replicas, Collection<ColumnFamilyStore> stores, TimeUUID pendingRepair, PreviewKind previewKind)
{
List<OutgoingStream> streams = new ArrayList<>();
try
diff --git a/src/java/org/apache/cassandra/streaming/StreamState.java b/src/java/org/apache/cassandra/streaming/StreamState.java
index be37677..55e50e6 100644
--- a/src/java/org/apache/cassandra/streaming/StreamState.java
+++ b/src/java/org/apache/cassandra/streaming/StreamState.java
@@ -20,22 +20,23 @@ package org.apache.cassandra.streaming;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
+import org.apache.cassandra.utils.TimeUUID;
+
/**
* Current snapshot of streaming progress.
*/
public class StreamState implements Serializable
{
- public final UUID planId;
+ public final TimeUUID planId;
public final StreamOperation streamOperation;
public final Set<SessionInfo> sessions;
- public StreamState(UUID planId, StreamOperation streamOperation, Set<SessionInfo> sessions)
+ public StreamState(TimeUUID planId, StreamOperation streamOperation, Set<SessionInfo> sessions)
{
this.planId = planId;
this.sessions = sessions;
diff --git a/src/java/org/apache/cassandra/streaming/StreamingState.java b/src/java/org/apache/cassandra/streaming/StreamingState.java
index b7ef61e..23685bd 100644
--- a/src/java/org/apache/cassandra/streaming/StreamingState.java
+++ b/src/java/org/apache/cassandra/streaming/StreamingState.java
@@ -26,7 +26,6 @@ import java.util.EnumMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
@@ -39,13 +38,16 @@ import org.apache.cassandra.db.virtual.SimpleDataSet;
import org.apache.cassandra.tools.nodetool.formatter.TableBuilder;
import org.apache.cassandra.utils.Clock;
import org.apache.cassandra.utils.ObjectSizes;
+import org.apache.cassandra.utils.TimeUUID;
import org.checkerframework.checker.nullness.qual.Nullable;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
+
public class StreamingState implements StreamEventHandler
{
private static final Logger logger = LoggerFactory.getLogger(StreamingState.class);
- public static final long ELEMENT_SIZE = ObjectSizes.measureDeep(new StreamingState(UUID.randomUUID(), StreamOperation.OTHER, false));
+ public static final long ELEMENT_SIZE = ObjectSizes.measureDeep(new StreamingState(nextTimeUUID(), StreamOperation.OTHER, false));
public enum Status
{INIT, START, SUCCESS, FAILURE}
@@ -59,7 +61,7 @@ public class StreamingState implements StreamEventHandler
// To lower memory costs, clear this after the stream completes
private ConcurrentMap<InetSocketAddress, SessionInfo> streamProgress = new ConcurrentHashMap<>();
- private final UUID id;
+ private final TimeUUID id;
private final boolean follower;
private final StreamOperation operation;
private Set<InetSocketAddress> peers = null;
@@ -79,7 +81,7 @@ public class StreamingState implements StreamEventHandler
this(result.planId, result.streamOperation, result.getCoordinator().isFollower());
}
- private StreamingState(UUID planId, StreamOperation streamOperation, boolean follower)
+ private StreamingState(TimeUUID planId, StreamOperation streamOperation, boolean follower)
{
this.id = planId;
this.operation = streamOperation;
@@ -88,7 +90,7 @@ public class StreamingState implements StreamEventHandler
updateState(Status.INIT);
}
- public UUID id()
+ public TimeUUID id()
{
return id;
}
diff --git a/src/java/org/apache/cassandra/streaming/TableStreamManager.java b/src/java/org/apache/cassandra/streaming/TableStreamManager.java
index d97fabc..208dc34 100644
--- a/src/java/org/apache/cassandra/streaming/TableStreamManager.java
+++ b/src/java/org/apache/cassandra/streaming/TableStreamManager.java
@@ -19,10 +19,10 @@
package org.apache.cassandra.streaming;
import java.util.Collection;
-import java.util.UUID;
import org.apache.cassandra.locator.RangesAtEndpoint;
import org.apache.cassandra.streaming.messages.StreamMessageHeader;
+import org.apache.cassandra.utils.TimeUUID;
/**
* The main streaming hook for a storage implementation.
@@ -51,6 +51,6 @@ public interface TableStreamManager
*/
Collection<OutgoingStream> createOutgoingStreams(StreamSession session,
RangesAtEndpoint replicas,
- UUID pendingRepair,
+ TimeUUID pendingRepair,
PreviewKind previewKind);
}
diff --git a/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java b/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
index a1f7d86..a3eb7d1 100644
--- a/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
+++ b/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
@@ -20,13 +20,13 @@ package org.apache.cassandra.streaming.management;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
-import java.util.UUID;
import javax.management.openmbean.*;
import com.google.common.base.Throwables;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.streaming.ProgressInfo;
+import org.apache.cassandra.utils.TimeUUID;
public class ProgressInfoCompositeData
{
@@ -72,7 +72,7 @@ public class ProgressInfoCompositeData
}
}
- public static CompositeData toCompositeData(UUID planId, ProgressInfo progressInfo)
+ public static CompositeData toCompositeData(TimeUUID planId, ProgressInfo progressInfo)
{
Map<String, Object> valueMap = new HashMap<>();
valueMap.put(ITEM_NAMES[0], planId.toString());
diff --git a/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java b/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
index 5cadac5..f39b321 100644
--- a/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
+++ b/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
@@ -31,6 +31,7 @@ import org.apache.cassandra.streaming.ProgressInfo;
import org.apache.cassandra.streaming.SessionInfo;
import org.apache.cassandra.streaming.StreamSession;
import org.apache.cassandra.streaming.StreamSummary;
+import org.apache.cassandra.utils.TimeUUID;
public class SessionInfoCompositeData
{
@@ -86,7 +87,7 @@ public class SessionInfoCompositeData
}
}
- public static CompositeData toCompositeData(final UUID planId, SessionInfo sessionInfo)
+ public static CompositeData toCompositeData(final TimeUUID planId, SessionInfo sessionInfo)
{
Map<String, Object> valueMap = new HashMap<>();
valueMap.put(ITEM_NAMES[0], planId.toString());
diff --git a/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java b/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
index de88762..5ee4f32 100644
--- a/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
+++ b/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
@@ -29,6 +29,7 @@ import com.google.common.collect.Sets;
import org.apache.cassandra.streaming.SessionInfo;
import org.apache.cassandra.streaming.StreamState;
import org.apache.cassandra.streaming.StreamOperation;
+import org.apache.cassandra.utils.TimeUUID;
/**
*/
@@ -121,7 +122,7 @@ public class StreamStateCompositeData
{
assert cd.getCompositeType().equals(COMPOSITE_TYPE);
Object[] values = cd.getAll(ITEM_NAMES);
- UUID planId = UUID.fromString((String) values[0]);
+ TimeUUID planId = TimeUUID.fromString((String) values[0]);
String typeString = (String) values[1];
Set<SessionInfo> sessions = Sets.newHashSet(Iterables.transform(Arrays.asList((CompositeData[]) values[2]),
new Function<CompositeData, SessionInfo>()
diff --git a/src/java/org/apache/cassandra/streaming/messages/StreamInitMessage.java b/src/java/org/apache/cassandra/streaming/messages/StreamInitMessage.java
index 64e3b71..889c732 100644
--- a/src/java/org/apache/cassandra/streaming/messages/StreamInitMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/StreamInitMessage.java
@@ -18,19 +18,17 @@
package org.apache.cassandra.streaming.messages;
import java.io.IOException;
-import java.util.UUID;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.streaming.StreamingChannel;
import org.apache.cassandra.streaming.StreamingDataOutputPlus;
import org.apache.cassandra.streaming.StreamOperation;
import org.apache.cassandra.streaming.PreviewKind;
import org.apache.cassandra.streaming.StreamResultFuture;
import org.apache.cassandra.streaming.StreamSession;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.locator.InetAddressAndPort.Serializer.inetAddressAndPortSerializer;
@@ -44,14 +42,14 @@ public class StreamInitMessage extends StreamMessage
public final InetAddressAndPort from;
public final int sessionIndex;
- public final UUID planId;
+ public final TimeUUID planId;
public final StreamOperation streamOperation;
- public final UUID pendingRepair;
+ public final TimeUUID pendingRepair;
public final PreviewKind previewKind;
- public StreamInitMessage(InetAddressAndPort from, int sessionIndex, UUID planId, StreamOperation streamOperation,
- UUID pendingRepair, PreviewKind previewKind)
+ public StreamInitMessage(InetAddressAndPort from, int sessionIndex, TimeUUID planId, StreamOperation streamOperation,
+ TimeUUID pendingRepair, PreviewKind previewKind)
{
super(Type.STREAM_INIT);
this.from = from;
@@ -86,14 +84,12 @@ public class StreamInitMessage extends StreamMessage
{
inetAddressAndPortSerializer.serialize(message.from, out, version);
out.writeInt(message.sessionIndex);
- UUIDSerializer.serializer.serialize(message.planId, out, MessagingService.current_version);
+ message.planId.serialize(out);
out.writeUTF(message.streamOperation.getDescription());
out.writeBoolean(message.pendingRepair != null);
if (message.pendingRepair != null)
- {
- UUIDSerializer.serializer.serialize(message.pendingRepair, out, MessagingService.current_version);
- }
+ message.pendingRepair.serialize(out);
out.writeInt(message.previewKind.getSerializationVal());
}
@@ -101,10 +97,10 @@ public class StreamInitMessage extends StreamMessage
{
InetAddressAndPort from = inetAddressAndPortSerializer.deserialize(in, version);
int sessionIndex = in.readInt();
- UUID planId = UUIDSerializer.serializer.deserialize(in, MessagingService.current_version);
+ TimeUUID planId = TimeUUID.deserialize(in);
String description = in.readUTF();
- UUID pendingRepair = in.readBoolean() ? UUIDSerializer.serializer.deserialize(in, version) : null;
+ TimeUUID pendingRepair = in.readBoolean() ? TimeUUID.deserialize(in) : null;
PreviewKind previewKind = PreviewKind.deserialize(in.readInt());
return new StreamInitMessage(from, sessionIndex, planId, StreamOperation.fromString(description),
pendingRepair, previewKind);
@@ -114,13 +110,11 @@ public class StreamInitMessage extends StreamMessage
{
long size = inetAddressAndPortSerializer.serializedSize(message.from, version);
size += TypeSizes.sizeof(message.sessionIndex);
- size += UUIDSerializer.serializer.serializedSize(message.planId, MessagingService.current_version);
+ size += TimeUUID.sizeInBytes();
size += TypeSizes.sizeof(message.streamOperation.getDescription());
size += TypeSizes.sizeof(message.pendingRepair != null);
if (message.pendingRepair != null)
- {
- size += UUIDSerializer.serializer.serializedSize(message.pendingRepair, MessagingService.current_version);
- }
+ size += TimeUUID.sizeInBytes();
size += TypeSizes.sizeof(message.previewKind.getSerializationVal());
return size;
diff --git a/src/java/org/apache/cassandra/streaming/messages/StreamMessageHeader.java b/src/java/org/apache/cassandra/streaming/messages/StreamMessageHeader.java
index 30afbb8..ec9d8e8 100644
--- a/src/java/org/apache/cassandra/streaming/messages/StreamMessageHeader.java
+++ b/src/java/org/apache/cassandra/streaming/messages/StreamMessageHeader.java
@@ -18,7 +18,6 @@
package org.apache.cassandra.streaming.messages;
import java.io.IOException;
-import java.util.UUID;
import com.google.common.base.Objects;
@@ -26,10 +25,9 @@ import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.streaming.StreamSession;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.locator.InetAddressAndPort.Serializer.inetAddressAndPortSerializer;
@@ -41,23 +39,23 @@ public class StreamMessageHeader
public static FileMessageHeaderSerializer serializer = new FileMessageHeaderSerializer();
public final TableId tableId;
- public UUID planId;
+ public TimeUUID planId;
// it tells us if the file was sent by a follower stream session
public final boolean sendByFollower;
public int sessionIndex;
public final int sequenceNumber;
public final long repairedAt;
- public final UUID pendingRepair;
+ public final TimeUUID pendingRepair;
public final InetAddressAndPort sender;
public StreamMessageHeader(TableId tableId,
InetAddressAndPort sender,
- UUID planId,
+ TimeUUID planId,
boolean sendByFollower,
int sessionIndex,
int sequenceNumber,
long repairedAt,
- UUID pendingRepair)
+ TimeUUID pendingRepair)
{
this.tableId = tableId;
this.sender = sender;
@@ -111,7 +109,7 @@ public class StreamMessageHeader
{
header.tableId.serialize(out);
inetAddressAndPortSerializer.serialize(header.sender, out, version);
- UUIDSerializer.serializer.serialize(header.planId, out, version);
+ header.planId.serialize(out);
out.writeBoolean(header.sendByFollower);
out.writeInt(header.sessionIndex);
out.writeInt(header.sequenceNumber);
@@ -119,7 +117,7 @@ public class StreamMessageHeader
out.writeBoolean(header.pendingRepair != null);
if (header.pendingRepair != null)
{
- UUIDSerializer.serializer.serialize(header.pendingRepair, out, version);
+ header.pendingRepair.serialize(out);
}
}
@@ -127,12 +125,12 @@ public class StreamMessageHeader
{
TableId tableId = TableId.deserialize(in);
InetAddressAndPort sender = inetAddressAndPortSerializer.deserialize(in, version);
- UUID planId = UUIDSerializer.serializer.deserialize(in, MessagingService.current_version);
+ TimeUUID planId = TimeUUID.deserialize(in);
boolean sendByFollower = in.readBoolean();
int sessionIndex = in.readInt();
int sequenceNumber = in.readInt();
long repairedAt = in.readLong();
- UUID pendingRepair = in.readBoolean() ? UUIDSerializer.serializer.deserialize(in, version) : null;
+ TimeUUID pendingRepair = in.readBoolean() ? TimeUUID.deserialize(in) : null;
return new StreamMessageHeader(tableId, sender, planId, sendByFollower, sessionIndex, sequenceNumber, repairedAt, pendingRepair);
}
@@ -141,13 +139,13 @@ public class StreamMessageHeader
{
long size = header.tableId.serializedSize();
size += inetAddressAndPortSerializer.serializedSize(header.sender, version);
- size += UUIDSerializer.serializer.serializedSize(header.planId, version);
+ size += TimeUUID.sizeInBytes();
size += TypeSizes.sizeof(header.sendByFollower);
size += TypeSizes.sizeof(header.sessionIndex);
size += TypeSizes.sizeof(header.sequenceNumber);
size += TypeSizes.sizeof(header.repairedAt);
size += TypeSizes.sizeof(header.pendingRepair != null);
- size += header.pendingRepair != null ? UUIDSerializer.serializer.serializedSize(header.pendingRepair, version) : 0;
+ size += header.pendingRepair != null ? TimeUUID.sizeInBytes() : 0;
return size;
}
diff --git a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java
index 1edeccf..c6ca1f2 100644
--- a/src/java/org/apache/cassandra/tracing/TraceKeyspace.java
+++ b/src/java/org/apache/cassandra/tracing/TraceKeyspace.java
@@ -35,9 +35,9 @@ import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.schema.Tables;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
import static java.lang.String.format;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public final class TraceKeyspace
{
@@ -144,7 +144,7 @@ public final class TraceKeyspace
static Mutation makeEventMutation(ByteBuffer sessionId, String message, int elapsed, String threadName, int ttl)
{
PartitionUpdate.SimpleBuilder builder = PartitionUpdate.simpleBuilder(Events, sessionId);
- Row.SimpleBuilder rowBuilder = builder.row(UUIDGen.getTimeUUID())
+ Row.SimpleBuilder rowBuilder = builder.row(nextTimeUUID())
.ttl(ttl);
rowBuilder.add("activity", message)
diff --git a/src/java/org/apache/cassandra/tracing/TraceState.java b/src/java/org/apache/cassandra/tracing/TraceState.java
index ae69801..1713369 100644
--- a/src/java/org/apache/cassandra/tracing/TraceState.java
+++ b/src/java/org/apache/cassandra/tracing/TraceState.java
@@ -19,7 +19,6 @@ package org.apache.cassandra.tracing;
import java.nio.ByteBuffer;
import java.util.List;
-import java.util.UUID;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -28,7 +27,7 @@ import com.google.common.base.Stopwatch;
import org.slf4j.helpers.MessageFormatter;
import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
import org.apache.cassandra.utils.progress.ProgressEvent;
import org.apache.cassandra.utils.progress.ProgressEventNotifier;
@@ -40,7 +39,7 @@ import org.apache.cassandra.utils.progress.ProgressListener;
*/
public abstract class TraceState implements ProgressEventNotifier
{
- public final UUID sessionId;
+ public final TimeUUID sessionId;
public final InetAddressAndPort coordinator;
public final Stopwatch watch;
public final ByteBuffer sessionIdBytes;
@@ -64,14 +63,14 @@ public abstract class TraceState implements ProgressEventNotifier
// See CASSANDRA-7626 for more details.
private final AtomicInteger references = new AtomicInteger(1);
- protected TraceState(InetAddressAndPort coordinator, UUID sessionId, Tracing.TraceType traceType)
+ protected TraceState(InetAddressAndPort coordinator, TimeUUID sessionId, Tracing.TraceType traceType)
{
assert coordinator != null;
assert sessionId != null;
this.coordinator = coordinator;
this.sessionId = sessionId;
- sessionIdBytes = ByteBufferUtil.bytes(sessionId);
+ sessionIdBytes = sessionId.toBytes();
this.traceType = traceType;
this.ttl = traceType.getTTL();
watch = Stopwatch.createStarted();
diff --git a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java
index ff158d0..d174062 100644
--- a/src/java/org/apache/cassandra/tracing/TraceStateImpl.java
+++ b/src/java/org/apache/cassandra/tracing/TraceStateImpl.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.tracing;
import java.util.Arrays;
import java.util.Collections;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -36,6 +35,7 @@ import org.apache.cassandra.exceptions.OverloadedException;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.utils.JVMStabilityInspector;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Future;
import org.apache.cassandra.utils.concurrent.FutureCombiner;
@@ -57,7 +57,7 @@ public class TraceStateImpl extends TraceState
private final Set<Future<?>> pendingFutures = ConcurrentHashMap.newKeySet();
- public TraceStateImpl(InetAddressAndPort coordinator, UUID sessionId, Tracing.TraceType traceType)
+ public TraceStateImpl(InetAddressAndPort coordinator, TimeUUID sessionId, Tracing.TraceType traceType)
{
super(coordinator, sessionId, traceType);
}
diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java b/src/java/org/apache/cassandra/tracing/Tracing.java
index 805f5da..5c820db 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -24,7 +24,6 @@ import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.Collections;
import java.util.Map;
-import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -33,7 +32,6 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.concurrent.ExecutorLocals;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
@@ -42,8 +40,9 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.ParamType;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.JVMStabilityInspector;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
/**
* A trace session context. Able to track and store trace sessions. A session is usually a user initiated query, and may
@@ -104,7 +103,7 @@ public abstract class Tracing extends ExecutorLocals.Impl
private final InetAddressAndPort localAddress = FBUtilities.getLocalAddressAndPort();
- protected final ConcurrentMap<UUID, TraceState> sessions = new ConcurrentHashMap<>();
+ protected final ConcurrentMap<TimeUUID, TraceState> sessions = new ConcurrentHashMap<>();
public static final Tracing instance;
@@ -128,7 +127,7 @@ public abstract class Tracing extends ExecutorLocals.Impl
instance = null != tracing ? tracing : new TracingImpl();
}
- public UUID getSessionId()
+ public TimeUUID getSessionId()
{
assert isTracing();
return get().sessionId;
@@ -154,29 +153,29 @@ public abstract class Tracing extends ExecutorLocals.Impl
return instance.get() != null;
}
- public UUID newSession(Map<String,ByteBuffer> customPayload)
+ public TimeUUID newSession(Map<String,ByteBuffer> customPayload)
{
return newSession(
- TimeUUIDType.instance.compose(ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes())),
+ nextTimeUUID(),
TraceType.QUERY,
customPayload);
}
- public UUID newSession(TraceType traceType)
+ public TimeUUID newSession(TraceType traceType)
{
return newSession(
- TimeUUIDType.instance.compose(ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes())),
+ nextTimeUUID(),
traceType,
Collections.EMPTY_MAP);
}
- public UUID newSession(UUID sessionId, Map<String,ByteBuffer> customPayload)
+ public TimeUUID newSession(TimeUUID sessionId, Map<String,ByteBuffer> customPayload)
{
return newSession(sessionId, TraceType.QUERY, customPayload);
}
/** This method is intended to be overridden in tracing implementations that need access to the customPayload */
- protected UUID newSession(UUID sessionId, TraceType traceType, Map<String,ByteBuffer> customPayload)
+ protected TimeUUID newSession(TimeUUID sessionId, TraceType traceType, Map<String,ByteBuffer> customPayload)
{
assert get() == null;
@@ -221,7 +220,7 @@ public abstract class Tracing extends ExecutorLocals.Impl
return ExecutorLocals.current().traceState;
}
- public TraceState get(UUID sessionId)
+ public TraceState get(TimeUUID sessionId)
{
return sessions.get(sessionId);
}
@@ -247,7 +246,7 @@ public abstract class Tracing extends ExecutorLocals.Impl
*/
public TraceState initializeFromMessage(final Message.Header header)
{
- final UUID sessionId = header.traceSession();
+ final TimeUUID sessionId = header.traceSession();
if (sessionId == null)
return null;
@@ -277,7 +276,7 @@ public abstract class Tracing extends ExecutorLocals.Impl
{
try
{
- final UUID sessionId = message.traceSession();
+ final TimeUUID sessionId = message.traceSession();
if (sessionId == null)
return;
@@ -288,7 +287,7 @@ public abstract class Tracing extends ExecutorLocals.Impl
if (state == null) // session may have already finished; see CASSANDRA-5668
{
TraceType traceType = message.traceType();
- trace(ByteBuffer.wrap(UUIDGen.decompose(sessionId)), logMessage, traceType.getTTL());
+ trace(sessionId.toBytes(), logMessage, traceType.getTTL());
}
else
{
@@ -312,7 +311,7 @@ public abstract class Tracing extends ExecutorLocals.Impl
return addToMutable;
}
- protected abstract TraceState newTraceState(InetAddressAndPort coordinator, UUID sessionId, Tracing.TraceType traceType);
+ protected abstract TraceState newTraceState(InetAddressAndPort coordinator, TimeUUID sessionId, Tracing.TraceType traceType);
// repair just gets a varargs method since it's so heavyweight anyway
public static void traceRepair(String format, Object... args)
diff --git a/src/java/org/apache/cassandra/tracing/TracingImpl.java b/src/java/org/apache/cassandra/tracing/TracingImpl.java
index 9192aca..1885146 100644
--- a/src/java/org/apache/cassandra/tracing/TracingImpl.java
+++ b/src/java/org/apache/cassandra/tracing/TracingImpl.java
@@ -22,10 +22,10 @@ package org.apache.cassandra.tracing;
import java.net.InetAddress;
import java.nio.ByteBuffer;
import java.util.Map;
-import java.util.UUID;
import org.apache.cassandra.concurrent.Stage;
import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.WrappedRunnable;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
@@ -95,7 +95,7 @@ class TracingImpl extends Tracing
}
@Override
- protected TraceState newTraceState(InetAddressAndPort coordinator, UUID sessionId, TraceType traceType)
+ protected TraceState newTraceState(InetAddressAndPort coordinator, TimeUUID sessionId, TraceType traceType)
{
return new TraceStateImpl(coordinator, sessionId, traceType);
}
diff --git a/src/java/org/apache/cassandra/transport/CBUtil.java b/src/java/org/apache/cassandra/transport/CBUtil.java
index fd6a0ff..6cab638 100644
--- a/src/java/org/apache/cassandra/transport/CBUtil.java
+++ b/src/java/org/apache/cassandra/transport/CBUtil.java
@@ -44,6 +44,7 @@ import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.UUIDGen;
/**
@@ -301,11 +302,24 @@ public abstract class CBUtil
return UUIDGen.getUUID(buffer);
}
+ public static TimeUUID readTimeUUID(ByteBuf cb)
+ {
+ long msb = cb.readLong();
+ long lsb = cb.readLong();
+ return TimeUUID.fromBytes(msb, lsb);
+ }
+
public static void writeUUID(UUID uuid, ByteBuf cb)
{
cb.writeBytes(UUIDGen.decompose(uuid));
}
+ public static void writeUUID(TimeUUID uuid, ByteBuf cb)
+ {
+ cb.writeLong(uuid.msb());
+ cb.writeLong(uuid.lsb());
+ }
+
public static int sizeOfUUID(UUID uuid)
{
return UUID_SIZE;
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index c40aa7a..75c997e 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -23,7 +23,6 @@ import java.nio.ByteBuffer;
import java.util.EnumSet;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import com.google.common.annotations.VisibleForTesting;
@@ -37,7 +36,9 @@ import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.transport.messages.*;
import org.apache.cassandra.service.QueryState;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
/**
* A message from the CQL binary protocol.
@@ -230,14 +231,14 @@ public abstract class Message
public final Response execute(QueryState queryState, long queryStartNanoTime)
{
boolean shouldTrace = false;
- UUID tracingSessionId = null;
+ TimeUUID tracingSessionId = null;
if (isTraceable())
{
if (isTracingRequested())
{
shouldTrace = true;
- tracingSessionId = UUIDGen.getTimeUUID();
+ tracingSessionId = nextTimeUUID();
Tracing.instance.newSession(tracingSessionId, getCustomPayload());
}
else if (StorageService.instance.shouldTraceProbablistically())
@@ -277,7 +278,7 @@ public abstract class Message
public static abstract class Response extends Message
{
- protected UUID tracingId;
+ protected TimeUUID tracingId;
protected List<String> warnings;
protected Response(Type type)
@@ -288,13 +289,13 @@ public abstract class Message
throw new IllegalArgumentException();
}
- Message setTracingId(UUID tracingId)
+ Message setTracingId(TimeUUID tracingId)
{
this.tracingId = tracingId;
return this;
}
- UUID getTracingId()
+ TimeUUID getTracingId()
{
return tracingId;
}
@@ -323,10 +324,10 @@ public abstract class Message
if (this instanceof Response)
{
Response message = (Response)this;
- UUID tracingId = message.getTracingId();
+ TimeUUID tracingId = message.getTracingId();
Map<String, ByteBuffer> customPayload = message.getCustomPayload();
if (tracingId != null)
- messageSize += CBUtil.sizeOfUUID(tracingId);
+ messageSize += TimeUUID.sizeInBytes();
List<String> warnings = message.getWarnings();
if (warnings != null)
{
@@ -416,7 +417,7 @@ public abstract class Message
boolean isCustomPayload = inbound.header.flags.contains(Envelope.Header.Flag.CUSTOM_PAYLOAD);
boolean hasWarning = inbound.header.flags.contains(Envelope.Header.Flag.WARNING);
- UUID tracingId = isRequest || !isTracing ? null : CBUtil.readUUID(inbound.body);
+ TimeUUID tracingId = isRequest || !isTracing ? null : CBUtil.readTimeUUID(inbound.body);
List<String> warnings = isRequest || !hasWarning ? null : CBUtil.readStringList(inbound.body);
Map<String, ByteBuffer> customPayload = !isCustomPayload ? null : CBUtil.readBytesMap(inbound.body);
diff --git a/src/java/org/apache/cassandra/utils/CounterId.java b/src/java/org/apache/cassandra/utils/CounterId.java
index b138aac..fc0385e 100644
--- a/src/java/org/apache/cassandra/utils/CounterId.java
+++ b/src/java/org/apache/cassandra/utils/CounterId.java
@@ -22,6 +22,8 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.cassandra.db.SystemKeyspace;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUIDAsBytes;
+
public class CounterId implements Comparable<CounterId>
{
public static final int LENGTH = 16; // we assume a fixed length size for all CounterIds
@@ -84,7 +86,7 @@ public class CounterId implements Comparable<CounterId>
public static CounterId generate()
{
- return new CounterId(ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes()));
+ return new CounterId(ByteBuffer.wrap(nextTimeUUIDAsBytes()));
}
/*
diff --git a/src/java/org/apache/cassandra/utils/TimeUUID.java b/src/java/org/apache/cassandra/utils/TimeUUID.java
new file mode 100644
index 0000000..c0841e7
--- /dev/null
+++ b/src/java/org/apache/cassandra/utils/TimeUUID.java
@@ -0,0 +1,579 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.utils;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.nio.ByteBuffer;
+import java.security.SecureRandom;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import com.google.common.hash.Hasher;
+import com.google.common.hash.Hashing;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.marshal.ValueAccessor;
+import org.apache.cassandra.io.IVersionedSerializer;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.serializers.MarshalException;
+import org.apache.cassandra.serializers.TypeSerializer;
+
+import static java.util.concurrent.TimeUnit.MICROSECONDS;
+import static org.apache.cassandra.config.CassandraRelevantProperties.DETERMINISM_UNSAFE_UUID_NODE;
+import static org.apache.cassandra.utils.ByteBufferUtil.EMPTY_BYTE_BUFFER;
+import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
+import static org.apache.cassandra.utils.Shared.Recursive.INTERFACES;
+
+@Shared(inner = INTERFACES)
+public class TimeUUID implements Serializable, Comparable<TimeUUID>
+{
+ public static final long serialVersionUID = 1L;
+
+ // A grand day! millis at 00:00:00.000 15 Oct 1582.
+ public static final long UUID_EPOCH_UNIX_MILLIS = -12219292800000L;
+ protected static final long TIMESTAMP_UUID_VERSION_IN_MSB = 0x1000L;
+ protected static final long UUID_VERSION_BITS_IN_MSB = 0xf000L;
+
+ /*
+ * The min and max possible lsb for a UUID.
+ * Note that his is not 0 and all 1's because Cassandra TimeUUIDType
+ * compares the lsb parts as a signed byte array comparison. So the min
+ * value is 8 times -128 and the max is 8 times +127.
+ *
+ * Note that we ignore the uuid variant (namely, MIN_CLOCK_SEQ_AND_NODE
+ * have variant 2 as it should, but MAX_CLOCK_SEQ_AND_NODE have variant 0).
+ * I don't think that has any practical consequence and is more robust in
+ * case someone provides a UUID with a broken variant.
+ */
+ private static final long MIN_CLOCK_SEQ_AND_NODE = 0x8080808080808080L;
+ private static final long MAX_CLOCK_SEQ_AND_NODE = 0x7f7f7f7f7f7f7f7fL;
+
+
+ final long rawTimestamp, lsb;
+
+ public TimeUUID(long rawTimestamp, long lsb)
+ {
+ // we don't validate that this is a true TIMEUUID to avoid problems with historical mixing of UUID with TimeUUID
+ this.rawTimestamp = rawTimestamp;
+ this.lsb = lsb;
+ }
+
+ public static TimeUUID atUnixMicrosWithLsb(long unixMicros, long uniqueLsb)
+ {
+ return new TimeUUID(unixMicrosToRawTimestamp(unixMicros), uniqueLsb);
+ }
+
+ public static TimeUUID atUnixMicrosWithLsb(long unixMicros, long uniqueLsb, boolean isSerial)
+ {
+ return new TimeUUID(unixMicrosToRawTimestamp(unixMicros) + (isSerial ? 2 : 1), uniqueLsb);
+ }
+
+ public static UUID atUnixMicrosWithLsbAsUUID(long unixMicros, long uniqueLsb)
+ {
+ return new UUID(rawTimestampToMsb(unixMicrosToRawTimestamp(unixMicros)), uniqueLsb);
+ }
+
+ /**
+ * Returns the smaller possible type 1 UUID having the provided timestamp.
+ *
+ * <b>Warning:</b> this method should only be used for querying as this
+ * doesn't at all guarantee the uniqueness of the resulting UUID.
+ */
+ public static TimeUUID minAtUnixMillis(long unixMillis)
+ {
+ return new TimeUUID(unixMillisToRawTimestamp(unixMillis, 0), MIN_CLOCK_SEQ_AND_NODE);
+ }
+
+ /**
+ * Returns the biggest possible type 1 UUID having the provided timestamp.
+ *
+ * <b>Warning:</b> this method should only be used for querying as this
+ * doesn't at all guarantee the uniqueness of the resulting UUID.
+ */
+ public static TimeUUID maxAtUnixMillis(long unixMillis)
+ {
+ return new TimeUUID(unixMillisToRawTimestamp(unixMillis + 1, 0) - 1, MAX_CLOCK_SEQ_AND_NODE);
+ }
+
+ public static TimeUUID fromString(String uuidString)
+ {
+ return fromUuid(UUID.fromString(uuidString));
+ }
+
+ public static TimeUUID fromUuid(UUID uuid)
+ {
+ return fromBytes(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
+ }
+
+ public static TimeUUID fromBytes(long msb, long lsb)
+ {
+ return new TimeUUID(msbToRawTimestamp(msb), lsb);
+ }
+
+ public static TimeUUID deserialize(ByteBuffer buffer)
+ {
+ return fromBytes(buffer.getLong(buffer.position()), buffer.getLong(buffer.position() + 8));
+ }
+
+ public static TimeUUID deserialize(DataInput in) throws IOException
+ {
+ long msb = in.readLong();
+ long lsb = in.readLong();
+ return fromBytes(msb, lsb);
+ }
+
+ public void serialize(DataOutput out) throws IOException
+ {
+ out.writeLong(msb());
+ out.writeLong(lsb());
+ }
+
+ public ByteBuffer toBytes()
+ {
+ return ByteBuffer.wrap(toBytes(msb(), lsb()));
+ }
+
+ public static byte[] toBytes(long msb, long lsb)
+ {
+ byte[] uuidBytes = new byte[16];
+
+ for (int i = 0; i < 8; i++)
+ uuidBytes[i] = (byte) (msb >>> 8 * (7 - i));
+
+ for (int i = 8; i < 16; i++)
+ uuidBytes[i] = (byte) (lsb >>> 8 * (15 - i));
+
+ return uuidBytes;
+ }
+
+ public static long sizeInBytes()
+ {
+ return 16;
+ }
+
+ public UUID asUUID()
+ {
+ return new UUID(rawTimestampToMsb(rawTimestamp), lsb);
+ }
+
+ /**
+ * The Cassandra internal micros-resolution timestamp of the TimeUUID, as of unix epoch
+ */
+ public long unix(TimeUnit units)
+ {
+ return units.convert(unixMicros(), MICROSECONDS);
+ }
+
+ /**
+ * The Cassandra internal micros-resolution timestamp of the TimeUUID, as of unix epoch
+ */
+ public long unixMicros()
+ {
+ return rawTimestampToUnixMicros(rawTimestamp);
+ }
+
+ /**
+ * The UUID-format timestamp, i.e. 10x micros-resolution, as of UUIDGen.UUID_EPOCH_UNIX_MILLIS
+ * The tenths of a microsecond are used to store a flag value.
+ */
+ public long rawTimestamp()
+ {
+ return rawTimestamp & 0x0FFFFFFFFFFFFFFFL;
+ }
+
+ public long msb()
+ {
+ return rawTimestampToMsb(rawTimestamp);
+ }
+
+ public long lsb()
+ {
+ return lsb;
+ }
+
+ public static long rawTimestampToUnixMicros(long rawTimestamp)
+ {
+ return (rawTimestamp / 10) + UUID_EPOCH_UNIX_MILLIS * 1000;
+ }
+
+ public static long unixMillisToRawTimestamp(long unixMillis, long tenthsOfAMicro)
+ {
+ return unixMillis * 10000 - (UUID_EPOCH_UNIX_MILLIS * 10000) + tenthsOfAMicro;
+ }
+
+ public static long unixMicrosToRawTimestamp(long unixMicros)
+ {
+ return unixMicros * 10 - (UUID_EPOCH_UNIX_MILLIS * 10000);
+ }
+
+ public static long msbToRawTimestamp(long msb)
+ {
+ assert (UUID_VERSION_BITS_IN_MSB & msb) == TIMESTAMP_UUID_VERSION_IN_MSB;
+ msb &= ~TIMESTAMP_UUID_VERSION_IN_MSB;
+ return (msb & 0xFFFFL) << 48
+ | (msb & 0xFFFF0000L) << 16
+ | (msb >>> 32);
+ }
+
+ public static long rawTimestampToMsb(long rawTimestamp)
+ {
+ return TIMESTAMP_UUID_VERSION_IN_MSB
+ | (rawTimestamp >>> 48)
+ | ((rawTimestamp & 0xFFFF00000000L) >>> 16)
+ | (rawTimestamp << 32);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return (int) ((rawTimestamp ^ (rawTimestamp >> 32) * 31) + (lsb ^ (lsb >> 32)));
+ }
+
+ @Override
+ public boolean equals(Object that)
+ {
+ return (that instanceof UUID && equals((UUID) that))
+ || (that instanceof TimeUUID && equals((TimeUUID) that));
+ }
+
+ public boolean equals(TimeUUID that)
+ {
+ return that != null && rawTimestamp == that.rawTimestamp && lsb == that.lsb;
+ }
+
+ public boolean equals(UUID that)
+ {
+ return that != null && rawTimestamp == that.timestamp() && lsb == that.getLeastSignificantBits();
+ }
+
+ @Override
+ public String toString()
+ {
+ return asUUID().toString();
+ }
+
+ public static String toString(TimeUUID ballot)
+ {
+ return ballot == null ? "null" : ballot.rawTimestamp() + ":" + ballot;
+ }
+
+ public static String toString(TimeUUID ballot, String kind)
+ {
+ return ballot == null ? "null" : String.format("%s(%d:%s)", kind, ballot.rawTimestamp(), ballot);
+ }
+
+ @Override
+ public int compareTo(TimeUUID that)
+ {
+ return this.rawTimestamp != that.rawTimestamp
+ ? Long.compare(this.rawTimestamp, that.rawTimestamp)
+ : Long.compare(this.lsb, that.lsb);
+ }
+
+ protected static abstract class AbstractSerializer<T extends TimeUUID> extends TypeSerializer<T>
+ {
+ public <V> void validate(V value, ValueAccessor<V> accessor) throws MarshalException
+ {
+ if (accessor.isEmpty(value))
+ return;
+
+ if (accessor.size(value) != 16)
+ throw new MarshalException(String.format("UUID should be 16 or 0 bytes (%d)", accessor.size(value)));
+
+ if ((accessor.getByte(value, 6) & 0xf0) != 0x10)
+ throw new MarshalException(String.format("Invalid version for TimeUUID type: 0x%s", Integer.toHexString((accessor.getByte(value, 0) >> 4) & 0xf)));
+ }
+
+ public String toString(T value)
+ {
+ return value == null ? "" : value.toString();
+ }
+
+ public ByteBuffer serialize(T value)
+ {
+ if (value == null)
+ return EMPTY_BYTE_BUFFER;
+ ByteBuffer buffer = ByteBuffer.allocate(16);
+ buffer.putLong(value.msb());
+ buffer.putLong(value.lsb());
+ buffer.flip();
+ return buffer;
+ }
+ }
+
+ public static class Serializer extends AbstractSerializer<TimeUUID> implements IVersionedSerializer<TimeUUID>
+ {
+ public static final Serializer instance = new Serializer();
+
+ public <V> TimeUUID deserialize(V value, ValueAccessor<V> accessor)
+ {
+ return accessor.isEmpty(value) ? null : accessor.toTimeUUID(value);
+ }
+
+ public Class<TimeUUID> getType()
+ {
+ return TimeUUID.class;
+ }
+
+ @Override
+ public void serialize(TimeUUID t, DataOutputPlus out, int version) throws IOException
+ {
+ t.serialize(out);
+ }
+
+ @Override
+ public TimeUUID deserialize(DataInputPlus in, int version) throws IOException
+ {
+ return TimeUUID.deserialize(in);
+ }
+
+ @Override
+ public long serializedSize(TimeUUID t, int version)
+ {
+ return 16;
+ }
+ }
+
+ public static class Generator
+ {
+ private static final long clockSeqAndNode = makeClockSeqAndNode();
+
+ private static final AtomicLong lastMicros = new AtomicLong();
+
+ public static TimeUUID nextTimeUUID()
+ {
+ return atUnixMicrosWithLsb(nextUnixMicros(), clockSeqAndNode);
+ }
+
+ public static UUID nextTimeAsUUID()
+ {
+ return atUnixMicrosWithLsbAsUUID(nextUnixMicros(), clockSeqAndNode);
+ }
+
+ public static TimeUUID atUnixMillis(long unixMillis)
+ {
+ return atUnixMillis(unixMillis, 0);
+ }
+
+ public static TimeUUID atUnixMillis(long unixMillis, long tenthsOfAMicro)
+ {
+ return new TimeUUID(unixMillisToRawTimestamp(unixMillis, tenthsOfAMicro), clockSeqAndNode);
+ }
+
+ public static byte[] atUnixMillisAsBytes(long unixMillis)
+ {
+ return atUnixMillisAsBytes(unixMillis, 0);
+ }
+
+ public static byte[] atUnixMillisAsBytes(long unixMillis, long tenthsOfAMicro)
+ {
+ return toBytes(rawTimestampToMsb(unixMillisToRawTimestamp(unixMillis, tenthsOfAMicro)), clockSeqAndNode);
+ }
+
+ public static byte[] nextTimeUUIDAsBytes()
+ {
+ return toBytes(rawTimestampToMsb(unixMicrosToRawTimestamp(nextUnixMicros())), clockSeqAndNode);
+ }
+
+ // needs to return two different values for the same when.
+ // we can generate at most 10k UUIDs per ms.
+ private static long nextUnixMicros()
+ {
+ long newLastMicros;
+ while (true)
+ {
+ //Generate a candidate value for new lastNanos
+ newLastMicros = currentTimeMillis() * 1000;
+ long originalLastNanos = lastMicros.get();
+ if (newLastMicros > originalLastNanos)
+ {
+ //Slow path once per millisecond do a CAS
+ if (lastMicros.compareAndSet(originalLastNanos, newLastMicros))
+ {
+ break;
+ }
+ }
+ else
+ {
+ //Fast path do an atomic increment
+ //Or when falling behind this will move time forward past the clock if necessary
+ newLastMicros = lastMicros.incrementAndGet();
+ break;
+ }
+ }
+ return newLastMicros;
+ }
+
+ private static long makeClockSeqAndNode()
+ {
+ if (DETERMINISM_UNSAFE_UUID_NODE.getBoolean())
+ return FBUtilities.getBroadcastAddressAndPort().addressBytes[3];
+
+ Long specified = Long.getLong("cassandra.unsafe.timeuuidnode");
+ if (specified != null)
+ return specified
+ ^ FBUtilities.getBroadcastAddressAndPort().addressBytes[3]
+ ^ (FBUtilities.getBroadcastAddressAndPort().addressBytes[2] << 8);
+
+ long clock = new SecureRandom().nextLong();
+
+ long lsb = 0;
+ lsb |= 0x8000000000000000L; // variant (2 bits)
+ lsb |= (clock & 0x0000000000003FFFL) << 48; // clock sequence (14 bits)
+ lsb |= makeNode(); // 6 bytes
+ return lsb;
+ }
+
+ private static long makeNode()
+ {
+ /*
+ * We don't have access to the MAC address but need to generate a node part
+ * that identify this host as uniquely as possible.
+ * The spec says that one option is to take as many source that identify
+ * this node as possible and hash them together. That's what we do here by
+ * gathering all the ip of this host.
+ * Note that FBUtilities.getJustBroadcastAddress() should be enough to uniquely
+ * identify the node *in the cluster* but it triggers DatabaseDescriptor
+ * instanciation and the UUID generator is used in Stress for instance,
+ * where we don't want to require the yaml.
+ */
+ Collection<InetAddressAndPort> localAddresses = getAllLocalAddresses();
+ if (localAddresses.isEmpty())
+ throw new RuntimeException("Cannot generate the node component of the UUID because cannot retrieve any IP addresses.");
+
+ // ideally, we'd use the MAC address, but java doesn't expose that.
+ byte[] hash = hash(localAddresses);
+ long node = 0;
+ for (int i = 0; i < Math.min(6, hash.length); i++)
+ node |= (0x00000000000000ff & (long)hash[i]) << (5-i)*8;
+ assert (0xff00000000000000L & node) == 0;
+
+ // Since we don't use the mac address, the spec says that multicast
+ // bit (least significant bit of the first octet of the node ID) must be 1.
+ return node | 0x0000010000000000L;
+ }
+
+ private static byte[] hash(Collection<InetAddressAndPort> data)
+ {
+ // Identify the host.
+ Hasher hasher = Hashing.md5().newHasher();
+ for(InetAddressAndPort addr : data)
+ {
+ hasher.putBytes(addr.addressBytes);
+ hasher.putInt(addr.getPort());
+ }
+
+ // Identify the process on the load: we use both the PID and class loader hash.
+ long pid = NativeLibrary.getProcessID();
+ if (pid < 0)
+ pid = new Random(currentTimeMillis()).nextLong();
+ updateWithLong(hasher, pid);
+
+ ClassLoader loader = UUIDGen.class.getClassLoader();
+ int loaderId = loader != null ? System.identityHashCode(loader) : 0;
+ updateWithInt(hasher, loaderId);
+
+ return hasher.hash().asBytes();
+ }
+
+ private static void updateWithInt(Hasher hasher, int val)
+ {
+ hasher.putByte((byte) ((val >>> 24) & 0xFF));
+ hasher.putByte((byte) ((val >>> 16) & 0xFF));
+ hasher.putByte((byte) ((val >>> 8) & 0xFF));
+ hasher.putByte((byte) ((val >>> 0) & 0xFF));
+ }
+
+ public static void updateWithLong(Hasher hasher, long val)
+ {
+ hasher.putByte((byte) ((val >>> 56) & 0xFF));
+ hasher.putByte((byte) ((val >>> 48) & 0xFF));
+ hasher.putByte((byte) ((val >>> 40) & 0xFF));
+ hasher.putByte((byte) ((val >>> 32) & 0xFF));
+ hasher.putByte((byte) ((val >>> 24) & 0xFF));
+ hasher.putByte((byte) ((val >>> 16) & 0xFF));
+ hasher.putByte((byte) ((val >>> 8) & 0xFF));
+ hasher.putByte((byte) ((val >>> 0) & 0xFF));
+ }
+
+ /**
+ * Helper function used exclusively by UUIDGen to create
+ **/
+ public static Collection<InetAddressAndPort> getAllLocalAddresses()
+ {
+ Set<InetAddressAndPort> localAddresses = new HashSet<>();
+ try
+ {
+ Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
+ if (nets != null)
+ {
+ while (nets.hasMoreElements())
+ {
+ Function<InetAddress, InetAddressAndPort> converter =
+ address -> InetAddressAndPort.getByAddressOverrideDefaults(address, 0);
+ List<InetAddressAndPort> addresses =
+ Collections.list(nets.nextElement().getInetAddresses()).stream().map(converter).collect(Collectors.toList());
+ localAddresses.addAll(addresses);
+ }
+ }
+ }
+ catch (SocketException e)
+ {
+ throw new AssertionError(e);
+ }
+ if (DatabaseDescriptor.isDaemonInitialized())
+ {
+ localAddresses.add(FBUtilities.getBroadcastAddressAndPort());
+ localAddresses.add(FBUtilities.getBroadcastNativeAddressAndPort());
+ localAddresses.add(FBUtilities.getLocalAddressAndPort());
+ }
+ return localAddresses;
+ }
+ }
+}
+
+// ---Copied from UUIDGen
+// for the curious, here is how I generated START_EPOCH
+// Calendar c = Calendar.getInstance(TimeZone.getTimeZone("GMT-0"));
+// c.set(Calendar.YEAR, 1582);
+// c.set(Calendar.MONTH, Calendar.OCTOBER);
+// c.set(Calendar.DAY_OF_MONTH, 15);
+// c.set(Calendar.HOUR_OF_DAY, 0);
+// c.set(Calendar.MINUTE, 0);
+// c.set(Calendar.SECOND, 0);
+// c.set(Calendar.MILLISECOND, 0);
+// long START_EPOCH = c.getTimeInMillis();
diff --git a/src/java/org/apache/cassandra/utils/UUIDGen.java b/src/java/org/apache/cassandra/utils/UUIDGen.java
index cab7256..14ab230 100644
--- a/src/java/org/apache/cassandra/utils/UUIDGen.java
+++ b/src/java/org/apache/cassandra/utils/UUIDGen.java
@@ -17,179 +17,16 @@
*/
package org.apache.cassandra.utils;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
import java.nio.ByteBuffer;
-import java.security.SecureRandom;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Random;
-import java.util.Set;
import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Preconditions;
-import com.google.common.hash.Hasher;
-import com.google.common.hash.Hashing;
-import com.google.common.primitives.Ints;
-
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.locator.InetAddressAndPort;
-
-import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
/**
* The goods are here: www.ietf.org/rfc/rfc4122.txt.
*/
public class UUIDGen
{
- // A grand day! millis at 00:00:00.000 15 Oct 1582.
- private static final long START_EPOCH = -12219292800000L;
- private static final long clockSeqAndNode = makeClockSeqAndNode();
-
public static final int UUID_LEN = 16;
- /*
- * The min and max possible lsb for a UUID.
- * Note that his is not 0 and all 1's because Cassandra TimeUUIDType
- * compares the lsb parts as a signed byte array comparison. So the min
- * value is 8 times -128 and the max is 8 times +127.
- *
- * Note that we ignore the uuid variant (namely, MIN_CLOCK_SEQ_AND_NODE
- * have variant 2 as it should, but MAX_CLOCK_SEQ_AND_NODE have variant 0).
- * I don't think that has any practical consequence and is more robust in
- * case someone provides a UUID with a broken variant.
- */
- private static final long MIN_CLOCK_SEQ_AND_NODE = 0x8080808080808080L;
- private static final long MAX_CLOCK_SEQ_AND_NODE = 0x7f7f7f7f7f7f7f7fL;
-
- private static final SecureRandom secureRandom = new SecureRandom();
-
- // placement of this singleton is important. It needs to be instantiated *AFTER* the other statics.
- private static final UUIDGen instance = new UUIDGen();
-
- private AtomicLong lastNanos = new AtomicLong();
-
- private UUIDGen()
- {
- // make sure someone didn't whack the clockSeqAndNode by changing the order of instantiation.
- if (clockSeqAndNode == 0) throw new RuntimeException("singleton instantiation is misplaced.");
- }
-
- /**
- * Creates a type 1 UUID (time-based UUID).
- *
- * @return a UUID instance
- */
- public static UUID getTimeUUID()
- {
- return new UUID(instance.createTimeSafe(), clockSeqAndNode);
- }
-
- /**
- * Creates a type 1 UUID (time-based UUID) with the timestamp of @param when, in milliseconds.
- *
- * @return a UUID instance
- */
- public static UUID getTimeUUID(long when)
- {
- return new UUID(createTime(fromUnixTimestamp(when)), clockSeqAndNode);
- }
-
- /**
- * Creates a type 1 UUID (time-based UUID) with the timestamp of @param when, in milliseconds.
- *
- * @return a UUID instance
- */
- public static UUID getTimeUUIDWithClockSeqAndNode(long when, long clockSeqAndNode)
- {
- return new UUID(createTime(fromUnixTimestamp(when)), clockSeqAndNode);
- }
-
- /**
- * Returns a version 1 UUID using the provided timestamp and the local clock and sequence.
- * <p>
- * Note that this method is generally only safe to use if you can guarantee that the provided
- * parameter is unique across calls (otherwise the returned UUID won't be unique accross calls).
- *
- * @param whenInMicros a unix time in microseconds.
- * @return a new UUID {@code id} such that {@code microsTimestamp(id) == whenInMicros}. Please not that
- * multiple calls to this method with the same value of {@code whenInMicros} will return the <b>same</b>
- * UUID.
- */
- public static UUID getTimeUUIDFromMicros(long whenInMicros)
- {
- long whenInMillis = whenInMicros / 1000;
- long nanos = (whenInMicros - (whenInMillis * 1000)) * 10;
- return getTimeUUID(whenInMillis, nanos);
- }
-
- /**
- * Similar to {@link #getTimeUUIDFromMicros}, but randomize (using SecureRandom) the clock and sequence.
- * <p>
- * If you can guarantee that the {@code whenInMicros} argument is unique (for this JVM instance) for
- * every call, then you should prefer {@link #getTimeUUIDFromMicros} which is faster. If you can't
- * guarantee this however, this method will ensure the returned UUID are still unique (accross calls)
- * through randomization.
- *
- * @param whenInMicros a unix time in microseconds.
- * @param flag a value between 0 and 9 (inclusive) to put in least significant (and unused) part of the timestamp
- * @return a new UUID {@code id} such that {@code microsTimestamp(id) == whenInMicros}. The UUID returned
- * by different calls will be unique even if {@code whenInMicros} is not.
- */
- public static UUID getRandomTimeUUIDFromMicros(long whenInMicros, int flag)
- {
- Preconditions.checkArgument(0 <= flag && flag < 10);
- long whenInMillis = whenInMicros / 1000;
- long nanos = (whenInMicros - (whenInMillis * 1000)) * 10 + flag;
- return new UUID(createTime(fromUnixTimestamp(whenInMillis, nanos)), secureRandom.nextLong());
- }
-
- @Deprecated
- public static UUID getRandomTimeUUIDFromMicros(long whenInMicros)
- {
- return getRandomTimeUUIDFromMicros(whenInMicros, 0);
- }
-
- /**
- * Similar to {@link #getTimeUUIDFromMicros}, but randomize (using SecureRandom) the clock and sequence.
- * <p>
- * If you can guarantee that the {@code whenInMicros} argument is unique (for this JVM instance) for
- * every call, then you should prefer {@link #getTimeUUIDFromMicros} which is faster. If you can't
- * guarantee this however, this method will ensure the returned UUID are still unique (accross calls)
- * through randomization.
- *
- * @param whenInMicros a unix time in microseconds.
- * @return a new UUID {@code id} such that {@code microsTimestamp(id) == whenInMicros}. The UUID returned
- * by different calls will be unique even if {@code whenInMicros} is not.
- */
- public static UUID getRandomTimeUUIDFromMicrosAndRandom(long whenInMicros, long randomPart, int flag)
- {
- Preconditions.checkArgument(0 <= flag && flag < 10);
- long whenInMillis = whenInMicros / 1000;
- long nanos = (whenInMicros - (whenInMillis * 1000)) * 10 + flag;
- return new UUID(createTime(fromUnixTimestamp(whenInMillis, nanos)), randomPart);
- }
-
- public static UUID getTimeUUID(long when, long nanos)
- {
- return new UUID(createTime(fromUnixTimestamp(when, nanos)), clockSeqAndNode);
- }
-
- @VisibleForTesting
- public static UUID getTimeUUID(long when, long nanos, long clockSeqAndNode)
- {
- return new UUID(createTime(fromUnixTimestamp(when, nanos)), clockSeqAndNode);
- }
-
/** creates a type 1 uuid from raw bytes. */
public static UUID getUUID(ByteBuffer raw)
{
@@ -220,122 +57,6 @@ public class UUIDGen
}
/**
- * Returns a 16 byte representation of a type 1 UUID (a time-based UUID),
- * based on the current system time.
- *
- * @return a type 1 UUID represented as a byte[]
- */
- public static byte[] getTimeUUIDBytes()
- {
- return createTimeUUIDBytes(instance.createTimeSafe());
- }
-
- /**
- * Returns the smaller possible type 1 UUID having the provided timestamp.
- *
- * <b>Warning:</b> this method should only be used for querying as this
- * doesn't at all guarantee the uniqueness of the resulting UUID.
- */
- public static UUID minTimeUUID(long timestamp)
- {
- return new UUID(createTime(fromUnixTimestamp(timestamp)), MIN_CLOCK_SEQ_AND_NODE);
- }
-
- /**
- * Returns the biggest possible type 1 UUID having the provided timestamp.
- *
- * <b>Warning:</b> this method should only be used for querying as this
- * doesn't at all guarantee the uniqueness of the resulting UUID.
- */
- public static UUID maxTimeUUID(long timestamp)
- {
- // unix timestamp are milliseconds precision, uuid timestamp are 100's
- // nanoseconds precision. If we ask for the biggest uuid have unix
- // timestamp 1ms, then we should not extend 100's nanoseconds
- // precision by taking 10000, but rather 19999.
- long uuidTstamp = fromUnixTimestamp(timestamp + 1) - 1;
- return new UUID(createTime(uuidTstamp), MAX_CLOCK_SEQ_AND_NODE);
- }
-
- /**
- * @param uuid
- * @return milliseconds since Unix epoch
- */
- public static long unixTimestamp(UUID uuid)
- {
- return (uuid.timestamp() / 10000) + START_EPOCH;
- }
-
- /**
- * @param uuid
- * @return seconds since Unix epoch
- */
- public static int unixTimestampInSec(UUID uuid)
- {
- return Ints.checkedCast(TimeUnit.MILLISECONDS.toSeconds(unixTimestamp(uuid)));
- }
-
- /**
- * @param uuid
- * @return microseconds since Unix epoch
- */
- public static long microsTimestamp(UUID uuid)
- {
- return (uuid.timestamp() / 10) + START_EPOCH * 1000;
- }
-
- /**
- * @param timestamp milliseconds since Unix epoch
- * @return
- */
- private static long fromUnixTimestamp(long timestamp)
- {
- return fromUnixTimestamp(timestamp, 0L);
- }
-
- private static long fromUnixTimestamp(long timestamp, long nanos)
- {
- return ((timestamp - START_EPOCH) * 10000) + nanos;
- }
-
- /**
- * Converts a 100-nanoseconds precision timestamp into the 16 byte representation
- * of a type 1 UUID (a time-based UUID).
- *
- * To specify a 100-nanoseconds precision timestamp, one should provide a milliseconds timestamp and
- * a number {@code 0 <= n < 10000} such that n*100 is the number of nanoseconds within that millisecond.
- *
- * <p><i><b>Warning:</b> This method is not guaranteed to return unique UUIDs; Multiple
- * invocations using identical timestamps will result in identical UUIDs.</i></p>
- *
- * @return a type 1 UUID represented as a byte[]
- */
- public static byte[] getTimeUUIDBytes(long timeMillis, int nanos)
- {
- if (nanos >= 10000)
- throw new IllegalArgumentException();
- return createTimeUUIDBytes(instance.createTimeUnsafe(timeMillis, nanos));
- }
-
- private static byte[] createTimeUUIDBytes(long msb)
- {
- return createTimeUUIDBytes(msb, clockSeqAndNode);
- }
-
- public static byte[] createTimeUUIDBytes(long msb, long lsb)
- {
- byte[] uuidBytes = new byte[16];
-
- for (int i = 0; i < 8; i++)
- uuidBytes[i] = (byte) (msb >>> 8 * (7 - i));
-
- for (int i = 8; i < 16; i++)
- uuidBytes[i] = (byte) (lsb >>> 8 * (7 - i));
-
- return uuidBytes;
- }
-
- /**
* Returns a milliseconds-since-epoch value for a type-1 UUID.
*
* @param uuid a type-1 (time-based) UUID
@@ -346,178 +67,7 @@ public class UUIDGen
{
if (uuid.version() != 1)
throw new IllegalArgumentException("incompatible with uuid version: "+uuid.version());
- return (uuid.timestamp() / 10000) + START_EPOCH;
- }
-
- private static long makeClockSeqAndNode()
- {
- if (Boolean.getBoolean("cassandra.unsafe.deterministicuuidnode"))
- return FBUtilities.getBroadcastAddressAndPort().addressBytes[3];
-
- Long specified = Long.getLong("cassandra.unsafe.timeuuidnode");
- if (specified != null)
- return specified
- ^ FBUtilities.getBroadcastAddressAndPort().addressBytes[3]
- ^ (FBUtilities.getBroadcastAddressAndPort().addressBytes[2] << 8);
-
- long clock = new SecureRandom().nextLong();
-
- long lsb = 0;
- lsb |= 0x8000000000000000L; // variant (2 bits)
- lsb |= (clock & 0x0000000000003FFFL) << 48; // clock sequence (14 bits)
- lsb |= makeNode(); // 6 bytes
- return lsb;
- }
-
- // needs to return two different values for the same when.
- // we can generate at most 10k UUIDs per ms.
- private long createTimeSafe()
- {
- long newLastNanos;
- while (true)
- {
- //Generate a candidate value for new lastNanos
- newLastNanos = (currentTimeMillis() - START_EPOCH) * 10000;
- long originalLastNanos = lastNanos.get();
- if (newLastNanos > originalLastNanos)
- {
- //Slow path once per millisecond do a CAS
- if (lastNanos.compareAndSet(originalLastNanos, newLastNanos))
- {
- break;
- }
- }
- else
- {
- //Fast path do an atomic increment
- //Or when falling behind this will move time forward past the clock if necessary
- newLastNanos = lastNanos.incrementAndGet();
- break;
- }
- }
- return createTime(newLastNanos);
- }
-
- private long createTimeUnsafe(long when, int nanos)
- {
- long nanosSince = ((when - START_EPOCH) * 10000) + nanos;
- return createTime(nanosSince);
- }
-
- public static long createTime(long nanosSince)
- {
- long msb = 0L;
- msb |= (0x00000000ffffffffL & nanosSince) << 32;
- msb |= (0x0000ffff00000000L & nanosSince) >>> 16;
- msb |= (0xffff000000000000L & nanosSince) >>> 48;
- msb |= 0x0000000000001000L; // sets the version to 1.
- return msb;
- }
-
- private static long makeNode()
- {
- /*
- * We don't have access to the MAC address but need to generate a node part
- * that identify this host as uniquely as possible.
- * The spec says that one option is to take as many source that identify
- * this node as possible and hash them together. That's what we do here by
- * gathering all the ip of this host.
- * Note that FBUtilities.getJustBroadcastAddress() should be enough to uniquely
- * identify the node *in the cluster* but it triggers DatabaseDescriptor
- * instanciation and the UUID generator is used in Stress for instance,
- * where we don't want to require the yaml.
- */
- Collection<InetAddressAndPort> localAddresses = getAllLocalAddresses();
- if (localAddresses.isEmpty())
- throw new RuntimeException("Cannot generate the node component of the UUID because cannot retrieve any IP addresses.");
-
- // ideally, we'd use the MAC address, but java doesn't expose that.
- byte[] hash = hash(localAddresses);
- long node = 0;
- for (int i = 0; i < Math.min(6, hash.length); i++)
- node |= (0x00000000000000ff & (long)hash[i]) << (5-i)*8;
- assert (0xff00000000000000L & node) == 0;
-
- // Since we don't use the mac address, the spec says that multicast
- // bit (least significant bit of the first octet of the node ID) must be 1.
- return node | 0x0000010000000000L;
- }
-
- private static byte[] hash(Collection<InetAddressAndPort> data)
- {
- // Identify the host.
- Hasher hasher = Hashing.md5().newHasher();
- for(InetAddressAndPort addr : data)
- {
- hasher.putBytes(addr.addressBytes);
- hasher.putInt(addr.getPort());
- }
-
- // Identify the process on the load: we use both the PID and class loader hash.
- long pid = NativeLibrary.getProcessID();
- if (pid < 0)
- pid = new Random(currentTimeMillis()).nextLong();
- updateWithLong(hasher, pid);
-
- ClassLoader loader = UUIDGen.class.getClassLoader();
- int loaderId = loader != null ? System.identityHashCode(loader) : 0;
- updateWithInt(hasher, loaderId);
-
- return hasher.hash().asBytes();
- }
-
- private static void updateWithInt(Hasher hasher, int val)
- {
- hasher.putByte((byte) ((val >>> 24) & 0xFF));
- hasher.putByte((byte) ((val >>> 16) & 0xFF));
- hasher.putByte((byte) ((val >>> 8) & 0xFF));
- hasher.putByte((byte) ((val >>> 0) & 0xFF));
- }
-
- public static void updateWithLong(Hasher hasher, long val)
- {
- hasher.putByte((byte) ((val >>> 56) & 0xFF));
- hasher.putByte((byte) ((val >>> 48) & 0xFF));
- hasher.putByte((byte) ((val >>> 40) & 0xFF));
- hasher.putByte((byte) ((val >>> 32) & 0xFF));
- hasher.putByte((byte) ((val >>> 24) & 0xFF));
- hasher.putByte((byte) ((val >>> 16) & 0xFF));
- hasher.putByte((byte) ((val >>> 8) & 0xFF));
- hasher.putByte((byte) ((val >>> 0) & 0xFF));
- }
-
- /**
- * Helper function used exclusively by UUIDGen to create
- **/
- public static Collection<InetAddressAndPort> getAllLocalAddresses()
- {
- Set<InetAddressAndPort> localAddresses = new HashSet<>();
- try
- {
- Enumeration<NetworkInterface> nets = NetworkInterface.getNetworkInterfaces();
- if (nets != null)
- {
- while (nets.hasMoreElements())
- {
- Function<InetAddress, InetAddressAndPort> converter =
- address -> InetAddressAndPort.getByAddressOverrideDefaults(address, 0);
- List<InetAddressAndPort> addresses =
- Collections.list(nets.nextElement().getInetAddresses()).stream().map(converter).collect(Collectors.toList());
- localAddresses.addAll(addresses);
- }
- }
- }
- catch (SocketException e)
- {
- throw new AssertionError(e);
- }
- if (DatabaseDescriptor.isDaemonInitialized())
- {
- localAddresses.add(FBUtilities.getBroadcastAddressAndPort());
- localAddresses.add(FBUtilities.getBroadcastNativeAddressAndPort());
- localAddresses.add(FBUtilities.getLocalAddressAndPort());
- }
- return localAddresses;
+ return (uuid.timestamp() / 10000) + TimeUUID.UUID_EPOCH_UNIX_MILLIS;
}
}
diff --git a/test/distributed/org/apache/cassandra/distributed/api/Row.java b/test/distributed/org/apache/cassandra/distributed/api/Row.java
new file mode 100644
index 0000000..33272ed
--- /dev/null
+++ b/test/distributed/org/apache/cassandra/distributed/api/Row.java
@@ -0,0 +1,219 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.distributed.api;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+
+import org.apache.cassandra.utils.TimeUUID;
+
+/**
+ * Data representing a single row in a query result.
+ * <p>
+ * This class is mutable from the parent {@link SimpleQueryResult} and can have the row it points to changed between calls
+ * to {@link SimpleQueryResult#hasNext()}, for this reason it is unsafe to hold reference to this class after that call;
+ * to get around this, a call to {@link #copy()} will return a new object pointing to the same row.
+ */
+public class Row
+{
+ private static final int NOT_FOUND = -1;
+
+ private final String[] names;
+ private final Map<String, Integer> nameIndex;
+ private Object[] results; // mutable to avoid allocations in loops
+
+ public Row(String[] names)
+ {
+ Objects.requireNonNull(names, "names");
+ this.names = names;
+ this.nameIndex = new HashMap<>(names.length);
+ for (int i = 0; i < names.length; i++)
+ {
+ // if duplicate names, always index by the first one seen
+ nameIndex.putIfAbsent(names[i], i);
+ }
+ }
+
+ private Row(String[] names, Map<String, Integer> nameIndex)
+ {
+ this.names = names;
+ this.nameIndex = nameIndex;
+ }
+
+ void setResults(Object[] results)
+ {
+ this.results = results;
+ }
+
+ /**
+ * Creates a copy of the current row; can be used past calls to {@link SimpleQueryResult#hasNext()}.
+ */
+ public Row copy()
+ {
+ Row copy = new Row(names, nameIndex);
+ copy.setResults(results);
+ return copy;
+ }
+
+ public <T> T get(int index)
+ {
+ checkAccess();
+ if (index < 0 || index >= results.length)
+ throw new NoSuchElementException("by index: " + index);
+ return (T) results[index];
+ }
+
+ public <T> T get(String name)
+ {
+ checkAccess();
+ int idx = findIndex(name);
+ if (idx == NOT_FOUND)
+ throw new NoSuchElementException("by name: " + name);
+ return (T) results[idx];
+ }
+
+ public Short getShort(int index)
+ {
+ return get(index);
+ }
+
+ public Short getShort(String name)
+ {
+ return get(name);
+ }
+
+ public Integer getInteger(int index)
+ {
+ return get(index);
+ }
+
+ public Integer getInteger(String name)
+ {
+ return get(name);
+ }
+
+ public Long getLong(int index)
+ {
+ return get(index);
+ }
+
+ public Long getLong(String name)
+ {
+ return get(name);
+ }
+
+ public Float getFloat(int index)
+ {
+ return get(index);
+ }
+
+ public Float getFloat(String name)
+ {
+ return get(name);
+ }
+
+ public Double getDouble(int index)
+ {
+ return get(index);
+ }
+
+ public Double getDouble(String name)
+ {
+ return get(name);
+ }
+
+ public String getString(int index)
+ {
+ return get(index);
+ }
+
+ public String getString(String name)
+ {
+ return get(name);
+ }
+
+ public UUID getUUID(int index)
+ {
+ Object uuid = get(index);
+ if (uuid instanceof TimeUUID)
+ return ((TimeUUID) uuid).asUUID();
+ return (UUID) uuid;
+ }
+
+ public UUID getUUID(String name)
+ {
+ Object uuid = get(name);
+ if (uuid instanceof TimeUUID)
+ return ((TimeUUID) uuid).asUUID();
+ return (UUID) uuid;
+ }
+
+ public Date getTimestamp(int index)
+ {
+ return get(index);
+ }
+
+ public Date getTimestamp(String name)
+ {
+ return get(name);
+ }
+
+ public <T> Set<T> getSet(int index)
+ {
+ return get(index);
+ }
+
+ public <T> Set<T> getSet(String name)
+ {
+ return get(name);
+ }
+
+ /**
+ * Get the row as a array.
+ */
+ public Object[] toObjectArray()
+ {
+ return results;
+ }
+
+ public String toString()
+ {
+ return "Row{" +
+ "names=" + Arrays.toString(names) +
+ ", results=" + (results == null ? "[]" : Arrays.toString(results)) +
+ '}';
+ }
+
+ private void checkAccess()
+ {
+ if (results == null)
+ throw new NoSuchElementException();
+ }
+
+ private int findIndex(String name)
+ {
+ return nameIndex.getOrDefault(name, NOT_FOUND);
+ }
+}
diff --git a/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java b/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
index 2a02d26..754c2a2 100644
--- a/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Coordinator.java
@@ -48,6 +48,7 @@ import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.transport.messages.ResultMessage;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
@@ -70,7 +71,7 @@ public class Coordinator implements ICoordinator
return instance.async(() -> {
try
{
- Tracing.instance.newSession(sessionId, Collections.emptyMap());
+ Tracing.instance.newSession(TimeUUID.fromUuid(sessionId), Collections.emptyMap());
return executeInternal(query, consistencyLevelOrigin, boundValues);
}
finally
diff --git a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
index 38cfef0..da4592a 100644
--- a/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/Instance.java
@@ -137,7 +137,6 @@ import org.apache.cassandra.utils.ExecutorUtils;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.JVMStabilityInspector;
import org.apache.cassandra.utils.Throwables;
-import org.apache.cassandra.utils.UUIDSerializer;
import org.apache.cassandra.utils.concurrent.Ref;
import org.apache.cassandra.utils.progress.jmx.JMXBroadcastExecutor;
import org.apache.cassandra.utils.memory.BufferPools;
@@ -422,7 +421,7 @@ public class Instance extends IsolatedExecutor implements IInvokableInstance
{
assert !batch.isLocal() : "attempted to reserialize a 'local' batch";
- UUIDSerializer.serializer.serialize(batch.id, out, version);
+ batch.id.serialize(out);
out.writeLong(batch.creationTime);
out.writeUnsignedVInt(batch.getEncodedMutations().size());
diff --git a/test/distributed/org/apache/cassandra/distributed/impl/TracingUtil.java b/test/distributed/org/apache/cassandra/distributed/impl/TracingUtil.java
index 439d4b7..06fdabb 100644
--- a/test/distributed/org/apache/cassandra/distributed/impl/TracingUtil.java
+++ b/test/distributed/org/apache/cassandra/distributed/impl/TracingUtil.java
@@ -25,6 +25,7 @@ import java.util.List;
import java.util.UUID;
import org.apache.cassandra.distributed.api.ConsistencyLevel;
+import org.apache.cassandra.utils.TimeUUID;
/**
@@ -56,8 +57,9 @@ public class TracingUtil
static TraceEntry fromRowResultObjects(Object[] objects)
{
- return new TraceEntry((UUID) objects[0],
- (UUID) objects[1],
+ UUID eventId = objects[1] instanceof UUID ? (UUID)objects[1]: ((TimeUUID)objects[1]).asUUID();
+ return new TraceEntry((UUID)objects[0],
+ eventId,
(String) objects[2],
(InetAddress) objects[3],
(Integer) objects[4],
diff --git a/test/distributed/org/apache/cassandra/distributed/test/CASTest.java b/test/distributed/org/apache/cassandra/distributed/test/CASTest.java
index 30a8a25..4513a8c 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/CASTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/CASTest.java
@@ -19,7 +19,6 @@
package org.apache.cassandra.distributed.test;
import java.io.IOException;
-import java.util.UUID;
import java.util.function.BiConsumer;
@@ -27,7 +26,6 @@ import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
-import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.marshal.Int32Type;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.dht.Token;
@@ -37,9 +35,6 @@ import org.apache.cassandra.distributed.api.ICoordinator;
import org.apache.cassandra.distributed.api.IInstance;
import org.apache.cassandra.distributed.api.IMessageFilters;
import org.apache.cassandra.distributed.impl.UnsafeGossipHelper;
-import org.apache.cassandra.schema.TableId;
-import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.UUIDGen;
import static org.apache.cassandra.distributed.shared.AssertUtils.assertRows;
import static org.apache.cassandra.distributed.shared.AssertUtils.fail;
@@ -677,20 +672,4 @@ public class CASTest extends TestBaseImpl
++pk;
return pk;
}
-
- private static void debugOwnership(Cluster cluster, int pk)
- {
- for (int i = 1 ; i <= cluster.size() ; ++i)
- System.out.println(i + ": " + cluster.get(i).appliesOnInstance((Integer v) -> StorageService.instance.getNaturalEndpointsWithPort(KEYSPACE, Int32Type.instance.decompose(v)))
- .apply(pk));
- }
-
- private static void debugPaxosState(Cluster cluster, int pk)
- {
- TableId tableId = cluster.get(1).callOnInstance(() -> Keyspace.open(KEYSPACE).getColumnFamilyStore("tbl").metadata.id);
- for (int i = 1 ; i <= cluster.size() ; ++i)
- for (Object[] row : cluster.get(i).executeInternal("select in_progress_ballot, proposal_ballot, most_recent_commit_at from system.paxos where row_key = ? and cf_id = ?", Int32Type.instance.decompose(pk), tableId))
- System.out.println(i + ": " + (row[0] == null ? 0L : UUIDGen.microsTimestamp((UUID)row[0])) + ", " + (row[1] == null ? 0L : UUIDGen.microsTimestamp((UUID)row[1])) + ", " + (row[2] == null ? 0L : UUIDGen.microsTimestamp((UUID)row[2])));
- }
-
}
diff --git a/test/distributed/org/apache/cassandra/distributed/test/IncRepairAdminTest.java b/test/distributed/org/apache/cassandra/distributed/test/IncRepairAdminTest.java
index c807087..b902632 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/IncRepairAdminTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/IncRepairAdminTest.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.distributed.test;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -41,12 +40,13 @@ import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.repair.consistent.LocalSessionAccessor;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.streaming.PreviewKind;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.distributed.api.Feature.GOSSIP;
import static org.apache.cassandra.distributed.api.Feature.NETWORK;
import static org.apache.cassandra.repair.consistent.ConsistentSession.State.REPAIRING;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertTrue;
public class IncRepairAdminTest extends TestBaseImpl
@@ -84,7 +84,7 @@ public class IncRepairAdminTest extends TestBaseImpl
res.asserts().stdoutContains("no sessions");
});
- UUID uuid = makeFakeSession(cluster);
+ TimeUUID uuid = makeFakeSession(cluster);
awaitNodetoolRepairAdminContains(cluster, uuid, "REPAIRING", false);
IInvokableInstance instance = cluster.get(coordinator ? 1 : 2);
@@ -114,7 +114,7 @@ public class IncRepairAdminTest extends TestBaseImpl
- private static void awaitNodetoolRepairAdminContains(Cluster cluster, UUID uuid, String state, boolean all)
+ private static void awaitNodetoolRepairAdminContains(Cluster cluster, TimeUUID uuid, String state, boolean all)
{
cluster.forEach(i -> {
while (true)
@@ -137,9 +137,9 @@ public class IncRepairAdminTest extends TestBaseImpl
});
}
- private static UUID makeFakeSession(Cluster cluster)
+ private static TimeUUID makeFakeSession(Cluster cluster)
{
- UUID sessionId = UUIDGen.getTimeUUID();
+ TimeUUID sessionId = nextTimeUUID();
InetSocketAddress coordinator = cluster.get(1).config().broadcastAddress();
Set<InetSocketAddress> participants = cluster.stream()
.map(i -> i.config().broadcastAddress())
diff --git a/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java b/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
index f92a315..c179737 100644
--- a/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
+++ b/test/distributed/org/apache/cassandra/distributed/test/MessageForwardingTest.java
@@ -23,7 +23,6 @@ import java.net.InetAddress;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.UUID;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -36,7 +35,9 @@ import org.apache.cassandra.distributed.api.ConsistencyLevel;
import org.apache.cassandra.distributed.Cluster;
import org.apache.cassandra.distributed.impl.IsolatedExecutor;
import org.apache.cassandra.distributed.impl.TracingUtil;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class MessageForwardingTest extends TestBaseImpl
{
@@ -56,9 +57,9 @@ public class MessageForwardingTest extends TestBaseImpl
cluster.schemaChange("CREATE TABLE " + KEYSPACE + ".tbl (pk int, ck int, v text, PRIMARY KEY (pk, ck))");
cluster.forEach(instance -> commitCounts.put(instance.broadcastAddress().getAddress(), 0));
- final UUID sessionId = UUIDGen.getTimeUUID();
+ final TimeUUID sessionId = nextTimeUUID();
Stream<Future<Object[][]>> inserts = IntStream.range(0, numInserts).mapToObj((idx) -> {
- return cluster.coordinator(1).asyncExecuteWithTracing(sessionId,
+ return cluster.coordinator(1).asyncExecuteWithTracing(sessionId.asUUID(),
"INSERT INTO " + KEYSPACE + ".tbl(pk,ck,v) VALUES (1, 1, 'x')",
ConsistencyLevel.ALL);
});
@@ -70,7 +71,7 @@ public class MessageForwardingTest extends TestBaseImpl
cluster.stream("dc1").forEach(instance -> forwardFromCounts.put(instance.broadcastAddress().getAddress(), 0));
cluster.forEach(instance -> commitCounts.put(instance.broadcastAddress().getAddress(), 0));
- List<TracingUtil.TraceEntry> traces = TracingUtil.getTrace(cluster, sessionId, ConsistencyLevel.ALL);
+ List<TracingUtil.TraceEntry> traces = TracingUtil.getTrace(cluster, sessionId.asUUID(), ConsistencyLevel.ALL);
traces.forEach(traceEntry -> {
if (traceEntry.activity.contains("Appending to commitlog"))
{
diff --git a/test/distributed/org/apache/cassandra/io/sstable/format/ForwardingSSTableReader.java b/test/distributed/org/apache/cassandra/io/sstable/format/ForwardingSSTableReader.java
index 9a76661..2f36f56 100644
--- a/test/distributed/org/apache/cassandra/io/sstable/format/ForwardingSSTableReader.java
+++ b/test/distributed/org/apache/cassandra/io/sstable/format/ForwardingSSTableReader.java
@@ -23,7 +23,6 @@ import java.nio.ByteBuffer;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.util.UUID;
import com.google.common.util.concurrent.RateLimiter;
@@ -56,6 +55,7 @@ import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.schema.TableMetadataRef;
import org.apache.cassandra.utils.EstimatedHistogram;
import org.apache.cassandra.utils.IFilter;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Ref;
public abstract class ForwardingSSTableReader extends SSTableReader
@@ -427,7 +427,7 @@ public abstract class ForwardingSSTableReader extends SSTableReader
}
@Override
- public UUID getPendingRepair()
+ public TimeUUID getPendingRepair()
{
return delegate.getPendingRepair();
}
diff --git a/test/microbench/org/apache/cassandra/test/microbench/MessageOutBench.java b/test/microbench/org/apache/cassandra/test/microbench/MessageOutBench.java
index 5addfa8..4bfc270 100644
--- a/test/microbench/org/apache/cassandra/test/microbench/MessageOutBench.java
+++ b/test/microbench/org/apache/cassandra/test/microbench/MessageOutBench.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.net.NoPayload;
import org.apache.cassandra.net.ParamType;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.UUIDGen;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
@@ -51,6 +52,7 @@ import org.openjdk.jmh.annotations.Warmup;
import static org.apache.cassandra.net.Verb.ECHO_REQ;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
@State(Scope.Thread)
@Warmup(iterations = 4, time = 1, timeUnit = TimeUnit.SECONDS)
@@ -72,7 +74,7 @@ public class MessageOutBench
{
DatabaseDescriptor.daemonInitialization();
- UUID uuid = UUIDGen.getTimeUUID();
+ TimeUUID uuid = nextTimeUUID();
Map<ParamType, Object> parameters = new EnumMap<>(ParamType.class);
if (withParams)
diff --git a/test/microbench/org/apache/cassandra/test/microbench/ZeroCopyStreamingBenchmark.java b/test/microbench/org/apache/cassandra/test/microbench/ZeroCopyStreamingBenchmark.java
index d721298..fd201b0 100644
--- a/test/microbench/org/apache/cassandra/test/microbench/ZeroCopyStreamingBenchmark.java
+++ b/test/microbench/org/apache/cassandra/test/microbench/ZeroCopyStreamingBenchmark.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import io.netty.buffer.ByteBuf;
@@ -79,6 +78,8 @@ import org.openjdk.jmh.annotations.TearDown;
import org.openjdk.jmh.annotations.Threads;
import org.openjdk.jmh.annotations.Warmup;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
+
/**
* Please ensure that this benchmark is run with entire_sstable_stream_throughput_outbound
* set to a really high value otherwise, throttling will kick in and the results will not be meaningful.
@@ -217,7 +218,7 @@ public class ZeroCopyStreamingBenchmark
private StreamSession setupStreamingSessionForTest()
{
StreamCoordinator streamCoordinator = new StreamCoordinator(StreamOperation.BOOTSTRAP, 1, new NettyStreamingConnectionFactory(), false, false, null, PreviewKind.NONE);
- StreamResultFuture future = StreamResultFuture.createInitiator(UUID.randomUUID(), StreamOperation.BOOTSTRAP, Collections.<StreamEventHandler>emptyList(), streamCoordinator);
+ StreamResultFuture future = StreamResultFuture.createInitiator(nextTimeUUID(), StreamOperation.BOOTSTRAP, Collections.<StreamEventHandler>emptyList(), streamCoordinator);
InetAddressAndPort peer = FBUtilities.getBroadcastAddressAndPort();
streamCoordinator.addSessionInfo(new SessionInfo(peer, 0, peer, Collections.emptyList(), Collections.emptyList(), StreamSession.State.INITIALIZED));
diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/Ballots.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/Ballots.java
index 4bcd5b6..d72e082 100644
--- a/test/simulator/main/org/apache/cassandra/simulator/paxos/Ballots.java
+++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/Ballots.java
@@ -49,6 +49,7 @@ import org.apache.cassandra.service.paxos.Commit;
import org.apache.cassandra.service.paxos.PaxosState;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Shared;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.UUIDGen;
import static java.lang.Long.max;
@@ -99,12 +100,12 @@ public class Ballots
{
return NonInterceptible.apply(() -> {
PaxosState state = loadPaxosState(key, metadata, nowInSec);
- UUID promised = state.promised.ballot;
+ TimeUUID promised = state.promised.ballot;
Commit accepted = isAfter(state.accepted, state.mostRecentCommit) ? null : state.accepted;
Commit committed = state.mostRecentCommit;
long baseTable = latestBallotFromBaseTable(key, metadata);
return new LatestBallots(
- UUIDGen.microsTimestamp(promised),
+ promised.unixMicros(),
accepted == null || accepted.update.isEmpty() ? 0L : latestBallot(accepted.update),
latestBallot(committed.update),
baseTable
@@ -228,7 +229,7 @@ public class Ballots
return debugBallot(cache == null ? null : cache.ballot, memtable, persisted == null ? null : persisted.ballot);
}
- private static String debugBallot(UUID cache, long memtable, UUID persisted)
+ private static String debugBallot(TimeUUID cache, long memtable, TimeUUID persisted)
{
return debugBallot(timestamp(cache), memtable, timestamp(persisted));
}
@@ -244,8 +245,8 @@ public class Ballots
return value + (memtable == value && memtable != 0 ? "*" : "");
}
- private static long timestamp(UUID a)
+ private static long timestamp(TimeUUID a)
{
- return a == null ? 0L : UUIDGen.microsTimestamp(a);
+ return a == null ? 0L : a.unixMicros();
}
}
diff --git a/test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedBallots.java b/test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedBallots.java
index fe9002b..1a188cb 100644
--- a/test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedBallots.java
+++ b/test/simulator/main/org/apache/cassandra/simulator/systems/SimulatedBallots.java
@@ -26,6 +26,7 @@ import java.util.function.Supplier;
import org.apache.cassandra.service.paxos.BallotGenerator;
import org.apache.cassandra.simulator.RandomSource;
import org.apache.cassandra.simulator.RandomSource.Choices;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.UUIDGen;
// TODO (feature): link with SimulateTime, and otherwise improve
@@ -54,14 +55,14 @@ public class SimulatedBallots
super(1L);
}
- public UUID randomBallot(long timestamp, boolean isSerial)
+ public TimeUUID randomBallot(long timestamp, boolean isSerial)
{
- return UUIDGen.getRandomTimeUUIDFromMicrosAndRandom(timestamp, uniqueSupplier.getAsLong(), isSerial ? 2 : 1);
+ return TimeUUID.atUnixMicrosWithLsb(timestamp, uniqueSupplier.getAsLong(), isSerial);
}
- public UUID randomBallot(long from, long to, boolean isSerial)
+ public TimeUUID randomBallot(long from, long to, boolean isSerial)
{
- return UUIDGen.getRandomTimeUUIDFromMicrosAndRandom(random.uniform(from, to), uniqueSupplier.getAsLong(), isSerial ? 2 : 1);
+ return TimeUUID.atUnixMicrosWithLsb(random.uniform(from, to), uniqueSupplier.getAsLong(), isSerial);
}
public long nextBallotTimestampMicros(long minTimestamp)
diff --git a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
index b2420ea..17b06e6 100644
--- a/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
+++ b/test/unit/org/apache/cassandra/batchlog/BatchlogManagerTest.java
@@ -51,11 +51,13 @@ import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
+import static org.apache.cassandra.utils.TimeUUID.Generator.atUnixMillis;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.*;
public class BatchlogManagerTest
@@ -96,7 +98,7 @@ public class BatchlogManagerTest
TokenMetadata metadata = StorageService.instance.getTokenMetadata();
InetAddressAndPort localhost = InetAddressAndPort.getByName("127.0.0.1");
metadata.updateNormalToken(Util.token("A"), localhost);
- metadata.updateHostId(UUIDGen.getTimeUUID(), localhost);
+ metadata.updateHostId(UUID.randomUUID(), localhost);
Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME).getColumnFamilyStore(SystemKeyspace.BATCHES).truncateBlocking();
}
@@ -150,7 +152,7 @@ public class BatchlogManagerTest
? (currentTimeMillis() - BatchlogManager.getBatchlogTimeout())
: (currentTimeMillis() + BatchlogManager.getBatchlogTimeout());
- BatchlogManager.store(Batch.createLocal(UUIDGen.getTimeUUID(timestamp, i), timestamp * 1000, mutations));
+ BatchlogManager.store(Batch.createLocal(atUnixMillis(timestamp, i), timestamp * 1000, mutations));
}
// Flush the batchlog to disk (see CASSANDRA-6822).
@@ -234,7 +236,7 @@ public class BatchlogManagerTest
else
timestamp--;
- BatchlogManager.store(Batch.createLocal(UUIDGen.getTimeUUID(timestamp, i), FBUtilities.timestampMicros(), mutations));
+ BatchlogManager.store(Batch.createLocal(atUnixMillis(timestamp, i), FBUtilities.timestampMicros(), mutations));
}
// Flush the batchlog to disk (see CASSANDRA-6822).
@@ -277,7 +279,7 @@ public class BatchlogManagerTest
TableMetadata cfm = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD5).metadata();
long timestamp = (currentTimeMillis() - DatabaseDescriptor.getWriteRpcTimeout(MILLISECONDS) * 2) * 1000;
- UUID uuid = UUIDGen.getTimeUUID();
+ TimeUUID uuid = nextTimeUUID();
// Add a batch with 10 mutations
List<Mutation> mutations = new ArrayList<>(10);
@@ -309,7 +311,7 @@ public class BatchlogManagerTest
TableMetadata cfm = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD5).metadata();
long timestamp = (currentTimeMillis() - DatabaseDescriptor.getWriteRpcTimeout(MILLISECONDS) * 2) * 1000;
- UUID uuid = UUIDGen.getTimeUUID();
+ TimeUUID uuid = nextTimeUUID();
// Add a batch with 10 mutations
List<Mutation> mutations = new ArrayList<>(10);
@@ -351,7 +353,7 @@ public class BatchlogManagerTest
TableMetadata cfm = Keyspace.open(KEYSPACE1).getColumnFamilyStore(CF_STANDARD1).metadata();
long timestamp = (currentTimeMillis() - DatabaseDescriptor.getWriteRpcTimeout(MILLISECONDS) * 2) * 1000;
- UUID uuid = UUIDGen.getTimeUUID();
+ TimeUUID uuid = nextTimeUUID();
// Add a batch with 10 mutations
List<Mutation> mutations = new ArrayList<>(10);
diff --git a/test/unit/org/apache/cassandra/batchlog/BatchlogTest.java b/test/unit/org/apache/cassandra/batchlog/BatchlogTest.java
index 8fa4afc..194ae91 100644
--- a/test/unit/org/apache/cassandra/batchlog/BatchlogTest.java
+++ b/test/unit/org/apache/cassandra/batchlog/BatchlogTest.java
@@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.UUID;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -40,9 +39,10 @@ import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
public class BatchlogTest
@@ -66,7 +66,7 @@ public class BatchlogTest
long now = FBUtilities.timestampMicros();
int version = MessagingService.current_version;
- UUID uuid = UUIDGen.getTimeUUID();
+ TimeUUID uuid = nextTimeUUID();
List<Mutation> mutations = new ArrayList<>(10);
for (int i = 0; i < 10; i++)
diff --git a/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java b/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
index adb0962..a3aff46 100644
--- a/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
+++ b/test/unit/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutorTest.java
@@ -41,11 +41,13 @@ import org.apache.cassandra.tracing.TraceState;
import org.apache.cassandra.tracing.TraceStateImpl;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.WrappedRunnable;
import org.assertj.core.api.Assertions;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.assertj.core.api.Assertions.assertThat;
@@ -151,7 +153,7 @@ public class DebuggableThreadPoolExecutorTest
assertThat(ClientWarn.instance.getWarnings()).isNullOrEmpty();
ConcurrentLinkedQueue<String> q = new ConcurrentLinkedQueue<>();
- Tracing.instance.set(new TraceState(FBUtilities.getLocalAddressAndPort(), UUID.randomUUID(), Tracing.TraceType.NONE)
+ Tracing.instance.set(new TraceState(FBUtilities.getLocalAddressAndPort(), nextTimeUUID(), Tracing.TraceType.NONE)
{
@Override
protected void traceImpl(String message)
@@ -249,7 +251,7 @@ public class DebuggableThreadPoolExecutorTest
{
TraceState state = Tracing.instance.get();
try {
- Tracing.instance.set(new TraceStateImpl(InetAddressAndPort.getByAddress(InetAddresses.forString("127.0.0.1")), UUID.randomUUID(), Tracing.TraceType.NONE));
+ Tracing.instance.set(new TraceStateImpl(InetAddressAndPort.getByAddress(InetAddresses.forString("127.0.0.1")), nextTimeUUID(), Tracing.TraceType.NONE));
fn.run();
}
finally
diff --git a/test/unit/org/apache/cassandra/cql3/CQL3TypeLiteralTest.java b/test/unit/org/apache/cassandra/cql3/CQL3TypeLiteralTest.java
index 48fefca..f0d2c19 100644
--- a/test/unit/org/apache/cassandra/cql3/CQL3TypeLiteralTest.java
+++ b/test/unit/org/apache/cassandra/cql3/CQL3TypeLiteralTest.java
@@ -30,9 +30,9 @@ import org.junit.Test;
import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.serializers.*;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDGen;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.junit.Assert.assertEquals;
@@ -226,8 +226,8 @@ public class CQL3TypeLiteralTest
for (int i = 0; i < 20; i++)
{
- UUID v = UUIDGen.getTimeUUID(randLong(currentTimeMillis()));
- addNativeValue(v.toString(), CQL3Type.Native.TIMEUUID, TimeUUIDType.instance.decompose(v));
+ TimeUUID v = TimeUUID.Generator.atUnixMillis(randLong(currentTimeMillis()));
+ addNativeValue(v.toString(), CQL3Type.Native.TIMEUUID, v.toBytes());
}
addNativeValue("null", CQL3Type.Native.TIMEUUID, ByteBufferUtil.EMPTY_BYTE_BUFFER);
addNativeValue("null", CQL3Type.Native.TIMEUUID, null);
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index 66e9acf..bfe446f 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -100,6 +100,7 @@ import org.apache.cassandra.transport.messages.ResultMessage;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.JMXServerUtils;
+import org.apache.cassandra.utils.TimeUUID;
import org.assertj.core.api.Assertions;
import org.apache.cassandra.utils.Pair;
import org.awaitility.Awaitility;
@@ -2050,7 +2051,7 @@ public abstract class CQLTester
if (value instanceof ByteBuffer)
return (ByteBuffer)value;
- return type.decompose(serializeTuples(value));
+ return type.decomposeUntyped(serializeTuples(value));
}
private static String formatValue(ByteBuffer bb, AbstractType<?> type)
@@ -2180,6 +2181,9 @@ public abstract class CQLTester
if (value instanceof UUID)
return UUIDType.instance;
+ if (value instanceof TimeUUID)
+ return TimeUUIDType.instance;
+
if (value instanceof List)
{
List l = (List)value;
diff --git a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java
index 0035fa1..7a7e4b8 100644
--- a/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java
+++ b/test/unit/org/apache/cassandra/cql3/conditions/ColumnConditionTest.java
@@ -32,9 +32,8 @@ import org.apache.cassandra.db.marshal.SetType;
import org.apache.cassandra.db.rows.*;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.schema.ColumnMetadata;
-import org.apache.cassandra.serializers.TimeUUIDSerializer;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -65,8 +64,8 @@ public class ColumnConditionTest
{
for (int i = 0, m = values.size(); i < m; i++)
{
- UUID uuid = UUIDGen.getTimeUUID(now, i);
- ByteBuffer key = TimeUUIDSerializer.instance.serialize(uuid);
+ TimeUUID uuid = TimeUUID.Generator.atUnixMillis(now, i);
+ ByteBuffer key = uuid.toBytes();
ByteBuffer value = values.get(i);
BufferCell cell = new BufferCell(definition,
0L,
diff --git a/test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java b/test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java
index 4278fb0..6efbdc0 100644
--- a/test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java
+++ b/test/unit/org/apache/cassandra/cql3/functions/CastFctsTest.java
@@ -28,7 +28,7 @@ import java.util.Date;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.serializers.SimpleDateSerializer;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import org.junit.Test;
@@ -211,7 +211,7 @@ public class CastFctsTest extends CQLTester
long timeInMillis = dateTime.toInstant().toEpochMilli();
execute("INSERT INTO %s (a, b, c, d) VALUES (?, '" + yearMonthDay + " 11:03:02+00', '2015-05-21', '11:03:02')",
- UUIDGen.getTimeUUID(timeInMillis));
+ TimeUUID.Generator.atUnixMillis(timeInMillis));
assertRows(execute("SELECT CAST(a AS timestamp), " +
"CAST(b AS timestamp), " +
diff --git a/test/unit/org/apache/cassandra/cql3/functions/TimeFctsTest.java b/test/unit/org/apache/cassandra/cql3/functions/TimeFctsTest.java
index 106dd70..a124e60 100644
--- a/test/unit/org/apache/cassandra/cql3/functions/TimeFctsTest.java
+++ b/test/unit/org/apache/cassandra/cql3/functions/TimeFctsTest.java
@@ -32,9 +32,10 @@ import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.db.marshal.TimestampType;
import org.apache.cassandra.transport.ProtocolVersion;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.cql3.functions.TimeFcts.*;
+import static org.apache.cassandra.utils.TimeUUID.Generator.atUnixMillisAsBytes;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -56,7 +57,7 @@ public class TimeFctsTest
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
ByteBuffer input = TimestampType.instance.fromString(DATE_TIME_STRING + "+00");
ByteBuffer output = executeFunction(TimeFcts.minTimeuuidFct, input);
- assertEquals(UUIDGen.minTimeUUID(timeInMillis), TimeUUIDType.instance.compose(output));
+ assertEquals(TimeUUID.minAtUnixMillis(timeInMillis), TimeUUIDType.instance.compose(output));
}
@Test
@@ -65,7 +66,7 @@ public class TimeFctsTest
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
ByteBuffer input = LongType.instance.decompose(timeInMillis);
ByteBuffer output = executeFunction(TimeFcts.minTimeuuidFct, input);
- assertEquals(UUIDGen.minTimeUUID(timeInMillis), TimeUUIDType.instance.compose(output));
+ assertEquals(TimeUUID.minAtUnixMillis(timeInMillis), TimeUUIDType.instance.compose(output));
}
@Test
@@ -74,7 +75,7 @@ public class TimeFctsTest
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
ByteBuffer input = TimestampType.instance.fromString(DATE_TIME_STRING + "+00");
ByteBuffer output = executeFunction(TimeFcts.maxTimeuuidFct, input);
- assertEquals(UUIDGen.maxTimeUUID(timeInMillis), TimeUUIDType.instance.compose(output));
+ assertEquals(TimeUUID.maxAtUnixMillis(timeInMillis), TimeUUIDType.instance.compose(output));
}
@Test
@@ -83,7 +84,7 @@ public class TimeFctsTest
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
ByteBuffer input = LongType.instance.decompose(timeInMillis);
ByteBuffer output = executeFunction(TimeFcts.maxTimeuuidFct, input);
- assertEquals(UUIDGen.maxTimeUUID(timeInMillis), TimeUUIDType.instance.compose(output));
+ assertEquals(TimeUUID.maxAtUnixMillis(timeInMillis), TimeUUIDType.instance.compose(output));
}
@Test
@@ -91,7 +92,7 @@ public class TimeFctsTest
{
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
- ByteBuffer input = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes(timeInMillis, 0));
+ ByteBuffer input = ByteBuffer.wrap(atUnixMillisAsBytes(timeInMillis, 0));
ByteBuffer output = executeFunction(TimeFcts.dateOfFct, input);
assertEquals(Date.from(DATE_TIME.toInstant()), TimestampType.instance.compose(output));
}
@@ -100,7 +101,7 @@ public class TimeFctsTest
public void testTimeUuidToTimestamp()
{
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
- ByteBuffer input = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes(timeInMillis, 0));
+ ByteBuffer input = ByteBuffer.wrap(atUnixMillisAsBytes(timeInMillis, 0));
ByteBuffer output = executeFunction(toTimestamp(TimeUUIDType.instance), input);
assertEquals(Date.from(DATE_TIME.toInstant()), TimestampType.instance.compose(output));
}
@@ -109,7 +110,7 @@ public class TimeFctsTest
public void testUnixTimestampOfFct()
{
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
- ByteBuffer input = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes(timeInMillis, 0));
+ ByteBuffer input = ByteBuffer.wrap(atUnixMillisAsBytes(timeInMillis, 0));
ByteBuffer output = executeFunction(TimeFcts.unixTimestampOfFct, input);
assertEquals(timeInMillis, LongType.instance.compose(output).longValue());
}
@@ -118,7 +119,7 @@ public class TimeFctsTest
public void testTimeUuidToUnixTimestamp()
{
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
- ByteBuffer input = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes(timeInMillis, 0));
+ ByteBuffer input = ByteBuffer.wrap(atUnixMillisAsBytes(timeInMillis, 0));
ByteBuffer output = executeFunction(toUnixTimestamp(TimeUUIDType.instance), input);
assertEquals(timeInMillis, LongType.instance.compose(output).longValue());
}
@@ -127,7 +128,7 @@ public class TimeFctsTest
public void testTimeUuidToDate()
{
long timeInMillis = DATE_TIME.toInstant().toEpochMilli();
- ByteBuffer input = ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes(timeInMillis, 0));
+ ByteBuffer input = ByteBuffer.wrap(atUnixMillisAsBytes(timeInMillis, 0));
ByteBuffer output = executeFunction(toDate(TimeUUIDType.instance), input);
long expectedTime = DATE.toInstant().toEpochMilli();
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/TimeuuidTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/TimeuuidTest.java
index 178da6a..931451e 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/TimeuuidTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/TimeuuidTest.java
@@ -19,14 +19,14 @@
package org.apache.cassandra.cql3.validation.entities;
import java.util.Date;
-import java.util.UUID;
import org.junit.Test;
import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.exceptions.SyntaxException;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.junit.Assert.assertEquals;
public class TimeuuidTest extends CQLTester
@@ -59,7 +59,7 @@ public class TimeuuidTest extends CQLTester
for (int i = 0; i < 4; i++)
{
- long timestamp = UUIDGen.unixTimestamp((UUID) rows[i][1]);
+ long timestamp = ((TimeUUID) rows[i][1]).unix(MILLISECONDS);
assertRows(execute("SELECT dateOf(t), unixTimestampOf(t) FROM %s WHERE k = 0 AND t = ?", rows[i][1]),
row(new Date(timestamp), timestamp));
}
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFScriptTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFScriptTest.java
index 099e42d..fb33e6f 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFScriptTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFScriptTest.java
@@ -38,7 +38,9 @@ import org.apache.cassandra.cql3.UntypedResultSet;
import org.apache.cassandra.cql3.functions.FunctionName;
import org.apache.cassandra.exceptions.FunctionExecutionException;
import org.apache.cassandra.transport.ProtocolVersion;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class UFScriptTest extends CQLTester
{
@@ -323,7 +325,7 @@ public class UFScriptTest extends CQLTester
public void testScriptParamReturnTypes() throws Throwable
{
UUID ruuid = UUID.randomUUID();
- UUID tuuid = UUIDGen.getTimeUUID();
+ TimeUUID tuuid = nextTimeUUID();
createTable("CREATE TABLE %s (key int primary key, " +
"tival tinyint, sival smallint, ival int, lval bigint, fval float, dval double, vval varint, ddval decimal, " +
diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTypesTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTypesTest.java
index f011a25..eb94fe5 100644
--- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFTypesTest.java
+++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFTypesTest.java
@@ -37,7 +37,8 @@ import org.apache.cassandra.cql3.UntypedResultSet;
import org.apache.cassandra.transport.Event.SchemaChange.Change;
import org.apache.cassandra.transport.Event.SchemaChange.Target;
import org.apache.cassandra.transport.ProtocolVersion;
-import org.apache.cassandra.utils.UUIDGen;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class UFTypesTest extends CQLTester
{
@@ -186,7 +187,7 @@ public class UFTypesTest extends CQLTester
new TypesTestDef("date", "date", "dt", 12345),
new TypesTestDef("time", "time", "tim", 12345L),
new TypesTestDef("uuid", "uuid", "uu", UUID.randomUUID()),
- new TypesTestDef("timeuuid", "timeuuid", "tu", UUIDGen.getTimeUUID()),
+ new TypesTestDef("timeuuid", "timeuuid", "tu", nextTimeUUID().asUUID()),
new TypesTestDef("tinyint", "tinyint", "ti", (byte) 42),
new TypesTestDef("smallint", "smallint", "si", (short) 43),
new TypesTestDef("int", "int", "i", 44),
diff --git a/test/unit/org/apache/cassandra/db/CellSpecTest.java b/test/unit/org/apache/cassandra/db/CellSpecTest.java
index dc7ffa8..3387c78 100644
--- a/test/unit/org/apache/cassandra/db/CellSpecTest.java
+++ b/test/unit/org/apache/cassandra/db/CellSpecTest.java
@@ -39,7 +39,7 @@ import org.apache.cassandra.db.rows.NativeCell;
import org.apache.cassandra.schema.ColumnMetadata;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.utils.ObjectSizes;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.ImmediateFuture;
import org.apache.cassandra.utils.concurrent.OpOrder;
import org.apache.cassandra.utils.memory.NativeAllocator;
@@ -47,6 +47,7 @@ import org.apache.cassandra.utils.memory.NativePool;
import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
@RunWith(Parameterized.class)
public class CellSpecTest
@@ -149,7 +150,7 @@ public class CellSpecTest
// complex
// seems NativeCell does not allow CellPath.TOP, or CellPath.BOTTOM
- fn.accept(ColumnMetadata.regularColumn(table, bytes("complex"), ListType.getInstance(BytesType.instance, true)), CellPath.create(bytes(UUIDGen.getTimeUUID())));
+ fn.accept(ColumnMetadata.regularColumn(table, bytes("complex"), ListType.getInstance(BytesType.instance, true)), CellPath.create(TimeUUID.Serializer.instance.serialize(nextTimeUUID())));
return tests.stream().map(a -> new Object[] {a.getClass().getSimpleName() + ":" + (a.path() == null ? "simple" : "complex"), a}).collect(Collectors.toList());
}
diff --git a/test/unit/org/apache/cassandra/db/DigestTest.java b/test/unit/org/apache/cassandra/db/DigestTest.java
index 4fd12d0..4719726 100644
--- a/test/unit/org/apache/cassandra/db/DigestTest.java
+++ b/test/unit/org/apache/cassandra/db/DigestTest.java
@@ -29,8 +29,8 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.Hex;
-import org.apache.cassandra.utils.UUIDGen;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUIDAsBytes;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -93,7 +93,7 @@ public class DigestTest
new Digest(Hashing.murmur3_128(1000).newHasher()),
new Digest(Hashing.murmur3_128(2000).newHasher())
};
- byte [] random = UUIDGen.getTimeUUIDBytes();
+ byte [] random = nextTimeUUIDAsBytes();
for (Digest digest : digests)
{
diff --git a/test/unit/org/apache/cassandra/db/ReadCommandTest.java b/test/unit/org/apache/cassandra/db/ReadCommandTest.java
index 289014f..9bbd956 100644
--- a/test/unit/org/apache/cassandra/db/ReadCommandTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadCommandTest.java
@@ -79,9 +79,10 @@ import org.apache.cassandra.streaming.PreviewKind;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.utils.ByteBufferUtil.EMPTY_BYTE_BUFFER;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
@@ -1242,13 +1243,13 @@ public class ReadCommandTest
digests.add(digest);
// add a pending repair session to table1, digest should remain the same but now we expect it to be marked inconclusive
- UUID session1 = UUIDGen.getTimeUUID();
+ TimeUUID session1 = nextTimeUUID();
mutateRepaired(cfs, sstable1, ActiveRepairService.UNREPAIRED_SSTABLE, session1);
digests.add(performReadAndVerifyRepairedInfo(readCommand, numPartitions, rowsPerPartition, false));
assertEquals(1, digests.size());
// add a different pending session to table2, digest should remain the same and still consider it inconclusive
- UUID session2 = UUIDGen.getTimeUUID();
+ TimeUUID session2 = nextTimeUUID();
mutateRepaired(cfs, sstable2, ActiveRepairService.UNREPAIRED_SSTABLE, session2);
digests.add(performReadAndVerifyRepairedInfo(readCommand, numPartitions, rowsPerPartition, false));
assertEquals(1, digests.size());
@@ -1286,7 +1287,7 @@ public class ReadCommandTest
}
}
- private void mutateRepaired(ColumnFamilyStore cfs, SSTableReader sstable, long repairedAt, UUID pendingSession)
+ private void mutateRepaired(ColumnFamilyStore cfs, SSTableReader sstable, long repairedAt, TimeUUID pendingSession)
{
try
{
diff --git a/test/unit/org/apache/cassandra/db/ReadCommandVerbHandlerTest.java b/test/unit/org/apache/cassandra/db/ReadCommandVerbHandlerTest.java
index 5cdaa58..b823f23 100644
--- a/test/unit/org/apache/cassandra/db/ReadCommandVerbHandlerTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadCommandVerbHandlerTest.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.db;
import java.net.UnknownHostException;
import java.util.Random;
-import java.util.UUID;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -46,6 +45,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import static org.apache.cassandra.net.Verb.*;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -110,7 +110,7 @@ public class ReadCommandVerbHandlerTest
handler.doVerb(Message.builder(READ_REQ, (ReadCommand) command)
.from(peer())
.withId(messageId())
- .withParam(ParamType.TRACE_SESSION, UUID.randomUUID())
+ .withParam(ParamType.TRACE_SESSION, nextTimeUUID())
.build());
assertFalse(command.isTrackingRepairedData());
}
diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java
index bbdea66..5d20af5 100644
--- a/test/unit/org/apache/cassandra/db/ScrubTest.java
+++ b/test/unit/org/apache/cassandra/db/ScrubTest.java
@@ -31,7 +31,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicInteger;
@@ -83,6 +82,7 @@ import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.schema.TableMetadataRef;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.SchemaLoader.counterCFMD;
import static org.apache.cassandra.SchemaLoader.createKeyspace;
@@ -680,7 +680,7 @@ public class ScrubTest
*/
private static class TestWriter extends BigTableWriter
{
- TestWriter(Descriptor descriptor, long keyCount, long repairedAt, UUID pendingRepair, boolean isTransient, TableMetadataRef metadata,
+ TestWriter(Descriptor descriptor, long keyCount, long repairedAt, TimeUUID pendingRepair, boolean isTransient, TableMetadataRef metadata,
MetadataCollector collector, SerializationHeader header, LifecycleTransaction txn)
{
super(descriptor, keyCount, repairedAt, pendingRepair, isTransient, metadata, collector, header, Collections.emptySet(), txn);
diff --git a/test/unit/org/apache/cassandra/db/SystemKeyspaceMigrator40Test.java b/test/unit/org/apache/cassandra/db/SystemKeyspaceMigrator40Test.java
index a14db00..b75bf42 100644
--- a/test/unit/org/apache/cassandra/db/SystemKeyspaceMigrator40Test.java
+++ b/test/unit/org/apache/cassandra/db/SystemKeyspaceMigrator40Test.java
@@ -32,12 +32,13 @@ import org.apache.cassandra.cql3.CQLTester;
import org.apache.cassandra.cql3.UntypedResultSet;
import org.apache.cassandra.db.marshal.BytesType;
import org.apache.cassandra.db.marshal.Int32Type;
+import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.db.marshal.UTF8Type;
-import org.apache.cassandra.db.marshal.UUIDType;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
public class SystemKeyspaceMigrator40Test extends CQLTester
@@ -57,8 +58,8 @@ public class SystemKeyspaceMigrator40Test extends CQLTester
+ "tokens) "
+ " values ( ?, ?, ? , ? , ?, ?, ?, ?, ?)",
SystemKeyspaceMigrator40.legacyPeersName);
- UUID hostId = UUIDGen.getTimeUUID();
- UUID schemaVersion = UUIDGen.getTimeUUID();
+ UUID hostId = UUID.randomUUID();
+ UUID schemaVersion = UUID.randomUUID();
execute(insert,
InetAddress.getByName("127.0.0.1"),
"dcFoo",
@@ -113,7 +114,7 @@ public class SystemKeyspaceMigrator40Test extends CQLTester
+ "hints_dropped) "
+ " values ( ?, ? )",
SystemKeyspaceMigrator40.legacyPeerEventsName);
- UUID uuid = UUIDGen.getTimeUUID();
+ TimeUUID uuid = nextTimeUUID();
execute(insert,
InetAddress.getByName("127.0.0.1"),
ImmutableMap.of(uuid, 42));
@@ -125,7 +126,7 @@ public class SystemKeyspaceMigrator40Test extends CQLTester
rowCount++;
assertEquals(InetAddress.getByName("127.0.0.1"), row.getInetAddress("peer"));
assertEquals(DatabaseDescriptor.getStoragePort(), row.getInt("peer_port"));
- assertEquals(ImmutableMap.of(uuid, 42), row.getMap("hints_dropped", UUIDType.instance, Int32Type.instance));
+ assertEquals(ImmutableMap.of(uuid, 42), row.getMap("hints_dropped", TimeUUIDType.instance, Int32Type.instance));
}
assertEquals(1, rowCount);
diff --git a/test/unit/org/apache/cassandra/db/VerifyTest.java b/test/unit/org/apache/cassandra/db/VerifyTest.java
index c86b988..15478c4 100644
--- a/test/unit/org/apache/cassandra/db/VerifyTest.java
+++ b/test/unit/org/apache/cassandra/db/VerifyTest.java
@@ -63,12 +63,26 @@ import org.apache.cassandra.schema.CompressionParams;
import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.io.*;
+import java.net.UnknownHostException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.zip.CRC32;
+import java.util.zip.CheckedInputStream;
import org.apache.cassandra.io.util.File;
import static org.apache.cassandra.SchemaLoader.counterCFMD;
import static org.apache.cassandra.SchemaLoader.createKeyspace;
import static org.apache.cassandra.SchemaLoader.loadSchema;
import static org.apache.cassandra.SchemaLoader.standardCFMD;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -700,7 +714,7 @@ public class VerifyTest
tmd.updateNormalToken(new ByteOrderedPartitioner.BytesToken(tk1), InetAddressAndPort.getByName("127.0.0.1"));
tmd.updateNormalToken(new ByteOrderedPartitioner.BytesToken(tk2), InetAddressAndPort.getByName("127.0.0.2"));
// write some bogus to a localpartitioner table
- Batch bogus = Batch.createLocal(UUID.randomUUID(), 0, Collections.emptyList());
+ Batch bogus = Batch.createLocal(nextTimeUUID(), 0, Collections.emptyList());
BatchlogManager.store(bogus);
ColumnFamilyStore cfs = Keyspace.open("system").getColumnFamilyStore("batches");
cfs.forceBlockingFlush();
diff --git a/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java b/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java
index de7ddfc..f12c2c8 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AbstractPendingRepairTest.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.db.compaction;
import java.io.IOException;
import java.util.HashSet;
import java.util.Set;
-import java.util.UUID;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -39,6 +38,7 @@ import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.schema.Schema;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.service.ActiveRepairService;
+import org.apache.cassandra.utils.TimeUUID;
@Ignore
public class AbstractPendingRepairTest extends AbstractRepairTest
@@ -99,7 +99,7 @@ public class AbstractPendingRepairTest extends AbstractRepairTest
return sstable;
}
- public static void mutateRepaired(SSTableReader sstable, long repairedAt, UUID pendingRepair, boolean isTransient)
+ public static void mutateRepaired(SSTableReader sstable, long repairedAt, TimeUUID pendingRepair, boolean isTransient)
{
try
{
@@ -117,7 +117,7 @@ public class AbstractPendingRepairTest extends AbstractRepairTest
mutateRepaired(sstable, repairedAt, ActiveRepairService.NO_PENDING_REPAIR, false);
}
- public static void mutateRepaired(SSTableReader sstable, UUID pendingRepair, boolean isTransient)
+ public static void mutateRepaired(SSTableReader sstable, TimeUUID pendingRepair, boolean isTransient)
{
mutateRepaired(sstable, ActiveRepairService.UNREPAIRED_SSTABLE, pendingRepair, isTransient);
}
diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionBytemanTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionBytemanTest.java
index 6caa935..5f24649 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionBytemanTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionBytemanTest.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -48,6 +47,7 @@ import org.jboss.byteman.contrib.bmunit.BMRule;
import org.jboss.byteman.contrib.bmunit.BMRules;
import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -126,7 +126,7 @@ public class AntiCompactionBytemanTest extends CQLTester
try (LifecycleTransaction txn = getCurrentColumnFamilyStore().getTracker().tryModify(getCurrentColumnFamilyStore().getLiveSSTables(), OperationType.ANTICOMPACTION))
{
- CompactionManager.instance.antiCompactGroup(getCurrentColumnFamilyStore(), ranges, txn, UUID.randomUUID(), () -> false);
+ CompactionManager.instance.antiCompactGroup(getCurrentColumnFamilyStore(), ranges, txn, nextTimeUUID(), () -> false);
}
finished.set(true);
t.join();
diff --git a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
index 6535b67..8a772f2 100644
--- a/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/AntiCompactionTest.java
@@ -25,7 +25,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.function.Predicate;
import com.google.common.collect.ImmutableSet;
@@ -62,7 +61,7 @@ import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.streaming.PreviewKind;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Refs;
import org.apache.cassandra.UpdateBuilder;
import org.apache.cassandra.utils.concurrent.Transactional;
@@ -70,6 +69,7 @@ import org.apache.cassandra.utils.concurrent.Transactional;
import static org.apache.cassandra.service.ActiveRepairService.NO_PENDING_REPAIR;
import static org.apache.cassandra.service.ActiveRepairService.UNREPAIRED_SSTABLE;
import static org.apache.cassandra.Util.assertOnDiskState;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -107,7 +107,7 @@ public class AntiCompactionTest
store.truncateBlocking();
}
- private void registerParentRepairSession(UUID sessionID, Iterable<Range<Token>> ranges, long repairedAt, UUID pendingRepair) throws IOException
+ private void registerParentRepairSession(TimeUUID sessionID, Iterable<Range<Token>> ranges, long repairedAt, TimeUUID pendingRepair) throws IOException
{
ActiveRepairService.instance.registerParentRepairSession(sessionID,
InetAddressAndPort.getByName("10.0.0.1"),
@@ -143,7 +143,7 @@ public class AntiCompactionTest
private SSTableStats antiCompactRanges(ColumnFamilyStore store, RangesAtEndpoint ranges) throws IOException
{
- UUID sessionID = UUID.randomUUID();
+ TimeUUID sessionID = nextTimeUUID();
Collection<SSTableReader> sstables = getUnrepairedSSTables(store);
try (LifecycleTransaction txn = store.getTracker().tryModify(sstables, OperationType.ANTICOMPACTION);
Refs<SSTableReader> refs = Refs.ref(sstables))
@@ -247,8 +247,8 @@ public class AntiCompactionTest
Range<Token> range = new Range<Token>(new BytesToken(ByteBufferUtil.bytes(0)), new BytesToken(ByteBufferUtil.bytes(500)));
List<Range<Token>> ranges = Arrays.asList(range);
Collection<SSTableReader> sstables = cfs.getLiveSSTables();
- UUID parentRepairSession = UUID.randomUUID();
- registerParentRepairSession(parentRepairSession, ranges, UNREPAIRED_SSTABLE, UUIDGen.getTimeUUID());
+ TimeUUID parentRepairSession = nextTimeUUID();
+ registerParentRepairSession(parentRepairSession, ranges, UNREPAIRED_SSTABLE, nextTimeUUID());
try (LifecycleTransaction txn = cfs.getTracker().tryModify(sstables, OperationType.ANTICOMPACTION);
Refs<SSTableReader> refs = Refs.ref(sstables))
{
@@ -376,7 +376,7 @@ public class AntiCompactionTest
// the sstables start at "0".getBytes() = 48, we need to include that first token, with "/".getBytes() = 47
Range<Token> range = new Range<Token>(new BytesToken("/".getBytes()), new BytesToken("9999".getBytes()));
List<Range<Token>> ranges = Arrays.asList(range);
- UUID pendingRepair = UUID.randomUUID();
+ TimeUUID pendingRepair = nextTimeUUID();
registerParentRepairSession(pendingRepair, ranges, UNREPAIRED_SSTABLE, pendingRepair);
try (LifecycleTransaction txn = store.getTracker().tryModify(sstables, OperationType.ANTICOMPACTION);
@@ -410,7 +410,7 @@ public class AntiCompactionTest
Range<Token> range = new Range<Token>(new BytesToken("-1".getBytes()), new BytesToken("-10".getBytes()));
List<Range<Token>> ranges = Arrays.asList(range);
- UUID parentRepairSession = UUID.randomUUID();
+ TimeUUID parentRepairSession = nextTimeUUID();
registerParentRepairSession(parentRepairSession, ranges, UNREPAIRED_SSTABLE, null);
boolean gotException = false;
try (LifecycleTransaction txn = store.getTracker().tryModify(sstables, OperationType.ANTICOMPACTION);
@@ -479,7 +479,7 @@ public class AntiCompactionTest
Range<Token> range = new Range<Token>(new BytesToken("-1".getBytes()), new BytesToken("-10".getBytes()));
List<Range<Token>> ranges = Arrays.asList(range);
- UUID missingRepairSession = UUIDGen.getTimeUUID();
+ TimeUUID missingRepairSession = nextTimeUUID();
try (LifecycleTransaction txn = store.getTracker().tryModify(sstables, OperationType.ANTICOMPACTION);
Refs<SSTableReader> refs = Refs.ref(sstables))
{
@@ -509,7 +509,7 @@ public class AntiCompactionTest
Range<Token> r = new Range<>(t(10), t(100)); // should include sstable 1 and 2 above, but none is fully contained (Range is (x, y])
Iterator<SSTableReader> sstableIterator = sstables.iterator();
- Set<SSTableReader> fullyContainedSSTables = CompactionManager.findSSTablesToAnticompact(sstableIterator, Collections.singletonList(r), UUID.randomUUID());
+ Set<SSTableReader> fullyContainedSSTables = CompactionManager.findSSTablesToAnticompact(sstableIterator, Collections.singletonList(r), nextTimeUUID());
assertTrue(fullyContainedSSTables.isEmpty());
assertEquals(2, sstables.size());
}
@@ -527,7 +527,7 @@ public class AntiCompactionTest
Range<Token> r = new Range<>(t(9), t(100)); // sstable 1 is fully contained
Iterator<SSTableReader> sstableIterator = sstables.iterator();
- Set<SSTableReader> fullyContainedSSTables = CompactionManager.findSSTablesToAnticompact(sstableIterator, Collections.singletonList(r), UUID.randomUUID());
+ Set<SSTableReader> fullyContainedSSTables = CompactionManager.findSSTablesToAnticompact(sstableIterator, Collections.singletonList(r), nextTimeUUID());
assertEquals(Collections.singleton(sstable1), fullyContainedSSTables);
assertEquals(Collections.singletonList(sstable2), sstables);
}
@@ -542,7 +542,7 @@ public class AntiCompactionTest
Range<Token> r = new Range<>(t(9), t(100)); // sstable is not intersecting and should not be included
- CompactionManager.validateSSTableBoundsForAnticompaction(UUID.randomUUID(), sstables, atEndpoint(Collections.singletonList(r), NO_RANGES));
+ CompactionManager.validateSSTableBoundsForAnticompaction(nextTimeUUID(), sstables, atEndpoint(Collections.singletonList(r), NO_RANGES));
}
@Test(expected = IllegalStateException.class)
@@ -557,7 +557,7 @@ public class AntiCompactionTest
Range<Token> r = new Range<>(t(10), t(11)); // no sstable included, throw
- CompactionManager.validateSSTableBoundsForAnticompaction(UUID.randomUUID(), sstables, atEndpoint(Collections.singletonList(r), NO_RANGES));
+ CompactionManager.validateSSTableBoundsForAnticompaction(nextTimeUUID(), sstables, atEndpoint(Collections.singletonList(r), NO_RANGES));
}
@Test
@@ -573,7 +573,7 @@ public class AntiCompactionTest
Range<Token> r = new Range<>(t(9), t(200)); // sstable 2 is fully contained - last token is equal
Iterator<SSTableReader> sstableIterator = sstables.iterator();
- Set<SSTableReader> fullyContainedSSTables = CompactionManager.findSSTablesToAnticompact(sstableIterator, Collections.singletonList(r), UUID.randomUUID());
+ Set<SSTableReader> fullyContainedSSTables = CompactionManager.findSSTablesToAnticompact(sstableIterator, Collections.singletonList(r), nextTimeUUID());
assertEquals(Sets.newHashSet(sstable1, sstable2), fullyContainedSSTables);
assertTrue(sstables.isEmpty());
}
diff --git a/test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java
index 9d94ff7..f63f4bb 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CancelCompactionsTest.java
@@ -23,7 +23,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
@@ -57,7 +56,9 @@ import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.streaming.PreviewKind;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -254,7 +255,7 @@ public class CancelCompactionsTest extends CQLTester
// make sure that sstables are fully contained so that the metadata gets mutated
Range<Token> range = new Range<>(token(-1), token(49));
- UUID prsid = UUID.randomUUID();
+ TimeUUID prsid = nextTimeUUID();
ActiveRepairService.instance.registerParentRepairSession(prsid, InetAddressAndPort.getLocalHost(), Collections.singletonList(cfs), Collections.singleton(range), true, 1, true, PreviewKind.NONE);
InetAddressAndPort local = FBUtilities.getBroadcastAddressAndPort();
@@ -397,7 +398,7 @@ public class CancelCompactionsTest extends CQLTester
txn = cfs.getTracker().tryModify(sstables, OperationType.COMPACTION);
assertNotNull(txn);
controller = new CompactionController(cfs, sstables, Integer.MIN_VALUE);
- ci = new CompactionIterator(txn.opType(), scanners, controller, FBUtilities.nowInSeconds(), UUID.randomUUID());
+ ci = new CompactionIterator(txn.opType(), scanners, controller, FBUtilities.nowInSeconds(), nextTimeUUID());
CompactionManager.instance.active.beginCompaction(ci);
}
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionInfoTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionInfoTest.java
index 5142489..753a185 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionInfoTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionInfoTest.java
@@ -27,15 +27,18 @@ import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.repair.AbstractPendingAntiCompactionTest;
import org.apache.cassandra.schema.MockSchema;
import org.apache.cassandra.schema.TableId;
+import org.apache.cassandra.utils.TimeUUID;
import org.assertj.core.api.Assertions;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
+
public class CompactionInfoTest extends AbstractPendingAntiCompactionTest
{
@Test
public void testCompactionInfoToStringContainsTaskId()
{
ColumnFamilyStore cfs = MockSchema.newCFS();
- UUID expectedTaskId = UUID.randomUUID();
+ TimeUUID expectedTaskId = nextTimeUUID();
CompactionInfo compactionInfo = new CompactionInfo(cfs.metadata(), OperationType.COMPACTION, 0, 1000, expectedTaskId, new ArrayList<>());
Assertions.assertThat(compactionInfo.toString())
.contains(expectedTaskId.toString());
@@ -45,7 +48,7 @@ public class CompactionInfoTest extends AbstractPendingAntiCompactionTest
public void testCompactionInfoToStringFormat()
{
UUID tableId = UUID.randomUUID();
- UUID taskId = UUID.randomUUID();
+ TimeUUID taskId = nextTimeUUID();
ColumnFamilyStore cfs = MockSchema.newCFS(builder -> builder.id(TableId.fromUUID(tableId)));
CompactionInfo compactionInfo = new CompactionInfo(cfs.metadata(), OperationType.COMPACTION, 0, 1000, taskId, new ArrayList<>());
Assertions.assertThat(compactionInfo.toString())
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerPendingRepairTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerPendingRepairTest.java
index e91c5fc..76bbd88 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerPendingRepairTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerPendingRepairTest.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.db.compaction;
import java.util.Collections;
import java.util.List;
-import java.util.UUID;
import com.google.common.collect.Iterables;
import org.junit.Assert;
@@ -35,6 +34,7 @@ import org.apache.cassandra.repair.NoSuchRepairSessionException;
import org.apache.cassandra.repair.consistent.LocalSessionAccessor;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Tests CompactionStrategyManager's handling of pending repair sstables
@@ -62,12 +62,12 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
return csm.getUnrepairedUnsafe().containsSSTable(sstable);
}
- private boolean hasPendingStrategiesFor(UUID sessionID)
+ private boolean hasPendingStrategiesFor(TimeUUID sessionID)
{
return !Iterables.isEmpty(csm.getPendingRepairsUnsafe().getStrategiesFor(sessionID));
}
- private boolean hasTransientStrategiesFor(UUID sessionID)
+ private boolean hasTransientStrategiesFor(TimeUUID sessionID)
{
return !Iterables.isEmpty(csm.getTransientRepairsUnsafe().getStrategiesFor(sessionID));
}
@@ -78,7 +78,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
@Test
public void sstableAdded()
{
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
Assert.assertTrue(Iterables.isEmpty(csm.getPendingRepairsUnsafe().allStrategies()));
@@ -104,7 +104,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
@Test
public void sstableListChangedAddAndRemove()
{
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable1 = makeSSTable(true);
@@ -153,7 +153,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
@Test
public void sstableRepairStatusChanged()
{
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
// add as unrepaired
@@ -187,7 +187,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
@Test
public void sstableDeleted()
{
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
@@ -210,7 +210,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
@Test
public void getStrategies()
{
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
List<List<AbstractCompactionStrategy>> strategies;
@@ -235,7 +235,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
@Test
public void cleanupCompactionFinalized() throws NoSuchRepairSessionException
{
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -275,7 +275,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
@Test
public void cleanupCompactionFailed()
{
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -311,7 +311,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
public void finalizedSessionTransientCleanup()
{
Assert.assertTrue(cfs.getLiveSSTables().isEmpty());
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, true);
@@ -342,7 +342,7 @@ public class CompactionStrategyManagerPendingRepairTest extends AbstractPendingR
public void failedSessionTransientCleanup()
{
Assert.assertTrue(cfs.getLiveSSTables().isEmpty());
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, true);
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerTest.java
index 234408e..b180489 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionStrategyManagerTest.java
@@ -24,7 +24,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -62,8 +61,8 @@ import org.apache.cassandra.schema.CompactionParams;
import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.UUIDGen;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -134,7 +133,7 @@ public class CompactionStrategyManagerTest
else if (i % 3 == 1)
{
//make 1 third of sstables pending repair
- cfs.getCompactionStrategyManager().mutateRepaired(newSSTables, 0, UUIDGen.getTimeUUID(), false);
+ cfs.getCompactionStrategyManager().mutateRepaired(newSSTables, 0, nextTimeUUID(), false);
}
previousSSTables = currentSSTables;
}
@@ -355,8 +354,8 @@ public class CompactionStrategyManagerTest
repaired.add(createSSTableWithKey(cfs.keyspace.getName(), cfs.name, key++));
}
- cfs.getCompactionStrategyManager().mutateRepaired(transientRepairs, 0, UUID.randomUUID(), true);
- cfs.getCompactionStrategyManager().mutateRepaired(pendingRepair, 0, UUID.randomUUID(), false);
+ cfs.getCompactionStrategyManager().mutateRepaired(transientRepairs, 0, nextTimeUUID(), true);
+ cfs.getCompactionStrategyManager().mutateRepaired(pendingRepair, 0, nextTimeUUID(), false);
cfs.getCompactionStrategyManager().mutateRepaired(repaired, 1000, null, false);
DiskBoundaries boundaries = new DiskBoundaries(cfs, cfs.getDirectories().getWriteableLocations(),
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionTaskTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionTaskTest.java
index bdd2014..e179788 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionTaskTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionTaskTest.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
-import java.util.UUID;
import org.junit.Assert;
import org.junit.Before;
@@ -41,9 +40,12 @@ import org.apache.cassandra.schema.Schema;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.Transactional;
+import static org.apache.cassandra.service.ActiveRepairService.UNREPAIRED_SSTABLE;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
+
public class CompactionTaskTest
{
private static TableMetadata cfm;
@@ -96,7 +98,7 @@ public class CompactionTaskTest
Assert.assertEquals(Transactional.AbstractTransactional.State.ABORTED, txn.state());
}
- private static void mutateRepaired(SSTableReader sstable, long repairedAt, UUID pendingRepair, boolean isTransient) throws IOException
+ private static void mutateRepaired(SSTableReader sstable, long repairedAt, TimeUUID pendingRepair, boolean isTransient) throws IOException
{
sstable.descriptor.getMetadataSerializer().mutateRepairMetadata(sstable.descriptor, repairedAt, pendingRepair, isTransient);
sstable.reloadSSTableMetadata();
@@ -128,8 +130,8 @@ public class CompactionTaskTest
SSTableReader pending2 = sstables.get(3);
mutateRepaired(repaired, FBUtilities.nowInSeconds(), ActiveRepairService.NO_PENDING_REPAIR, false);
- mutateRepaired(pending1, ActiveRepairService.UNREPAIRED_SSTABLE, UUIDGen.getTimeUUID(), false);
- mutateRepaired(pending2, ActiveRepairService.UNREPAIRED_SSTABLE, UUIDGen.getTimeUUID(), false);
+ mutateRepaired(pending1, UNREPAIRED_SSTABLE, nextTimeUUID(), false);
+ mutateRepaired(pending2, UNREPAIRED_SSTABLE, nextTimeUUID(), false);
LifecycleTransaction txn = null;
List<SSTableReader> toCompact = new ArrayList<>(sstables);
diff --git a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
index 4ec194a..4cc49b0 100644
--- a/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/LeveledCompactionStrategyTest.java
@@ -67,9 +67,11 @@ import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.streaming.PreviewKind;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.TimeUUID;
import static java.util.Collections.singleton;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -203,7 +205,7 @@ public class LeveledCompactionStrategyTest
Range<Token> range = new Range<>(Util.token(""), Util.token(""));
int gcBefore = keyspace.getColumnFamilyStore(CF_STANDARDDLEVELED).gcBefore(FBUtilities.nowInSeconds());
- UUID parentRepSession = UUID.randomUUID();
+ TimeUUID parentRepSession = nextTimeUUID();
ActiveRepairService.instance.registerParentRepairSession(parentRepSession,
FBUtilities.getBroadcastAddressAndPort(),
Arrays.asList(cfs),
@@ -212,7 +214,7 @@ public class LeveledCompactionStrategyTest
ActiveRepairService.UNREPAIRED_SSTABLE,
true,
PreviewKind.NONE);
- RepairJobDesc desc = new RepairJobDesc(parentRepSession, UUID.randomUUID(), KEYSPACE1, CF_STANDARDDLEVELED, Arrays.asList(range));
+ RepairJobDesc desc = new RepairJobDesc(parentRepSession, nextTimeUUID(), KEYSPACE1, CF_STANDARDDLEVELED, Arrays.asList(range));
Validator validator = new Validator(desc, FBUtilities.getBroadcastAddressAndPort(), gcBefore, PreviewKind.NONE);
ValidationManager.instance.submitValidation(cfs, validator).get();
diff --git a/test/unit/org/apache/cassandra/db/compaction/PendingRepairManagerTest.java b/test/unit/org/apache/cassandra/db/compaction/PendingRepairManagerTest.java
index 9f4cf8d..d2b3693 100644
--- a/test/unit/org/apache/cassandra/db/compaction/PendingRepairManagerTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/PendingRepairManagerTest.java
@@ -20,7 +20,6 @@ package org.apache.cassandra.db.compaction;
import java.util.Collection;
import java.util.Collections;
-import java.util.UUID;
import com.google.common.collect.Lists;
import org.junit.Assert;
@@ -30,7 +29,9 @@ import org.apache.cassandra.db.lifecycle.SSTableSet;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.repair.consistent.LocalSessionAccessor;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
@@ -42,7 +43,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -60,7 +61,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -79,7 +80,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -93,7 +94,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
@Test
public void needsCleanupNoSession()
{
- UUID fakeID = UUIDGen.getTimeUUID();
+ TimeUUID fakeID = nextTimeUUID();
PendingRepairManager prm = new PendingRepairManager(cfs, null, false);
Assert.assertTrue(prm.canCleanup(fakeID));
}
@@ -103,7 +104,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -119,7 +120,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -137,7 +138,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -180,7 +181,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
public void getNextBackgroundTaskAllCleanup() throws Exception
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
@@ -199,7 +200,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairID, false);
@@ -223,7 +224,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
public void userDefinedTaskTest()
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairId = registerSession(cfs, true, true);
+ TimeUUID repairId = registerSession(cfs, true, true);
SSTableReader sstable = makeSSTable(true);
mutateRepaired(sstable, repairId, false);
prm.addSSTable(sstable);
@@ -238,8 +239,8 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
public void mixedPendingSessionsTest()
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairId = registerSession(cfs, true, true);
- UUID repairId2 = registerSession(cfs, true, true);
+ TimeUUID repairId = registerSession(cfs, true, true);
+ TimeUUID repairId2 = registerSession(cfs, true, true);
SSTableReader sstable = makeSSTable(true);
SSTableReader sstable2 = makeSSTable(true);
@@ -282,7 +283,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
- UUID repairID = registerSession(cfs, true, true);
+ TimeUUID repairID = registerSession(cfs, true, true);
LocalSessionAccessor.prepareUnsafe(repairID, COORDINATOR, PARTICIPANTS);
Assert.assertFalse(prm.hasDataForSession(repairID));
@@ -297,7 +298,7 @@ public class PendingRepairManagerTest extends AbstractPendingRepairTest
{
PendingRepairManager prm = csm.getPendingRepairManagers().get(0);
SSTableReader sstable = makeSSTable(false);
- UUID id = UUID.randomUUID();
+ TimeUUID id = nextTimeUUID();
mutateRepaired(sstable, id, false);
prm.getOrCreate(sstable);
cfs.truncateBlocking();
diff --git a/test/unit/org/apache/cassandra/db/compaction/writers/CompactionAwareWriterTest.java b/test/unit/org/apache/cassandra/db/compaction/writers/CompactionAwareWriterTest.java
index 9e29772..98abd0c 100644
--- a/test/unit/org/apache/cassandra/db/compaction/writers/CompactionAwareWriterTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/writers/CompactionAwareWriterTest.java
@@ -35,8 +35,9 @@ import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.io.util.File;
import org.apache.cassandra.schema.MockSchema;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
+import static org.apache.cassandra.db.compaction.OperationType.COMPACTION;
+import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
import static org.junit.Assert.assertEquals;
public class CompactionAwareWriterTest extends CQLTester
@@ -208,7 +209,7 @@ public class CompactionAwareWriterTest extends CQLTester
int nowInSec = FBUtilities.nowInSeconds();
try (AbstractCompactionStrategy.ScannerList scanners = cfs.getCompactionStrategyManager().getScanners(txn.originals());
CompactionController controller = new CompactionController(cfs, txn.originals(), cfs.gcBefore(nowInSec));
- CompactionIterator ci = new CompactionIterator(OperationType.COMPACTION, scanners.scanners, controller, nowInSec, UUIDGen.getTimeUUID()))
+ CompactionIterator ci = new CompactionIterator(COMPACTION, scanners.scanners, controller, nowInSec, nextTimeUUID()))
{
while (ci.hasNext())
{
... 3317 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 03/03: CEP-14: Paxos Improvements
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benedict pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d2923275e360a1ee9db498e748c269f701bb3a8b
Author: Benedict Elliott Smith <be...@apache.org>
AuthorDate: Mon Mar 30 15:24:12 2020 +0100
CEP-14: Paxos Improvements
This work encompasses a range of improvements to Paxos, summarised as:
- The introduction of Paxos Repair for ensuring consistency during range movements
- The reduction of network round-trips by a factor of 2x for reads and writes
patch by Benedict Elliott Smith and Blake Eggleston; reviewed by Alex Petrov, Aleksey Yeschenko and Sam Tunnicliffe for CASSANDRA-17164
---
.build/build-rat.xml | 1 +
.circleci/config.yml | 6 +-
.circleci/config.yml.HIGHRES | 6 +-
.circleci/config.yml.LOWRES | 6 +-
.circleci/config.yml.MIDRES | 6 +-
NEWS.txt | 24 +
build.xml | 42 +-
.../apache/cassandra/batchlog/BatchlogManager.java | 13 +-
.../cassandra/concurrent/ExecutorFactory.java | 26 +-
.../apache/cassandra/concurrent/FutureTask.java | 4 +-
.../cassandra/concurrent/InfiniteLoopExecutor.java | 73 +-
.../org/apache/cassandra/concurrent/Stage.java | 14 +-
.../cassandra/concurrent/SyncFutureTask.java | 3 +-
.../config/CassandraRelevantProperties.java | 15 +-
src/java/org/apache/cassandra/config/Config.java | 202 +++-
.../apache/cassandra/config/DataStorageSpec.java | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 199 +++-
.../org/apache/cassandra/config/DurationSpec.java | 4 +-
.../apache/cassandra/config/EncryptionOptions.java | 17 +-
.../org/apache/cassandra/cql3/QueryOptions.java | 16 +
.../org/apache/cassandra/cql3/QueryProcessor.java | 40 +-
.../apache/cassandra/cql3/UntypedResultSet.java | 6 +
.../apache/cassandra/cql3/functions/TimeFcts.java | 4 +-
.../cassandra/cql3/statements/CQL3CasRequest.java | 13 +-
.../cql3/statements/ModificationStatement.java | 10 +-
.../cassandra/cql3/statements/SelectStatement.java | 50 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 64 +-
.../org/apache/cassandra/db/ConsistencyLevel.java | 6 +-
.../org/apache/cassandra/db/CounterMutation.java | 7 +
src/java/org/apache/cassandra/db/IMutation.java | 2 +
src/java/org/apache/cassandra/db/Keyspace.java | 5 +
src/java/org/apache/cassandra/db/Mutation.java | 25 +-
.../apache/cassandra/db/MutationVerbHandler.java | 16 +-
.../cassandra/db/PartitionRangeReadCommand.java | 4 +-
src/java/org/apache/cassandra/db/ReadQuery.java | 8 +-
src/java/org/apache/cassandra/db/ReadResponse.java | 12 +
.../org/apache/cassandra/db/SimpleBuilders.java | 1 -
.../cassandra/db/SinglePartitionReadCommand.java | 17 +-
.../org/apache/cassandra/db/SystemKeyspace.java | 230 +++-
.../cassandra/db/commitlog/CommitLogReplayer.java | 1 -
.../db/compaction/AbstractCompactionStrategy.java | 1 -
.../compaction/CompactionInterruptedException.java | 10 +-
.../db/compaction/CompactionIterator.java | 96 +-
.../cassandra/db/marshal/ByteArrayAccessor.java | 7 +
.../cassandra/db/marshal/ByteBufferAccessor.java | 7 +
.../org/apache/cassandra/db/marshal/TupleType.java | 14 +-
.../apache/cassandra/db/marshal/ValueAccessor.java | 4 +
.../db/partitions/AbstractBTreePartition.java | 44 +-
.../cassandra/db/partitions/PartitionUpdate.java | 49 +-
.../org/apache/cassandra/db/rows/AbstractCell.java | 5 +
.../org/apache/cassandra/db/rows/BTreeRow.java | 12 +
.../org/apache/cassandra/db/rows/BufferCell.java | 9 -
src/java/org/apache/cassandra/db/rows/Cell.java | 4 +
.../org/apache/cassandra/db/rows/CellPath.java | 2 +
.../org/apache/cassandra/db/rows/ColumnData.java | 3 +
.../cassandra/db/rows/ComplexColumnData.java | 13 +-
.../org/apache/cassandra/db/rows/NativeCell.java | 1 -
src/java/org/apache/cassandra/db/rows/Row.java | 8 +-
.../db/rows/UnfilteredRowIteratorSerializer.java | 2 +-
.../org/apache/cassandra/db/view/ViewUtils.java | 1 -
.../db/virtual/StreamingVirtualTable.java | 6 +-
.../cassandra/db/virtual/VirtualMutation.java | 8 +
.../apache/cassandra/dht/Murmur3Partitioner.java | 11 +-
src/java/org/apache/cassandra/dht/Range.java | 2 +-
.../exceptions/CasWriteTimeoutException.java | 3 +-
.../exceptions/RequestFailureException.java | 2 +-
.../cassandra/exceptions/RequestFailureReason.java | 5 +-
.../org/apache/cassandra/gms/EndpointState.java | 18 +-
.../org/apache/cassandra/gms/GossipDigestAck2.java | 5 -
.../cassandra/gms/GossipDigestAck2VerbHandler.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 15 +-
.../org/apache/cassandra/gms/VersionedValue.java | 8 +
.../cassandra/hadoop/cql3/CqlInputFormat.java | 2 +-
src/java/org/apache/cassandra/index/Index.java | 22 +-
.../cassandra/index/SecondaryIndexManager.java | 59 +-
.../apache/cassandra/io/FSDiskFullWriteError.java | 6 -
src/java/org/apache/cassandra/io/FSError.java | 21 +-
.../io/FSNoDiskAvailableForWriteError.java | 6 -
src/java/org/apache/cassandra/io/FSReadError.java | 20 +-
src/java/org/apache/cassandra/io/FSWriteError.java | 20 +-
.../cassandra/io/sstable/CQLSSTableWriter.java | 2 +-
.../cassandra/io/sstable/IndexSummaryManager.java | 7 +-
.../cassandra/io/sstable/format/SSTableReader.java | 1 -
.../cassandra/io/sstable/format/big/BigFormat.java | 1 -
.../io/sstable/format/big/BigTableWriter.java | 2 +-
.../io/sstable/metadata/StatsMetadata.java | 1 -
.../io/util/ChecksummedSequentialWriter.java | 2 -
src/java/org/apache/cassandra/io/util/File.java | 183 ++-
.../org/apache/cassandra/io/util/PathUtils.java | 40 +-
.../cassandra/io/util/SequentialWriterOption.java | 1 +
.../locator/AbstractReplicaCollection.java | 133 ++-
.../locator/AbstractReplicationStrategy.java | 18 +-
.../org/apache/cassandra/locator/Endpoints.java | 24 +-
.../cassandra/locator/EndpointsForToken.java | 39 +
.../locator/{InOurDcTester.java => InOurDc.java} | 31 +-
.../cassandra/locator/ReplicaCollection.java | 12 +-
.../apache/cassandra/locator/ReplicaLayout.java | 12 +-
.../org/apache/cassandra/locator/ReplicaPlan.java | 171 +--
.../org/apache/cassandra/locator/ReplicaPlans.java | 36 +-
.../org/apache/cassandra/locator/Replicas.java | 2 +-
.../apache/cassandra/locator/TokenMetadata.java | 2 +-
.../metrics/ClientRequestsMetricsHolder.java | 4 +-
.../DecayingEstimatedHistogramReservoir.java | 51 +-
.../cassandra/metrics/HintedHandoffMetrics.java | 2 +-
.../org/apache/cassandra/metrics/PaxosMetrics.java | 21 +-
src/java/org/apache/cassandra/net/Message.java | 31 +-
.../org/apache/cassandra/net/MessagingService.java | 18 +
.../apache/cassandra/net/OutboundMessageQueue.java | 1 -
.../org/apache/cassandra/net/RequestCallback.java | 7 +
.../cassandra/net/RequestCallbackWithFailure.java | 24 +-
.../org/apache/cassandra/net/RequestCallbacks.java | 22 +-
src/java/org/apache/cassandra/net/Verb.java | 47 +-
.../cassandra/repair/AbstractRepairTask.java | 2 +
.../org/apache/cassandra/repair/RepairJob.java | 75 +-
.../apache/cassandra/repair/RepairRunnable.java | 4 +-
.../org/apache/cassandra/repair/RepairSession.java | 15 +-
.../cassandra/repair/consistent/LocalSessions.java | 1 -
.../repair/consistent/admin/CleanupSummary.java | 1 -
.../cassandra/repair/messages/PrepareMessage.java | 1 -
.../cassandra/repair/messages/RepairOption.java | 33 +-
.../cassandra/schema/MigrationCoordinator.java | 3 +
.../DisableSslContextFactory.java} | 33 +-
.../cassandra/serializers/TimeUUIDSerializer.java | 38 -
.../service/AbstractWriteResponseHandler.java | 25 +-
.../cassandra/service/ActiveRepairService.java | 94 +-
.../service/ActiveRepairServiceMBean.java | 2 +
.../cassandra/service/BatchlogResponseHandler.java | 2 +-
.../org/apache/cassandra/service/CASRequest.java | 8 +-
.../apache/cassandra/service/CassandraDaemon.java | 13 +
.../org/apache/cassandra/service/ClientState.java | 19 +-
.../DatacenterSyncWriteResponseHandler.java | 7 +-
.../service/DatacenterWriteResponseHandler.java | 11 +-
.../service/FailureRecordingCallback.java | 153 +++
.../service/PendingRangeCalculatorService.java | 6 +
.../org/apache/cassandra/service/StorageProxy.java | 175 +--
.../cassandra/service/StorageProxyMBean.java | 6 +
.../apache/cassandra/service/StorageService.java | 326 ++++-
.../cassandra/service/StorageServiceMBean.java | 42 +
.../cassandra/service/WriteResponseHandler.java | 11 +-
.../service/paxos/AbstractPaxosRepair.java | 290 +++++
.../org/apache/cassandra/service/paxos/Ballot.java | 151 +++
.../cassandra/service/paxos/BallotGenerator.java | 41 +-
.../org/apache/cassandra/service/paxos/Commit.java | 399 ++++++-
.../cassandra/service/paxos/CommitVerbHandler.java | 39 -
.../service/paxos/ContentionStrategy.java | 651 ++++++++++
.../org/apache/cassandra/service/paxos/Paxos.java | 1195 ++++++++++++++++++-
.../org/apache/cassandra/service/paxos/Paxos.md | 345 ++++++
.../cassandra/service/paxos/PaxosCommit.java | 325 +++++
.../service/paxos/PaxosCommitAndPrepare.java | 145 +++
.../service/paxos/PaxosOperationLock.java | 15 +-
.../cassandra/service/paxos/PaxosPrepare.java | 1253 ++++++++++++++++++++
.../service/paxos/PaxosPrepareRefresh.java | 245 ++++
.../cassandra/service/paxos/PaxosPropose.java | 479 ++++++++
.../cassandra/service/paxos/PaxosRepair.java | 706 +++++++++++
.../service/paxos/PaxosRepairHistory.java | 480 ++++++++
.../service/paxos/PaxosRequestCallback.java | 76 ++
.../apache/cassandra/service/paxos/PaxosState.java | 811 +++++++++++--
.../service/paxos/TablePaxosRepairHistory.java | 80 ++
.../service/paxos/cleanup/PaxosCleanup.java | 156 +++
.../paxos/cleanup/PaxosCleanupComplete.java | 144 +++
.../paxos/cleanup/PaxosCleanupException.java | 9 +-
.../service/paxos/cleanup/PaxosCleanupHistory.java | 68 ++
.../cleanup/PaxosCleanupLocalCoordinator.java | 189 +++
.../service/paxos/cleanup/PaxosCleanupRequest.java | 142 +++
.../paxos/cleanup/PaxosCleanupResponse.java | 87 ++
.../service/paxos/cleanup/PaxosCleanupSession.java | 267 +++++
.../paxos/cleanup/PaxosFinishPrepareCleanup.java | 169 +++
.../paxos/cleanup/PaxosStartPrepareCleanup.java | 192 +++
.../service/paxos/cleanup/PaxosTableRepairs.java | 235 ++++
.../paxos/uncommitted/PaxosBallotTracker.java | 207 ++++
.../service/paxos/uncommitted/PaxosKeyState.java | 168 +++
.../service/paxos/uncommitted/PaxosRows.java | 359 ++++++
.../paxos/uncommitted/PaxosStateTracker.java | 322 +++++
.../paxos/uncommitted/PaxosUncommittedIndex.java | 264 +++++
.../paxos/uncommitted/PaxosUncommittedTracker.java | 376 ++++++
.../paxos/uncommitted/UncommittedDataFile.java | 384 ++++++
.../paxos/uncommitted/UncommittedPaxosKey.java | 12 +-
.../paxos/uncommitted/UncommittedTableData.java | 617 ++++++++++
.../paxos/{ => v1}/AbstractPaxosCallback.java | 23 +-
.../service/paxos/{ => v1}/PrepareCallback.java | 54 +-
.../service/paxos/{ => v1}/PrepareVerbHandler.java | 27 +-
.../service/paxos/{ => v1}/ProposeCallback.java | 22 +-
.../service/paxos/{ => v1}/ProposeVerbHandler.java | 29 +-
.../service/reads/AbstractReadExecutor.java | 6 +-
.../cassandra/service/reads/DataResolver.java | 30 +-
.../cassandra/service/reads/DigestResolver.java | 2 +-
.../cassandra/service/reads/ReadCallback.java | 4 +-
.../cassandra/service/reads/ResponseResolver.java | 11 +-
.../reads/ShortReadPartitionsProtection.java | 2 +-
.../service/reads/repair/AbstractReadRepair.java | 5 +-
.../reads/repair/BlockingPartitionRepair.java | 14 +-
.../service/reads/repair/BlockingReadRepair.java | 4 +-
.../service/reads/repair/NoopReadRepair.java | 4 +-
.../repair/PartitionIteratorMergeListener.java | 4 +-
.../service/reads/repair/ReadOnlyReadRepair.java | 4 +-
.../cassandra/service/reads/repair/ReadRepair.java | 8 +-
.../reads/repair/ReadRepairDiagnostics.java | 8 +-
.../service/reads/repair/ReadRepairStrategy.java | 4 +-
.../reads/repair/RowIteratorMergeListener.java | 6 +-
.../apache/cassandra/streaming/StreamManager.java | 2 +-
.../cassandra/streaming/StreamTransferTask.java | 6 +-
.../async/StreamCompressionSerializer.java | 1 -
.../apache/cassandra/tools/nodetool/Repair.java | 8 +
.../apache/cassandra/tracing/TraceStateImpl.java | 2 -
.../apache/cassandra/utils/BiLongAccumulator.java | 2 +-
.../apache/cassandra/utils/CassandraVersion.java | 26 +-
.../apache/cassandra/utils/CloseableIterator.java | 45 +
.../cassandra/utils/CollectionSerializer.java | 125 ++
.../apache/cassandra/utils/EstimatedHistogram.java | 9 +-
.../org/apache/cassandra/utils/MonotonicClock.java | 4 +-
src/java/org/apache/cassandra/utils/Nemesis.java | 2 +-
.../apache/cassandra/utils/NullableSerializer.java | 70 ++
src/java/org/apache/cassandra/utils/TimeUUID.java | 35 +-
src/java/org/apache/cassandra/utils/UUIDGen.java | 1 +
...{BiLongAccumulator.java => VoidSerializer.java} | 14 +-
.../cassandra/utils/binlog/ExternalArchiver.java | 2 +-
.../cassandra/utils/concurrent/AbstractFuture.java | 1 -
.../utils/concurrent/ConditionAsConsumer.java | 19 +-
.../cassandra/utils/concurrent/IntrusiveStack.java | 58 +-
.../org/apache/cassandra/utils/concurrent/Ref.java | 3 +-
.../cassandra/utils/concurrent/SyncFuture.java | 2 +-
.../cassandra/utils/concurrent/SyncPromise.java | 269 +++++
.../apache/cassandra/utils/memory/BufferPool.java | 3 +-
.../cassandra/utils/memory/LongBufferPoolTest.java | 1 +
test/conf/cassandra.yaml | 2 +-
test/conf/logback-simulator.xml | 4 +
test/data/serialization/4.1/gms.EndpointState.bin | Bin 0 -> 73 bytes
test/data/serialization/4.1/gms.Gossip.bin | Bin 0 -> 166 bytes
.../serialization/4.1/service.SyncComplete.bin | Bin 0 -> 256 bytes
.../data/serialization/4.1/service.SyncRequest.bin | Bin 0 -> 111 bytes
.../4.1/service.ValidationComplete.bin | Bin 0 -> 597 bytes
.../4.1/service.ValidationRequest.bin | Bin 0 -> 74 bytes
.../serialization/4.1/utils.EstimatedHistogram.bin | Bin 0 -> 97500 bytes
.../distributed/api/ConsistencyLevel.java} | 26 +-
.../distributed/api/IClassTransformer.java} | 21 +-
.../cassandra/distributed/api/ICoordinator.java | 72 ++
.../apache/cassandra/distributed/api/IMessage.java | 46 +-
.../cassandra/distributed/api/QueryResult.java | 86 ++
.../cassandra/distributed/api/QueryResults.java | 224 ++++
.../distributed/api/SimpleQueryResult.java | 163 +++
.../distributed/impl/AbstractCluster.java | 38 +-
.../cassandra/distributed/impl/Coordinator.java | 38 +-
.../impl/DelegatingInvokableInstance.java | 2 +-
.../impl/DirectStreamingConnectionFactory.java | 38 +-
.../cassandra/distributed/impl/Instance.java | 57 +-
.../distributed/impl/IsolatedExecutor.java | 85 +-
.../cassandra/distributed/impl/MessageFilters.java | 207 ++++
.../cassandra/distributed/impl/MessageImpl.java | 10 +-
.../distributed/impl/ShutdownExecutor.java} | 22 +-
.../distributed/impl/UnsafeGossipHelper.java | 24 +-
.../distributed/test/CASCommonTestCases.java | 204 ++++
.../distributed/test/CASContentionTest.java | 110 ++
.../cassandra/distributed/test/CASMultiDCTest.java | 150 +++
.../apache/cassandra/distributed/test/CASTest.java | 874 +++++++-------
.../cassandra/distributed/test/CASTestBase.java | 221 ++++
.../distributed/test/CasCriticalSectionTest.java | 218 ++++
.../cassandra/distributed/test/LegacyCASTest.java | 118 ++
.../cassandra/distributed/test/MoveTest.java | 90 ++
.../distributed/test/PaxosRepairTest.java | 620 ++++++++++
.../distributed/test/PaxosRepairTest2.java | 612 ++++++++++
.../test/PaxosUncommittedIndexTest.java | 54 +
.../test/ReadDigestConsistencyTest.java | 3 +-
.../cassandra/distributed/test/ReadRepairTest.java | 2 +-
.../distributed/test/SecondaryIndexTest.java | 3 +-
.../cassandra/test/microbench/MessageOutBench.java | 6 +-
.../test/microbench/TimedMonitorBench.java | 198 ++++
.../cassandra/simulator/asm/ClassTransformer.java | 81 +-
.../org/apache/cassandra/simulator/asm/Flag.java | 2 +-
.../simulator/asm/GlobalMethodTransformer.java | 8 +
.../cassandra/simulator/asm/InterceptAgent.java | 15 +-
.../cassandra/simulator/asm/InterceptClasses.java | 216 +++-
.../cassandra/simulator/asm/MethodLogger.java | 10 +-
.../simulator/asm/ShadowingTransformer.java | 2 +-
.../asm/ThreadLocalRandomCheckTransformer.java | 56 +
.../org/apache/cassandra/simulator/asm/Utils.java | 25 +
.../systems/InterceptorOfSystemMethods.java | 46 +-
.../org/apache/cassandra/simulator/Action.java | 158 ++-
.../org/apache/cassandra/simulator/ActionList.java | 6 +
.../org/apache/cassandra/simulator/ActionPlan.java | 13 +-
.../apache/cassandra/simulator/ActionSchedule.java | 86 +-
.../cassandra/simulator/ClusterSimulation.java | 136 ++-
.../main/org/apache/cassandra/simulator/Debug.java | 3 +-
.../cassandra/simulator/FutureActionScheduler.java | 4 +-
.../org/apache/cassandra/simulator/OrderOns.java | 5 +
.../org/apache/cassandra/simulator/Ordered.java | 7 +-
.../simulator/RunnableActionScheduler.java | 2 +-
.../cassandra/simulator/SimulationRunner.java | 54 +-
.../simulator/asm/InterceptAsClassTransformer.java | 49 +
.../simulator/cluster/ClusterActions.java | 14 +-
.../simulator/cluster/KeyspaceActions.java | 10 +-
.../simulator/cluster/OnClusterChangeTopology.java | 3 +-
.../cassandra/simulator/cluster/OnClusterJoin.java | 1 +
.../simulator/cluster/OnClusterLeave.java | 4 +-
.../simulator/cluster/OnClusterReplace.java | 1 +
.../simulator/cluster/OnInstanceRepair.java | 2 +-
.../OnInstanceTopologyChangePaxosRepair.java | 71 ++
.../cassandra/simulator/debug/Reconcile.java | 134 ++-
.../apache/cassandra/simulator/debug/Record.java | 121 +-
.../cassandra/simulator/debug/SelfReconcile.java | 76 +-
.../apache/cassandra/simulator/package-info.java | 1 +
.../apache/cassandra/simulator/paxos/Ballots.java | 62 +-
.../paxos/PairOfSequencesPaxosSimulation.java | 20 +-
.../simulator/paxos/PaxosClusterSimulation.java | 7 +-
.../simulator/paxos/PaxosRepairValidator.java | 5 +-
.../cassandra/simulator/paxos/PaxosSimulation.java | 78 +-
.../simulator/paxos/PaxosSimulationRunner.java | 9 +-
.../paxos/PaxosTopologyChangeVerifier.java | 9 +-
.../simulator/systems/InterceptedExecution.java | 3 +-
.../simulator/systems/InterceptedWait.java | 127 +-
.../simulator/systems/InterceptibleThread.java | 110 +-
.../simulator/systems/InterceptingAwaitable.java | 45 +-
.../simulator/systems/InterceptingExecutor.java | 326 ++++-
.../systems/InterceptingExecutorFactory.java | 35 +-
.../systems/InterceptingGlobalMethods.java | 157 ++-
.../simulator/systems/InterceptingMonitors.java | 273 +++--
.../simulator/systems/InterceptingWaitQueue.java | 15 +-
.../systems/InterceptorOfConsequences.java | 43 +-
.../simulator/systems/InterceptorOfExecution.java | 5 +-
.../systems/InterceptorOfGlobalMethods.java | 96 ++
.../simulator/systems/InterceptorOfWaits.java | 46 -
.../simulator/systems/NonInterceptible.java | 46 +-
.../simulator/systems/SimulatedAction.java | 134 ++-
.../simulator/systems/SimulatedActionCallable.java | 1 -
.../simulator/systems/SimulatedActionTask.java | 27 +-
.../simulator/systems/SimulatedBallots.java | 31 +-
.../simulator/systems/SimulatedExecution.java | 1 +
.../systems/SimulatedFutureActionScheduler.java | 12 +-
.../simulator/systems/SimulatedSystems.java | 10 +-
.../cassandra/simulator/systems/SimulatedTime.java | 267 ++++-
.../simulator/systems/SimulatedWaits.java | 156 ---
.../simulator/test/ShortPaxosSimulationTest.java | 25 +-
.../simulator/test/SimulationTestBase.java | 32 +-
...ulationTest.java => TrivialSimulationTest.java} | 2 +-
.../cassandra/AbstractSerializationsTester.java | 3 +-
test/unit/org/apache/cassandra/Util.java | 1 +
.../config/DatabaseDescriptorRefTest.java | 2 +
.../LoadOldYAMLBackwardCompatibilityTest.java | 2 +-
.../cassandra/config/ParseAndConvertUnitsTest.java | 2 +-
.../cassandra/cql3/PstmtPersistenceTest.java | 1 -
.../cassandra/db/filter/ColumnFilterTest.java | 1 +
.../db/partition/PartitionUpdateTest.java | 2 +-
.../index/internal/CassandraIndexTest.java | 8 +-
.../sstable/metadata/MetadataSerializerTest.java | 3 -
.../apache/cassandra/locator/ReplicaPlansTest.java | 4 +-
.../DecayingEstimatedHistogramReservoirTest.java | 50 +-
.../cassandra/net/WriteCallbackInfoTest.java | 5 +-
.../org/apache/cassandra/repair/RepairJobTest.java | 89 +-
.../apache/cassandra/repair/RepairSessionTest.java | 2 +-
.../messages/RepairMessageSerializerTest.java | 1 -
.../cassandra/service/ActiveRepairServiceTest.java | 1 -
.../apache/cassandra/service/PaxosStateTest.java | 177 +++
.../service/WriteResponseHandlerTest.java | 2 +-
.../service/WriteResponseHandlerTransientTest.java | 12 +-
.../service/paxos/AbstractPaxosRepairTest.java | 174 +++
.../service/paxos/ContentionStrategyTest.java | 430 +++++++
.../cassandra/service/paxos/PaxosProposeTest.java | 97 ++
.../service/paxos/PaxosRepairHistoryTest.java | 531 +++++++++
.../cassandra/service/paxos/PaxosRepairTest.java | 172 +++
.../cassandra/service/paxos/PaxosStateTest.java | 323 +++++
.../paxos/cleanup/PaxosTableRepairsTest.java | 262 ++++
.../paxos/uncommitted/PaxosBallotTrackerTest.java | 258 ++++
.../paxos/uncommitted/PaxosMockUpdateSupplier.java | 113 ++
.../service/paxos/uncommitted/PaxosRowsTest.java | 165 +++
.../paxos/uncommitted/PaxosStateTrackerTest.java | 242 ++++
.../paxos/uncommitted/PaxosUncommittedTests.java | 94 ++
.../PaxosUncommittedTrackerIntegrationTest.java | 141 +++
.../uncommitted/PaxosUncommittedTrackerTest.java | 248 ++++
.../uncommitted/UncommittedTableDataTest.java | 650 ++++++++++
.../reads/repair/AbstractReadRepairTest.java | 10 +-
.../reads/repair/BlockingReadRepairTest.java | 10 +-
.../repair/DiagEventsBlockingReadRepairTest.java | 8 +-
.../reads/repair/InstrumentedReadRepair.java | 4 +-
.../reads/repair/ReadOnlyReadRepairTest.java | 4 +-
.../service/reads/repair/ReadRepairTest.java | 6 +-
.../service/reads/repair/TestableReadRepair.java | 4 +-
.../cassandra/transport/ErrorMessageTest.java | 6 +-
.../cassandra/utils/CassandraVersionTest.java | 12 +-
.../utils/concurrent/AbstractTestAsyncPromise.java | 56 +-
.../utils/concurrent/AbstractTestAwaitable.java | 40 +-
.../cassandra/utils/concurrent/SemaphoreTest.java | 21 +-
380 files changed, 26774 insertions(+), 2821 deletions(-)
diff --git a/.build/build-rat.xml b/.build/build-rat.xml
index 13c4169..b30e5cd 100644
--- a/.build/build-rat.xml
+++ b/.build/build-rat.xml
@@ -74,6 +74,7 @@
<exclude name="**/tools/cqlstress-lwt-example.yaml"/>
<!-- Documentation files -->
<exclude NAME="**/doc/modules/**/*"/>
+ <exclude NAME="**/src/java/**/Paxos.md"/>
<!-- NOTICE files -->
<exclude NAME="**/NOTICE.md"/>
<!-- LICENSE files -->
diff --git a/.circleci/config.yml b/.circleci/config.yml
index ee3f52c..0e42a3d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -39,7 +39,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
@@ -1723,7 +1723,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
@@ -2335,7 +2335,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
diff --git a/.circleci/config.yml.HIGHRES b/.circleci/config.yml.HIGHRES
index 3d15e4b..8eb0f1f 100644
--- a/.circleci/config.yml.HIGHRES
+++ b/.circleci/config.yml.HIGHRES
@@ -39,7 +39,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
@@ -1723,7 +1723,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
@@ -2335,7 +2335,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
diff --git a/.circleci/config.yml.LOWRES b/.circleci/config.yml.LOWRES
index ee3f52c..1715910 100644
--- a/.circleci/config.yml.LOWRES
+++ b/.circleci/config.yml.LOWRES
@@ -39,7 +39,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
@@ -1723,7 +1723,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
@@ -2335,7 +2335,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
diff --git a/.circleci/config.yml.MIDRES b/.circleci/config.yml.MIDRES
index 981dccf..a750d21 100644
--- a/.circleci/config.yml.MIDRES
+++ b/.circleci/config.yml.MIDRES
@@ -39,7 +39,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
@@ -1723,7 +1723,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
@@ -2335,7 +2335,7 @@ jobs:
echo "***java tests***"
# get all of our unit test filenames
- set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" > /tmp/all_java_unit_tests.txt
+ set -eo pipefail && circleci tests glob "$HOME/cassandra/test/distributed/**/*.java" "$HOME/cassandra/test/simulator/test/**/*.java" > /tmp/all_java_unit_tests.txt
# split up the unit tests into groups based on the number of containers we have
set -eo pipefail && circleci tests split --split-by=timings --timings-type=filename --index=${CIRCLE_NODE_INDEX} --total=${CIRCLE_NODE_TOTAL} /tmp/all_java_unit_tests.txt > /tmp/java_tests_${CIRCLE_NODE_INDEX}.txt
diff --git a/NEWS.txt b/NEWS.txt
index 65cce3c..3ed36a7 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -74,6 +74,18 @@ New features
- A new ALL TABLES IN KEYSPACE resource has been added. It allows to grant permissions for all tables and user types
in a keyspace while preventing the user to use those permissions on the keyspace itself.
- Added support for type casting in the WHERE clause components and in the values of INSERT and UPDATE statements.
+ - A new implementation of Paxos (named v2) has been included that improves the safety and performance of LWT operations.
+ Importantly, v2 guarantees linearizability across safe range movements, so users are encouraged to enable v2.
+ v2 also halves the number of WAN messages required to be exchanged if used on conjunction with the new Paxos Repair
+ mechanism (see below) and with some minor modifications to applications using LWTs.
+ The new implementation may be enabled at any time by setting paxos_variant: v2, and disabled by setting to v1,
+ and this alone will reduce the number of WAN round-trips by between one and two for reads, and one for writes.
+ - A new Paxos Repair mechanism has been introduced as part of Repair, that permits further reducing the number of WAN
+ round-trips for write LWTs. This process may be manually executed for v1 and is run automatically alongside normal
+ repairs for v2. Once users are running regular repairs that include paxos repairs they are encouraged to set
+ paxos_state_purging: repaired. Once this has been set across the cluster, users are encouraged to set their
+ applications to supply a Commit consistency level of ANY with their LWT write operations, saving one additional WAN
+ round-trip. See upgrade notes below.
- Warn/abort thresholds added to read queries notifying clients when these thresholds trigger (by
emitting a client warning or aborting the query). This feature is disabled by default, scheduled
to be enabled in 4.2; it is controlled with the configuration track_warnings.enabled,
@@ -122,6 +134,18 @@ Upgrading
what was actually applied in previous versions. This also affects the setters and getters for these properties in
the JMX MBean `org.apache.cassandra.db:type=StorageService` and the nodetool commands `set/getstreamthroughput`
and `set/getinterdcstreamthroughput`.
+ - Steps for upgrading Paxos
+ - Set paxos_variant: v2 across the cluster. This may be set via JMX, but should also be written
+ persistently to any yaml.
+ - Ensure paxos repairs are running regularly, either as part of normal incremental repair workflows or on their
+ own separate schedule. These operations are cheap and better to run frequently (e.g. once per hour)
+ - Set paxos_state_purging: repaired across the cluster. This may be set via JMX, but should also be written
+ persistently to any yaml. NOTE: once this has been set, you must not restore paxos_state_purging: legacy. If
+ this setting must be disabled you must instead set paxos_state_purging: gc_grace. This may be necessary if
+ paxos repairs must be disabled for some reason on an extended basis, but in this case your applications must
+ restore default commit consistency to ensure correctness.
+ - Applications may now safely be updated to use ANY commit consistency level (or LOCAL_QUORUM, as preferred).
+ Uncontended writes should now take 2 round-trips, and uncontended reads should typically take one round-trip.
Deprecation
-----------
diff --git a/build.xml b/build.xml
index 46e8f62..30097ac 100644
--- a/build.xml
+++ b/build.xml
@@ -66,6 +66,7 @@
<property name="test.simulator.src" value="${test.dir}/simulator/main"/>
<property name="test.simulator-asm.src" value="${test.dir}/simulator/asm"/>
<property name="test.simulator-bootstrap.src" value="${test.dir}/simulator/bootstrap"/>
+ <property name="test.simulator-test.src" value="${test.dir}/simulator/test"/>
<property name="test.driver.connection_timeout_ms" value="5000"/>
<property name="test.driver.read_timeout_ms" value="12000"/>
<property name="dist.dir" value="${build.dir}/dist"/>
@@ -1070,6 +1071,7 @@
<include name="**/asm-*${asm.version}.jar" />
</fileset>
</classpath>
+ <compilerarg value="-XDignore.symbol.file"/>
</javac>
</target>
@@ -1154,10 +1156,10 @@
<attribute name="Can-Retransform-Classes" value="true"/>
</manifest>
<mkdir dir="${simulator-asm.build.classes}/META-INF" />
- <mkdir dir="${build.dir}/test/lib/" />
- <jar destfile="${build.dir}/test/lib/simulator-asm.jar" manifest="${simulator-asm.manifest}">
+ <mkdir dir="${test.lib}/jars/" />
+ <jar destfile="${test.lib}/jars/simulator-asm.jar" manifest="${simulator-asm.manifest}">
<fileset dir="${simulator-asm.build.classes}"/>
- <fileset dir="${test.lib}">
+ <fileset dir="${test.lib}/jars">
<include name="**/asm-*${asm.version}.jar" />
</fileset>
</jar>
@@ -1167,10 +1169,10 @@
<attribute name="Built-By" value="Benedict Elliott Smith"/>
</manifest>
<mkdir dir="${simulator-bootstrap.build.classes}/META-INF" />
- <mkdir dir="${build.dir}/test/lib/" />
- <jar destfile="${build.dir}/test/lib/simulator-bootstrap.jar" manifest="${simulator-bootstrap.manifest}">
+ <mkdir dir="${test.lib}/jars/" />
+ <jar destfile="${test.lib}/jars/simulator-bootstrap.jar" manifest="${simulator-bootstrap.manifest}">
<fileset dir="${simulator-bootstrap.build.classes}"/>
- <fileset dir="${test.lib}">
+ <fileset dir="${test.lib}/jars">
<include name="**/asm-*${asm.version}.jar" />
</fileset>
</jar>
@@ -1367,7 +1369,7 @@
</jar>
</target>
- <target name="build-test" depends="_main-jar,stress-build,fqltool-build,resolver-dist-lib" unless="no-build-test"
+ <target name="build-test" depends="_main-jar,stress-build,fqltool-build,resolver-dist-lib,simulator-jars" unless="no-build-test"
description="Compile test classes">
<antcall target="_build-test"/>
</target>
@@ -1397,6 +1399,7 @@
<src path="${test.simulator.src}"/>
<src path="${test.simulator-asm.src}"/>
<src path="${test.simulator-bootstrap.src}"/>
+ <src path="${test.simulator-test.src}"/>
</javac>
<!-- Non-java resources needed by the test suite -->
@@ -1504,6 +1507,8 @@
<pathelement location="${stress.test.classes}"/>
<pathelement location="${fqltool.test.classes}"/>
<pathelement location="${test.conf}"/>
+ <pathelement path="${java.class.path}"/>
+ <path refid="cassandra.classpath" />
<fileset dir="${test.lib}">
<include name="**/*.jar" />
<exclude name="**/ant-*.jar"/>
@@ -1960,23 +1965,36 @@
</target>
<target name="dtest-jar" depends="build-test, build" description="Create dtest-compatible jar, including all dependencies">
- <jar jarfile="${build.dir}/dtest-${base.version}.jar">
- <zipgroupfileset dir="${build.lib}" includes="*.jar" excludes="META-INF/*.SF"/>
- <zipgroupfileset dir="${build.dir.lib}/jars" includes="javassist-*.jar,reflections-*.jar" excludes="META-INF/*.SF"/>
- <zipgroupfileset dir="${build.dir.lib}/jars" includes="jimfs-1.1.jar" excludes="META-INF/*.SF"/>
+ <jar jarfile="${build.dir}/dtest-${base.version}.jar" duplicate="preserve">
<fileset dir="${build.classes.main}"/>
<fileset dir="${test.classes}"/>
<fileset dir="${test.conf}" />
+ <zipgroupfileset dir="${build.lib}" includes="*.jar" excludes="META-INF/*.SF"/>
+ <zipgroupfileset dir="${test.lib}/jars" includes="jimfs-1.1.jar,dtest-api-*.jar,asm-*.jar,javassist-*.jar,reflections-*.jar,semver4j-*.jar" excludes="META-INF/*.SF"/>
+ <zipgroupfileset dir="${build.dir.lib}/jars" includes="asm-*.jar" excludes="META-INF/*.SF"/>
</jar>
</target>
<target name="test-jvm-dtest" depends="build-test" description="Execute in-jvm dtests">
- <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true" filter="**/test/*Test.java">
+ <testmacro inputdir="${test.distributed.src}" timeout="${test.distributed.timeout}" forkmode="once" showoutput="true" filter="**/test/${test.name}.java">
<jvmarg value="-Dlogback.configurationFile=test/conf/logback-dtest.xml"/>
<jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
<jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
<jvmarg value="-Dcassandra.skip_sync=true" />
</testmacro>
+ <testmacro inputdir="${test.simulator-test.src}" timeout="${test.distributed.timeout}" forkmode="perTest" showoutput="true" filter="**/test/${test.name}.java">
+ <jvmarg value="-Dlogback.configurationFile=test/conf/logback-simulator.xml"/>
+ <jvmarg value="-Dcassandra.ring_delay_ms=10000"/>
+ <jvmarg value="-Dcassandra.tolerate_sstable_size=true"/>
+ <jvmarg value="-Dcassandra.skip_sync=true" />
+ <!-- Support Simulator Tests -->
+ <jvmarg line="-javaagent:${test.lib}/jars/simulator-asm.jar"/>
+ <jvmarg line="-Xbootclasspath/a:${test.lib}/jars/simulator-bootstrap.jar"/>
+ <jvmarg line="-XX:ActiveProcessorCount=4"/>
+ <jvmarg line="-XX:-TieredCompilation"/>
+ <jvmarg line="-XX:Tier4CompileThreshold=1000"/>
+ <jvmarg line="-XX:ReservedCodeCacheSize=256M"/>
+ </testmacro>
</target>
<target name="test-jvm-upgrade-dtest" depends="build-test" description="Execute in-jvm dtests">
diff --git a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
index 34f5326..8897e37 100644
--- a/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
+++ b/src/java/org/apache/cassandra/batchlog/BatchlogManager.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
+import java.util.function.Supplier;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Iterables;
@@ -50,7 +51,6 @@ import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.db.WriteType;
import org.apache.cassandra.db.marshal.BytesType;
-import org.apache.cassandra.db.marshal.UUIDType;
import org.apache.cassandra.db.partitions.PartitionUpdate;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.exceptions.WriteFailureException;
@@ -501,9 +501,9 @@ public class BatchlogManager implements BatchlogManagerMBean
}
}
- ReplicaPlan.ForTokenWrite replicaPlan = new ReplicaPlan.ForTokenWrite(keyspace, liveAndDown.replicationStrategy(),
- ConsistencyLevel.ONE, liveRemoteOnly.pending(), liveRemoteOnly.all(), liveRemoteOnly.all(), liveRemoteOnly.all());
- ReplayWriteResponseHandler<Mutation> handler = new ReplayWriteResponseHandler<>(replicaPlan, nanoTime());
+ ReplicaPlan.ForWrite replicaPlan = new ReplicaPlan.ForWrite(keyspace, liveAndDown.replicationStrategy(),
+ ConsistencyLevel.ONE, liveRemoteOnly.pending(), liveRemoteOnly.all(), liveRemoteOnly.all(), liveRemoteOnly.all());
+ ReplayWriteResponseHandler<Mutation> handler = new ReplayWriteResponseHandler<>(replicaPlan, mutation, nanoTime());
Message<Mutation> message = Message.outWithFlag(MUTATION_REQ, mutation, MessageFlag.CALL_BACK_ON_FAILURE);
for (Replica replica : liveRemoteOnly.all())
MessagingService.instance().sendWriteWithCallback(message, replica, handler, false);
@@ -526,9 +526,10 @@ public class BatchlogManager implements BatchlogManagerMBean
{
private final Set<InetAddressAndPort> undelivered = Collections.newSetFromMap(new ConcurrentHashMap<>());
- ReplayWriteResponseHandler(ReplicaPlan.ForTokenWrite replicaPlan, long queryStartNanoTime)
+ // TODO: should we be hinting here, since presumably batch log will retry? Maintaining historical behaviour for the moment.
+ ReplayWriteResponseHandler(ReplicaPlan.ForWrite replicaPlan, Supplier<Mutation> hintOnFailure, long queryStartNanoTime)
{
- super(replicaPlan, null, WriteType.UNLOGGED_BATCH, queryStartNanoTime);
+ super(replicaPlan, null, WriteType.UNLOGGED_BATCH, hintOnFailure, queryStartNanoTime);
Iterables.addAll(undelivered, replicaPlan.contacts().endpoints());
}
diff --git a/src/java/org/apache/cassandra/concurrent/ExecutorFactory.java b/src/java/org/apache/cassandra/concurrent/ExecutorFactory.java
index 83f48d1..f7d93e8 100644
--- a/src/java/org/apache/cassandra/concurrent/ExecutorFactory.java
+++ b/src/java/org/apache/cassandra/concurrent/ExecutorFactory.java
@@ -25,6 +25,7 @@ import org.apache.cassandra.utils.JVMStabilityInspector;
import org.apache.cassandra.utils.Shared;
import static java.lang.Thread.*;
+import static org.apache.cassandra.concurrent.ExecutorFactory.SimulatorSemantics.NORMAL;
import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.Daemon.DAEMON;
import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.Interrupts.UNSYNCHRONIZED;
import static org.apache.cassandra.concurrent.NamedThreadFactory.createThread;
@@ -72,6 +73,11 @@ public interface ExecutorFactory extends ExecutorBuilderFactory.Jmxable<Executor
default LocalAwareSubFactoryWithJMX withJmxInternal() { return withJmx("internal"); }
}
+ public enum SimulatorSemantics
+ {
+ NORMAL, DISCARD
+ }
+
/**
* @return a factory that configures executors that propagate {@link ExecutorLocals} to the executing thread
*/
@@ -84,6 +90,13 @@ public interface ExecutorFactory extends ExecutorBuilderFactory.Jmxable<Executor
default ScheduledExecutorPlus scheduled(String name) { return scheduled(true, name, NORM_PRIORITY); }
/**
+ * @param name the name of the executor, the executor's thread group, and of any worker threads
+ * @param simulatorSemantics indicate special semantics for the executor under simulation
+ * @return a default-configured {@link ScheduledExecutorPlus}
+ */
+ default ScheduledExecutorPlus scheduled(String name, SimulatorSemantics simulatorSemantics) { return scheduled(true, name, NORM_PRIORITY, simulatorSemantics); }
+
+ /**
* @param executeOnShutdown if false, waiting tasks will be cancelled on shutdown
* @param name the name of the executor, the executor's thread group, and of any worker threads
* @return a {@link ScheduledExecutorPlus} with normal thread priority
@@ -96,7 +109,16 @@ public interface ExecutorFactory extends ExecutorBuilderFactory.Jmxable<Executor
* @param priority the thread priority of workers
* @return a {@link ScheduledExecutorPlus}
*/
- ScheduledExecutorPlus scheduled(boolean executeOnShutdown, String name, int priority);
+ default ScheduledExecutorPlus scheduled(boolean executeOnShutdown, String name, int priority) { return scheduled(executeOnShutdown, name, priority, NORMAL); }
+
+ /**
+ * @param executeOnShutdown if false, waiting tasks will be cancelled on shutdown
+ * @param name the name of the executor, the executor's thread group, and of any worker threads
+ * @param priority the thread priority of workers
+ * @param simulatorSemantics indicate special semantics for the executor under simulation
+ * @return a {@link ScheduledExecutorPlus}
+ */
+ ScheduledExecutorPlus scheduled(boolean executeOnShutdown, String name, int priority, SimulatorSemantics simulatorSemantics);
/**
* Create and start a new thread to execute {@code runnable}
@@ -249,7 +271,7 @@ public interface ExecutorFactory extends ExecutorBuilderFactory.Jmxable<Executor
}
@Override
- public ScheduledExecutorPlus scheduled(boolean executeOnShutdown, String name, int priority)
+ public ScheduledExecutorPlus scheduled(boolean executeOnShutdown, String name, int priority, SimulatorSemantics simulatorSemantics)
{
ScheduledThreadPoolExecutorPlus executor = new ScheduledThreadPoolExecutorPlus(newThreadFactory(name, priority));
if (!executeOnShutdown)
diff --git a/src/java/org/apache/cassandra/concurrent/FutureTask.java b/src/java/org/apache/cassandra/concurrent/FutureTask.java
index e2fc5cf..2348ff6 100644
--- a/src/java/org/apache/cassandra/concurrent/FutureTask.java
+++ b/src/java/org/apache/cassandra/concurrent/FutureTask.java
@@ -30,9 +30,9 @@ import org.apache.cassandra.utils.concurrent.AsyncFuture;
*/
public class FutureTask<V> extends AsyncFuture<V> implements RunnableFuture<V>
{
- private Callable<V> call;
+ private Callable<? extends V> call;
- public FutureTask(Callable<V> call)
+ public FutureTask(Callable<? extends V> call)
{
this.call = call;
}
diff --git a/src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java b/src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java
index e1d25e5..51c5f9f 100644
--- a/src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/InfiniteLoopExecutor.java
@@ -29,21 +29,25 @@ import java.util.function.BiFunction;
import java.util.function.Consumer;
import org.apache.cassandra.utils.Shared;
+import org.apache.cassandra.utils.concurrent.Condition;
import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
+import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.InternalState.SHUTTING_DOWN_NOW;
import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.InternalState.TERMINATED;
import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.Interrupts.SYNCHRONIZED;
import static org.apache.cassandra.concurrent.InfiniteLoopExecutor.Interrupts.UNSYNCHRONIZED;
import static org.apache.cassandra.concurrent.Interruptible.State.INTERRUPTED;
import static org.apache.cassandra.concurrent.Interruptible.State.NORMAL;
import static org.apache.cassandra.concurrent.Interruptible.State.SHUTTING_DOWN;
+import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.concurrent.Condition.newOneTimeCondition;
public class InfiniteLoopExecutor implements Interruptible
{
private static final Logger logger = LoggerFactory.getLogger(InfiniteLoopExecutor.class);
@Shared(scope = Shared.Scope.SIMULATION)
- public enum InternalState { TERMINATED }
+ public enum InternalState { SHUTTING_DOWN_NOW, TERMINATED }
@Shared(scope = Shared.Scope.SIMULATION)
public enum SimulatorSafe { SAFE, UNSAFE }
@@ -59,6 +63,7 @@ public class InfiniteLoopExecutor implements Interruptible
private final Task task;
private volatile Object state = NORMAL;
private final Consumer<Thread> interruptHandler;
+ private final Condition isTerminated = newOneTimeCondition();
public InfiniteLoopExecutor(String name, Task task, Daemon daemon)
{
@@ -102,33 +107,41 @@ public class InfiniteLoopExecutor implements Interruptible
private void loop()
{
boolean interrupted = false;
- while (true)
+ try
{
- try
+ while (true)
{
- Object cur = state;
- if (cur == TERMINATED) break;
-
- interrupted |= Thread.interrupted();
- if (cur == NORMAL && interrupted) cur = INTERRUPTED;
- task.run((State) cur);
-
- interrupted = false;
- if (cur == SHUTTING_DOWN) state = TERMINATED;
- }
- catch (TerminateException ignore)
- {
- state = TERMINATED;
- }
- catch (UncheckedInterruptedException | InterruptedException ignore)
- {
- interrupted = true;
- }
- catch (Throwable t)
- {
- logger.error("Exception thrown by runnable, continuing with loop", t);
+ try
+ {
+ Object cur = state;
+ if (cur == SHUTTING_DOWN_NOW) break;
+
+ interrupted |= Thread.interrupted();
+ if (cur == NORMAL && interrupted) cur = INTERRUPTED;
+ task.run((State) cur);
+
+ interrupted = false;
+ if (cur == SHUTTING_DOWN) break;
+ }
+ catch (TerminateException ignore)
+ {
+ break;
+ }
+ catch (UncheckedInterruptedException | InterruptedException ignore)
+ {
+ interrupted = true;
+ }
+ catch (Throwable t)
+ {
+ logger.error("Exception thrown by runnable, continuing with loop", t);
+ }
}
}
+ finally
+ {
+ state = TERMINATED;
+ isTerminated.signal();
+ }
}
public void interrupt()
@@ -138,13 +151,13 @@ public class InfiniteLoopExecutor implements Interruptible
public void shutdown()
{
- stateUpdater.updateAndGet(this, cur -> cur != TERMINATED ? SHUTTING_DOWN : TERMINATED);
+ stateUpdater.updateAndGet(this, cur -> cur != TERMINATED && cur != SHUTTING_DOWN_NOW ? SHUTTING_DOWN : cur);
interruptHandler.accept(thread);
}
public Object shutdownNow()
{
- state = TERMINATED;
+ stateUpdater.updateAndGet(this, cur -> cur != TERMINATED ? SHUTTING_DOWN_NOW : TERMINATED);
interruptHandler.accept(thread);
return null;
}
@@ -152,12 +165,16 @@ public class InfiniteLoopExecutor implements Interruptible
@Override
public boolean isTerminated()
{
- return state == TERMINATED && !thread.isAlive();
+ return state == TERMINATED;
}
public boolean awaitTermination(long time, TimeUnit unit) throws InterruptedException
{
- thread.join(unit.toMillis(time));
+ if (isTerminated())
+ return true;
+
+ long deadlineNanos = nanoTime() + unit.toNanos(time);
+ isTerminated.awaitUntil(deadlineNanos);
return isTerminated();
}
diff --git a/src/java/org/apache/cassandra/concurrent/Stage.java b/src/java/org/apache/cassandra/concurrent/Stage.java
index d8a5e54..1c15e45 100644
--- a/src/java/org/apache/cassandra/concurrent/Stage.java
+++ b/src/java/org/apache/cassandra/concurrent/Stage.java
@@ -53,16 +53,18 @@ public enum Stage
MISC ("MiscStage", "internal", () -> 1, null, Stage::singleThreadedStage),
TRACING ("TracingStage", "internal", () -> 1, null, Stage::tracingStage),
INTERNAL_RESPONSE ("InternalResponseStage", "internal", FBUtilities::getAvailableProcessors, null, Stage::multiThreadedStage),
- IMMEDIATE ("ImmediateStage", "internal", () -> 0, null, Stage::immediateExecutor);
+ IMMEDIATE ("ImmediateStage", "internal", () -> 0, null, Stage::immediateExecutor),
+ PAXOS_REPAIR ("PaxosRepairStage", "internal", FBUtilities::getAvailableProcessors, null, Stage::multiThreadedStage),
+ ;
public final String jmxName;
- private final Supplier<ExecutorPlus> initialiser;
- private volatile ExecutorPlus executor = null;
+ private final Supplier<ExecutorPlus> executorSupplier;
+ private volatile ExecutorPlus executor;
- Stage(String jmxName, String jmxType, IntSupplier numThreads, LocalAwareExecutorPlus.MaximumPoolSizeListener onSetMaximumPoolSize, ExecutorServiceInitialiser initialiser)
+ Stage(String jmxName, String jmxType, IntSupplier numThreads, LocalAwareExecutorPlus.MaximumPoolSizeListener onSetMaximumPoolSize, ExecutorServiceInitialiser executorSupplier)
{
this.jmxName = jmxName;
- this.initialiser = () -> initialiser.init(jmxName, jmxType, numThreads.getAsInt(), onSetMaximumPoolSize);
+ this.executorSupplier = () -> executorSupplier.init(jmxName, jmxType, numThreads.getAsInt(), onSetMaximumPoolSize);
}
private static String normalizeName(String stageName)
@@ -128,7 +130,7 @@ public enum Stage
{
if (executor == null)
{
- executor = initialiser.get();
+ executor = executorSupplier.get();
}
}
}
diff --git a/src/java/org/apache/cassandra/concurrent/SyncFutureTask.java b/src/java/org/apache/cassandra/concurrent/SyncFutureTask.java
index 4885821..422da99 100644
--- a/src/java/org/apache/cassandra/concurrent/SyncFutureTask.java
+++ b/src/java/org/apache/cassandra/concurrent/SyncFutureTask.java
@@ -71,8 +71,7 @@ public class SyncFutureTask<T> extends SyncFuture<T> implements RunnableFuture<T
catch (Throwable t)
{
tryFailure(t);
- Thread thread = Thread.currentThread();
- thread.getUncaughtExceptionHandler().uncaughtException(thread, t);
+ ExecutionFailure.handle(t);
}
}
diff --git a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
index 74ed13e..b6bcebb 100644
--- a/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
+++ b/src/java/org/apache/cassandra/config/CassandraRelevantProperties.java
@@ -244,7 +244,9 @@ public enum CassandraRelevantProperties
TEST_SIMULATOR_PRINT_ASM("cassandra.test.simulator.print_asm", "none"),
TEST_SIMULATOR_PRINT_ASM_TYPES("cassandra.test.simulator.print_asm_types", ""),
TEST_SIMULATOR_LIVENESS_CHECK("cassandra.test.simulator.livenesscheck", "true"),
- TEST_SIMULATOR_DEBUG("cassandra.test.simulator.debug", "true"),
+ TEST_SIMULATOR_DEBUG("cassandra.test.simulator.debug", "false"),
+ TEST_SIMULATOR_DETERMINISM_CHECK("cassandra.test.simulator.determinismcheck", "none"),
+ TEST_JVM_DTEST_DISABLE_SSL("cassandra.test.disable_ssl", "false"),
// determinism properties for testing
DETERMINISM_SSTABLE_COMPRESSION_DEFAULT("cassandra.sstable_compression_default", "true"),
@@ -320,6 +322,15 @@ public enum CassandraRelevantProperties
return STRING_CONVERTER.convert(value);
}
+ public <T> T convert(PropertyConverter<T> converter)
+ {
+ String value = System.getProperty(key);
+ if (value == null)
+ value = defaultVal;
+
+ return converter.convert(value);
+ }
+
/**
* Sets the value into system properties.
* @param value to set
@@ -415,7 +426,7 @@ public enum CassandraRelevantProperties
System.setProperty(key, Long.toString(value));
}
- private interface PropertyConverter<T>
+ public interface PropertyConverter<T>
{
T convert(String value);
}
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 09da88c..4c0f29a 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -29,6 +29,7 @@ import java.util.TreeMap;
import java.util.function.Supplier;
import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import org.slf4j.Logger;
@@ -48,6 +49,20 @@ public class Config
{
private static final Logger logger = LoggerFactory.getLogger(Config.class);
+ public static Set<String> splitCommaDelimited(String src)
+ {
+ if (src == null)
+ return ImmutableSet.of();
+ String[] split = src.split(",\\s*");
+ ImmutableSet.Builder<String> builder = ImmutableSet.builder();
+ for (String s : split)
+ {
+ s = s.trim();
+ if (!s.isEmpty())
+ builder.add(s);
+ }
+ return builder.build();
+ }
/*
* Prefix for Java properties for internal Cassandra configuration options
*/
@@ -125,11 +140,13 @@ public class Config
public volatile SmallestDurationMilliseconds counter_write_request_timeout = new SmallestDurationMilliseconds("5000ms");
@Replaces(oldName = "cas_contention_timeout_in_ms", converter = Converters.MILLIS_DURATION, deprecated = true)
- public volatile SmallestDurationMilliseconds cas_contention_timeout = new SmallestDurationMilliseconds("1000ms");
+ public volatile SmallestDurationMilliseconds cas_contention_timeout = new SmallestDurationMilliseconds("1800ms");
@Replaces(oldName = "truncate_request_timeout_in_ms", converter = Converters.MILLIS_DURATION, deprecated = true)
public volatile SmallestDurationMilliseconds truncate_request_timeout = new SmallestDurationMilliseconds("60000ms");
+ public volatile Long repair_request_timeout_in_ms = 120000L;
+
public Integer streaming_connections_per_host = 1;
@Replaces(oldName = "streaming_keep_alive_period_in_secs", converter = Converters.SECONDS_DURATION, deprecated = true)
public SmallestDurationSeconds streaming_keep_alive_period = new SmallestDurationSeconds("300s");
@@ -406,6 +423,8 @@ public class Config
public volatile SmallestDurationSeconds counter_cache_save_period = new SmallestDurationSeconds("7200s");
public volatile int counter_cache_keys_to_save = Integer.MAX_VALUE;
+ public SmallestDataStorageMebibytes paxos_cache_size = null;
+
@Replaces(oldName = "cache_load_timeout_seconds ", converter = Converters.SECONDS_DURATION, deprecated = true)
public SmallestDurationSeconds cache_load_timeout = new SmallestDurationSeconds("30s");
@@ -780,13 +799,190 @@ public class Config
/** The configuration of startup checks. */
public volatile Map<StartupCheckType, Map<String, Object>> startup_checks = new HashMap<>();
+ /**
+ * The variants of paxos implementation and semantics supported by Cassandra.
+ */
public enum PaxosVariant
{
- v1_without_linearizable_reads, // with legacy semantics for read/read linearizability (i.e. not guaranteed)
- v1
+ /**
+ * v1 Paxos lacks most optimisations. Expect 4RTs for a write and 2RTs for a read.
+ *
+ * With legacy semantics for read/read and rejected write linearizability, i.e. not guaranteed.
+ */
+ v1_without_linearizable_reads_or_rejected_writes,
+
+ /**
+ * v1 Paxos lacks most optimisations. Expect 4RTs for a write and 3RTs for a read.
+ */
+ v1,
+
+ /**
+ * v2 Paxos. With PaxosStatePurging.repaired safe to use ANY Commit consistency.
+ * Expect 2RTs for a write and 1RT for a read.
+ *
+ * With legacy semantics for read/read linearizability, i.e. not guaranteed.
+ */
+ v2_without_linearizable_reads,
+
+ /**
+ * v2 Paxos. With PaxosStatePurging.repaired safe to use ANY Commit consistency.
+ * Expect 2RTs for a write and 1RT for a read.
+ *
+ * With legacy semantics for read/read and rejected write linearizability, i.e. not guaranteed.
+ */
+ v2_without_linearizable_reads_or_rejected_writes,
+
+ /**
+ * v2 Paxos. With PaxosStatePurging.repaired safe to use ANY Commit consistency.
+ * Expect 2RTs for a write, and either 1RT or 2RT for a read.
+ */
+ v2
+ }
+
+ /**
+ * Select the kind of paxos state purging to use. Migration to repaired is recommended, but requires that
+ * regular paxos repairs are performed (which by default run as part of incremental repair).
+ *
+ * Once migrated from legacy it is unsafe to return to legacy, but gc_grace mode may be used in its place
+ * and performs a very similar cleanup process.
+ *
+ * Should only be modified once paxos_variant = v2.
+ */
+ public enum PaxosStatePurging
+ {
+ /**
+ * system.paxos records are written and garbage collected with TTLs. Unsafe to use with Commit consistency ANY.
+ * Once migrated from, cannot be migrated back to safely. Must use gc_grace or repaired instead, as TTLs
+ * will not have been set.
+ */
+ legacy,
+
+ /**
+ * Functionally similar to legacy, but the gc_grace expiry is applied at compaction and read time rather than
+ * using TTLs, so may be safely enabled at any point.
+ */
+ gc_grace,
+
+ /**
+ * Clears system.paxos records only once they are known to be persisted to a quorum of replica's base tables
+ * through the use of paxos repair. Requires that regular paxos repairs are performed on the cluster
+ * (which by default are included in incremental repairs if paxos_variant = v2).
+ *
+ * This setting permits the use of Commit consistency ANY or LOCAL_QUORUM without any loss of durability or consistency,
+ * saving 1 RT.
+ */
+ repaired;
+
+ public static PaxosStatePurging fromBoolean(boolean enabled)
+ {
+ return enabled ? repaired : gc_grace;
+ }
}
+
+ /**
+ * See {@link PaxosVariant}. Defaults to v1, recommend upgrading to v2 at earliest opportunity.
+ */
public volatile PaxosVariant paxos_variant = PaxosVariant.v1;
+ /**
+ * If true, paxos topology change repair will not run on a topology change - this option should only be used in
+ * rare operation circumstances e.g. where for some reason the repair is impossible to perform (e.g. too few replicas)
+ * and an unsafe topology change must be made
+ */
+ public volatile boolean skip_paxos_repair_on_topology_change = Boolean.getBoolean("cassandra.skip_paxos_repair_on_topology_change");
+
+ /**
+ * A safety margin when purging paxos state information that has been safely replicated to a quorum.
+ * Data for transactions initiated within this grace period will not be expunged.
+ */
+ public volatile DurationSpec paxos_purge_grace_period = new SmallestDurationSeconds("60s");
+
+ /**
+ * A safety mechanism for detecting incorrect paxos state, that may be down either to a bug or incorrect usage of LWTs
+ * (most likely due to unsafe mixing of SERIAL and LOCAL_SERIAL operations), and rejecting
+ */
+ public enum PaxosOnLinearizabilityViolation
+ {
+ // reject an operation when a linearizability violation is detected.
+ // note this does not guarantee a violation has been averted,
+ // as it may be a prior operation that invalidated the state.
+ fail,
+ // log any detected linearizability violation
+ log,
+ // ignore any detected linearizability violation
+ ignore
+ }
+
+ /**
+ * See {@link PaxosOnLinearizabilityViolation}.
+ *
+ * Default is to ignore, as applications may readily mix SERIAL and LOCAL_SERIAL and this is the most likely source
+ * of linearizability violations. this facility should be activated only for debugging Cassandra or by power users
+ * who are investigating their own application behaviour.
+ */
+ public volatile PaxosOnLinearizabilityViolation paxos_on_linearizability_violations = PaxosOnLinearizabilityViolation.ignore;
+
+ /**
+ * See {@link PaxosStatePurging} default is legacy.
+ */
+ public volatile PaxosStatePurging paxos_state_purging;
+
+ /**
+ * Enable/disable paxos repair. This is a global flag that not only determines default behaviour but overrides
+ * explicit paxos repair requests, paxos repair on topology changes and paxos auto repairs.
+ */
+ public volatile boolean paxos_repair_enabled = true;
+
+ /**
+ * If true, paxos topology change repair only requires a global quorum of live nodes. If false,
+ * it requires a global quorum as well as a local quorum for each dc (EACH_QUORUM), with the
+ * exception explained in paxos_topology_repair_strict_each_quorum
+ */
+ public boolean paxos_topology_repair_no_dc_checks = false;
+
+ /**
+ * If true, a quorum will be required for the global and local quorum checks. If false, we will
+ * accept a quorum OR n - 1 live nodes. This is to allow for topologies like 2:2:2, where paxos queries
+ * always use SERIAL, and a single node down in a dc should not preclude a paxos repair
+ */
+ public boolean paxos_topology_repair_strict_each_quorum = false;
+
+ /**
+ * If necessary for operational purposes, permit certain keyspaces to be ignored for paxos topology repairs
+ */
+ public volatile Set<String> skip_paxos_repair_on_topology_change_keyspaces = splitCommaDelimited(System.getProperty("cassandra.skip_paxos_repair_on_topology_change_keyspaces"));
+
+ /**
+ * See {@link org.apache.cassandra.service.paxos.ContentionStrategy}
+ */
+ public String paxos_contention_wait_randomizer;
+
+ /**
+ * See {@link org.apache.cassandra.service.paxos.ContentionStrategy}
+ */
+ public String paxos_contention_min_wait;
+
+ /**
+ * See {@link org.apache.cassandra.service.paxos.ContentionStrategy}
+ */
+ public String paxos_contention_max_wait;
+
+ /**
+ * See {@link org.apache.cassandra.service.paxos.ContentionStrategy}
+ */
+ public String paxos_contention_min_delta;
+
+ /**
+ * The amount of disk space paxos uncommitted key files can consume before we begin automatically scheduling paxos repairs.
+ * Note that these repairs are uncoordinated and so do not contribute to expunging system.paxos records.
+ */
+ public volatile int paxos_auto_repair_threshold_mb = 32;
+
+ /**
+ * The number of keys we may simultaneously attempt to finish incomplete paxos operations for.
+ */
+ public volatile int paxos_repair_parallelism = -1;
+
public static Supplier<Config> getOverrideLoadConfig()
{
return overrideLoadConfig;
diff --git a/src/java/org/apache/cassandra/config/DataStorageSpec.java b/src/java/org/apache/cassandra/config/DataStorageSpec.java
index baa6d4a..8b5a0e4 100644
--- a/src/java/org/apache/cassandra/config/DataStorageSpec.java
+++ b/src/java/org/apache/cassandra/config/DataStorageSpec.java
@@ -88,7 +88,7 @@ public class DataStorageSpec
public DataStorageSpec (String value, DataStorageUnit minUnit)
{
- if (value == null || value.equals("null"))
+ if (value == null || value.equals("null") || value.equals("0"))
{
quantity = 0;
unit = minUnit;
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 65cb3d6..05547e5 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -32,6 +32,15 @@ import com.google.common.primitives.Ints;
import com.google.common.primitives.Longs;
import com.google.common.util.concurrent.RateLimiter;
+import org.apache.cassandra.config.Config.PaxosOnLinearizabilityViolation;
+import org.apache.cassandra.db.ConsistencyLevel;
+import org.apache.cassandra.gms.IFailureDetector;
+import org.apache.cassandra.io.util.File;
+import org.apache.cassandra.config.Config.PaxosStatePurging;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.cassandra.audit.AuditLogOptions;
import org.apache.cassandra.fql.FullQueryLoggerOptions;
import org.apache.cassandra.auth.AllowAllInternodeAuthenticator;
@@ -42,15 +51,12 @@ import org.apache.cassandra.auth.IInternodeAuthenticator;
import org.apache.cassandra.auth.INetworkAuthorizer;
import org.apache.cassandra.auth.IRoleManager;
import org.apache.cassandra.config.Config.CommitLogSync;
-import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.commitlog.AbstractCommitLogSegmentManager;
import org.apache.cassandra.db.commitlog.CommitLog;
import org.apache.cassandra.db.commitlog.CommitLogSegmentManagerCDC;
import org.apache.cassandra.db.commitlog.CommitLogSegmentManagerStandard;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.gms.IFailureDetector;
-import org.apache.cassandra.io.util.File;
import org.apache.cassandra.io.FSWriteError;
import org.apache.cassandra.io.util.DiskOptimizationStrategy;
import org.apache.cassandra.io.util.FileUtils;
@@ -81,6 +87,7 @@ import static org.apache.cassandra.config.CassandraRelevantProperties.OS_ARCH;
import static org.apache.cassandra.config.CassandraRelevantProperties.SUN_ARCH_DATA_MODEL;
import static org.apache.cassandra.io.util.FileUtils.ONE_GIB;
import static org.apache.cassandra.io.util.FileUtils.ONE_MIB;
+import static org.apache.cassandra.config.CassandraRelevantProperties.TEST_JVM_DTEST_DISABLE_SSL;
import static org.apache.cassandra.utils.Clock.Global.logInitializationOutcome;
public class DatabaseDescriptor
@@ -132,6 +139,7 @@ public class DatabaseDescriptor
private static long preparedStatementsCacheSizeInMiB;
private static long keyCacheSizeInMiB;
+ private static long paxosCacheSizeInMiB;
private static long counterCacheSizeInMiB;
private static long indexSummaryCapacityInMiB;
@@ -730,6 +738,28 @@ public class DatabaseDescriptor
+ (conf.counter_cache_size !=null ?conf.counter_cache_size.toString() : null) + "', supported values are <integer> >= 0.", false);
}
+ try
+ {
+ // if paxosCacheSizeInMiB option was set to "auto" then size of the cache should be "min(1% of Heap (in MB), 50MB)
+ paxosCacheSizeInMiB = (conf.paxos_cache_size == null)
+ ? Math.min(Math.max(1, (int) (Runtime.getRuntime().totalMemory() * 0.01 / 1024 / 1024)), 50)
+ : conf.paxos_cache_size.toMebibytes();
+
+ if (paxosCacheSizeInMiB < 0)
+ throw new NumberFormatException(); // to escape duplicating error message
+ }
+ catch (NumberFormatException e)
+ {
+ throw new ConfigurationException("paxos_cache_size option was set incorrectly to '"
+ + conf.paxos_cache_size + "', supported values are <integer> >= 0.", false);
+ }
+
+ if (conf.paxos_auto_repair_threshold_mb < 0)
+ {
+ throw new ConfigurationException("paxos_auto_repair_threshold_mb option was set incorrectly to '"
+ + conf.paxos_auto_repair_threshold_mb + "', supported values are <integer> >= 0.", false);
+ }
+
// if set to empty/"auto" then use 5% of Heap size
indexSummaryCapacityInMiB = (conf.index_summary_capacity == null)
? Math.max(1, (int) (Runtime.getRuntime().totalMemory() * 0.05 / 1024 / 1024))
@@ -844,18 +874,12 @@ public class DatabaseDescriptor
conf.default_keyspace_rf, conf.minimum_keyspace_rf));
}
- if (conf.paxos_variant == Config.PaxosVariant.v1_without_linearizable_reads)
- {
- logger.warn("This node was started with paxos_variant config option set to v1_norrl. " +
- "SERIAL (and LOCAL_SERIAL) reads coordinated by this node " +
- "will not offer linearizability (see CASSANDRA-12126 for details on what this mean) with " +
- "respect to other SERIAL operations. Please note that, with this option, SERIAL reads will be " +
- "slower than QUORUM reads, yet offer no more guarantee. This flag should only be used in " +
- "the restricted case of upgrading from a pre-CASSANDRA-12126 version, and only if you " +
- "understand the tradeoff.");
- }
+ if (conf.paxos_repair_parallelism <= 0)
+ conf.paxos_repair_parallelism = Math.max(1, conf.concurrent_writes / 8);
Paxos.setPaxosVariant(conf.paxos_variant);
+ if (conf.paxos_state_purging == null)
+ conf.paxos_state_purging = PaxosStatePurging.legacy;
logInitializationOutcome(logger);
}
@@ -1053,6 +1077,9 @@ public class DatabaseDescriptor
public static void applySslContext()
{
+ if (TEST_JVM_DTEST_DISABLE_SSL.getBoolean())
+ return;
+
try
{
SSLFactory.validateSslContext("Internode messaging", conf.server_encryption_options, true, true);
@@ -1756,6 +1783,16 @@ public class DatabaseDescriptor
conf.truncate_request_timeout = SmallestDurationMilliseconds.inMilliseconds(timeOutInMillis);
}
+ public static long getRepairRpcTimeout()
+ {
+ return conf.repair_request_timeout_in_ms;
+ }
+
+ public static void setRepairRpcTimeout(Long timeOutInMillis)
+ {
+ conf.repair_request_timeout_in_ms = timeOutInMillis;
+ }
+
public static boolean hasCrossNodeTimeout()
{
return conf.internode_timeout;
@@ -2462,6 +2499,126 @@ public class DatabaseDescriptor
conf.paxos_variant = variant;
}
+ public static String getPaxosContentionWaitRandomizer()
+ {
+ return conf.paxos_contention_wait_randomizer;
+ }
+
+ public static String getPaxosContentionMinWait()
+ {
+ return conf.paxos_contention_min_wait;
+ }
+
+ public static String getPaxosContentionMaxWait()
+ {
+ return conf.paxos_contention_max_wait;
+ }
+
+ public static String getPaxosContentionMinDelta()
+ {
+ return conf.paxos_contention_min_delta;
+ }
+
+ public static void setPaxosContentionWaitRandomizer(String waitRandomizer)
+ {
+ conf.paxos_contention_wait_randomizer = waitRandomizer;
+ }
+
+ public static void setPaxosContentionMinWait(String minWait)
+ {
+ conf.paxos_contention_min_wait = minWait;
+ }
+
+ public static void setPaxosContentionMaxWait(String maxWait)
+ {
+ conf.paxos_contention_max_wait = maxWait;
+ }
+
+ public static void setPaxosContentionMinDelta(String minDelta)
+ {
+ conf.paxos_contention_min_delta = minDelta;
+ }
+
+ public static boolean skipPaxosRepairOnTopologyChange()
+ {
+ return conf.skip_paxos_repair_on_topology_change;
+ }
+
+ public static void setSkipPaxosRepairOnTopologyChange(boolean value)
+ {
+ conf.skip_paxos_repair_on_topology_change = value;
+ }
+
+ public static long getPaxosPurgeGrace(TimeUnit units)
+ {
+ return conf.paxos_purge_grace_period.to(units);
+ }
+
+ public static void setPaxosPurgeGrace(long value, TimeUnit units)
+ {
+ conf.paxos_purge_grace_period = new DurationSpec(value, units);
+ }
+
+ public static PaxosOnLinearizabilityViolation paxosOnLinearizabilityViolations()
+ {
+ return conf.paxos_on_linearizability_violations;
+ }
+
+ public static void setPaxosOnLinearizabilityViolations(PaxosOnLinearizabilityViolation v)
+ {
+ conf.paxos_on_linearizability_violations = v;
+ }
+
+ public static PaxosStatePurging paxosStatePurging()
+ {
+ return conf.paxos_state_purging;
+ }
+
+ public static void setPaxosStatePurging(PaxosStatePurging v)
+ {
+ conf.paxos_state_purging = v;
+ }
+
+ public static boolean paxosRepairEnabled()
+ {
+ return conf.paxos_repair_enabled;
+ }
+
+ public static void setPaxosRepairEnabled(boolean v)
+ {
+ conf.paxos_repair_enabled = v;
+ }
+
+ public static Set<String> skipPaxosRepairOnTopologyChangeKeyspaces()
+ {
+ return conf.skip_paxos_repair_on_topology_change_keyspaces;
+ }
+
+ public static void setSkipPaxosRepairOnTopologyChangeKeyspaces(String keyspaces)
+ {
+ conf.skip_paxos_repair_on_topology_change_keyspaces = Config.splitCommaDelimited(keyspaces);
+ }
+
+ public static boolean paxoTopologyRepairNoDcChecks()
+ {
+ return conf.paxos_topology_repair_no_dc_checks;
+ }
+
+ public static boolean paxoTopologyRepairStrictEachQuorum()
+ {
+ return conf.paxos_topology_repair_strict_each_quorum;
+ }
+
+ public static int getPaxosAutoRepairThresholdMB()
+ {
+ return conf.paxos_auto_repair_threshold_mb;
+ }
+
+ public static void setPaxosAutoRepairThresholdMB(int threshold)
+ {
+ conf.paxos_auto_repair_threshold_mb = threshold;
+ }
+
public static void setNativeTransportMaxConcurrentRequestsInBytesPerIp(long maxConcurrentRequestsInBytes)
{
conf.native_transport_max_concurrent_requests_in_bytes_per_ip = maxConcurrentRequestsInBytes;
@@ -2952,6 +3109,11 @@ public class DatabaseDescriptor
return conf.row_cache_keys_to_save;
}
+ public static long getPaxosCacheSizeInMiB()
+ {
+ return paxosCacheSizeInMiB;
+ }
+
public static long getCounterCacheSizeInMiB()
{
return counterCacheSizeInMiB;
@@ -3081,6 +3243,17 @@ public class DatabaseDescriptor
conf.repair_session_space = SmallestDataStorageMebibytes.inMebibytes(sizeInMiB);
}
+ public static int getPaxosRepairParallelism()
+ {
+ return conf.paxos_repair_parallelism;
+ }
+
+ public static void setPaxosRepairParallelism(int v)
+ {
+ Preconditions.checkArgument(v > 0);
+ conf.paxos_repair_parallelism = v;
+ }
+
public static Float getMemtableCleanupThreshold()
{
return conf.memtable_cleanup_threshold;
diff --git a/src/java/org/apache/cassandra/config/DurationSpec.java b/src/java/org/apache/cassandra/config/DurationSpec.java
index e5edb35..a192e35 100644
--- a/src/java/org/apache/cassandra/config/DurationSpec.java
+++ b/src/java/org/apache/cassandra/config/DurationSpec.java
@@ -64,7 +64,7 @@ public class DurationSpec
public DurationSpec(String value)
{
- if (value == null || value.equals("null") || value.toLowerCase(Locale.ROOT).equals("nan"))
+ if (value == null || value.equals("null") || value.toLowerCase(Locale.ROOT).equals("nan") || value.equals("0"))
{
quantity = 0;
unit = MILLISECONDS;
@@ -74,7 +74,7 @@ public class DurationSpec
//parse the string field value
Matcher matcher = TIME_UNITS_PATTERN.matcher(value);
- if(matcher.find())
+ if (matcher.find())
{
quantity = Long.parseLong(matcher.group(1));
unit = fromSymbol(matcher.group(2));
diff --git a/src/java/org/apache/cassandra/config/EncryptionOptions.java b/src/java/org/apache/cassandra/config/EncryptionOptions.java
index 6c26e8d..246d13f 100644
--- a/src/java/org/apache/cassandra/config/EncryptionOptions.java
+++ b/src/java/org/apache/cassandra/config/EncryptionOptions.java
@@ -25,6 +25,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManagerFactory;
+
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
@@ -33,6 +37,8 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.security.AbstractSslContextFactory;
+import org.apache.cassandra.security.DisableSslContextFactory;
import org.apache.cassandra.security.ISslContextFactory;
import org.apache.cassandra.utils.FBUtilities;
@@ -277,8 +283,15 @@ public class EncryptionOptions
putSslContextFactoryParameter(sslContextFactoryParameters, ConfigKey.ENABLED, this.enabled);
putSslContextFactoryParameter(sslContextFactoryParameters, ConfigKey.OPTIONAL, this.optional);
- sslContextFactoryInstance = FBUtilities.newSslContextFactory(ssl_context_factory.class_name,
- sslContextFactoryParameters);
+ if (CassandraRelevantProperties.TEST_JVM_DTEST_DISABLE_SSL.getBoolean())
+ {
+ sslContextFactoryInstance = new DisableSslContextFactory();
+ }
+ else
+ {
+ sslContextFactoryInstance = FBUtilities.newSslContextFactory(ssl_context_factory.class_name,
+ sslContextFactoryParameters);
+ }
}
private void putSslContextFactoryParameter(Map<String,Object> existingParameters, ConfigKey configKey,
diff --git a/src/java/org/apache/cassandra/cql3/QueryOptions.java b/src/java/org/apache/cassandra/cql3/QueryOptions.java
index 7e3d267..7b93616 100644
--- a/src/java/org/apache/cassandra/cql3/QueryOptions.java
+++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java
@@ -60,6 +60,11 @@ public abstract class QueryOptions
return new DefaultQueryOptions(consistency, values, false, SpecificOptions.DEFAULT, ProtocolVersion.V3);
}
+ public static QueryOptions forInternalCallsWithNowInSec(int nowInSec, ConsistencyLevel consistency, List<ByteBuffer> values)
+ {
+ return new DefaultQueryOptions(consistency, values, false, SpecificOptions.DEFAULT.withNowInSec(nowInSec), ProtocolVersion.CURRENT);
+ }
+
public static QueryOptions forInternalCalls(List<ByteBuffer> values)
{
return new DefaultQueryOptions(ConsistencyLevel.ONE, values, false, SpecificOptions.DEFAULT, ProtocolVersion.V3);
@@ -209,6 +214,12 @@ public abstract class QueryOptions
/** The keyspace that this query is bound to, or null if not relevant. */
public String getKeyspace() { return getSpecificOptions().keyspace; }
+ public int getNowInSec(int ifNotSet)
+ {
+ int nowInSec = getSpecificOptions().nowInSeconds;
+ return nowInSec != Integer.MIN_VALUE ? nowInSec : ifNotSet;
+ }
+
/**
* The protocol version for the query.
*/
@@ -506,6 +517,11 @@ public abstract class QueryOptions
this.keyspace = keyspace;
this.nowInSeconds = nowInSeconds;
}
+
+ public SpecificOptions withNowInSec(int nowInSec)
+ {
+ return new SpecificOptions(pageSize, state, serialConsistency, timestamp, keyspace, nowInSec);
+ }
}
private static class Codec implements CBCodec<QueryOptions>
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 1b8e94d..bf03773 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -52,6 +52,7 @@ import org.apache.cassandra.cql3.functions.Function;
import org.apache.cassandra.cql3.functions.FunctionName;
import org.apache.cassandra.cql3.statements.*;
import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.rows.Row;
import org.apache.cassandra.db.rows.RowIterator;
import org.apache.cassandra.db.partitions.PartitionIterator;
import org.apache.cassandra.db.partitions.PartitionIterators;
@@ -376,6 +377,16 @@ public class QueryProcessor implements QueryHandler
private static QueryOptions makeInternalOptions(CQLStatement prepared, Object[] values, ConsistencyLevel cl)
{
+ return makeInternalOptionsWithNowInSec(prepared, FBUtilities.nowInSeconds(), values, cl);
+ }
+
+ public static QueryOptions makeInternalOptionsWithNowInSec(CQLStatement prepared, int nowInSec, Object[] values)
+ {
+ return makeInternalOptionsWithNowInSec(prepared, nowInSec, values, ConsistencyLevel.ONE);
+ }
+
+ private static QueryOptions makeInternalOptionsWithNowInSec(CQLStatement prepared, int nowInSec, Object[] values, ConsistencyLevel cl)
+ {
if (prepared.getBindVariables().size() != values.length)
throw new IllegalArgumentException(String.format("Invalid number of values. Expecting %d but got %d", prepared.getBindVariables().size(), values.length));
@@ -383,10 +394,10 @@ public class QueryProcessor implements QueryHandler
for (int i = 0; i < values.length; i++)
{
Object value = values[i];
- AbstractType type = prepared.getBindVariables().get(i).type;
- boundValues.add(value instanceof ByteBuffer || value == null ? (ByteBuffer)value : type.decompose(value));
+ AbstractType<?> type = prepared.getBindVariables().get(i).type;
+ boundValues.add(value instanceof ByteBuffer || value == null ? (ByteBuffer)value : type.decomposeUntyped(value));
}
- return QueryOptions.forInternalCalls(cl, boundValues);
+ return QueryOptions.forInternalCallsWithNowInSec(nowInSec, cl, boundValues);
}
public static Prepared prepareInternal(String query) throws RequestValidationException
@@ -497,6 +508,16 @@ public class QueryProcessor implements QueryHandler
return execute(query, cl, internalQueryState(), values);
}
+ public static UntypedResultSet executeInternalWithNowInSec(String query, int nowInSec, Object... values)
+ {
+ Prepared prepared = prepareInternal(query);
+ ResultMessage result = prepared.statement.executeLocally(internalQueryState(), makeInternalOptionsWithNowInSec(prepared.statement, nowInSec, values));
+ if (result instanceof ResultMessage.Rows)
+ return UntypedResultSet.create(((ResultMessage.Rows)result).result);
+ else
+ return null;
+ }
+
public static UntypedResultSet execute(String query, ConsistencyLevel cl, QueryState state, Object... values)
throws RequestExecutionException
{
@@ -572,6 +593,19 @@ public class QueryProcessor implements QueryHandler
return UntypedResultSet.create(((ResultMessage.Rows)result).result);
}
+ /**
+ * A special version of executeInternal that takes the time used as "now" for the query in argument.
+ * Note that this only make sense for Selects so this only accept SELECT statements and is only useful in rare
+ * cases.
+ */
+ public static Map<DecoratedKey, List<Row>> executeInternalRawWithNow(int nowInSec, String query, Object... values)
+ {
+ Prepared prepared = prepareInternal(query);
+ assert prepared.statement instanceof SelectStatement;
+ SelectStatement select = (SelectStatement)prepared.statement;
+ return select.executeRawInternal(makeInternalOptions(prepared.statement, values), internalQueryState().getClientState(), nowInSec);
+ }
+
public static UntypedResultSet resultify(String query, RowIterator partition)
{
return resultify(query, PartitionIterators.singletonIterator(partition));
diff --git a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
index 020d27f..f00c137 100644
--- a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
+++ b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java
@@ -374,6 +374,12 @@ public abstract class UntypedResultSet implements Iterable<UntypedResultSet.Row>
return Int32Type.instance.compose(data.get(column));
}
+ public int getInt(String column, int ifNull)
+ {
+ ByteBuffer bytes = data.get(column);
+ return bytes == null ? ifNull : Int32Type.instance.compose(bytes);
+ }
+
public double getDouble(String column)
{
return DoubleType.instance.compose(data.get(column));
diff --git a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java
index d9c706a..1bf03ff 100644
--- a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java
+++ b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java
@@ -94,7 +94,7 @@ public abstract class TimeFcts
/**
* Function that convert a value of <code>TIMEUUID</code> into a value of type <code>TIMESTAMP</code>.
- * @deprecated Replaced by the {@link #timeUuidToTimestamp} function
+ * @deprecated Replaced by the {@link #toTimestamp} function
*/
public static final NativeScalarFunction dateOfFct = new NativeScalarFunction("dateof", TimestampType.instance, TimeUUIDType.instance)
{
@@ -120,7 +120,7 @@ public abstract class TimeFcts
/**
* Function that convert a value of type <code>TIMEUUID</code> into an UNIX timestamp.
- * @deprecated Replaced by the {@link #timeUuidToUnixTimestamp} function
+ * @deprecated Replaced by the {@link #toUnixTimestamp} function
*/
public static final NativeScalarFunction unixTimestampOfFct = new NativeScalarFunction("unixtimestampof", LongType.instance, TimeUUIDType.instance)
{
diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
index 376a65f..3db4793 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
@@ -36,6 +36,7 @@ import org.apache.cassandra.db.partitions.PartitionUpdate;
import org.apache.cassandra.exceptions.InvalidRequestException;
import org.apache.cassandra.service.CASRequest;
import org.apache.cassandra.service.ClientState;
+import org.apache.cassandra.service.paxos.Ballot;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.TimeUUID;
@@ -180,7 +181,7 @@ public class CQL3CasRequest implements CASRequest
return new RegularAndStaticColumns(statics, regulars);
}
- public SinglePartitionReadQuery readCommand(int nowInSec)
+ public SinglePartitionReadCommand readCommand(int nowInSec)
{
assert staticConditions != null || !conditions.isEmpty();
@@ -190,7 +191,7 @@ public class CQL3CasRequest implements CASRequest
// With only a static condition, we still want to make the distinction between a non-existing partition and one
// that exists (has some live data) but has not static content. So we query the first live row of the partition.
if (conditions.isEmpty())
- return SinglePartitionReadQuery.create(metadata,
+ return SinglePartitionReadCommand.create(metadata,
nowInSec,
columnFilter,
RowFilter.NONE,
@@ -199,7 +200,7 @@ public class CQL3CasRequest implements CASRequest
new ClusteringIndexSliceFilter(Slices.ALL, false));
ClusteringIndexNamesFilter filter = new ClusteringIndexNamesFilter(conditions.navigableKeySet(), false);
- return SinglePartitionReadQuery.create(metadata, nowInSec, key, columnFilter, filter);
+ return SinglePartitionReadCommand.create(metadata, nowInSec, key, columnFilter, filter);
}
/**
@@ -232,14 +233,14 @@ public class CQL3CasRequest implements CASRequest
return builder.build();
}
- public PartitionUpdate makeUpdates(FilteredPartition current, ClientState state, TimeUUID ballot) throws InvalidRequestException
+ public PartitionUpdate makeUpdates(FilteredPartition current, ClientState clientState, Ballot ballot) throws InvalidRequestException
{
PartitionUpdate.Builder updateBuilder = new PartitionUpdate.Builder(metadata, key, updatedColumns(), conditions.size());
long timeUuidNanos = 0;
for (RowUpdate upd : updates)
- timeUuidNanos = upd.applyUpdates(current, updateBuilder, state, ballot.msb(), timeUuidNanos);
+ timeUuidNanos = upd.applyUpdates(current, updateBuilder, clientState, ballot.msb(), timeUuidNanos);
for (RangeDeletion upd : rangeDeletions)
- upd.applyUpdates(current, updateBuilder, state);
+ upd.applyUpdates(current, updateBuilder, clientState);
PartitionUpdate partitionUpdate = updateBuilder.build();
IndexRegistry.obtain(metadata).validate(partitionUpdate);
diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index fd2f044..52578a6 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -51,18 +51,18 @@ import org.apache.cassandra.exceptions.*;
import org.apache.cassandra.service.ClientState;
import org.apache.cassandra.service.QueryState;
import org.apache.cassandra.service.StorageProxy;
+import org.apache.cassandra.service.paxos.Ballot;
import org.apache.cassandra.service.paxos.BallotGenerator;
-import org.apache.cassandra.service.paxos.Commit;
+import org.apache.cassandra.service.paxos.Commit.Proposal;
import org.apache.cassandra.transport.messages.ResultMessage;
import org.apache.cassandra.triggers.TriggerExecutor;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MD5Digest;
import org.apache.cassandra.utils.Pair;
-import org.apache.cassandra.utils.TimeUUID;
-import org.apache.cassandra.utils.UUIDGen;
import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse;
import static org.apache.cassandra.cql3.statements.RequestValidations.checkNull;
+import static org.apache.cassandra.service.paxos.Ballot.Flag.NONE;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
/*
@@ -660,7 +660,7 @@ public abstract class ModificationStatement implements CQLStatement.SingleKeyspa
static RowIterator casInternal(ClientState state, CQL3CasRequest request, long timestamp, int nowInSeconds)
{
- TimeUUID ballot = BallotGenerator.Global.randomBallot(timestamp, false);
+ Ballot ballot = BallotGenerator.Global.atUnixMicros(timestamp, NONE);
SinglePartitionReadQuery readCommand = request.readCommand(nowInSeconds);
FilteredPartition current;
@@ -676,7 +676,7 @@ public abstract class ModificationStatement implements CQLStatement.SingleKeyspa
PartitionUpdate updates = request.makeUpdates(current, state, ballot);
updates = TriggerExecutor.instance.execute(updates);
- Commit proposal = Commit.newProposal(ballot, updates);
+ Proposal proposal = Proposal.of(ballot, updates);
proposal.makeMutation().apply();
return null;
}
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 4d6bf00..e5f4d75 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -254,7 +254,7 @@ public class SelectStatement implements CQLStatement.SingleKeyspaceCqlStatement
query.trackWarnings();
if (aggregationSpec == null && (pageSize <= 0 || (query.limits().count() <= pageSize)))
- return execute(query, options, state, selectors, nowInSec, userLimit, queryStartNanoTime);
+ return execute(query, options, state.getClientState(), selectors, nowInSec, userLimit, queryStartNanoTime);
QueryPager pager = getPager(query, options);
@@ -300,12 +300,12 @@ public class SelectStatement implements CQLStatement.SingleKeyspaceCqlStatement
private ResultMessage.Rows execute(ReadQuery query,
QueryOptions options,
- QueryState state,
+ ClientState state,
Selectors selectors,
int nowInSec,
int userLimit, long queryStartNanoTime) throws RequestValidationException, RequestExecutionException
{
- try (PartitionIterator data = query.execute(options.getConsistency(), state.getClientState(), queryStartNanoTime))
+ try (PartitionIterator data = query.execute(options.getConsistency(), state, queryStartNanoTime))
{
return processResults(data, options, selectors, nowInSec, userLimit);
}
@@ -491,6 +491,50 @@ public class SelectStatement implements CQLStatement.SingleKeyspaceCqlStatement
return new AggregationQueryPager(pager, query.limits());
}
+ public Map<DecoratedKey, List<Row>> executeRawInternal(QueryOptions options, ClientState state, int nowInSec) throws RequestExecutionException, RequestValidationException
+ {
+ int userLimit = getLimit(options);
+ int userPerPartitionLimit = getPerPartitionLimit(options);
+ if (options.getPageSize() > 0)
+ throw new IllegalStateException();
+ if (aggregationSpec != null)
+ throw new IllegalStateException();
+
+ Selectors selectors = selection.newSelectors(options);
+ ReadQuery query = getQuery(options, state, selectors.getColumnFilter(), nowInSec, userLimit, userPerPartitionLimit, Integer.MAX_VALUE);
+
+ Map<DecoratedKey, List<Row>> result = Collections.emptyMap();
+ try (ReadExecutionController executionController = query.executionController())
+ {
+ try (PartitionIterator data = query.executeInternal(executionController))
+ {
+ while (data.hasNext())
+ {
+ try (RowIterator in = data.next())
+ {
+ List<Row> out = Collections.emptyList();
+ while (in.hasNext())
+ {
+ switch (out.size())
+ {
+ case 0: out = Collections.singletonList(in.next()); break;
+ case 1: out = new ArrayList<>(out);
+ default: out.add(in.next());
+ }
+ }
+ switch (result.size())
+ {
+ case 0: result = Collections.singletonMap(in.partitionKey(), out); break;
+ case 1: result = new TreeMap<>(result);
+ default: result.put(in.partitionKey(), out);
+ }
+ }
+ }
+ return result;
+ }
+ }
+ }
+
public ResultSet process(PartitionIterator partitions, int nowInSec) throws InvalidRequestException
{
QueryOptions options = QueryOptions.DEFAULT;
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 9e2338a..542bf0b 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -40,10 +40,10 @@ import java.util.stream.Collectors;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.*;
-import com.google.common.base.Throwables;
import com.google.common.collect.*;
import com.google.common.util.concurrent.*;
+import org.apache.cassandra.service.paxos.Ballot;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.AsyncPromise;
@@ -99,7 +99,15 @@ import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.service.snapshot.SnapshotManifest;
import org.apache.cassandra.service.snapshot.TableSnapshot;
import org.apache.cassandra.streaming.TableStreamManager;
-import org.apache.cassandra.utils.*;
+import org.apache.cassandra.service.paxos.PaxosRepairHistory;
+import org.apache.cassandra.service.paxos.TablePaxosRepairHistory;
+import org.apache.cassandra.utils.DefaultValue;
+import org.apache.cassandra.utils.ExecutorUtils;
+import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.JVMStabilityInspector;
+import org.apache.cassandra.utils.MBeanWrapper;
+import org.apache.cassandra.utils.NoSpamLogger;
+import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.cassandra.utils.concurrent.OpOrder;
import org.apache.cassandra.utils.concurrent.Promise;
import org.apache.cassandra.utils.concurrent.Refs;
@@ -228,6 +236,29 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
private volatile boolean neverPurgeTombstones = false;
+ private class PaxosRepairHistoryLoader
+ {
+ private TablePaxosRepairHistory history;
+
+ TablePaxosRepairHistory get()
+ {
+ if (history != null)
+ return history;
+
+ synchronized (this)
+ {
+ if (history != null)
+ return history;
+
+ history = TablePaxosRepairHistory.load(keyspace.getName(), name);
+ return history;
+ }
+ }
+
+ }
+
+ private final PaxosRepairHistoryLoader paxosRepairHistory = new PaxosRepairHistoryLoader();
+
public static void shutdownPostFlushExecutor() throws InterruptedException
{
postFlushExecutor.shutdown();
@@ -604,7 +635,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
return createColumnFamilyStore(keyspace, metadata.name, metadata, loadSSTables);
}
- public static synchronized ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace,
+ public static ColumnFamilyStore createColumnFamilyStore(Keyspace keyspace,
String columnFamily,
TableMetadataRef metadata,
boolean loadSSTables)
@@ -1143,7 +1174,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
* with CL as we do with memtables/CFS-backed SecondaryIndexes.
*/
if (flushNonCf2i)
- indexManager.flushAllNonCFSBackedIndexesBlocking();
+ indexManager.flushAllNonCFSBackedIndexesBlocking(memtable);
flushResults = Lists.newArrayList(FBUtilities.waitOnFutures(futures));
}
@@ -1731,6 +1762,31 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
|| filter.isFullyCoveredBy(cached);
}
+ public PaxosRepairHistory getPaxosRepairHistory()
+ {
+ return paxosRepairHistory.get().getHistory();
+ }
+
+ public PaxosRepairHistory getPaxosRepairHistoryForRanges(Collection<Range<Token>> ranges)
+ {
+ return paxosRepairHistory.get().getHistoryForRanges(ranges);
+ }
+
+ public void syncPaxosRepairHistory(PaxosRepairHistory sync, boolean flush)
+ {
+ paxosRepairHistory.get().merge(sync, flush);
+ }
+
+ public void onPaxosRepairComplete(Collection<Range<Token>> ranges, Ballot highBallot)
+ {
+ paxosRepairHistory.get().add(ranges, highBallot, true);
+ }
+
+ public Ballot getPaxosRepairLowBound(DecoratedKey key)
+ {
+ return paxosRepairHistory.get().getBallotForToken(key.getToken());
+ }
+
public int gcBefore(int nowInSec)
{
return nowInSec - metadata().params.gcGraceSeconds;
diff --git a/src/java/org/apache/cassandra/db/ConsistencyLevel.java b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
index fbaf3fd..ccbd918 100644
--- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java
+++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.db;
import com.carrotsearch.hppc.ObjectIntHashMap;
import org.apache.cassandra.locator.Endpoints;
+import org.apache.cassandra.locator.InOurDc;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.exceptions.InvalidRequestException;
@@ -28,7 +29,6 @@ import org.apache.cassandra.locator.NetworkTopologyStrategy;
import org.apache.cassandra.transport.ProtocolException;
import static org.apache.cassandra.locator.Replicas.addToCountPerDc;
-import static org.apache.cassandra.locator.Replicas.countInOurDc;
public enum ConsistencyLevel
{
@@ -41,7 +41,7 @@ public enum ConsistencyLevel
LOCAL_QUORUM(6, true),
EACH_QUORUM (7),
SERIAL (8),
- LOCAL_SERIAL(9),
+ LOCAL_SERIAL(9, true),
LOCAL_ONE (10, true),
NODE_LOCAL (11, true);
@@ -173,7 +173,7 @@ public enum ConsistencyLevel
break;
case LOCAL_ONE: case LOCAL_QUORUM: case LOCAL_SERIAL:
// we will only count local replicas towards our response count, as these queries only care about local guarantees
- blockFor += countInOurDc(pending).allReplicas();
+ blockFor += pending.count(InOurDc.replicas());
break;
case ONE: case TWO: case THREE:
case QUORUM: case EACH_QUORUM:
diff --git a/src/java/org/apache/cassandra/db/CounterMutation.java b/src/java/org/apache/cassandra/db/CounterMutation.java
index 3ac1c5d..4f91b83 100644
--- a/src/java/org/apache/cassandra/db/CounterMutation.java
+++ b/src/java/org/apache/cassandra/db/CounterMutation.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
+import java.util.function.Supplier;
import com.google.common.base.Function;
import com.google.common.base.Objects;
@@ -82,6 +83,12 @@ public class CounterMutation implements IMutation
return mutation.getPartitionUpdates();
}
+ @Override
+ public Supplier<Mutation> hintOnFailure()
+ {
+ return null;
+ }
+
public void validateSize(int version, int overhead)
{
long totalSize = serializedSize(version) + overhead;
diff --git a/src/java/org/apache/cassandra/db/IMutation.java b/src/java/org/apache/cassandra/db/IMutation.java
index 10472c1..831652b 100644
--- a/src/java/org/apache/cassandra/db/IMutation.java
+++ b/src/java/org/apache/cassandra/db/IMutation.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.db;
import java.util.Collection;
import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.partitions.PartitionUpdate;
@@ -35,6 +36,7 @@ public interface IMutation
public long getTimeout(TimeUnit unit);
public String toString(boolean shallow);
public Collection<PartitionUpdate> getPartitionUpdates();
+ public Supplier<Mutation> hintOnFailure();
public default void validateIndexedColumns()
{
diff --git a/src/java/org/apache/cassandra/db/Keyspace.java b/src/java/org/apache/cassandra/db/Keyspace.java
index 4ef3d02..1457b89 100644
--- a/src/java/org/apache/cassandra/db/Keyspace.java
+++ b/src/java/org/apache/cassandra/db/Keyspace.java
@@ -119,6 +119,11 @@ public class Keyspace
private static volatile boolean initialized = false;
+ public static boolean isInitialized()
+ {
+ return initialized;
+ }
+
public static void setInitialized()
{
initialized = true;
diff --git a/src/java/org/apache/cassandra/db/Mutation.java b/src/java/org/apache/cassandra/db/Mutation.java
index 6350082..7b6a686 100644
--- a/src/java/org/apache/cassandra/db/Mutation.java
+++ b/src/java/org/apache/cassandra/db/Mutation.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
import com.google.common.collect.ImmutableCollection;
import com.google.common.collect.ImmutableMap;
@@ -44,7 +45,7 @@ import static org.apache.cassandra.net.MessagingService.VERSION_3014;
import static org.apache.cassandra.net.MessagingService.VERSION_40;
import static org.apache.cassandra.utils.MonotonicClock.Global.approxTime;
-public class Mutation implements IMutation
+public class Mutation implements IMutation, Supplier<Mutation>
{
public static final MutationSerializer serializer = new MutationSerializer();
@@ -132,6 +133,18 @@ public class Mutation implements IMutation
return modifications.values();
}
+ @Override
+ public Supplier<Mutation> hintOnFailure()
+ {
+ return this;
+ }
+
+ @Override
+ public Mutation get()
+ {
+ return this;
+ }
+
public void validateSize(int version, int overhead)
{
long totalSize = serializedSize(version) + overhead;
@@ -210,9 +223,14 @@ public class Mutation implements IMutation
return ks.applyFuture(this, Keyspace.open(keyspaceName).getMetadata().params.durableWrites, true);
}
+ private void apply(Keyspace keyspace, boolean durableWrites, boolean isDroppable)
+ {
+ keyspace.apply(this, durableWrites, true, isDroppable);
+ }
+
public void apply(boolean durableWrites, boolean isDroppable)
{
- Keyspace.open(keyspaceName).apply(this, durableWrites, true, isDroppable);
+ apply(Keyspace.open(keyspaceName), durableWrites, isDroppable);
}
public void apply(boolean durableWrites)
@@ -226,7 +244,8 @@ public class Mutation implements IMutation
*/
public void apply()
{
- apply(Keyspace.open(keyspaceName).getMetadata().params.durableWrites);
+ Keyspace keyspace = Keyspace.open(keyspaceName);
+ apply(keyspace, keyspace.getMetadata().params.durableWrites, true);
}
public void applyUnsafe()
diff --git a/src/java/org/apache/cassandra/db/MutationVerbHandler.java b/src/java/org/apache/cassandra/db/MutationVerbHandler.java
index 9c0335e..3077b24 100644
--- a/src/java/org/apache/cassandra/db/MutationVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/MutationVerbHandler.java
@@ -40,19 +40,11 @@ public class MutationVerbHandler implements IVerbHandler<Mutation>
public void doVerb(Message<Mutation> message)
{
// Check if there were any forwarding headers in this message
- InetAddressAndPort from = message.respondTo();
- InetAddressAndPort respondToAddress;
- if (from == null)
- {
- respondToAddress = message.from();
- ForwardingInfo forwardTo = message.forwardTo();
- if (forwardTo != null) forwardToLocalNodes(message, forwardTo);
- }
- else
- {
- respondToAddress = from;
- }
+ ForwardingInfo forwardTo = message.forwardTo();
+ if (forwardTo != null)
+ forwardToLocalNodes(message, forwardTo);
+ InetAddressAndPort respondToAddress = message.respondTo();
try
{
message.payload.applyFuture().addCallback(o -> respond(message, respondToAddress), wto -> failed());
diff --git a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
index ef12853..48bacf6 100644
--- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
+++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java
@@ -293,7 +293,7 @@ public class PartitionRangeReadCommand extends ReadCommand implements PartitionR
return dataRange.isReversed();
}
- public PartitionIterator execute(ConsistencyLevel consistency, ClientState clientState, long queryStartNanoTime) throws RequestExecutionException
+ public PartitionIterator execute(ConsistencyLevel consistency, ClientState state, long queryStartNanoTime) throws RequestExecutionException
{
return StorageProxy.getRangeSlice(this, consistency, queryStartNanoTime);
}
@@ -512,7 +512,7 @@ public class PartitionRangeReadCommand extends ReadCommand implements PartitionR
}
@Override
- public PartitionIterator execute(ConsistencyLevel consistency, ClientState clientState, long queryStartNanoTime) throws RequestExecutionException
+ public PartitionIterator execute(ConsistencyLevel consistency, ClientState state, long queryStartNanoTime) throws RequestExecutionException
{
return executeInternal(executionController());
}
diff --git a/src/java/org/apache/cassandra/db/ReadQuery.java b/src/java/org/apache/cassandra/db/ReadQuery.java
index f9695d6..55a2cf6 100644
--- a/src/java/org/apache/cassandra/db/ReadQuery.java
+++ b/src/java/org/apache/cassandra/db/ReadQuery.java
@@ -48,7 +48,7 @@ public interface ReadQuery
return ReadExecutionController.empty();
}
- public PartitionIterator execute(ConsistencyLevel consistency, ClientState clientState, long queryStartNanoTime) throws RequestExecutionException
+ public PartitionIterator execute(ConsistencyLevel consistency, ClientState state, long queryStartNanoTime) throws RequestExecutionException
{
return EmptyIterators.partition();
}
@@ -140,12 +140,10 @@ public interface ReadQuery
* Executes the query at the provided consistency level.
*
* @param consistency the consistency level to achieve for the query.
- * @param clientState the {@code ClientState} for the query. In practice, this can be null unless
- * {@code consistency} is a serial consistency.
- *
+ * @param state client state
* @return the result of the query.
*/
- public PartitionIterator execute(ConsistencyLevel consistency, ClientState clientState, long queryStartNanoTime) throws RequestExecutionException;
+ public PartitionIterator execute(ConsistencyLevel consistency, ClientState state, long queryStartNanoTime) throws RequestExecutionException;
/**
* Execute the query for internal queries (that is, it basically executes the query locally).
diff --git a/src/java/org/apache/cassandra/db/ReadResponse.java b/src/java/org/apache/cassandra/db/ReadResponse.java
index 52e6fd5..4d34326 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -34,6 +34,8 @@ import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.utils.ByteBufferUtil;
+import static org.apache.cassandra.db.RepairedDataInfo.NO_OP_REPAIRED_DATA_INFO;
+
public abstract class ReadResponse
{
// Serializer for single partition read response
@@ -48,6 +50,11 @@ public abstract class ReadResponse
return new LocalDataResponse(data, command, rdi);
}
+ public static ReadResponse createSimpleDataResponse(UnfilteredPartitionIterator data, ColumnFilter selection)
+ {
+ return new LocalDataResponse(data, selection);
+ }
+
@VisibleForTesting
public static ReadResponse createRemoteDataResponse(UnfilteredPartitionIterator data,
ByteBuffer repairedDataDigest,
@@ -184,6 +191,11 @@ public abstract class ReadResponse
DeserializationHelper.Flag.LOCAL);
}
+ private LocalDataResponse(UnfilteredPartitionIterator iter, ColumnFilter selection)
+ {
+ super(build(iter, selection), null, false, MessagingService.current_version, DeserializationHelper.Flag.LOCAL);
+ }
+
private static ByteBuffer build(UnfilteredPartitionIterator iter, ColumnFilter selection)
{
try (DataOutputBuffer buffer = new DataOutputBuffer())
diff --git a/src/java/org/apache/cassandra/db/SimpleBuilders.java b/src/java/org/apache/cassandra/db/SimpleBuilders.java
index c63703a..3167f8d 100644
--- a/src/java/org/apache/cassandra/db/SimpleBuilders.java
+++ b/src/java/org/apache/cassandra/db/SimpleBuilders.java
@@ -36,7 +36,6 @@ import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.CounterId;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.utils.UUIDGen;
import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUIDAsBytes;
diff --git a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
index 54a2524..ccd9768 100644
--- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
+++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
@@ -434,12 +434,13 @@ public class SinglePartitionReadCommand extends ReadCommand implements SinglePar
return cmd;
}
- public PartitionIterator execute(ConsistencyLevel consistency, ClientState clientState, long queryStartNanoTime) throws RequestExecutionException
+ @Override
+ public PartitionIterator execute(ConsistencyLevel consistency, ClientState state, long queryStartNanoTime) throws RequestExecutionException
{
if (clusteringIndexFilter.isEmpty(metadata().comparator))
return EmptyIterators.partition();
- return StorageProxy.read(Group.one(this), consistency, clientState, queryStartNanoTime);
+ return StorageProxy.read(Group.one(this), consistency, queryStartNanoTime);
}
protected void recordLatency(TableMetrics metric, long latencyNanos)
@@ -1221,9 +1222,9 @@ public class SinglePartitionReadCommand extends ReadCommand implements SinglePar
new Group(commands, limits);
}
- public PartitionIterator execute(ConsistencyLevel consistency, ClientState clientState, long queryStartNanoTime) throws RequestExecutionException
+ public PartitionIterator execute(ConsistencyLevel consistency, ClientState state, long queryStartNanoTime) throws RequestExecutionException
{
- return StorageProxy.read(this, consistency, clientState, queryStartNanoTime);
+ return StorageProxy.read(this, consistency, queryStartNanoTime);
}
}
@@ -1235,13 +1236,13 @@ public class SinglePartitionReadCommand extends ReadCommand implements SinglePar
}
@Override
- public PartitionIterator execute(ConsistencyLevel consistency, ClientState clientState, long queryStartNanoTime) throws RequestExecutionException
+ public PartitionIterator execute(ConsistencyLevel consistency, ClientState state, long queryStartNanoTime) throws RequestExecutionException
{
if (queries.size() == 1)
- return queries.get(0).execute(consistency, clientState, queryStartNanoTime);
+ return queries.get(0).execute(consistency, state, queryStartNanoTime);
return PartitionIterators.concat(queries.stream()
- .map(q -> q.execute(consistency, clientState, queryStartNanoTime))
+ .map(q -> q.execute(consistency, state, queryStartNanoTime))
.collect(Collectors.toList()));
}
}
@@ -1314,7 +1315,7 @@ public class SinglePartitionReadCommand extends ReadCommand implements SinglePar
}
@Override
- public PartitionIterator execute(ConsistencyLevel consistency, ClientState clientState, long queryStartNanoTime) throws RequestExecutionException
+ public PartitionIterator execute(ConsistencyLevel consistency, ClientState state, long queryStartNanoTime) throws RequestExecutionException
{
return executeInternal(executionController());
}
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 69ed5e2..e837aa5 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -34,6 +34,7 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
import com.google.common.collect.SetMultimap;
import com.google.common.collect.Sets;
import com.google.common.io.ByteStreams;
@@ -51,6 +52,7 @@ import org.apache.cassandra.db.compaction.CompactionHistoryTabularData;
import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.db.partitions.PartitionUpdate;
import org.apache.cassandra.db.rows.Rows;
+import org.apache.cassandra.db.rows.Row;
import org.apache.cassandra.dht.*;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.util.*;
@@ -60,10 +62,14 @@ import org.apache.cassandra.metrics.RestorableMeter;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.schema.*;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.service.paxos.Commit;
-import org.apache.cassandra.service.paxos.PaxosState;
import org.apache.cassandra.streaming.StreamOperation;
import org.apache.cassandra.transport.ProtocolVersion;
+import org.apache.cassandra.service.paxos.*;
+import org.apache.cassandra.service.paxos.Commit.Accepted;
+import org.apache.cassandra.service.paxos.Commit.AcceptedWithTTL;
+import org.apache.cassandra.service.paxos.Commit.Committed;
+import org.apache.cassandra.service.paxos.uncommitted.PaxosRows;
+import org.apache.cassandra.service.paxos.uncommitted.PaxosUncommittedIndex;
import org.apache.cassandra.utils.*;
import org.apache.cassandra.utils.concurrent.Future;
@@ -71,8 +77,12 @@ import static java.lang.String.format;
import static java.util.Collections.emptyMap;
import static java.util.Collections.singletonMap;
+import static org.apache.cassandra.config.Config.PaxosStatePurging.*;
+import static org.apache.cassandra.config.DatabaseDescriptor.paxosStatePurging;
import static org.apache.cassandra.cql3.QueryProcessor.executeInternal;
+import static org.apache.cassandra.cql3.QueryProcessor.executeInternalWithNowInSec;
import static org.apache.cassandra.cql3.QueryProcessor.executeOnceInternal;
+import static org.apache.cassandra.service.paxos.Commit.latest;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
import static org.apache.cassandra.utils.FBUtilities.now;
@@ -100,6 +110,7 @@ public final class SystemKeyspace
public static final String BATCHES = "batches";
public static final String PAXOS = "paxos";
+ public static final String PAXOS_REPAIR_HISTORY = "paxos_repair_history";
public static final String BUILT_INDEXES = "IndexInfo";
public static final String LOCAL = "local";
public static final String PEERS_V2 = "peers_v2";
@@ -153,6 +164,7 @@ public final class SystemKeyspace
+ "row_key blob,"
+ "cf_id UUID,"
+ "in_progress_ballot timeuuid,"
+ + "in_progress_read_ballot timeuuid,"
+ "most_recent_commit blob,"
+ "most_recent_commit_at timeuuid,"
+ "most_recent_commit_version int,"
@@ -161,6 +173,7 @@ public final class SystemKeyspace
+ "proposal_version int,"
+ "PRIMARY KEY ((row_key), cf_id))")
.compaction(CompactionParams.lcs(emptyMap()))
+ .indexes(PaxosUncommittedIndex.indexes())
.build();
private static final TableMetadata BuiltIndexes =
@@ -173,6 +186,17 @@ public final class SystemKeyspace
+ "PRIMARY KEY ((table_name), index_name)) ")
.build();
+ private static final TableMetadata PaxosRepairHistoryTable =
+ parse(PAXOS_REPAIR_HISTORY,
+ "paxos repair history",
+ "CREATE TABLE %s ("
+ + "keyspace_name text,"
+ + "table_name text,"
+ + "points frozen<list<tuple<blob, timeuuid>>>, "
+ + "PRIMARY KEY (keyspace_name, table_name))"
+ + "WITH COMMENT='Last successful paxos repairs by range'")
+ .build();
+
private static final TableMetadata Local =
parse(LOCAL,
"information about the local node",
@@ -425,6 +449,7 @@ public final class SystemKeyspace
return Tables.of(BuiltIndexes,
Batches,
Paxos,
+ PaxosRepairHistoryTable,
Local,
PeersV2,
LegacyPeers,
@@ -1179,72 +1204,177 @@ public final class SystemKeyspace
return null;
}
- public static PaxosState loadPaxosState(DecoratedKey key, TableMetadata metadata, int nowInSec)
+ /**
+ * Load the current paxos state for the table and key
+ */
+ public static PaxosState.Snapshot loadPaxosState(DecoratedKey partitionKey, TableMetadata metadata, int nowInSec)
{
- String req = "SELECT * FROM system.%s WHERE row_key = ? AND cf_id = ?";
- UntypedResultSet results = QueryProcessor.executeInternalWithNow(nowInSec, nanoTime(), format(req, PAXOS), key.getKey(), metadata.id.asUUID());
- if (results.isEmpty())
- return new PaxosState(key, metadata);
- UntypedResultSet.Row row = results.one();
+ String cql = "SELECT * FROM system." + PAXOS + " WHERE row_key = ? AND cf_id = ?";
+ List<Row> results = QueryProcessor.executeInternalRawWithNow(nowInSec, cql, partitionKey.getKey(), metadata.id.asUUID()).get(partitionKey);
+ if (results == null || results.isEmpty())
+ {
+ Committed noneCommitted = Committed.none(partitionKey, metadata);
+ return new PaxosState.Snapshot(Ballot.none(), Ballot.none(), null, noneCommitted);
+ }
+
+ Row row = results.get(0);
+
+ Ballot promisedWrite = PaxosRows.getWritePromise(row);
+ Ballot promised = latest(promisedWrite, PaxosRows.getPromise(row));
- Commit promised = row.has("in_progress_ballot")
- ? new Commit(row.getTimeUUID("in_progress_ballot"), new PartitionUpdate.Builder(metadata, key, metadata.regularAndStaticColumns(), 1).build())
- : Commit.emptyCommit(key, metadata);
// either we have both a recently accepted ballot and update or we have neither
- Commit accepted = row.has("proposal_version") && row.has("proposal")
- ? new Commit(row.getTimeUUID("proposal_ballot"),
- PartitionUpdate.fromBytes(row.getBytes("proposal"), row.getInt("proposal_version")))
- : Commit.emptyCommit(key, metadata);
- // either most_recent_commit and most_recent_commit_at will both be set, or neither
- Commit mostRecent = row.has("most_recent_commit_version") && row.has("most_recent_commit")
- ? new Commit(row.getTimeUUID("most_recent_commit_at"),
- PartitionUpdate.fromBytes(row.getBytes("most_recent_commit"), row.getInt("most_recent_commit_version")))
- : Commit.emptyCommit(key, metadata);
- return new PaxosState(promised, accepted, mostRecent);
+ Accepted accepted = PaxosRows.getAccepted(row);
+ Committed committed = PaxosRows.getCommitted(metadata, partitionKey, row);
+ // fix a race with TTL/deletion resolution, where TTL expires after equal deletion is inserted; TTL wins the resolution, and is read using an old ballot's nowInSec
+ if (accepted != null && !accepted.isAfter(committed))
+ accepted = null;
+
+ return new PaxosState.Snapshot(promised, promisedWrite, accepted, committed);
}
- public static void savePaxosPromise(Commit promise)
+ public static int legacyPaxosTtlSec(TableMetadata metadata)
{
- String req = "UPDATE system.%s USING TIMESTAMP ? AND TTL ? SET in_progress_ballot = ? WHERE row_key = ? AND cf_id = ?";
- executeInternal(format(req, PAXOS),
- promise.ballot.unixMicros(),
- paxosTtlSec(promise.update.metadata()),
- promise.ballot,
- promise.update.partitionKey().getKey(),
- promise.update.metadata().id.asUUID());
+ // keep paxos state around for at least 3h
+ return Math.max(3 * 3600, metadata.params.gcGraceSeconds);
}
- public static void savePaxosProposal(Commit proposal)
+ public static void savePaxosWritePromise(DecoratedKey key, TableMetadata metadata, Ballot ballot)
{
- executeInternal(format("UPDATE system.%s USING TIMESTAMP ? AND TTL ? SET proposal_ballot = ?, proposal = ?, proposal_version = ? WHERE row_key = ? AND cf_id = ?", PAXOS),
- proposal.ballot.unixMicros(),
- paxosTtlSec(proposal.update.metadata()),
- proposal.ballot,
- PartitionUpdate.toBytes(proposal.update, MessagingService.current_version),
- MessagingService.current_version,
- proposal.update.partitionKey().getKey(),
- proposal.update.metadata().id.asUUID());
+ if (paxosStatePurging() == legacy)
+ {
+ String cql = "UPDATE system." + PAXOS + " USING TIMESTAMP ? AND TTL ? SET in_progress_ballot = ? WHERE row_key = ? AND cf_id = ?";
+ executeInternal(cql,
+ ballot.unixMicros(),
+ legacyPaxosTtlSec(metadata),
+ ballot,
+ key.getKey(),
+ metadata.id.asUUID());
+ }
+ else
+ {
+ String cql = "UPDATE system." + PAXOS + " USING TIMESTAMP ? SET in_progress_ballot = ? WHERE row_key = ? AND cf_id = ?";
+ executeInternal(cql,
+ ballot.unixMicros(),
+ ballot,
+ key.getKey(),
+ metadata.id.asUUID());
+ }
}
- public static int paxosTtlSec(TableMetadata metadata)
+ public static void savePaxosReadPromise(DecoratedKey key, TableMetadata metadata, Ballot ballot)
{
- // keep paxos state around for at least 3h
- return Math.max(3 * 3600, metadata.params.gcGraceSeconds);
+ if (paxosStatePurging() == legacy)
+ {
+ String cql = "UPDATE system." + PAXOS + " USING TIMESTAMP ? AND TTL ? SET in_progress_read_ballot = ? WHERE row_key = ? AND cf_id = ?";
+ executeInternal(cql,
+ ballot.unixMicros(),
+ legacyPaxosTtlSec(metadata),
+ ballot,
+ key.getKey(),
+ metadata.id.asUUID());
+ }
+ else
+ {
+ String cql = "UPDATE system." + PAXOS + " USING TIMESTAMP ? SET in_progress_read_ballot = ? WHERE row_key = ? AND cf_id = ?";
+ executeInternal(cql,
+ ballot.unixMicros(),
+ ballot,
+ key.getKey(),
+ metadata.id.asUUID());
+ }
+ }
+
+ public static void savePaxosProposal(Commit proposal)
+ {
+ if (proposal instanceof AcceptedWithTTL)
+ {
+ int localDeletionTime = ((Commit.AcceptedWithTTL) proposal).localDeletionTime;
+ int ttlInSec = legacyPaxosTtlSec(proposal.update.metadata());
+ int nowInSec = localDeletionTime - ttlInSec;
+ String cql = "UPDATE system." + PAXOS + " USING TIMESTAMP ? AND TTL ? SET proposal_ballot = ?, proposal = ?, proposal_version = ? WHERE row_key = ? AND cf_id = ?";
+ executeInternalWithNowInSec(cql,
+ nowInSec,
+ proposal.ballot.unixMicros(),
+ ttlInSec,
+ proposal.ballot,
+ PartitionUpdate.toBytes(proposal.update, MessagingService.current_version),
+ MessagingService.current_version,
+ proposal.update.partitionKey().getKey(),
+ proposal.update.metadata().id.asUUID());
+ }
+ else
+ {
+ String cql = "UPDATE system." + PAXOS + " USING TIMESTAMP ? SET proposal_ballot = ?, proposal = ?, proposal_version = ? WHERE row_key = ? AND cf_id = ?";
+ executeInternal(cql,
+ proposal.ballot.unixMicros(),
+ proposal.ballot,
+ PartitionUpdate.toBytes(proposal.update, MessagingService.current_version),
+ MessagingService.current_version,
+ proposal.update.partitionKey().getKey(),
+ proposal.update.metadata().id.asUUID());
+ }
}
public static void savePaxosCommit(Commit commit)
{
// We always erase the last proposal (with the commit timestamp to no erase more recent proposal in case the commit is old)
// even though that's really just an optimization since SP.beginAndRepairPaxos will exclude accepted proposal older than the mrc.
- String cql = "UPDATE system.%s USING TIMESTAMP ? AND TTL ? SET proposal_ballot = null, proposal = null, most_recent_commit_at = ?, most_recent_commit = ?, most_recent_commit_version = ? WHERE row_key = ? AND cf_id = ?";
- executeInternal(format(cql, PAXOS),
- commit.ballot.unixMicros(),
- paxosTtlSec(commit.update.metadata()),
- commit.ballot,
- PartitionUpdate.toBytes(commit.update, MessagingService.current_version),
- MessagingService.current_version,
- commit.update.partitionKey().getKey(),
- commit.update.metadata().id.asUUID());
+ if (commit instanceof Commit.CommittedWithTTL)
+ {
+ int localDeletionTime = ((Commit.CommittedWithTTL) commit).localDeletionTime;
+ int ttlInSec = legacyPaxosTtlSec(commit.update.metadata());
+ int nowInSec = localDeletionTime - ttlInSec;
+ String cql = "UPDATE system." + PAXOS + " USING TIMESTAMP ? AND TTL ? SET proposal_ballot = null, proposal = null, proposal_version = null, most_recent_commit_at = ?, most_recent_commit = ?, most_recent_commit_version = ? WHERE row_key = ? AND cf_id = ?";
+ executeInternalWithNowInSec(cql,
+ nowInSec,
+ commit.ballot.unixMicros(),
+ ttlInSec,
+ commit.ballot,
+ PartitionUpdate.toBytes(commit.update, MessagingService.current_version),
+ MessagingService.current_version,
+ commit.update.partitionKey().getKey(),
+ commit.update.metadata().id.asUUID());
+ }
+ else
+ {
+ String cql = "UPDATE system." + PAXOS + " USING TIMESTAMP ? SET proposal_ballot = null, proposal = null, proposal_version = null, most_recent_commit_at = ?, most_recent_commit = ?, most_recent_commit_version = ? WHERE row_key = ? AND cf_id = ?";
+ executeInternal(cql,
+ commit.ballot.unixMicros(),
+ commit.ballot,
+ PartitionUpdate.toBytes(commit.update, MessagingService.current_version),
+ MessagingService.current_version,
+ commit.update.partitionKey().getKey(),
+ commit.update.metadata().id.asUUID());
+ }
+ }
+
+ @VisibleForTesting
+ public static void savePaxosRepairHistory(String keyspace, String table, PaxosRepairHistory history, boolean flush)
+ {
+ String cql = "INSERT INTO system.%s (keyspace_name, table_name, points) VALUES (?, ?, ?)";
+ executeInternal(String.format(cql, PAXOS_REPAIR_HISTORY), keyspace, table, history.toTupleBufferList());
+ if (flush)
+ flushPaxosRepairHistory();
+ }
+
+ public static void flushPaxosRepairHistory()
+ {
+ Schema.instance.getColumnFamilyStoreInstance(PaxosRepairHistoryTable.id).forceBlockingFlush();
+ }
+
+ public static PaxosRepairHistory loadPaxosRepairHistory(String keyspace, String table)
+ {
+ if (SchemaConstants.LOCAL_SYSTEM_KEYSPACE_NAMES.contains(keyspace))
+ return PaxosRepairHistory.EMPTY;
+
+ UntypedResultSet results = executeInternal(String.format("SELECT * FROM system.%s WHERE keyspace_name=? AND table_name=?", PAXOS_REPAIR_HISTORY), keyspace, table);
+ if (results.isEmpty())
+ return PaxosRepairHistory.EMPTY;
+
+ UntypedResultSet.Row row = Iterables.getOnlyElement(results);
+ List<ByteBuffer> points = row.getList("points", BytesType.instance);
+
+ return PaxosRepairHistory.fromTupleBufferList(points);
}
/**
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index b59480e..cbed018 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -52,7 +52,6 @@ import org.apache.cassandra.schema.Schema;
import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.schema.TableMetadataRef;
-import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.WrappedRunnable;
diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
index 4aec19f..5fe1df7 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
@@ -38,7 +38,6 @@ import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.exceptions.ConfigurationException;
-import org.apache.cassandra.io.sstable.Component;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.io.sstable.metadata.MetadataCollector;
import org.apache.cassandra.io.sstable.metadata.StatsMetadata;
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java b/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java
index 809c10c..b9174ec 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionInterruptedException.java
@@ -17,16 +17,14 @@
*/
package org.apache.cassandra.db.compaction;
+import org.apache.cassandra.utils.Shared;
+
+@Shared
public class CompactionInterruptedException extends RuntimeException
{
private static final long serialVersionUID = -8651427062512310398L;
- public CompactionInterruptedException(CompactionInfo info)
- {
- super("Compaction interrupted: " + info);
- }
-
- public CompactionInterruptedException(String info)
+ public CompactionInterruptedException(Object info)
{
super("Compaction interrupted: " + info);
}
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
index fc4dc9c..86ab5ff 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
@@ -19,11 +19,17 @@ package org.apache.cassandra.db.compaction;
import java.util.*;
import java.util.function.LongPredicate;
+import java.util.concurrent.TimeUnit;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Ordering;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.io.sstable.format.SSTableReader;
+import org.apache.cassandra.schema.Schema;
+import org.apache.cassandra.schema.SchemaConstants;
+import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.db.transform.DuplicateRowChecker;
@@ -37,8 +43,14 @@ import org.apache.cassandra.db.transform.Transformation;
import org.apache.cassandra.index.transactions.CompactionTransaction;
import org.apache.cassandra.io.sstable.ISSTableScanner;
import org.apache.cassandra.schema.CompactionParams.TombstoneOption;
+import org.apache.cassandra.service.paxos.PaxosRepairHistory;
+import org.apache.cassandra.service.paxos.uncommitted.PaxosRows;
import org.apache.cassandra.utils.TimeUUID;
+import static java.util.concurrent.TimeUnit.MICROSECONDS;
+import static org.apache.cassandra.config.Config.PaxosStatePurging.legacy;
+import static org.apache.cassandra.config.DatabaseDescriptor.paxosStatePurging;
+
/**
* Merge multiple iterators over the content of sstable into a "compacted" iterator.
* <p>
@@ -110,7 +122,10 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
? EmptyIterators.unfilteredPartition(controller.cfs.metadata())
: UnfilteredPartitionIterators.merge(scanners, listener());
merged = Transformation.apply(merged, new GarbageSkipper(controller));
- merged = Transformation.apply(merged, new Purger(controller, nowInSec));
+ Transformation<UnfilteredRowIterator> purger = isPaxos(controller.cfs) && paxosStatePurging() != legacy
+ ? new PaxosPurger(nowInSec)
+ : new Purger(controller, nowInSec);
+ merged = Transformation.apply(merged, purger);
merged = DuplicateRowChecker.duringCompaction(merged, type);
compacted = Transformation.apply(merged, new AbortableUnfilteredPartitionTransformation(this));
}
@@ -556,6 +571,78 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
}
}
+ private class PaxosPurger extends Transformation<UnfilteredRowIterator>
+ {
+ private final long nowInSec;
+ private final long paxosPurgeGraceMicros = DatabaseDescriptor.getPaxosPurgeGrace(MICROSECONDS);
+ private final Map<TableId, PaxosRepairHistory.Searcher> tableIdToHistory = new HashMap<>();
+ private Token currentToken;
+ private int compactedUnfiltered;
+
+ private PaxosPurger(long nowInSec)
+ {
+ this.nowInSec = nowInSec;
+ }
+
+ protected void onEmptyPartitionPostPurge(DecoratedKey key)
+ {
+ if (type == OperationType.COMPACTION)
+ controller.cfs.invalidateCachedPartition(key);
+ }
+
+ protected void updateProgress()
+ {
+ if ((++compactedUnfiltered) % UNFILTERED_TO_UPDATE_PROGRESS == 0)
+ updateBytesRead();
+ }
+
+ @Override
+ @SuppressWarnings("resource")
+ protected UnfilteredRowIterator applyToPartition(UnfilteredRowIterator partition)
+ {
+ currentToken = partition.partitionKey().getToken();
+ UnfilteredRowIterator purged = Transformation.apply(partition, this);
+ if (purged.isEmpty())
+ {
+ onEmptyPartitionPostPurge(purged.partitionKey());
+ purged.close();
+ return null;
+ }
+
+ return purged;
+ }
+
+ @Override
+ protected Row applyToRow(Row row)
+ {
+ updateProgress();
+ TableId tableId = PaxosRows.getTableId(row);
+
+ switch (paxosStatePurging())
+ {
+ default: throw new AssertionError();
+ case legacy:
+ case gc_grace:
+ {
+ TableMetadata metadata = Schema.instance.getTableMetadata(tableId);
+ return row.purgeDataOlderThan(TimeUnit.SECONDS.toMicros(nowInSec - (metadata == null ? (3 * 3600) : metadata.params.gcGraceSeconds)), false);
+ }
+ case repaired:
+ {
+ PaxosRepairHistory.Searcher history = tableIdToHistory.computeIfAbsent(tableId, find -> {
+ TableMetadata metadata = Schema.instance.getTableMetadata(find);
+ if (metadata == null)
+ return null;
+ return Keyspace.openAndGetStore(metadata).getPaxosRepairHistory().searcher();
+ });
+
+ return history == null ? row :
+ row.purgeDataOlderThan(history.ballotForToken(currentToken).unixMicros() - paxosPurgeGraceMicros, false);
+ }
+ }
+ }
+ }
+
private static class AbortableUnfilteredPartitionTransformation extends Transformation<UnfilteredRowIterator>
{
private final AbortableUnfilteredRowTransformation abortableIter;
@@ -574,7 +661,7 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
}
}
- private static class AbortableUnfilteredRowTransformation extends Transformation
+ private static class AbortableUnfilteredRowTransformation extends Transformation<UnfilteredRowIterator>
{
private final CompactionIterator iter;
@@ -590,4 +677,9 @@ public class CompactionIterator extends CompactionInfo.Holder implements Unfilte
return row;
}
}
+
+ private static boolean isPaxos(ColumnFamilyStore cfs)
+ {
+ return cfs.name.equals(SystemKeyspace.PAXOS) && cfs.keyspace.getName().equals(SchemaConstants.SYSTEM_KEYSPACE_NAME);
+ }
}
diff --git a/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java b/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java
index bb26cba..df24a62 100644
--- a/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java
+++ b/src/java/org/apache/cassandra/db/marshal/ByteArrayAccessor.java
@@ -29,6 +29,7 @@ import org.apache.cassandra.db.Digest;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.service.paxos.Ballot;
import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.ByteArrayUtil;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -242,6 +243,12 @@ public class ByteArrayAccessor implements ValueAccessor<byte[]>
}
@Override
+ public Ballot toBallot(byte[] value)
+ {
+ return Ballot.deserialize(value);
+ }
+
+ @Override
public int putShort(byte[] dst, int offset, short value)
{
ByteArrayUtil.putShort(dst, offset, value);
diff --git a/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java b/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java
index e428b7c..40a3bf4 100644
--- a/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java
+++ b/src/java/org/apache/cassandra/db/marshal/ByteBufferAccessor.java
@@ -28,6 +28,7 @@ import org.apache.cassandra.db.Digest;
import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.service.paxos.Ballot;
import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FastByteOperations;
@@ -246,6 +247,12 @@ public class ByteBufferAccessor implements ValueAccessor<ByteBuffer>
}
@Override
+ public Ballot toBallot(ByteBuffer value)
+ {
+ return Ballot.deserialize(value);
+ }
+
+ @Override
public int putShort(ByteBuffer dst, int offset, short value)
{
dst.putShort(dst.position() + offset, value);
diff --git a/src/java/org/apache/cassandra/db/marshal/TupleType.java b/src/java/org/apache/cassandra/db/marshal/TupleType.java
index 83fbb25..cc08487 100644
--- a/src/java/org/apache/cassandra/db/marshal/TupleType.java
+++ b/src/java/org/apache/cassandra/db/marshal/TupleType.java
@@ -205,9 +205,17 @@ public class TupleType extends AbstractType<ByteBuffer>
*/
public ByteBuffer[] split(ByteBuffer value)
{
- ByteBuffer[] components = new ByteBuffer[size()];
+ return split(value, size(), this);
+ }
+
+ /**
+ * Split a tuple value into its component values.
+ */
+ public static ByteBuffer[] split(ByteBuffer value, int numberOfElements, TupleType type)
+ {
+ ByteBuffer[] components = new ByteBuffer[numberOfElements];
ByteBuffer input = value.duplicate();
- for (int i = 0; i < size(); i++)
+ for (int i = 0; i < numberOfElements; i++)
{
if (!input.hasRemaining())
return Arrays.copyOfRange(components, 0, i);
@@ -226,7 +234,7 @@ public class TupleType extends AbstractType<ByteBuffer>
{
throw new InvalidRequestException(String.format(
"Expected %s %s for %s column, but got more",
- size(), size() == 1 ? "value" : "values", this.asCQL3Type()));
+ numberOfElements, numberOfElements == 1 ? "value" : "values", type.asCQL3Type()));
}
return components;
diff --git a/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java b/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java
index 2f089a6..a51836e 100644
--- a/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java
+++ b/src/java/org/apache/cassandra/db/marshal/ValueAccessor.java
@@ -37,6 +37,7 @@ import org.apache.cassandra.db.rows.CellPath;
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.paxos.Ballot;
import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.db.ClusteringPrefix.Kind.*;
@@ -326,6 +327,9 @@ public interface ValueAccessor<V>
/** returns a TimeUUID from offset 0 */
TimeUUID toTimeUUID(V value);
+ /** returns a TimeUUID from offset 0 */
+ Ballot toBallot(V value);
+
/**
* writes the short value {@param value} to {@param dst} at offset {@param offset}
* @return the number of bytes written to {@param value}
diff --git a/src/java/org/apache/cassandra/db/partitions/AbstractBTreePartition.java b/src/java/org/apache/cassandra/db/partitions/AbstractBTreePartition.java
index 1d6603e..b51a678 100644
--- a/src/java/org/apache/cassandra/db/partitions/AbstractBTreePartition.java
+++ b/src/java/org/apache/cassandra/db/partitions/AbstractBTreePartition.java
@@ -375,26 +375,52 @@ public abstract class AbstractBTreePartition implements Partition, Iterable<Row>
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder();
+ return toString(true);
+ }
- sb.append(String.format("[%s] key=%s partition_deletion=%s columns=%s",
- metadata(),
- metadata().partitionKeyType.getString(partitionKey().getKey()),
- partitionLevelDeletion(),
- columns()));
+ public String toString(boolean includeFullDetails)
+ {
+ StringBuilder sb = new StringBuilder();
+ if (includeFullDetails)
+ {
+ sb.append(String.format("[%s.%s] key=%s partition_deletion=%s columns=%s",
+ metadata().keyspace,
+ metadata().name,
+ metadata().partitionKeyType.getString(partitionKey().getKey()),
+ partitionLevelDeletion(),
+ columns()));
+ }
+ else
+ {
+ sb.append("key=").append(metadata().partitionKeyType.getString(partitionKey().getKey()));
+ }
if (staticRow() != Rows.EMPTY_STATIC_ROW)
- sb.append("\n ").append(staticRow().toString(metadata(), true));
+ sb.append("\n ").append(staticRow().toString(metadata(), includeFullDetails));
try (UnfilteredRowIterator iter = unfilteredIterator())
{
while (iter.hasNext())
- sb.append("\n ").append(iter.next().toString(metadata(), true));
+ sb.append("\n ").append(iter.next().toString(metadata(), includeFullDetails));
}
-
return sb.toString();
}
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (!(obj instanceof PartitionUpdate))
+ return false;
+
+ PartitionUpdate that = (PartitionUpdate) obj;
+ Holder a = this.holder(), b = that.holder();
+ return partitionKey.equals(that.partitionKey)
+ && metadata().id.equals(that.metadata().id)
+ && a.deletionInfo.equals(b.deletionInfo)
+ && a.staticRow.equals(b.staticRow)
+ && Iterators.elementsEqual(iterator(), that.iterator());
+ }
+
public int rowCount()
{
return BTree.size(holder().tree);
diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
index 9530e10..f6fd259 100644
--- a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
+++ b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java
@@ -17,13 +17,16 @@
*/
package org.apache.cassandra.db.partitions;
+import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.List;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
+import com.google.common.primitives.Ints;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,6 +41,9 @@ import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.utils.btree.BTree;
import org.apache.cassandra.utils.btree.UpdateFunction;
+import org.apache.cassandra.utils.vint.VIntCoding;
+
+import static org.apache.cassandra.db.rows.UnfilteredRowIteratorSerializer.IS_EMPTY;
/**
* Stores updates made on a partition.
@@ -322,23 +328,19 @@ public class PartitionUpdate extends AbstractBTreePartition
*/
public int dataSize()
{
- int size = 0;
-
- if (holder.staticRow != null)
- {
- for (ColumnData cd : holder.staticRow.columnData())
- {
- size += cd.dataSize();
- }
- }
+ return Ints.saturatedCast(BTree.<Row>accumulate(holder.tree, (row, value) -> row.dataSize() + value, 0L)
+ + holder.staticRow.dataSize() + holder.deletionInfo.dataSize());
+ }
- for (Row row : this)
- {
- size += row.clustering().dataSize();
- for (ColumnData cd : row)
- size += cd.dataSize();
- }
- return size;
+ /**
+ * The size of the data contained in this update.
+ *
+ * @return the size of the data contained in this update.
+ */
+ public long unsharedHeapSize()
+ {
+ return BTree.<Row>accumulate(holder.tree, (row, value) -> row.unsharedHeapSize() + value, 0L)
+ + holder.staticRow.unsharedHeapSize() + holder.deletionInfo.unsharedHeapSize();
}
public TableMetadata metadata()
@@ -667,6 +669,21 @@ public class PartitionUpdate extends AbstractBTreePartition
false);
}
+ public static boolean isEmpty(ByteBuffer in, DeserializationHelper.Flag flag, DecoratedKey key) throws IOException
+ {
+ int position = in.position();
+ position += 16; // CFMetaData.serializer.deserialize(in, version);
+ if (position >= in.limit())
+ throw new EOFException();
+ // DecoratedKey key = metadata.decorateKey(ByteBufferUtil.readWithVIntLength(in));
+ int keyLength = (int) VIntCoding.getUnsignedVInt(in, position);
+ position += keyLength + VIntCoding.computeUnsignedVIntSize(keyLength);
+ if (position >= in.limit())
+ throw new EOFException();
+ int flags = in.get(position) & 0xff;
+ return (flags & IS_EMPTY) != 0;
+ }
+
public long serializedSize(PartitionUpdate update, int version)
{
try (UnfilteredRowIterator iter = update.unfilteredIterator())
diff --git a/src/java/org/apache/cassandra/db/rows/AbstractCell.java b/src/java/org/apache/cassandra/db/rows/AbstractCell.java
index 5d4fc3c..21d2c10 100644
--- a/src/java/org/apache/cassandra/db/rows/AbstractCell.java
+++ b/src/java/org/apache/cassandra/db/rows/AbstractCell.java
@@ -98,6 +98,11 @@ public abstract class AbstractCell<V> extends Cell<V>
return this;
}
+ public Cell<?> purgeDataOlderThan(long timestamp)
+ {
+ return this.timestamp() < timestamp ? null : this;
+ }
+
public Cell<?> copy(AbstractAllocator allocator)
{
CellPath path = path();
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 2d3ee83..64b494f 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -474,6 +474,18 @@ public class BTreeRow extends AbstractRow
return transformAndFilter(newInfo, newDeletion, (cd) -> cd.purge(purger, nowInSec));
}
+ public Row purgeDataOlderThan(long timestamp, boolean enforceStrictLiveness)
+ {
+ LivenessInfo newInfo = primaryKeyLivenessInfo.timestamp() < timestamp ? LivenessInfo.EMPTY : primaryKeyLivenessInfo;
+ Deletion newDeletion = deletion.time().markedForDeleteAt() < timestamp ? Deletion.LIVE : deletion;
+
+ // when enforceStrictLiveness is set, a row is considered dead when it's PK liveness info is not present
+ if (enforceStrictLiveness && newDeletion.isLive() && newInfo.isEmpty())
+ return null;
+
+ return transformAndFilter(newInfo, newDeletion, cd -> cd.purgeDataOlderThan(timestamp));
+ }
+
private Row transformAndFilter(LivenessInfo info, Deletion deletion, Function<ColumnData, ColumnData> function)
{
Object[] transformed = BTree.transformAndFilter(btree, function);
diff --git a/src/java/org/apache/cassandra/db/rows/BufferCell.java b/src/java/org/apache/cassandra/db/rows/BufferCell.java
index 85d28f8..171dfbb 100644
--- a/src/java/org/apache/cassandra/db/rows/BufferCell.java
+++ b/src/java/org/apache/cassandra/db/rows/BufferCell.java
@@ -26,7 +26,6 @@ import org.apache.cassandra.schema.ColumnMetadata;
import org.apache.cassandra.db.marshal.ByteType;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.ObjectSizes;
-import org.apache.cassandra.utils.memory.AbstractAllocator;
import static java.lang.String.format;
@@ -134,14 +133,6 @@ public class BufferCell extends AbstractCell<ByteBuffer>
return withUpdatedValue(ByteBufferUtil.EMPTY_BYTE_BUFFER);
}
- public Cell<?> copy(AbstractAllocator allocator)
- {
- if (!value.hasRemaining())
- return this;
-
- return new BufferCell(column, timestamp, ttl, localDeletionTime, allocator.clone(value), path == null ? null : path.copy(allocator));
- }
-
@Override
public long unsharedHeapSize()
{
diff --git a/src/java/org/apache/cassandra/db/rows/Cell.java b/src/java/org/apache/cassandra/db/rows/Cell.java
index 38d1c84..2a19a98 100644
--- a/src/java/org/apache/cassandra/db/rows/Cell.java
+++ b/src/java/org/apache/cassandra/db/rows/Cell.java
@@ -167,6 +167,10 @@ public abstract class Cell<V> extends ColumnData
// Overrides super type to provide a more precise return type.
public abstract Cell<?> purge(DeletionPurger purger, int nowInSec);
+ @Override
+ // Overrides super type to provide a more precise return type.
+ public abstract Cell<?> purgeDataOlderThan(long timestamp);
+
/**
* The serialization format for cell is:
* [ flags ][ timestamp ][ deletion time ][ ttl ][ path size ][ path ][ value size ][ value ]
diff --git a/src/java/org/apache/cassandra/db/rows/CellPath.java b/src/java/org/apache/cassandra/db/rows/CellPath.java
index cee2484..817a2d0 100644
--- a/src/java/org/apache/cassandra/db/rows/CellPath.java
+++ b/src/java/org/apache/cassandra/db/rows/CellPath.java
@@ -65,6 +65,8 @@ public abstract class CellPath implements IMeasurableMemory
public abstract long unsharedHeapSizeExcludingData();
+ public abstract long unsharedHeapSize();
+
@Override
public final int hashCode()
{
diff --git a/src/java/org/apache/cassandra/db/rows/ColumnData.java b/src/java/org/apache/cassandra/db/rows/ColumnData.java
index 4146946..8ac19cc 100644
--- a/src/java/org/apache/cassandra/db/rows/ColumnData.java
+++ b/src/java/org/apache/cassandra/db/rows/ColumnData.java
@@ -58,6 +58,8 @@ public abstract class ColumnData implements IMeasurableMemory
public abstract long unsharedHeapSizeExcludingData();
+ public abstract long unsharedHeapSize();
+
/**
* Validate the column data.
*
@@ -95,6 +97,7 @@ public abstract class ColumnData implements IMeasurableMemory
public abstract ColumnData markCounterLocalToBeCleared();
public abstract ColumnData purge(DeletionPurger purger, int nowInSec);
+ public abstract ColumnData purgeDataOlderThan(long timestamp);
public abstract long maxTimestamp();
}
diff --git a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
index bf7714d..84f52e1 100644
--- a/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
+++ b/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
@@ -121,13 +121,10 @@ public class ComplexColumnData extends ColumnData implements Iterable<Cell<?>>
return size;
}
- @Override
public long unsharedHeapSize()
{
- long heapSize = EMPTY_SIZE + ObjectSizes.sizeOfArray(cells);
- for (Cell<?> cell : this)
- heapSize += cell.unsharedHeapSize();
- return heapSize;
+ long heapSize = EMPTY_SIZE + ObjectSizes.sizeOfArray(cells) + complexDeletion.unsharedHeapSize();
+ return BTree.<Cell>accumulate(cells, (cell, value) -> value + cell.unsharedHeapSize(), heapSize);
}
@Override
@@ -205,6 +202,12 @@ public class ComplexColumnData extends ColumnData implements Iterable<Cell<?>>
return transformAndFilter(complexDeletion, (cell) -> filter.fetchedCellIsQueried(column, cell.path()) ? null : cell);
}
+ public ComplexColumnData purgeDataOlderThan(long timestamp)
+ {
+ DeletionTime newDeletion = complexDeletion.markedForDeleteAt() < timestamp ? DeletionTime.LIVE : complexDeletion;
+ return transformAndFilter(newDeletion, (cell) -> cell.purgeDataOlderThan(timestamp));
+ }
+
private ComplexColumnData transformAndFilter(DeletionTime newDeletion, Function<? super Cell<?>, ? extends Cell<?>> function)
{
Object[] transformed = BTree.transformAndFilter(cells, function);
diff --git a/src/java/org/apache/cassandra/db/rows/NativeCell.java b/src/java/org/apache/cassandra/db/rows/NativeCell.java
index 03dfc70..1267560 100644
--- a/src/java/org/apache/cassandra/db/rows/NativeCell.java
+++ b/src/java/org/apache/cassandra/db/rows/NativeCell.java
@@ -177,5 +177,4 @@ public class NativeCell extends AbstractCell<ByteBuffer>
{
return EMPTY_SIZE;
}
-
}
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java
index 85d27a4..7575f06 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -116,7 +116,7 @@ public interface Row extends Unfiltered, Iterable<ColumnData>, IMeasurableMemory
*
* @param nowInSec the current time to decide what is deleted and what isn't
* @param enforceStrictLiveness whether the row should be purged if there is no PK liveness info,
- * normally retrieved from {@link CFMetaData#enforceStrictLiveness()}
+ * normally retrieved from {@link TableMetadata#enforceStrictLiveness()}
* @return true if there is some live information
*/
public boolean hasLiveData(int nowInSec, boolean enforceStrictLiveness);
@@ -249,6 +249,11 @@ public interface Row extends Unfiltered, Iterable<ColumnData>, IMeasurableMemory
*/
public Row withOnlyQueriedData(ColumnFilter filter);
+ /*
+ * Returns a copy of this row without any data with a timestamp older than the one provided
+ */
+ public Row purgeDataOlderThan(long timestamp, boolean enforceStrictLiveness);
+
/**
* Returns a copy of this row where all counter cells have they "local" shard marked for clearing.
*/
@@ -281,6 +286,7 @@ public interface Row extends Unfiltered, Iterable<ColumnData>, IMeasurableMemory
public long unsharedHeapSizeExcludingData();
public String toString(TableMetadata metadata, boolean fullDetails);
+ public long unsharedHeapSize();
/**
* Apply a function to every column in a row
diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredRowIteratorSerializer.java b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIteratorSerializer.java
index 938a3ee..11541ee 100644
--- a/src/java/org/apache/cassandra/db/rows/UnfilteredRowIteratorSerializer.java
+++ b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIteratorSerializer.java
@@ -66,7 +66,7 @@ public class UnfilteredRowIteratorSerializer
{
protected static final Logger logger = LoggerFactory.getLogger(UnfilteredRowIteratorSerializer.class);
- private static final int IS_EMPTY = 0x01;
+ public static final int IS_EMPTY = 0x01;
private static final int IS_REVERSED = 0x02;
private static final int HAS_PARTITION_DELETION = 0x04;
private static final int HAS_STATIC_ROW = 0x08;
diff --git a/src/java/org/apache/cassandra/db/view/ViewUtils.java b/src/java/org/apache/cassandra/db/view/ViewUtils.java
index c248ddc..55a462c 100644
--- a/src/java/org/apache/cassandra/db/view/ViewUtils.java
+++ b/src/java/org/apache/cassandra/db/view/ViewUtils.java
@@ -23,7 +23,6 @@ import java.util.function.Predicate;
import com.google.common.collect.Iterables;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.locator.EndpointsForToken;
diff --git a/src/java/org/apache/cassandra/db/virtual/StreamingVirtualTable.java b/src/java/org/apache/cassandra/db/virtual/StreamingVirtualTable.java
index 1036f18..f9fe0ef 100644
--- a/src/java/org/apache/cassandra/db/virtual/StreamingVirtualTable.java
+++ b/src/java/org/apache/cassandra/db/virtual/StreamingVirtualTable.java
@@ -23,10 +23,12 @@ import java.util.UUID;
import java.util.stream.Collectors;
import org.apache.cassandra.db.DecoratedKey;
+import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.db.marshal.UUIDType;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.streaming.StreamManager;
import org.apache.cassandra.streaming.StreamingState;
+import org.apache.cassandra.utils.TimeUUID;
import static org.apache.cassandra.cql3.statements.schema.CreateTableStatement.parse;
@@ -35,7 +37,7 @@ public class StreamingVirtualTable extends AbstractVirtualTable
public StreamingVirtualTable(String keyspace)
{
super(parse("CREATE TABLE streaming (" +
- " id uuid,\n" +
+ " id timeuuid,\n" +
" follower boolean,\n" +
" operation text, \n" +
" peers frozen<list<text>>,\n" +
@@ -76,7 +78,7 @@ public class StreamingVirtualTable extends AbstractVirtualTable
@Override
public DataSet data(DecoratedKey partitionKey)
{
- UUID id = UUIDType.instance.compose(partitionKey.getKey());
+ TimeUUID id = TimeUUIDType.instance.compose(partitionKey.getKey());
SimpleDataSet result = new SimpleDataSet(metadata());
StreamingState state = StreamManager.instance.getStreamingState(id);
if (state != null)
diff --git a/src/java/org/apache/cassandra/db/virtual/VirtualMutation.java b/src/java/org/apache/cassandra/db/virtual/VirtualMutation.java
index 09ac4a6..3e26032 100644
--- a/src/java/org/apache/cassandra/db/virtual/VirtualMutation.java
+++ b/src/java/org/apache/cassandra/db/virtual/VirtualMutation.java
@@ -19,6 +19,7 @@ package org.apache.cassandra.db.virtual;
import java.util.Collection;
import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableMap;
@@ -26,6 +27,7 @@ import com.google.common.collect.ImmutableMap;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.IMutation;
+import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.db.partitions.PartitionUpdate;
import org.apache.cassandra.schema.TableId;
@@ -105,6 +107,12 @@ public final class VirtualMutation implements IMutation
}
@Override
+ public Supplier<Mutation> hintOnFailure()
+ {
+ return null;
+ }
+
+ @Override
public void validateIndexedColumns()
{
// no-op
diff --git a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
index 2856f13..b0f8bf9 100644
--- a/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
+++ b/src/java/org/apache/cassandra/dht/Murmur3Partitioner.java
@@ -144,7 +144,7 @@ public class Murmur3Partitioner implements IPartitioner
{
static final long serialVersionUID = -5833580143318243006L;
- final long token;
+ public final long token;
public LongToken(long token)
{
@@ -204,11 +204,16 @@ public class Murmur3Partitioner implements IPartitioner
}
@Override
- public Token increaseSlightly()
+ public LongToken increaseSlightly()
{
return new LongToken(token + 1);
}
+ public LongToken decreaseSlightly()
+ {
+ return new LongToken(token - 1);
+ }
+
/**
* Reverses murmur3 to find a possible 16 byte key that generates a given token
*/
@@ -216,7 +221,7 @@ public class Murmur3Partitioner implements IPartitioner
public static ByteBuffer keyForToken(LongToken token)
{
ByteBuffer result = ByteBuffer.allocate(16);
- long[] inv = MurmurHash.inv_hash3_x64_128(new long[] {token.token, 0L});
+ long[] inv = MurmurHash.inv_hash3_x64_128(new long[]{ token.token, 0L });
result.putLong(inv[0]).putLong(inv[1]).position(0);
return result;
}
diff --git a/src/java/org/apache/cassandra/dht/Range.java b/src/java/org/apache/cassandra/dht/Range.java
index 5b2f3d9..2c46899 100644
--- a/src/java/org/apache/cassandra/dht/Range.java
+++ b/src/java/org/apache/cassandra/dht/Range.java
@@ -483,7 +483,7 @@ public class Range<T extends RingPosition<T>> extends AbstractBounds<T> implemen
* Given a list of unwrapped ranges sorted by left position, return an
* equivalent list of ranges but with no overlapping ranges.
*/
- private static <T extends RingPosition<T>> List<Range<T>> deoverlap(List<Range<T>> ranges)
+ public static <T extends RingPosition<T>> List<Range<T>> deoverlap(List<Range<T>> ranges)
{
if (ranges.isEmpty())
return ranges;
diff --git a/src/java/org/apache/cassandra/exceptions/CasWriteTimeoutException.java b/src/java/org/apache/cassandra/exceptions/CasWriteTimeoutException.java
index b134764..32cc014 100644
--- a/src/java/org/apache/cassandra/exceptions/CasWriteTimeoutException.java
+++ b/src/java/org/apache/cassandra/exceptions/CasWriteTimeoutException.java
@@ -20,13 +20,14 @@ package org.apache.cassandra.exceptions;
import org.apache.cassandra.db.ConsistencyLevel;
import org.apache.cassandra.db.WriteType;
+
public class CasWriteTimeoutException extends WriteTimeoutException
{
public final int contentions;
public CasWriteTimeoutException(WriteType writeType, ConsistencyLevel consistency, int received, int blockFor, int contentions)
{
- super(writeType, consistency, received, blockFor, String.format("CAS operation timed out - encountered contentions: %d", contentions));
+ super(writeType, consistency, received, blockFor, String.format("CAS operation timed out: received %d of %d required responses after %d contention retries", received, blockFor, contentions));
this.contentions = contentions;
}
}
diff --git a/src/java/org/apache/cassandra/exceptions/RequestFailureException.java b/src/java/org/apache/cassandra/exceptions/RequestFailureException.java
index c75ff9c..a715347 100644
--- a/src/java/org/apache/cassandra/exceptions/RequestFailureException.java
+++ b/src/java/org/apache/cassandra/exceptions/RequestFailureException.java
@@ -35,7 +35,7 @@ public class RequestFailureException extends RequestExecutionException
this(code, buildErrorMessage(received, failureReasonByEndpoint), consistency, received, blockFor, failureReasonByEndpoint);
}
- protected RequestFailureException(ExceptionCode code, String msg, ConsistencyLevel consistency, int received, int blockFor, Map<InetAddressAndPort, RequestFailureReason> failureReasonByEndpoint)
+ public RequestFailureException(ExceptionCode code, String msg, ConsistencyLevel consistency, int received, int blockFor, Map<InetAddressAndPort, RequestFailureReason> failureReasonByEndpoint)
{
super(code, buildErrorMessage(msg, failureReasonByEndpoint));
this.consistency = consistency;
diff --git a/src/java/org/apache/cassandra/exceptions/RequestFailureReason.java b/src/java/org/apache/cassandra/exceptions/RequestFailureReason.java
index f205900..3d3476a 100644
--- a/src/java/org/apache/cassandra/exceptions/RequestFailureReason.java
+++ b/src/java/org/apache/cassandra/exceptions/RequestFailureReason.java
@@ -36,8 +36,9 @@ public enum RequestFailureReason
READ_TOO_MANY_TOMBSTONES (1),
TIMEOUT (2),
INCOMPATIBLE_SCHEMA (3),
- READ_SIZE (4);
-
+ READ_SIZE (4),
+ NODE_DOWN (5);
+
public static final Serializer serializer = new Serializer();
public final int code;
diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java b/src/java/org/apache/cassandra/gms/EndpointState.java
index 2cc9c0d..c60a479 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -34,6 +34,7 @@ import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.utils.CassandraVersion;
+import org.apache.cassandra.utils.NullableSerializer;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
@@ -41,13 +42,12 @@ import static org.apache.cassandra.utils.Clock.Global.nanoTime;
* This abstraction represents both the HeartBeatState and the ApplicationState in an EndpointState
* instance. Any state for a given endpoint can be retrieved from this instance.
*/
-
-
public class EndpointState
{
protected static final Logger logger = LoggerFactory.getLogger(EndpointState.class);
public final static IVersionedSerializer<EndpointState> serializer = new EndpointStateSerializer();
+ public final static IVersionedSerializer<EndpointState> nullableSerializer = NullableSerializer.wrap(serializer);
private volatile HeartBeatState hbState;
private final AtomicReference<Map<ApplicationState, VersionedValue>> applicationState;
@@ -255,6 +255,20 @@ public class EndpointState
{
return "EndpointState: HeartBeatState = " + hbState + ", AppStateMap = " + applicationState.get();
}
+
+ public boolean isSupersededBy(EndpointState that)
+ {
+ int thisGeneration = this.getHeartBeatState().getGeneration();
+ int thatGeneration = that.getHeartBeatState().getGeneration();
+
+ if (thatGeneration > thisGeneration)
+ return true;
+
+ if (thisGeneration > thatGeneration)
+ return false;
+
+ return Gossiper.getMaxEndpointStateVersion(that) > Gossiper.getMaxEndpointStateVersion(this);
+ }
}
class EndpointStateSerializer implements IVersionedSerializer<EndpointState>
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAck2.java b/src/java/org/apache/cassandra/gms/GossipDigestAck2.java
index 0e4062b..ed959a5 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestAck2.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAck2.java
@@ -43,11 +43,6 @@ public class GossipDigestAck2
{
this.epStateMap = epStateMap;
}
-
- Map<InetAddressAndPort, EndpointState> getEndpointStateMap()
- {
- return epStateMap;
- }
}
class GossipDigestAck2Serializer implements IVersionedSerializer<GossipDigestAck2>
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java b/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
index 58c1589..0f01999 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
@@ -44,7 +44,7 @@ public class GossipDigestAck2VerbHandler extends GossipVerbHandler<GossipDigestA
logger.trace("Ignoring GossipDigestAck2Message because gossip is disabled");
return;
}
- Map<InetAddressAndPort, EndpointState> remoteEpStateMap = message.payload.getEndpointStateMap();
+ Map<InetAddressAndPort, EndpointState> remoteEpStateMap = message.payload.epStateMap;
/* Notify the Failure Detector */
Gossiper.instance.notifyFailureDetector(remoteEpStateMap);
Gossiper.instance.applyStateLocally(remoteEpStateMap);
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 4c68cfe..7ee36a4 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -610,7 +610,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
* @param epState
* @return
*/
- int getMaxEndpointStateVersion(EndpointState epState)
+ static int getMaxEndpointStateVersion(EndpointState epState)
{
int maxVersion = epState.getHeartBeatState().getHeartBeatVersion();
for (Map.Entry<ApplicationState, VersionedValue> state : epState.states())
@@ -1144,6 +1144,15 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
return ImmutableSet.copyOf(endpointStateMap.keySet());
}
+ public String getForEndpoint(InetAddressAndPort ep, ApplicationState state)
+ {
+ EndpointState epState = endpointStateMap.get(ep);
+ if (epState == null)
+ return null;
+ VersionedValue value = epState.getApplicationState(state);
+ return value == null ? null : value.value;
+ }
+
public int getEndpointCount()
{
return endpointStateMap.size();
@@ -1261,7 +1270,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
return ep1.getHeartBeatState().getGeneration() - ep2.getHeartBeatState().getGeneration();
}
- void notifyFailureDetector(Map<InetAddressAndPort, EndpointState> remoteEpStateMap)
+ public void notifyFailureDetector(Map<InetAddressAndPort, EndpointState> remoteEpStateMap)
{
for (Entry<InetAddressAndPort, EndpointState> entry : remoteEpStateMap.entrySet())
{
@@ -2143,7 +2152,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
}
}
- protected boolean isInShadowRound()
+ public boolean isInShadowRound()
{
return inShadowRound;
}
diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java
index 880cb98..63e9487 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -190,6 +190,14 @@ public class VersionedValue implements Comparable<VersionedValue>
Long.toString(expireTime)));
}
+ @VisibleForTesting
+ public VersionedValue left(Collection<Token> tokens, long expireTime, int generation)
+ {
+ return new VersionedValue(versionString(VersionedValue.STATUS_LEFT,
+ makeTokenString(tokens),
+ Long.toString(expireTime)), generation);
+ }
+
public VersionedValue moving(Token token)
{
return new VersionedValue(VersionedValue.STATUS_MOVING + VersionedValue.DELIMITER + partitioner.getTokenFactory().toString(token));
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
index 584a80c..0755684 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlInputFormat.java
@@ -54,8 +54,8 @@ import org.apache.cassandra.dht.*;
import org.apache.cassandra.hadoop.*;
import org.apache.cassandra.utils.*;
-import static org.apache.cassandra.utils.Clock.Global.nanoTime;
import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
+import static org.apache.cassandra.utils.Clock.Global.nanoTime;
/**
* Hadoop InputFormat allowing map/reduce against Cassandra rows within one ColumnFamily.
diff --git a/src/java/org/apache/cassandra/index/Index.java b/src/java/org/apache/cassandra/index/Index.java
index e9d3d3c..63f6198 100644
--- a/src/java/org/apache/cassandra/index/Index.java
+++ b/src/java/org/apache/cassandra/index/Index.java
@@ -267,7 +267,27 @@ public interface Index
public Optional<ColumnFamilyStore> getBackingTable();
/**
- * Return a task which performs a blocking flush of the index's data to persistent storage.
+ * Return a task which performs a blocking flush of the index's data corresponding to the provided
+ * base table's Memtable. This may extract any necessary data from the base table's Memtable as part of the flush.
+ *
+ * This version of the method is invoked whenever we flush the base table. If the index stores no in-memory data
+ * of its own, it is safe to only implement this method.
+ *
+ * @return task to be executed by the index manager to perform the flush.
+ */
+ public default Callable<?> getBlockingFlushTask(Memtable baseCfs)
+ {
+ return getBlockingFlushTask();
+ }
+
+ /**
+ * Return a task which performs a blocking flush of any in-memory index data to persistent storage,
+ * independent of any flush of the base table.
+ *
+ * Note that this method is only invoked outside of normal flushes: if there is no in-memory storage
+ * for this index, and it only extracts data on flush from the base table's Memtable, then it is safe to
+ * perform no work.
+ *
* @return task to be executed by the index manager to perform the flush.
*/
public Callable<?> getBlockingFlushTask();
diff --git a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
index d75b488..c296880 100644
--- a/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/index/SecondaryIndexManager.java
@@ -38,7 +38,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.concurrent.ExecutorPlus;
+import org.apache.cassandra.concurrent.FutureTask;
import org.apache.cassandra.concurrent.ImmediateExecutor;
+import org.apache.cassandra.concurrent.ScheduledExecutors;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.cql3.statements.schema.IndexTarget;
import org.apache.cassandra.db.*;
@@ -63,6 +65,8 @@ import org.apache.cassandra.notifications.SSTableAddedNotification;
import org.apache.cassandra.schema.ColumnMetadata;
import org.apache.cassandra.schema.IndexMetadata;
import org.apache.cassandra.schema.Indexes;
+import org.apache.cassandra.schema.Schema;
+import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.service.pager.SinglePartitionPager;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.transport.ProtocolVersion;
@@ -209,13 +213,15 @@ public class SecondaryIndexManager implements IndexRegistry, INotificationConsum
markIndexesBuilding(ImmutableSet.of(index), true, isNewCF);
- Callable<?> initialBuildTask = null;
+ FutureTask<?> initialBuildTask = null;
// if the index didn't register itself, we can probably assume that no initialization needs to happen
if (indexes.containsKey(indexDef.name))
{
try
{
- initialBuildTask = index.getInitializationTask();
+ Callable<?> call = index.getInitializationTask();
+ if (call != null)
+ initialBuildTask = new FutureTask<>(call);
}
catch (Throwable t)
{
@@ -233,16 +239,20 @@ public class SecondaryIndexManager implements IndexRegistry, INotificationConsum
// otherwise run the initialization task asynchronously with a callback to mark it built or failed
final Promise<Void> initialization = new AsyncPromise<>();
- asyncExecutor.submit(initialBuildTask)
- .addCallback(
- success -> {
- markIndexBuilt(index, true);
- initialization.trySuccess(null);
- },
- failure -> {
- logAndMarkIndexesFailed(Collections.singleton(index), failure, true);
- initialization.tryFailure(failure);
- });
+ // we want to ensure we invoke this task asynchronously, so we want to add our callback before submission
+ // to ensure the work is not completed before we register the callback and so it gets performed by us.
+ // This is because Keyspace.open("system") can transitively attempt to open Keyspace.open("system")
+ initialBuildTask.addCallback(
+ success -> {
+ markIndexBuilt(index, true);
+ initialization.trySuccess(null);
+ },
+ failure -> {
+ logAndMarkIndexesFailed(Collections.singleton(index), failure, true);
+ initialization.tryFailure(failure);
+ }
+ );
+ asyncExecutor.execute(initialBuildTask);
return initialization;
}
@@ -667,7 +677,7 @@ public class SecondaryIndexManager implements IndexRegistry, INotificationConsum
if (counter.decrementAndGet() == 0)
{
inProgressBuilds.remove(indexName);
- if (!needsFullRebuild.contains(indexName) && DatabaseDescriptor.isDaemonInitialized())
+ if (!needsFullRebuild.contains(indexName) && DatabaseDescriptor.isDaemonInitialized() && Keyspace.isInitialized())
SystemKeyspace.setIndexBuilt(baseCfs.keyspace.getName(), indexName);
}
}
@@ -799,17 +809,6 @@ public class SecondaryIndexManager implements IndexRegistry, INotificationConsum
}
/**
- * Performs a blocking flush of all custom indexes
- */
- public void flushAllNonCFSBackedIndexesBlocking()
- {
- executeAllBlocking(indexes.values()
- .stream()
- .filter(index -> !index.getBackingTable().isPresent()),
- Index::getBlockingFlushTask, null);
- }
-
- /**
* Performs a blocking execution of pre-join tasks of all indexes
*/
public void executePreJoinTasksBlocking(boolean hadBootstrap)
@@ -844,6 +843,18 @@ public class SecondaryIndexManager implements IndexRegistry, INotificationConsum
}
/**
+ * Performs a blocking flush of all custom indexes
+ */
+ public void flushAllNonCFSBackedIndexesBlocking(Memtable baseCfsMemtable)
+ {
+ executeAllBlocking(indexes.values()
+ .stream()
+ .filter(index -> !index.getBackingTable().isPresent()),
+ index -> index.getBlockingFlushTask(baseCfsMemtable),
+ null);
+ }
+
+ /**
* @return all indexes which are marked as built and ready to use
*/
public List<String> getBuiltIndexNames()
diff --git a/src/java/org/apache/cassandra/io/FSDiskFullWriteError.java b/src/java/org/apache/cassandra/io/FSDiskFullWriteError.java
index ebb07e2..abf0b6c 100644
--- a/src/java/org/apache/cassandra/io/FSDiskFullWriteError.java
+++ b/src/java/org/apache/cassandra/io/FSDiskFullWriteError.java
@@ -28,10 +28,4 @@ public class FSDiskFullWriteError extends FSWriteError
mutationSize,
keyspace)));
}
-
- @Override
- public String toString()
- {
- return "FSDiskFullWriteError";
- }
}
diff --git a/src/java/org/apache/cassandra/io/FSError.java b/src/java/org/apache/cassandra/io/FSError.java
index 6531394..4c06d9c 100644
--- a/src/java/org/apache/cassandra/io/FSError.java
+++ b/src/java/org/apache/cassandra/io/FSError.java
@@ -24,17 +24,30 @@ import org.apache.cassandra.io.util.File;
public abstract class FSError extends IOError
{
+ final String message;
public final String path;
public FSError(Throwable cause, File path)
{
+ this(null, cause, path);
+ }
+
+ public FSError(Throwable cause, Path path)
+ {
+ this(null, cause, path);
+ }
+
+ public FSError(String message, Throwable cause, File path)
+ {
super(cause);
+ this.message = message;
this.path = path.toString();
}
- public FSError(Throwable cause, Path path)
+ public FSError(String message, Throwable cause, Path path)
{
super(cause);
+ this.message = message;
this.path = path.toString();
}
@@ -53,4 +66,10 @@ public abstract class FSError extends IOError
return null;
}
+
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName() + (message != null ? ' ' + message : "") + (path != null ? " in " + path : "");
+ }
}
diff --git a/src/java/org/apache/cassandra/io/FSNoDiskAvailableForWriteError.java b/src/java/org/apache/cassandra/io/FSNoDiskAvailableForWriteError.java
index 14dcd38..415f204 100644
--- a/src/java/org/apache/cassandra/io/FSNoDiskAvailableForWriteError.java
+++ b/src/java/org/apache/cassandra/io/FSNoDiskAvailableForWriteError.java
@@ -30,10 +30,4 @@ public class FSNoDiskAvailableForWriteError extends FSWriteError
super(new IOException(String.format("The data directories for the %s keyspace have been marked as unwritable",
keyspace)));
}
-
- @Override
- public String toString()
- {
- return "FSNoDiskAvailableForWriteError";
- }
}
diff --git a/src/java/org/apache/cassandra/io/FSReadError.java b/src/java/org/apache/cassandra/io/FSReadError.java
index 688182a..ac15534 100644
--- a/src/java/org/apache/cassandra/io/FSReadError.java
+++ b/src/java/org/apache/cassandra/io/FSReadError.java
@@ -39,9 +39,23 @@ public class FSReadError extends FSError
this(cause, new File(path));
}
- @Override
- public String toString()
+ public FSReadError(String message, Throwable cause, Path path)
{
- return "FSReadError in " + path;
+ super(message, cause, path);
+ }
+
+ public FSReadError(String message, Throwable cause, File path)
+ {
+ super(message, cause, path);
+ }
+
+ public FSReadError(String message, Throwable cause, String path)
+ {
+ this(message, cause, new File(path));
+ }
+
+ public FSReadError(String message, Throwable cause)
+ {
+ this(message, cause, new File(""));
}
}
diff --git a/src/java/org/apache/cassandra/io/FSWriteError.java b/src/java/org/apache/cassandra/io/FSWriteError.java
index 481795d..81f00bd 100644
--- a/src/java/org/apache/cassandra/io/FSWriteError.java
+++ b/src/java/org/apache/cassandra/io/FSWriteError.java
@@ -44,9 +44,23 @@ public class FSWriteError extends FSError
this(cause, new File(""));
}
- @Override
- public String toString()
+ public FSWriteError(String message, Throwable cause, Path path)
{
- return "FSWriteError in " + path;
+ super(message, cause, path);
+ }
+
+ public FSWriteError(String message, Throwable cause, File path)
+ {
+ super(message, cause, path);
+ }
+
+ public FSWriteError(String message, Throwable cause, String path)
+ {
+ this(message, cause, new File(path));
+ }
+
+ public FSWriteError(String message, Throwable cause)
+ {
+ this(message, cause, new File(""));
}
}
diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
index 6224cb7..eab47c4 100644
--- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
@@ -251,7 +251,7 @@ public class CQLSSTableWriter implements Closeable
ClientState.forInternalCalls(),
options,
insert.getTimestamp(TimeUnit.MILLISECONDS.toMicros(now), options),
- (int) TimeUnit.MILLISECONDS.toSeconds(now),
+ options.getNowInSec((int) TimeUnit.MILLISECONDS.toSeconds(now)),
insert.getTimeToLive(options),
Collections.emptyMap());
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java b/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
index 4e3ae30..a95cbff 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryManager.java
@@ -281,6 +281,11 @@ public class IndexSummaryManager implements IndexSummaryManagerMBean
@VisibleForTesting
public void shutdownAndWait(long timeout, TimeUnit unit) throws InterruptedException, TimeoutException
{
- ExecutorUtils.shutdownNowAndWait(timeout, unit, executor);
+ if (future != null)
+ {
+ future.cancel(false);
+ future = null;
+ }
+ ExecutorUtils.shutdownAndWait(timeout, unit, executor);
}
}
diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
index 8fb5ad5..c5f07bc 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
@@ -34,7 +34,6 @@ import com.google.common.primitives.Longs;
import com.google.common.util.concurrent.RateLimiter;
import org.apache.cassandra.config.CassandraRelevantProperties;
-import org.apache.cassandra.io.util.File;
import org.apache.cassandra.concurrent.ExecutorPlus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
index e25b0a9..cff1f1c 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigFormat.java
@@ -18,7 +18,6 @@
package org.apache.cassandra.io.sstable.format.big;
import java.util.Collection;
-import java.util.UUID;
import org.apache.cassandra.io.sstable.SSTable;
import org.apache.cassandra.schema.TableMetadata;
diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
index 0e20f28..e8dff32 100644
--- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
@@ -638,7 +638,7 @@ public class BigTableWriter extends SSTableWriter
protected Throwable doAbort(Throwable accumulate)
{
- return indexFile.abort(accumulate);
+ return summary.close(indexFile.abort(accumulate));
}
@Override
diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
index 9efcfa6..ee5505f 100644
--- a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
+++ b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java
@@ -36,7 +36,6 @@ import org.apache.cassandra.io.ISerializer;
import org.apache.cassandra.io.sstable.format.Version;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.EstimatedHistogram;
import org.apache.cassandra.utils.TimeUUID;
diff --git a/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.java b/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.java
index 1477c5c..fa8fad7 100644
--- a/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/util/ChecksummedSequentialWriter.java
@@ -20,8 +20,6 @@ package org.apache.cassandra.io.util;
import java.nio.ByteBuffer;
import java.util.Optional;
-import org.apache.cassandra.io.util.File;
-
public class ChecksummedSequentialWriter extends SequentialWriter
{
private static final SequentialWriterOption CRC_WRITER_OPTION = SequentialWriterOption.newBuilder()
diff --git a/src/java/org/apache/cassandra/io/util/File.java b/src/java/org/apache/cassandra/io/util/File.java
index 8d4a030..23113b1 100644
--- a/src/java/org/apache/cassandra/io/util/File.java
+++ b/src/java/org/apache/cassandra/io/util/File.java
@@ -18,7 +18,9 @@
package org.apache.cassandra.io.util;
+import java.io.FileNotFoundException;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.net.URI;
import java.nio.channels.FileChannel;
import java.nio.file.*; // checkstyle: permit this import
@@ -34,6 +36,7 @@ import javax.annotation.Nullable;
import com.google.common.util.concurrent.RateLimiter;
+import net.openhft.chronicle.core.util.ThrowingFunction;
import org.apache.cassandra.io.FSWriteError;
import static org.apache.cassandra.io.util.PathUtils.filename;
@@ -165,6 +168,16 @@ public class File implements Comparable<File>
}
/**
+ * This file will be deleted, with any failures being reported with an FSError
+ * @throws FSWriteError if cannot be deleted
+ */
+ public void deleteIfExists()
+ {
+ if (path != null)
+ PathUtils.deleteIfExists(path);
+ }
+
+ /**
* This file will be deleted, obeying the provided rate limiter.
* @throws FSWriteError if cannot be deleted
*/
@@ -336,6 +349,11 @@ public class File implements Comparable<File>
return PathUtils.createFileIfNotExists(toPathForWrite());
}
+ public boolean createDirectoriesIfNotExists()
+ {
+ return PathUtils.createDirectoriesIfNotExists(toPathForWrite());
+ }
+
/**
* Try to create a directory at this path.
* Return true if a new directory was created at this path, and false otherwise.
@@ -436,12 +454,29 @@ public class File implements Comparable<File>
PathUtils.forEachRecursive(path, path -> forEach.accept(new File(path)));
}
+ private static <V> ThrowingFunction<IOException, V, RuntimeException> nulls() { return ignore -> null; }
+ private static <V> ThrowingFunction<IOException, V, IOException> rethrow()
+ {
+ return fail -> {
+ if (fail == null) throw new FileNotFoundException();
+ throw fail;
+ };
+ }
+ private static <V> ThrowingFunction<IOException, V, UncheckedIOException> unchecked()
+ {
+ return fail -> {
+ if (fail == null) fail = new FileNotFoundException();
+ throw new UncheckedIOException(fail);
+ };
+ }
+
+
/**
* @return if a directory, the names of the files within; null otherwise
*/
public String[] tryListNames()
{
- return tryListNames(path, Function.identity());
+ return tryListNames(nulls());
}
/**
@@ -449,7 +484,7 @@ public class File implements Comparable<File>
*/
public String[] tryListNames(BiPredicate<File, String> filter)
{
- return tryList(path, stream -> stream.map(PathUtils::filename).filter(filename -> filter.test(this, filename)), String[]::new);
+ return tryListNames(filter, nulls());
}
/**
@@ -457,7 +492,7 @@ public class File implements Comparable<File>
*/
public File[] tryList()
{
- return tryList(path, Function.identity());
+ return tryList(nulls());
}
/**
@@ -465,7 +500,7 @@ public class File implements Comparable<File>
*/
public File[] tryList(Predicate<File> filter)
{
- return tryList(path, stream -> stream.filter(filter));
+ return tryList(filter, nulls());
}
/**
@@ -473,28 +508,148 @@ public class File implements Comparable<File>
*/
public File[] tryList(BiPredicate<File, String> filter)
{
- return tryList(path, stream -> stream.filter(file -> filter.test(this, file.name())));
+ return tryList(filter, nulls());
+ }
+
+ /**
+ * @return if a directory, the names of the files within; null otherwise
+ */
+ public String[] listNames() throws IOException
+ {
+ return tryListNames(rethrow());
+ }
+
+ /**
+ * @return if a directory, the names of the files within, filtered by the provided predicate; null otherwise
+ */
+ public String[] listNames(BiPredicate<File, String> filter) throws IOException
+ {
+ return tryListNames(filter, rethrow());
+ }
+
+ /**
+ * @return if a directory, the files within; null otherwise
+ */
+ public File[] list() throws IOException
+ {
+ return tryList(rethrow());
+ }
+
+ /**
+ * @return if a directory, the files within, filtered by the provided predicate; null otherwise
+ */
+ public File[] list(Predicate<File> filter) throws IOException
+ {
+ return tryList(filter, rethrow());
+ }
+
+ /**
+ * @return if a directory, the files within, filtered by the provided predicate; null otherwise
+ */
+ public File[] list(BiPredicate<File, String> filter) throws IOException
+ {
+ return tryList(filter, rethrow());
+ }
+
+ /**
+ * @return if a directory, the names of the files within; null otherwise
+ */
+ public String[] listNamesUnchecked() throws UncheckedIOException
+ {
+ return tryListNames(unchecked());
+ }
+
+ /**
+ * @return if a directory, the names of the files within, filtered by the provided predicate; null otherwise
+ */
+ public String[] listNamesUnchecked(BiPredicate<File, String> filter) throws UncheckedIOException
+ {
+ return tryListNames(filter, unchecked());
+ }
+
+ /**
+ * @return if a directory, the files within; null otherwise
+ */
+ public File[] listUnchecked() throws UncheckedIOException
+ {
+ return tryList(unchecked());
+ }
+
+ /**
+ * @return if a directory, the files within, filtered by the provided predicate; null otherwise
+ */
+ public File[] listUnchecked(Predicate<File> filter) throws UncheckedIOException
+ {
+ return tryList(filter, unchecked());
+ }
+
+ /**
+ * @return if a directory, the files within, filtered by the provided predicate; throw an UncheckedIO exception otherwise
+ */
+ public File[] listUnchecked(BiPredicate<File, String> filter) throws UncheckedIOException
+ {
+ return tryList(filter, unchecked());
+ }
+
+ /**
+ * @return if a directory, the names of the files within; null otherwise
+ */
+ public <T extends Throwable> String[] tryListNames(ThrowingFunction<IOException, String[], T> orElse) throws T
+ {
+ return tryListNames(path, Function.identity(), orElse);
+ }
+
+ /**
+ * @return if a directory, the names of the files within, filtered by the provided predicate; null otherwise
+ */
+ public <T extends Throwable> String[] tryListNames(BiPredicate<File, String> filter, ThrowingFunction<IOException, String[], T> orElse) throws T
+ {
+ return tryList(path, stream -> stream.map(PathUtils::filename).filter(filename -> filter.test(this, filename)), String[]::new, orElse);
+ }
+
+ /**
+ * @return if a directory, the files within; null otherwise
+ */
+ private <T extends Throwable> File[] tryList(ThrowingFunction<IOException, File[], T> orElse) throws T
+ {
+ return tryList(path, Function.identity(), orElse);
+ }
+
+ /**
+ * @return if a directory, the files within, filtered by the provided predicate; null otherwise
+ */
+ private <T extends Throwable> File[] tryList(Predicate<File> filter, ThrowingFunction<IOException, File[], T> orElse) throws T
+ {
+ return tryList(path, stream -> stream.filter(filter), orElse);
+ }
+
+ /**
+ * @return if a directory, the files within, filtered by the provided predicate; null otherwise
+ */
+ private <T extends Throwable> File[] tryList(BiPredicate<File, String> filter, ThrowingFunction<IOException, File[], T> orElse) throws T
+ {
+ return tryList(path, stream -> stream.filter(file -> filter.test(this, file.name())), orElse);
}
- private static String[] tryListNames(Path path, Function<Stream<File>, Stream<File>> toFiles)
+ private static <T extends Throwable> String[] tryListNames(Path path, Function<Stream<File>, Stream<File>> toFiles, ThrowingFunction<IOException, String[], T> orElse) throws T
{
if (path == null)
- return null;
- return PathUtils.tryList(path, stream -> toFiles.apply(stream.map(File::new)).map(File::name), String[]::new);
+ return orElse.apply(null);
+ return PathUtils.tryList(path, stream -> toFiles.apply(stream.map(File::new)).map(File::name), String[]::new, orElse);
}
- private static <T> T[] tryList(Path path, Function<Stream<Path>, Stream<T>> transformation, IntFunction<T[]> constructor)
+ private static <T extends Throwable, V> V[] tryList(Path path, Function<Stream<Path>, Stream<V>> transformation, IntFunction<V[]> constructor, ThrowingFunction<IOException, V[], T> orElse) throws T
{
if (path == null)
- return null;
- return PathUtils.tryList(path, transformation, constructor);
+ return orElse.apply(null);
+ return PathUtils.tryList(path, transformation, constructor, orElse);
}
- private static File[] tryList(Path path, Function<Stream<File>, Stream<File>> toFiles)
+ private static <T extends Throwable> File[] tryList(Path path, Function<Stream<File>, Stream<File>> toFiles, ThrowingFunction<IOException, File[], T> orElse) throws T
{
if (path == null)
- return null;
- return PathUtils.tryList(path, stream -> toFiles.apply(stream.map(File::new)), File[]::new);
+ return orElse.apply(null);
+ return PathUtils.tryList(path, stream -> toFiles.apply(stream.map(File::new)), File[]::new, orElse);
}
/**
diff --git a/src/java/org/apache/cassandra/io/util/PathUtils.java b/src/java/org/apache/cassandra/io/util/PathUtils.java
index c5a1e96..2e321c7 100644
--- a/src/java/org/apache/cassandra/io/util/PathUtils.java
+++ b/src/java/org/apache/cassandra/io/util/PathUtils.java
@@ -34,6 +34,7 @@ import com.google.common.util.concurrent.RateLimiter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import net.openhft.chronicle.core.util.ThrowingFunction;
import org.apache.cassandra.config.CassandraRelevantProperties;
import org.apache.cassandra.io.FSError;
import org.apache.cassandra.io.FSReadError;
@@ -132,7 +133,7 @@ public final class PathUtils
}
}
- public static <T> T[] tryList(Path path, Function<Stream<Path>, Stream<T>> transform, IntFunction<T[]> arrayFactory)
+ public static <T extends Throwable, V> V[] tryList(Path path, Function<Stream<Path>, Stream<V>> transform, IntFunction<V[]> arrayFactory, ThrowingFunction<IOException, V[], T> orElse) throws T
{
try (Stream<Path> stream = Files.list(path))
{
@@ -141,7 +142,7 @@ public final class PathUtils
}
catch (IOException e)
{
- return null;
+ return orElse.apply(e);
}
}
@@ -255,6 +256,22 @@ public final class PathUtils
}
}
+ public static void deleteIfExists(Path file)
+ {
+ try
+ {
+ Files.delete(file);
+ onDeletion.accept(file);
+ }
+ catch (IOException e)
+ {
+ if (e instanceof FileNotFoundException | e instanceof NoSuchFileException)
+ return;
+
+ throw propagateUnchecked(e, file, true);
+ }
+ }
+
public static boolean tryDelete(Path file)
{
try
@@ -375,9 +392,8 @@ public final class PathUtils
{
logger.trace("Could not move file {} to {}", from, to, e);
- // TODO: this should be an FSError (either read or write)?
- // (but for now this is maintaining legacy semantics)
- throw new RuntimeException(String.format("Failed to rename %s to %s", from, to), e);
+ // TODO: try to decide if is read or write? for now, have assumed write
+ throw propagateUnchecked(String.format("Failed to rename %s to %s", from, to), e, to, true);
}
}
@@ -734,6 +750,14 @@ public final class PathUtils
*/
public static RuntimeException propagateUnchecked(IOException ioe, Path path, boolean write)
{
+ return propagateUnchecked(null, ioe, path, write);
+ }
+
+ /**
+ * propagate an IOException as an FSWriteError, FSReadError or UncheckedIOException
+ */
+ public static RuntimeException propagateUnchecked(String message, IOException ioe, Path path, boolean write)
+ {
if (ioe instanceof FileAlreadyExistsException
|| ioe instanceof NoSuchFileException
|| ioe instanceof AtomicMoveNotSupportedException
@@ -741,10 +765,10 @@ public final class PathUtils
|| ioe instanceof java.nio.file.FileSystemLoopException
|| ioe instanceof java.nio.file.NotDirectoryException
|| ioe instanceof java.nio.file.NotLinkException)
- throw new UncheckedIOException(ioe);
+ throw new UncheckedIOException(message, ioe);
- if (write) throw new FSWriteError(ioe, path);
- else throw new FSReadError(ioe, path);
+ if (write) throw new FSWriteError(message, ioe, path);
+ else throw new FSReadError(message, ioe, path);
}
/**
diff --git a/src/java/org/apache/cassandra/io/util/SequentialWriterOption.java b/src/java/org/apache/cassandra/io/util/SequentialWriterOption.java
index 599c654..49093c1 100644
--- a/src/java/org/apache/cassandra/io/util/SequentialWriterOption.java
+++ b/src/java/org/apache/cassandra/io/util/SequentialWriterOption.java
@@ -40,6 +40,7 @@ public class SequentialWriterOption
* </ul>
*/
public static final SequentialWriterOption DEFAULT = SequentialWriterOption.newBuilder().build();
+ public static final SequentialWriterOption FINISH_ON_CLOSE = SequentialWriterOption.newBuilder().finishOnClose(true).build();
private final int bufferSize;
private final BufferType bufferType;
diff --git a/src/java/org/apache/cassandra/locator/AbstractReplicaCollection.java b/src/java/org/apache/cassandra/locator/AbstractReplicaCollection.java
index 16db492..cc21062 100644
--- a/src/java/org/apache/cassandra/locator/AbstractReplicaCollection.java
+++ b/src/java/org/apache/cassandra/locator/AbstractReplicaCollection.java
@@ -32,9 +32,12 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
+import java.util.RandomAccess;
import java.util.Set;
+import java.util.Spliterator;
import java.util.function.BiConsumer;
import java.util.function.BinaryOperator;
+import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
@@ -45,6 +48,9 @@ import java.util.stream.Stream;
* A collection like class for Replica objects. Since the Replica class contains inetaddress, range, and
* transient replication status, basic contains and remove methods can be ambiguous. Replicas forces you
* to be explicit about what you're checking the container for, or removing from it.
+ *
+ * TODO: there's nothing about this collection that's unique to Replicas, and the implementation
+ * could make a useful general purpose immutable list<->set
*/
public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollection<C>> implements ReplicaCollection<C>
{
@@ -69,8 +75,10 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
* A simple list with no comodification checks and immutability by default (only append permitted, and only one initial copy)
* this permits us to reduce the amount of garbage generated, by not wrapping iterators or unnecessarily copying
* and reduces the amount of indirection necessary, as well as ensuring monomorphic callsites
+ *
+ * TODO flatten into AbstractReplicaCollection?
*/
- protected static class ReplicaList implements Iterable<Replica>
+ protected final static class ReplicaList implements Iterable<Replica>
{
private static final Replica[] EMPTY = new Replica[0];
Replica[] contents;
@@ -125,7 +133,7 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
return new ReplicaList(contents, this.begin + begin, end - begin);
}
- public ReplicaList sorted(Comparator<Replica> comparator)
+ public ReplicaList sorted(Comparator<? super Replica> comparator)
{
Replica[] copy = Arrays.copyOfRange(contents, begin, begin + size);
Arrays.sort(copy, comparator);
@@ -137,6 +145,37 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
return Arrays.stream(contents, begin, begin + size);
}
+ @Override
+ public void forEach(Consumer<? super Replica> forEach)
+ {
+ for (int i = begin, end = begin + size ; i < end ; ++i)
+ forEach.accept(contents[i]);
+ }
+
+ /** see {@link ReplicaCollection#count(Predicate)}*/
+ public int count(Predicate<? super Replica> test)
+ {
+ int count = 0;
+ for (int i = begin, end = i + size ; i < end ; ++i)
+ if (test.test(contents[i]))
+ ++count;
+ return count;
+ }
+
+ public final boolean anyMatch(Predicate<? super Replica> predicate)
+ {
+ for (int i = begin, end = i + size ; i < end ; ++i)
+ if (predicate.test(contents[i]))
+ return true;
+ return false;
+ }
+
+ @Override
+ public Spliterator<Replica> spliterator()
+ {
+ return Arrays.spliterator(contents, begin, begin + size);
+ }
+
// we implement our own iterator, because it is trivial to do so, and in monomorphic call sites
// will compile down to almost optimal indexed for loop
@Override
@@ -163,7 +202,7 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
// we implement our own iterator, because it is trivial to do so, and in monomorphic call sites
// will compile down to almost optimal indexed for loop
- public <K> Iterator<K> transformIterator(Function<Replica, K> function)
+ public <K> Iterator<K> transformIterator(Function<? super Replica, ? extends K> function)
{
return new Iterator<K>()
{
@@ -186,7 +225,7 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
// we implement our own iterator, because it is trivial to do so, and in monomorphic call sites
// will compile down to almost optimal indexed for loop
// in this case, especially, it is impactful versus Iterables.limit(Iterables.filter())
- private Iterator<Replica> filterIterator(Predicate<Replica> predicate, int limit)
+ private Iterator<Replica> filterIterator(Predicate<? super Replica> predicate, int limit)
{
return new Iterator<Replica>()
{
@@ -218,6 +257,12 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
};
}
+ protected <T> void forEach(Function<? super Replica, T> function, Consumer<? super T> action)
+ {
+ for (int i = begin, end = begin + size ; i < end ; ++i)
+ action.accept(function.apply(contents[i]));
+ }
+
@VisibleForTesting
public boolean equals(Object to)
{
@@ -263,6 +308,12 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
public boolean contains(Object o) { return containsKey(o); }
@Override
public Iterator<K> iterator() { return list.transformIterator(toKey); }
+
+ @Override
+ public void forEach(Consumer<? super K> action)
+ {
+ list.forEach(toKey, action);
+ }
}
class EntrySet extends AbstractImmutableSet<Entry<K, Replica>>
@@ -318,7 +369,7 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
public boolean containsKey(Object key)
{
Preconditions.checkNotNull(key);
- return get((K)key) != null;
+ return get(key) != null;
}
public Replica get(Object key)
@@ -368,6 +419,35 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
}
}
+ static class AsList<T> extends AbstractList<T> implements RandomAccess
+ {
+ final Function<Replica, T> view;
+ final ReplicaList list;
+
+ AsList(Function<Replica, T> view, ReplicaList list)
+ {
+ this.view = view;
+ this.list = list;
+ }
+
+ public final T get(int index)
+ {
+ return view.apply(list.get(index));
+ }
+
+ public final int size()
+ {
+ return list.size;
+ }
+
+ @Override
+ public final void forEach(Consumer<? super T> forEach)
+ {
+ list.forEach(view, forEach);
+ }
+ }
+
+
protected final ReplicaList list;
AbstractReplicaCollection(ReplicaList list)
{
@@ -398,40 +478,30 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
return snapshot(subList);
}
- public final <T> List<T> asList(Function<Replica, T> viewTransform)
+ public final <T> List<T> asList(Function<Replica, T> view)
{
- return new AbstractList<T>()
- {
- public T get(int index)
- {
- return viewTransform.apply(list.get(index));
- }
-
- public int size()
- {
- return list.size;
- }
- };
+ return new AsList<>(view, list);
}
/** see {@link ReplicaCollection#count(Predicate)}*/
- public int count(Predicate<Replica> predicate)
+ public final int count(Predicate<? super Replica> test)
{
- int count = 0;
- for (int i = 0 ; i < list.size() ; ++i)
- if (predicate.test(list.get(i)))
- ++count;
- return count;
+ return list.count(test);
+ }
+
+ public final boolean anyMatch(Predicate<? super Replica> test)
+ {
+ return list.anyMatch(test);
}
/** see {@link ReplicaCollection#filter(Predicate)}*/
- public final C filter(Predicate<Replica> predicate)
+ public final C filter(Predicate<? super Replica> predicate)
{
return filter(predicate, Integer.MAX_VALUE);
}
/** see {@link ReplicaCollection#filter(Predicate, int)}*/
- public final C filter(Predicate<Replica> predicate, int limit)
+ public final C filter(Predicate<? super Replica> predicate, int limit)
{
if (isEmpty())
return snapshot();
@@ -475,19 +545,19 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
}
/** see {@link ReplicaCollection#filterLazily(Predicate)}*/
- public final Iterable<Replica> filterLazily(Predicate<Replica> predicate)
+ public final Iterable<Replica> filterLazily(Predicate<? super Replica> predicate)
{
return filterLazily(predicate, Integer.MAX_VALUE);
}
/** see {@link ReplicaCollection#filterLazily(Predicate,int)}*/
- public final Iterable<Replica> filterLazily(Predicate<Replica> predicate, int limit)
+ public final Iterable<Replica> filterLazily(Predicate<? super Replica> predicate, int limit)
{
return () -> list.filterIterator(predicate, limit);
}
/** see {@link ReplicaCollection#sorted(Comparator)}*/
- public final C sorted(Comparator<Replica> comparator)
+ public final C sorted(Comparator<? super Replica> comparator)
{
return snapshot(list.sorted(comparator));
}
@@ -512,6 +582,11 @@ public abstract class AbstractReplicaCollection<C extends AbstractReplicaCollect
return list.iterator();
}
+ public final void forEach(Consumer<? super Replica> forEach)
+ {
+ list.forEach(forEach);
+ }
+
public final Stream<Replica> stream() { return list.stream(); }
/**
diff --git a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
index 0b7c378..7f33c57 100644
--- a/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
+++ b/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
import com.google.common.base.Preconditions;
@@ -32,6 +33,7 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ConsistencyLevel;
+import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.db.WriteType;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.RingPosition;
@@ -128,17 +130,20 @@ public abstract class AbstractReplicationStrategy
*/
public abstract EndpointsForRange calculateNaturalReplicas(Token searchToken, TokenMetadata tokenMetadata);
- public <T> AbstractWriteResponseHandler<T> getWriteResponseHandler(ReplicaPlan.ForTokenWrite replicaPlan,
+ public <T> AbstractWriteResponseHandler<T> getWriteResponseHandler(ReplicaPlan.ForWrite replicaPlan,
Runnable callback,
WriteType writeType,
+ Supplier<Mutation> hintOnFailure,
long queryStartNanoTime)
{
- return getWriteResponseHandler(replicaPlan, callback, writeType, queryStartNanoTime, DatabaseDescriptor.getIdealConsistencyLevel());
+ return getWriteResponseHandler(replicaPlan, callback, writeType, hintOnFailure,
+ queryStartNanoTime, DatabaseDescriptor.getIdealConsistencyLevel());
}
- public <T> AbstractWriteResponseHandler<T> getWriteResponseHandler(ReplicaPlan.ForTokenWrite replicaPlan,
+ public <T> AbstractWriteResponseHandler<T> getWriteResponseHandler(ReplicaPlan.ForWrite replicaPlan,
Runnable callback,
WriteType writeType,
+ Supplier<Mutation> hintOnFailure,
long queryStartNanoTime,
ConsistencyLevel idealConsistencyLevel)
{
@@ -146,15 +151,15 @@ public abstract class AbstractReplicationStrategy
if (replicaPlan.consistencyLevel().isDatacenterLocal())
{
// block for in this context will be localnodes block.
- resultResponseHandler = new DatacenterWriteResponseHandler<T>(replicaPlan, callback, writeType, queryStartNanoTime);
+ resultResponseHandler = new DatacenterWriteResponseHandler<T>(replicaPlan, callback, writeType, hintOnFailure, queryStartNanoTime);
}
else if (replicaPlan.consistencyLevel() == ConsistencyLevel.EACH_QUORUM && (this instanceof NetworkTopologyStrategy))
{
- resultResponseHandler = new DatacenterSyncWriteResponseHandler<T>(replicaPlan, callback, writeType, queryStartNanoTime);
+ resultResponseHandler = new DatacenterSyncWriteResponseHandler<T>(replicaPlan, callback, writeType, hintOnFailure, queryStartNanoTime);
}
else
{
- resultResponseHandler = new WriteResponseHandler<T>(replicaPlan, callback, writeType, queryStartNanoTime);
+ resultResponseHandler = new WriteResponseHandler<T>(replicaPlan, callback, writeType, hintOnFailure, queryStartNanoTime);
}
//Check if tracking the ideal consistency level is configured
@@ -173,6 +178,7 @@ public abstract class AbstractReplicationStrategy
AbstractWriteResponseHandler<T> idealHandler = getWriteResponseHandler(replicaPlan.withConsistencyLevel(idealConsistencyLevel),
callback,
writeType,
+ hintOnFailure,
queryStartNanoTime,
idealConsistencyLevel);
resultResponseHandler.setIdealCLResponseHandler(idealHandler);
diff --git a/src/java/org/apache/cassandra/locator/Endpoints.java b/src/java/org/apache/cassandra/locator/Endpoints.java
index 32e972a..1561db2 100644
--- a/src/java/org/apache/cassandra/locator/Endpoints.java
+++ b/src/java/org/apache/cassandra/locator/Endpoints.java
@@ -21,7 +21,6 @@ package org.apache.cassandra.locator;
import org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict;
import org.apache.cassandra.utils.FBUtilities;
-import java.util.AbstractList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -54,20 +53,14 @@ public abstract class Endpoints<E extends Endpoints<E>> extends AbstractReplicaC
return byEndpoint().keySet();
}
- public List<InetAddressAndPort> endpointList()
+ public InetAddressAndPort endpoint(int i)
{
- return new AbstractList<InetAddressAndPort>()
- {
- public InetAddressAndPort get(int index)
- {
- return list.get(index).endpoint();
- }
+ return get(i).endpoint();
+ }
- public int size()
- {
- return list.size;
- }
- };
+ public List<InetAddressAndPort> endpointList()
+ {
+ return asList(Replica::endpoint);
}
public Map<InetAddressAndPort, Replica> byEndpoint()
@@ -87,6 +80,11 @@ public abstract class Endpoints<E extends Endpoints<E>> extends AbstractReplicaC
replica);
}
+ public boolean contains(InetAddressAndPort endpoint)
+ {
+ return endpoint != null && byEndpoint().containsKey(endpoint);
+ }
+
public E withoutSelf()
{
InetAddressAndPort self = FBUtilities.getBroadcastAddressAndPort();
diff --git a/src/java/org/apache/cassandra/locator/EndpointsForToken.java b/src/java/org/apache/cassandra/locator/EndpointsForToken.java
index c709988..70cd763 100644
--- a/src/java/org/apache/cassandra/locator/EndpointsForToken.java
+++ b/src/java/org/apache/cassandra/locator/EndpointsForToken.java
@@ -19,7 +19,11 @@
package org.apache.cassandra.locator;
import com.google.common.base.Preconditions;
+
+import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.schema.TableMetadata;
+import org.apache.cassandra.service.StorageService;
import java.util.Arrays;
import java.util.Collection;
@@ -67,6 +71,11 @@ public class EndpointsForToken extends Endpoints<EndpointsForToken>
return new EndpointsForToken(token, newList, byEndpoint);
}
+ public Replica lookup(InetAddressAndPort endpoint)
+ {
+ return byEndpoint().get(endpoint);
+ }
+
public static class Builder extends EndpointsForToken implements ReplicaCollection.Builder<EndpointsForToken>
{
boolean built;
@@ -146,4 +155,34 @@ public class EndpointsForToken extends Endpoints<EndpointsForToken>
if (replicas.isEmpty()) return empty(token);
return builder(token, replicas.size()).addAll(replicas).build();
}
+
+ public static EndpointsForToken natural(Keyspace keyspace, Token token)
+ {
+ return keyspace.getReplicationStrategy().getNaturalReplicasForToken(token);
+ }
+
+ public static EndpointsForToken natural(AbstractReplicationStrategy replicationStrategy, Token token)
+ {
+ return replicationStrategy.getNaturalReplicasForToken(token);
+ }
+
+ public static EndpointsForToken natural(TableMetadata table, Token token)
+ {
+ return natural(Keyspace.open(table.keyspace), token);
+ }
+
+ public static EndpointsForToken pending(TableMetadata table, Token token)
+ {
+ return pending(table.keyspace, token);
+ }
+
+ public static EndpointsForToken pending(Keyspace keyspace, Token token)
+ {
+ return pending(keyspace.getName(), token);
+ }
+
+ public static EndpointsForToken pending(String keyspace, Token token)
+ {
+ return StorageService.instance.getTokenMetadata().pendingEndpointsForToken(token, keyspace);
+ }
}
diff --git a/src/java/org/apache/cassandra/locator/InOurDcTester.java b/src/java/org/apache/cassandra/locator/InOurDc.java
similarity index 71%
rename from src/java/org/apache/cassandra/locator/InOurDcTester.java
rename to src/java/org/apache/cassandra/locator/InOurDc.java
index 181cace..34e8ef8 100644
--- a/src/java/org/apache/cassandra/locator/InOurDcTester.java
+++ b/src/java/org/apache/cassandra/locator/InOurDc.java
@@ -18,11 +18,12 @@
package org.apache.cassandra.locator;
-import org.apache.cassandra.config.DatabaseDescriptor;
-
import java.util.function.Predicate;
-public class InOurDcTester
+import static org.apache.cassandra.config.DatabaseDescriptor.getEndpointSnitch;
+import static org.apache.cassandra.config.DatabaseDescriptor.getLocalDataCenter;
+
+public class InOurDc
{
private static ReplicaTester replicas;
private static EndpointTester endpoints;
@@ -30,7 +31,7 @@ public class InOurDcTester
final String dc;
final IEndpointSnitch snitch;
- private InOurDcTester(String dc, IEndpointSnitch snitch)
+ private InOurDc(String dc, IEndpointSnitch snitch)
{
this.dc = dc;
this.snitch = snitch;
@@ -38,15 +39,15 @@ public class InOurDcTester
boolean stale()
{
- return dc != DatabaseDescriptor.getLocalDataCenter()
- || snitch != DatabaseDescriptor.getEndpointSnitch()
+ return dc != getLocalDataCenter()
+ || snitch != getEndpointSnitch()
// this final clause checks if somehow the snitch/localDc have got out of whack;
// presently, this is possible but very unlikely, but this check will also help
// resolve races on these global fields as well
|| !dc.equals(snitch.getLocalDatacenter());
}
- private static final class ReplicaTester extends InOurDcTester implements Predicate<Replica>
+ private static final class ReplicaTester extends InOurDc implements Predicate<Replica>
{
private ReplicaTester(String dc, IEndpointSnitch snitch)
{
@@ -60,7 +61,7 @@ public class InOurDcTester
}
}
- private static final class EndpointTester extends InOurDcTester implements Predicate<InetAddressAndPort>
+ private static final class EndpointTester extends InOurDc implements Predicate<InetAddressAndPort>
{
private EndpointTester(String dc, IEndpointSnitch snitch)
{
@@ -78,7 +79,7 @@ public class InOurDcTester
{
ReplicaTester cur = replicas;
if (cur == null || cur.stale())
- replicas = cur = new ReplicaTester(DatabaseDescriptor.getLocalDataCenter(), DatabaseDescriptor.getEndpointSnitch());
+ replicas = cur = new ReplicaTester(getLocalDataCenter(), getEndpointSnitch());
return cur;
}
@@ -86,8 +87,18 @@ public class InOurDcTester
{
EndpointTester cur = endpoints;
if (cur == null || cur.stale())
- endpoints = cur = new EndpointTester(DatabaseDescriptor.getLocalDataCenter(), DatabaseDescriptor.getEndpointSnitch());
+ endpoints = cur = new EndpointTester(getLocalDataCenter(), getEndpointSnitch());
return cur;
}
+ public static boolean isInOurDc(Replica replica)
+ {
+ return replicas().test(replica);
+ }
+
+ public static boolean isInOurDc(InetAddressAndPort endpoint)
+ {
+ return endpoints().test(endpoint);
+ }
+
}
diff --git a/src/java/org/apache/cassandra/locator/ReplicaCollection.java b/src/java/org/apache/cassandra/locator/ReplicaCollection.java
index ec671d5..b679b50 100644
--- a/src/java/org/apache/cassandra/locator/ReplicaCollection.java
+++ b/src/java/org/apache/cassandra/locator/ReplicaCollection.java
@@ -62,14 +62,14 @@ public interface ReplicaCollection<C extends ReplicaCollection<C>> extends Itera
/**
* @return the number of replicas that match the predicate
*/
- public abstract int count(Predicate<Replica> predicate);
+ public abstract int count(Predicate<? super Replica> predicate);
/**
* @return a *eagerly constructed* copy of this collection containing the Replica that match the provided predicate.
* An effort will be made to either return ourself, or a subList, where possible.
* It is guaranteed that no changes to any upstream Builder will affect the state of the result.
*/
- public abstract C filter(Predicate<Replica> predicate);
+ public abstract C filter(Predicate<? super Replica> predicate);
/**
* @return a *eagerly constructed* copy of this collection containing the Replica that match the provided predicate.
@@ -77,18 +77,18 @@ public interface ReplicaCollection<C extends ReplicaCollection<C>> extends Itera
* It is guaranteed that no changes to any upstream Builder will affect the state of the result.
* Only the first maxSize items will be returned.
*/
- public abstract C filter(Predicate<Replica> predicate, int maxSize);
+ public abstract C filter(Predicate<? super Replica> predicate, int maxSize);
/**
* @return a *lazily constructed* Iterable over this collection, containing the Replica that match the provided predicate.
*/
- public abstract Iterable<Replica> filterLazily(Predicate<Replica> predicate);
+ public abstract Iterable<Replica> filterLazily(Predicate<? super Replica> predicate);
/**
* @return a *lazily constructed* Iterable over this collection, containing the Replica that match the provided predicate.
* Only the first maxSize matching items will be returned.
*/
- public abstract Iterable<Replica> filterLazily(Predicate<Replica> predicate, int maxSize);
+ public abstract Iterable<Replica> filterLazily(Predicate<? super Replica> predicate, int maxSize);
/**
* @return an *eagerly constructed* copy of this collection containing the Replica at positions [start..end);
@@ -101,7 +101,7 @@ public interface ReplicaCollection<C extends ReplicaCollection<C>> extends Itera
* @return an *eagerly constructed* copy of this collection containing the Replica re-ordered according to this comparator
* It is guaranteed that no changes to any upstream Builder will affect the state of the result.
*/
- public abstract C sorted(Comparator<Replica> comparator);
+ public abstract C sorted(Comparator<? super Replica> comparator);
public abstract Iterator<Replica> iterator();
public abstract Stream<Replica> stream();
diff --git a/src/java/org/apache/cassandra/locator/ReplicaLayout.java b/src/java/org/apache/cassandra/locator/ReplicaLayout.java
index ff81732..351e837 100644
--- a/src/java/org/apache/cassandra/locator/ReplicaLayout.java
+++ b/src/java/org/apache/cassandra/locator/ReplicaLayout.java
@@ -25,7 +25,6 @@ import org.apache.cassandra.db.PartitionPosition;
import org.apache.cassandra.dht.AbstractBounds;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.gms.FailureDetector;
-import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
import java.util.Set;
@@ -169,13 +168,14 @@ public abstract class ReplicaLayout<E extends Endpoints<E>>
@Override
public Token token() { return natural().token(); }
- public ReplicaLayout.ForTokenWrite filter(Predicate<Replica> filter)
+ public ForTokenWrite filter(Predicate<Replica> filter)
{
EndpointsForToken filtered = all().filter(filter);
// AbstractReplicaCollection.filter returns itself if all elements match the filter
if (filtered == all()) return this;
+ if (pending().isEmpty()) return new ForTokenWrite(replicationStrategy(), filtered, pending(), filtered);
// unique by endpoint, so can for efficiency filter only on endpoint
- return new ReplicaLayout.ForTokenWrite(
+ return new ForTokenWrite(
replicationStrategy(),
natural().keep(filtered.endpoints()),
pending().keep(filtered.endpoints()),
@@ -206,8 +206,8 @@ public abstract class ReplicaLayout<E extends Endpoints<E>>
// TODO: these should be cached, not the natural replicas
// TODO: race condition to fetch these. implications??
AbstractReplicationStrategy replicationStrategy = keyspace.getReplicationStrategy();
- EndpointsForToken natural = replicationStrategy.getNaturalReplicasForToken(token);
- EndpointsForToken pending = StorageService.instance.getTokenMetadata().pendingEndpointsForToken(token, keyspace.getName());
+ EndpointsForToken natural = EndpointsForToken.natural(replicationStrategy, token);
+ EndpointsForToken pending = EndpointsForToken.pending(keyspace, token);
return forTokenWrite(replicationStrategy, natural, pending);
}
@@ -325,7 +325,7 @@ public abstract class ReplicaLayout<E extends Endpoints<E>>
* @return the read layout for a token - this includes only live natural replicas, i.e. those that are not pending
* and not marked down by the failure detector. these are reverse sorted by the badness score of the configured snitch
*/
- static ReplicaLayout.ForTokenRead forTokenReadLiveSorted(AbstractReplicationStrategy replicationStrategy, Token token)
+ public static ReplicaLayout.ForTokenRead forTokenReadLiveSorted(AbstractReplicationStrategy replicationStrategy, Token token)
{
EndpointsForToken replicas = replicationStrategy.getNaturalReplicasForToken(token);
replicas = DatabaseDescriptor.getEndpointSnitch().sortedByProximity(FBUtilities.getBroadcastAddressAndPort(), replicas);
diff --git a/src/java/org/apache/cassandra/locator/ReplicaPlan.java b/src/java/org/apache/cassandra/locator/ReplicaPlan.java
index 51cab13..3bb3ec0 100644
--- a/src/java/org/apache/cassandra/locator/ReplicaPlan.java
+++ b/src/java/org/apache/cassandra/locator/ReplicaPlan.java
@@ -25,69 +25,89 @@ import org.apache.cassandra.db.PartitionPosition;
import org.apache.cassandra.dht.AbstractBounds;
import java.util.function.Predicate;
+import java.util.function.Supplier;
-public abstract class ReplicaPlan<E extends Endpoints<E>>
+public interface ReplicaPlan<E extends Endpoints<E>, P extends ReplicaPlan<E, P>>
{
- protected final Keyspace keyspace;
- protected final ConsistencyLevel consistencyLevel;
- // The snapshot of the replication strategy when instantiating.
- // It could be different than the one fetched from Keyspace later, e.g. RS altered during the query.
- // Use the snapshot to calculate {@code blockFor} in order to have a consistent view of RS for the query.
- protected final AbstractReplicationStrategy replicationStrategy;
-
- // all nodes we will contact via any mechanism, including hints
- // i.e., for:
- // - reads, only live natural replicas
- // ==> live.natural().subList(0, blockFor + initial speculate)
- // - writes, includes all full, and any pending replicas, (and only any necessary transient ones to make up the difference)
- // ==> liveAndDown.natural().filter(isFull) ++ liveAndDown.pending() ++ live.natural.filter(isTransient, req)
- // - paxos, includes all live replicas (natural+pending), for this DC if SERIAL_LOCAL
- // ==> live.all() (if consistencyLevel.isDCLocal(), then .filter(consistencyLevel.isLocal))
- private final E contacts;
-
- ReplicaPlan(Keyspace keyspace, AbstractReplicationStrategy replicationStrategy, ConsistencyLevel consistencyLevel, E contacts)
+ Keyspace keyspace();
+ AbstractReplicationStrategy replicationStrategy();
+ ConsistencyLevel consistencyLevel();
+
+ E contacts();
+
+ Replica lookup(InetAddressAndPort endpoint);
+ P withContacts(E contacts);
+
+ interface ForRead<E extends Endpoints<E>, P extends ReplicaPlan.ForRead<E, P>> extends ReplicaPlan<E, P>
{
- assert contacts != null;
- this.keyspace = keyspace;
- this.replicationStrategy = replicationStrategy;
- this.consistencyLevel = consistencyLevel;
- this.contacts = contacts;
+ int readQuorum();
+ E readCandidates();
+
+ default Replica firstUncontactedCandidate(Predicate<Replica> extraPredicate)
+ {
+ return Iterables.tryFind(readCandidates(), r -> extraPredicate.test(r) && !contacts().contains(r)).orNull();
+ }
}
- public abstract int blockFor();
+ abstract class AbstractReplicaPlan<E extends Endpoints<E>, P extends ReplicaPlan<E, P>> implements ReplicaPlan<E, P>
+ {
+ protected final Keyspace keyspace;
+ protected final ConsistencyLevel consistencyLevel;
+ // The snapshot of the replication strategy when instantiating.
+ // It could be different than the one fetched from Keyspace later, e.g. RS altered during the query.
+ // Use the snapshot to calculate {@code blockFor} in order to have a consistent view of RS for the query.
+ protected final AbstractReplicationStrategy replicationStrategy;
+
+ // all nodes we will contact via any mechanism, including hints
+ // i.e., for:
+ // - reads, only live natural replicas
+ // ==> live.natural().subList(0, blockFor + initial speculate)
+ // - writes, includes all full, and any pending replicas, (and only any necessary transient ones to make up the difference)
+ // ==> liveAndDown.natural().filter(isFull) ++ liveAndDown.pending() ++ live.natural.filter(isTransient, req)
+ // - paxos, includes all live replicas (natural+pending), for this DC if SERIAL_LOCAL
+ // ==> live.all() (if consistencyLevel.isDCLocal(), then .filter(consistencyLevel.isLocal))
+ private final E contacts;
+
+ AbstractReplicaPlan(Keyspace keyspace, AbstractReplicationStrategy replicationStrategy, ConsistencyLevel consistencyLevel, E contacts)
+ {
+ assert contacts != null;
+ this.keyspace = keyspace;
+ this.replicationStrategy = replicationStrategy;
+ this.consistencyLevel = consistencyLevel;
+ this.contacts = contacts;
+ }
- public E contacts() { return contacts; }
+ public E contacts() { return contacts; }
- // TODO: should this semantically return true if we contain the endpoint, not the exact replica?
- public boolean contacts(Replica replica) { return contacts.contains(replica); }
- public Keyspace keyspace() { return keyspace; }
- public AbstractReplicationStrategy replicationStrategy() { return replicationStrategy; }
- public ConsistencyLevel consistencyLevel() { return consistencyLevel; }
+ public Keyspace keyspace() { return keyspace; }
+ public AbstractReplicationStrategy replicationStrategy() { return replicationStrategy; }
+ public ConsistencyLevel consistencyLevel() { return consistencyLevel; }
+ }
- public static abstract class ForRead<E extends Endpoints<E>> extends ReplicaPlan<E>
+ public static abstract class AbstractForRead<E extends Endpoints<E>, P extends ForRead<E, P>> extends AbstractReplicaPlan<E, P> implements ForRead<E, P>
{
// all nodes we *could* contacts; typically all natural replicas that are believed to be alive
// we will consult this collection to find uncontacted nodes we might contact if we doubt we will meet consistency level
- private final E candidates;
+ final E candidates;
- ForRead(Keyspace keyspace, AbstractReplicationStrategy replicationStrategy, ConsistencyLevel consistencyLevel, E candidates, E contacts)
+ AbstractForRead(Keyspace keyspace, AbstractReplicationStrategy replicationStrategy, ConsistencyLevel consistencyLevel, E candidates, E contacts)
{
super(keyspace, replicationStrategy, consistencyLevel, contacts);
this.candidates = candidates;
}
- public int blockFor() { return consistencyLevel.blockFor(replicationStrategy); }
+ public int readQuorum() { return consistencyLevel.blockFor(replicationStrategy); }
- public E candidates() { return candidates; }
+ public E readCandidates() { return candidates; }
public Replica firstUncontactedCandidate(Predicate<Replica> extraPredicate)
{
- return Iterables.tryFind(candidates(), r -> extraPredicate.test(r) && !contacts(r)).orNull();
+ return Iterables.tryFind(readCandidates(), r -> extraPredicate.test(r) && !contacts().contains(r)).orNull();
}
public Replica lookup(InetAddressAndPort endpoint)
{
- return candidates().byEndpoint().get(endpoint);
+ return readCandidates().byEndpoint().get(endpoint);
}
public String toString()
@@ -96,7 +116,7 @@ public abstract class ReplicaPlan<E extends Endpoints<E>>
}
}
- public static class ForTokenRead extends ForRead<EndpointsForToken>
+ public static class ForTokenRead extends AbstractForRead<EndpointsForToken, ForTokenRead>
{
public ForTokenRead(Keyspace keyspace,
AbstractReplicationStrategy replicationStrategy,
@@ -107,13 +127,13 @@ public abstract class ReplicaPlan<E extends Endpoints<E>>
super(keyspace, replicationStrategy, consistencyLevel, candidates, contacts);
}
- ForTokenRead withContact(EndpointsForToken newContact)
+ public ForTokenRead withContacts(EndpointsForToken newContact)
{
- return new ForTokenRead(keyspace, replicationStrategy, consistencyLevel, candidates(), newContact);
+ return new ForTokenRead(keyspace, replicationStrategy, consistencyLevel, candidates, newContact);
}
}
- public static class ForRangeRead extends ForRead<EndpointsForRange>
+ public static class ForRangeRead extends AbstractForRead<EndpointsForRange, ForRangeRead>
{
final AbstractBounds<PartitionPosition> range;
final int vnodeCount;
@@ -138,20 +158,20 @@ public abstract class ReplicaPlan<E extends Endpoints<E>>
*/
public int vnodeCount() { return vnodeCount; }
- ForRangeRead withContact(EndpointsForRange newContact)
+ public ForRangeRead withContacts(EndpointsForRange newContact)
{
- return new ForRangeRead(keyspace, replicationStrategy, consistencyLevel, range, candidates(), newContact, vnodeCount);
+ return new ForRangeRead(keyspace, replicationStrategy, consistencyLevel, range, readCandidates(), newContact, vnodeCount);
}
}
- public static abstract class ForWrite<E extends Endpoints<E>> extends ReplicaPlan<E>
+ public static class ForWrite extends AbstractReplicaPlan<EndpointsForToken, ForWrite>
{
// TODO: this is only needed because of poor isolation of concerns elsewhere - we can remove it soon, and will do so in a follow-up patch
- final E pending;
- final E liveAndDown;
- final E live;
+ final EndpointsForToken pending;
+ final EndpointsForToken liveAndDown;
+ final EndpointsForToken live;
- ForWrite(Keyspace keyspace, AbstractReplicationStrategy replicationStrategy, ConsistencyLevel consistencyLevel, E pending, E liveAndDown, E live, E contact)
+ public ForWrite(Keyspace keyspace, AbstractReplicationStrategy replicationStrategy, ConsistencyLevel consistencyLevel, EndpointsForToken pending, EndpointsForToken liveAndDown, EndpointsForToken live, EndpointsForToken contact)
{
super(keyspace, replicationStrategy, consistencyLevel, contact);
this.pending = pending;
@@ -159,46 +179,43 @@ public abstract class ReplicaPlan<E extends Endpoints<E>>
this.live = live;
}
- public int blockFor() { return consistencyLevel.blockForWrite(replicationStrategy, pending()); }
+ public int writeQuorum() { return consistencyLevel.blockForWrite(replicationStrategy, pending()); }
/** Replicas that a region of the ring is moving to; not yet ready to serve reads, but should receive writes */
- public E pending() { return pending; }
+ public EndpointsForToken pending() { return pending; }
+
/** Replicas that can participate in the write - this always includes all nodes (pending and natural) in all DCs, except for paxos LOCAL_QUORUM (which is local DC only) */
- public E liveAndDown() { return liveAndDown; }
+ public EndpointsForToken liveAndDown() { return liveAndDown; }
+
/** The live replicas present in liveAndDown, usually derived from FailureDetector.isReplicaAlive */
- public E live() { return live; }
+ public EndpointsForToken live() { return live; }
+
/** Calculate which live endpoints we could have contacted, but chose not to */
- public E liveUncontacted() { return live().filter(r -> !contacts(r)); }
+ public EndpointsForToken liveUncontacted() { return live().filter(r -> !contacts().contains(r)); }
+
/** Test liveness, consistent with the upfront analysis done for this operation (i.e. test membership of live()) */
public boolean isAlive(Replica replica) { return live.endpoints().contains(replica.endpoint()); }
+
public Replica lookup(InetAddressAndPort endpoint)
{
return liveAndDown().byEndpoint().get(endpoint);
}
- public String toString()
+ private ForWrite copy(ConsistencyLevel newConsistencyLevel, EndpointsForToken newContact)
{
- return "ReplicaPlan.ForWrite [ CL: " + consistencyLevel + " keyspace: " + keyspace + " liveAndDown: " + liveAndDown + " live: " + live + " contacts: " + contacts() + " ]";
+ return new ForWrite(keyspace, replicationStrategy, newConsistencyLevel, pending(), liveAndDown(), live(), newContact);
}
- }
- public static class ForTokenWrite extends ForWrite<EndpointsForToken>
- {
- public ForTokenWrite(Keyspace keyspace, AbstractReplicationStrategy replicationStrategy, ConsistencyLevel consistencyLevel, EndpointsForToken pending, EndpointsForToken liveAndDown, EndpointsForToken live, EndpointsForToken contact)
- {
- super(keyspace, replicationStrategy, consistencyLevel, pending, liveAndDown, live, contact);
- }
+ ForWrite withConsistencyLevel(ConsistencyLevel newConsistencylevel) { return copy(newConsistencylevel, contacts()); }
+ public ForWrite withContacts(EndpointsForToken newContact) { return copy(consistencyLevel, newContact); }
- private ReplicaPlan.ForTokenWrite copy(ConsistencyLevel newConsistencyLevel, EndpointsForToken newContact)
+ public String toString()
{
- return new ReplicaPlan.ForTokenWrite(keyspace, replicationStrategy, newConsistencyLevel, pending(), liveAndDown(), live(), newContact);
+ return "ReplicaPlan.ForWrite [ CL: " + consistencyLevel + " keyspace: " + keyspace + " liveAndDown: " + liveAndDown + " live: " + live + " contacts: " + contacts() + " ]";
}
-
- ForTokenWrite withConsistencyLevel(ConsistencyLevel newConsistencylevel) { return copy(newConsistencylevel, contacts()); }
- public ForTokenWrite withContact(EndpointsForToken newContact) { return copy(consistencyLevel, newContact); }
}
- public static class ForPaxosWrite extends ForWrite<EndpointsForToken>
+ public static class ForPaxosWrite extends ForWrite
{
final int requiredParticipants;
@@ -219,8 +236,11 @@ public abstract class ReplicaPlan<E extends Endpoints<E>>
* the constructor should be visible by the normal process of sharing data between threads (i.e. executors, etc)
* and any updates will either be seen or not seen, perhaps not promptly, but certainly not incompletely.
* The contained ReplicaPlan has only final member properties, so it cannot be seen partially initialised.
+ *
+ * TODO: there's no reason this couldn't be achieved instead by a ReplicaPlan with mutable contacts,
+ * simplifying the hierarchy
*/
- public interface Shared<E extends Endpoints<E>, P extends ReplicaPlan<E>>
+ public interface Shared<E extends Endpoints<E>, P extends ReplicaPlan<E, P>> extends Supplier<P>
{
/**
* add the provided replica to this shared plan, by updating the internal reference
@@ -230,29 +250,22 @@ public abstract class ReplicaPlan<E extends Endpoints<E>>
* get the shared replica plan, non-volatile (so maybe stale) but no risk of partially initialised
*/
public P get();
- /**
- * get the shared replica plan, non-volatile (so maybe stale) but no risk of partially initialised,
- * but replace its 'contacts' with those provided
- */
- public abstract P getWithContacts(E endpoints);
}
public static class SharedForTokenRead implements Shared<EndpointsForToken, ForTokenRead>
{
private ForTokenRead replicaPlan;
SharedForTokenRead(ForTokenRead replicaPlan) { this.replicaPlan = replicaPlan; }
- public void addToContacts(Replica replica) { replicaPlan = replicaPlan.withContact(Endpoints.append(replicaPlan.contacts(), replica)); }
+ public void addToContacts(Replica replica) { replicaPlan = replicaPlan.withContacts(Endpoints.append(replicaPlan.contacts(), replica)); }
public ForTokenRead get() { return replicaPlan; }
- public ForTokenRead getWithContacts(EndpointsForToken newContact) { return replicaPlan.withContact(newContact); }
}
public static class SharedForRangeRead implements Shared<EndpointsForRange, ForRangeRead>
{
private ForRangeRead replicaPlan;
SharedForRangeRead(ForRangeRead replicaPlan) { this.replicaPlan = replicaPlan; }
- public void addToContacts(Replica replica) { replicaPlan = replicaPlan.withContact(Endpoints.append(replicaPlan.contacts(), replica)); }
+ public void addToContacts(Replica replica) { replicaPlan = replicaPlan.withContacts(Endpoints.append(replicaPlan.contacts(), replica)); }
public ForRangeRead get() { return replicaPlan; }
- public ForRangeRead getWithContacts(EndpointsForRange newContact) { return replicaPlan.withContact(newContact); }
}
public static SharedForTokenRead shared(ForTokenRead replicaPlan) { return new SharedForTokenRead(replicaPlan); }
diff --git a/src/java/org/apache/cassandra/locator/ReplicaPlans.java b/src/java/org/apache/cassandra/locator/ReplicaPlans.java
index 85979d3..c39862a 100644
--- a/src/java/org/apache/cassandra/locator/ReplicaPlans.java
+++ b/src/java/org/apache/cassandra/locator/ReplicaPlans.java
@@ -133,7 +133,7 @@ public class ReplicaPlans
if (logger.isTraceEnabled())
{
logger.trace(String.format("Local replicas %s are insufficient to satisfy LOCAL_QUORUM requirement of %d live replicas and %d full replicas in '%s'",
- allLive.filter(InOurDcTester.replicas()), blockFor, blockForFullReplicas, DatabaseDescriptor.getLocalDataCenter()));
+ allLive.filter(InOurDc.replicas()), blockFor, blockForFullReplicas, DatabaseDescriptor.getLocalDataCenter()));
}
throw UnavailableException.create(consistencyLevel, blockFor, blockForFullReplicas, localLive.allReplicas(), localLive.fullReplicas());
}
@@ -175,23 +175,23 @@ public class ReplicaPlans
/**
* Construct a ReplicaPlan for writing to exactly one node, with CL.ONE. This node is *assumed* to be alive.
*/
- public static ReplicaPlan.ForTokenWrite forSingleReplicaWrite(Keyspace keyspace, Token token, Replica replica)
+ public static ReplicaPlan.ForWrite forSingleReplicaWrite(Keyspace keyspace, Token token, Replica replica)
{
EndpointsForToken one = EndpointsForToken.of(token, replica);
EndpointsForToken empty = EndpointsForToken.empty(token);
- return new ReplicaPlan.ForTokenWrite(keyspace, keyspace.getReplicationStrategy(), ConsistencyLevel.ONE, empty, one, one, one);
+ return new ReplicaPlan.ForWrite(keyspace, keyspace.getReplicationStrategy(), ConsistencyLevel.ONE, empty, one, one, one);
}
/**
* A forwarding counter write is always sent to a single owning coordinator for the range, by the original coordinator
* (if it is not itself an owner)
*/
- public static ReplicaPlan.ForTokenWrite forForwardingCounterWrite(Keyspace keyspace, Token token, Replica replica)
+ public static ReplicaPlan.ForWrite forForwardingCounterWrite(Keyspace keyspace, Token token, Replica replica)
{
return forSingleReplicaWrite(keyspace, token, replica);
}
- public static ReplicaPlan.ForTokenWrite forLocalBatchlogWrite()
+ public static ReplicaPlan.ForWrite forLocalBatchlogWrite()
{
Token token = DatabaseDescriptor.getPartitioner().getMinimumToken();
Keyspace systemKeypsace = Keyspace.open(SchemaConstants.SYSTEM_KEYSPACE_NAME);
@@ -211,7 +211,7 @@ public class ReplicaPlans
*
* @param isAny if batch consistency level is ANY, in which case a local node will be picked
*/
- public static ReplicaPlan.ForTokenWrite forBatchlogWrite(boolean isAny) throws UnavailableException
+ public static ReplicaPlan.ForWrite forBatchlogWrite(boolean isAny) throws UnavailableException
{
// A single case we write not for range or token, but multiple mutations to many tokens
Token token = DatabaseDescriptor.getPartitioner().getMinimumToken();
@@ -317,41 +317,41 @@ public class ReplicaPlans
return result;
}
- public static ReplicaPlan.ForTokenWrite forReadRepair(Token token, ReplicaPlan.ForRead<?> readPlan) throws UnavailableException
+ public static ReplicaPlan.ForWrite forReadRepair(Token token, ReplicaPlan<?, ?> readPlan) throws UnavailableException
{
- return forWrite(readPlan.keyspace, readPlan.consistencyLevel, token, writeReadRepair(readPlan));
+ return forWrite(readPlan.keyspace(), readPlan.consistencyLevel(), token, writeReadRepair(readPlan));
}
- public static ReplicaPlan.ForTokenWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, Token token, Selector selector) throws UnavailableException
+ public static ReplicaPlan.ForWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, Token token, Selector selector) throws UnavailableException
{
return forWrite(keyspace, consistencyLevel, ReplicaLayout.forTokenWriteLiveAndDown(keyspace, token), selector);
}
@VisibleForTesting
- public static ReplicaPlan.ForTokenWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, EndpointsForToken natural, EndpointsForToken pending, Predicate<Replica> isAlive, Selector selector) throws UnavailableException
+ public static ReplicaPlan.ForWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, EndpointsForToken natural, EndpointsForToken pending, Predicate<Replica> isAlive, Selector selector) throws UnavailableException
{
return forWrite(keyspace, consistencyLevel, ReplicaLayout.forTokenWrite(keyspace.getReplicationStrategy(), natural, pending), isAlive, selector);
}
- public static ReplicaPlan.ForTokenWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, ReplicaLayout.ForTokenWrite liveAndDown, Selector selector) throws UnavailableException
+ public static ReplicaPlan.ForWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, ReplicaLayout.ForTokenWrite liveAndDown, Selector selector) throws UnavailableException
{
return forWrite(keyspace, consistencyLevel, liveAndDown, FailureDetector.isReplicaAlive, selector);
}
- private static ReplicaPlan.ForTokenWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, ReplicaLayout.ForTokenWrite liveAndDown, Predicate<Replica> isAlive, Selector selector) throws UnavailableException
+ private static ReplicaPlan.ForWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, ReplicaLayout.ForTokenWrite liveAndDown, Predicate<Replica> isAlive, Selector selector) throws UnavailableException
{
ReplicaLayout.ForTokenWrite live = liveAndDown.filter(isAlive);
return forWrite(keyspace, consistencyLevel, liveAndDown, live, selector);
}
- public static ReplicaPlan.ForTokenWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, ReplicaLayout.ForTokenWrite liveAndDown, ReplicaLayout.ForTokenWrite live, Selector selector) throws UnavailableException
+ public static ReplicaPlan.ForWrite forWrite(Keyspace keyspace, ConsistencyLevel consistencyLevel, ReplicaLayout.ForTokenWrite liveAndDown, ReplicaLayout.ForTokenWrite live, Selector selector) throws UnavailableException
{
assert liveAndDown.replicationStrategy() == live.replicationStrategy()
: "ReplicaLayout liveAndDown and live should be derived from the same replication strategy.";
AbstractReplicationStrategy replicationStrategy = liveAndDown.replicationStrategy();
EndpointsForToken contacts = selector.select(consistencyLevel, liveAndDown, live);
assureSufficientLiveReplicasForWrite(replicationStrategy, consistencyLevel, live.all(), liveAndDown.pending());
- return new ReplicaPlan.ForTokenWrite(keyspace, replicationStrategy, consistencyLevel, liveAndDown.pending(), liveAndDown.all(), live.all(), contacts);
+ return new ReplicaPlan.ForWrite(keyspace, replicationStrategy, consistencyLevel, liveAndDown.pending(), liveAndDown.all(), live.all(), contacts);
}
public interface Selector
@@ -434,7 +434,7 @@ public class ReplicaPlans
* the minimal number of nodes to meet the consistency level, and prefer nodes we contacted on read to minimise
* data transfer.
*/
- public static Selector writeReadRepair(ReplicaPlan.ForRead<?> readPlan)
+ public static Selector writeReadRepair(ReplicaPlan<?, ?> readPlan)
{
return new Selector()
{
@@ -497,7 +497,7 @@ public class ReplicaPlans
{
// TODO: we should cleanup our semantics here, as we're filtering ALL nodes to localDC which is unexpected for ReplicaPlan
// Restrict natural and pending to node in the local DC only
- liveAndDown = liveAndDown.filter(InOurDcTester.replicas());
+ liveAndDown = liveAndDown.filter(InOurDc.replicas());
}
ReplicaLayout.ForTokenWrite live = liveAndDown.filter(FailureDetector.isReplicaAlive);
@@ -526,7 +526,7 @@ public class ReplicaPlans
private static <E extends Endpoints<E>> E candidatesForRead(ConsistencyLevel consistencyLevel, E liveNaturalReplicas)
{
return consistencyLevel.isDatacenterLocal()
- ? liveNaturalReplicas.filter(InOurDcTester.replicas())
+ ? liveNaturalReplicas.filter(InOurDc.replicas())
: liveNaturalReplicas;
}
@@ -621,7 +621,7 @@ public class ReplicaPlans
{
// TODO: should we be asserting that the ranges are adjacent?
AbstractBounds<PartitionPosition> newRange = left.range().withNewRight(right.range().right);
- EndpointsForRange mergedCandidates = left.candidates().keep(right.candidates().endpoints());
+ EndpointsForRange mergedCandidates = left.readCandidates().keep(right.readCandidates().endpoints());
AbstractReplicationStrategy replicationStrategy = keyspace.getReplicationStrategy();
// Check if there are enough shared endpoints for the merge to be possible.
diff --git a/src/java/org/apache/cassandra/locator/Replicas.java b/src/java/org/apache/cassandra/locator/Replicas.java
index 1b299cf..c53815c 100644
--- a/src/java/org/apache/cassandra/locator/Replicas.java
+++ b/src/java/org/apache/cassandra/locator/Replicas.java
@@ -78,7 +78,7 @@ public class Replicas
public static ReplicaCount countInOurDc(ReplicaCollection<?> replicas)
{
ReplicaCount count = new ReplicaCount();
- Predicate<Replica> inOurDc = InOurDcTester.replicas();
+ Predicate<Replica> inOurDc = InOurDc.replicas();
for (Replica replica : replicas)
if (inOurDc.test(replica))
count.increment(replica);
diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java
index 0e60a1f..51dd120 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -1391,7 +1391,7 @@ public class TokenMetadata
*/
public Topology getTopology()
{
- assert this != StorageService.instance.getTokenMetadata();
+ assert !DatabaseDescriptor.isDaemonInitialized() || this != StorageService.instance.getTokenMetadata();
return topology;
}
diff --git a/src/java/org/apache/cassandra/metrics/ClientRequestsMetricsHolder.java b/src/java/org/apache/cassandra/metrics/ClientRequestsMetricsHolder.java
index 05ab338..26f2913 100644
--- a/src/java/org/apache/cassandra/metrics/ClientRequestsMetricsHolder.java
+++ b/src/java/org/apache/cassandra/metrics/ClientRequestsMetricsHolder.java
@@ -30,8 +30,8 @@ public final class ClientRequestsMetricsHolder
public static final CASClientRequestMetrics casReadMetrics = new CASClientRequestMetrics("CASRead");
public static final ViewWriteMetrics viewWriteMetrics = new ViewWriteMetrics("ViewWrite");
- private static final Map<ConsistencyLevel, ClientRequestMetrics> readMetricsMap = new EnumMap<>(ConsistencyLevel.class);
- private static final Map<ConsistencyLevel, ClientWriteRequestMetrics> writeMetricsMap = new EnumMap<>(ConsistencyLevel.class);
+ public static final Map<ConsistencyLevel, ClientRequestMetrics> readMetricsMap = new EnumMap<>(ConsistencyLevel.class);
+ public static final Map<ConsistencyLevel, ClientWriteRequestMetrics> writeMetricsMap = new EnumMap<>(ConsistencyLevel.class);
static
{
diff --git a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
index 6af2389..93b385b 100644
--- a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
+++ b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
@@ -22,17 +22,23 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.Objects;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLongArray;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.primitives.Ints;
-import com.codahale.metrics.Clock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.codahale.metrics.Reservoir;
import com.codahale.metrics.Snapshot;
import org.apache.cassandra.utils.EstimatedHistogram;
+import org.apache.cassandra.utils.MonotonicClock;
+import org.apache.cassandra.utils.NoSpamLogger;
import static java.lang.Math.max;
import static java.lang.Math.min;
@@ -78,7 +84,8 @@ import static java.lang.Math.min;
*/
public class DecayingEstimatedHistogramReservoir implements Reservoir
{
-
+ private static Logger logger = LoggerFactory.getLogger(DecayingEstimatedHistogramReservoir.class);
+ private static NoSpamLogger noSpamLogger = NoSpamLogger.getLogger(logger, 5L, TimeUnit.MINUTES);
/**
* The default number of decayingBuckets. Use this bucket count to reduce memory allocation for bucket offsets.
*/
@@ -147,21 +154,20 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
public static final long HALF_TIME_IN_S = 60L;
public static final double MEAN_LIFETIME_IN_S = HALF_TIME_IN_S / Math.log(2.0);
- public static final long LANDMARK_RESET_INTERVAL_IN_MS = 30L * 60L * 1000L;
+ public static final long LANDMARK_RESET_INTERVAL_IN_NS = TimeUnit.MINUTES.toNanos(30L);
private final AtomicBoolean rescaling = new AtomicBoolean(false);
private volatile long decayLandmark;
// Wrapper around System.nanoTime() to simplify unit testing.
- private final Clock clock;
-
+ private final MonotonicClock clock;
/**
* Construct a decaying histogram with default number of buckets and without considering zeroes.
*/
public DecayingEstimatedHistogramReservoir()
{
- this(DEFAULT_ZERO_CONSIDERATION, DEFAULT_BUCKET_COUNT, DEFAULT_STRIPE_COUNT, Clock.defaultClock());
+ this(DEFAULT_ZERO_CONSIDERATION, DEFAULT_BUCKET_COUNT, DEFAULT_STRIPE_COUNT, MonotonicClock.Global.approxTime);
}
/**
@@ -172,7 +178,7 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
*/
public DecayingEstimatedHistogramReservoir(boolean considerZeroes)
{
- this(considerZeroes, DEFAULT_BUCKET_COUNT, DEFAULT_STRIPE_COUNT, Clock.defaultClock());
+ this(considerZeroes, DEFAULT_BUCKET_COUNT, DEFAULT_STRIPE_COUNT, MonotonicClock.Global.approxTime);
}
/**
@@ -184,17 +190,17 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
*/
public DecayingEstimatedHistogramReservoir(boolean considerZeroes, int bucketCount, int stripes)
{
- this(considerZeroes, bucketCount, stripes, Clock.defaultClock());
+ this(considerZeroes, bucketCount, stripes, MonotonicClock.Global.approxTime);
}
@VisibleForTesting
- public DecayingEstimatedHistogramReservoir(Clock clock)
+ public DecayingEstimatedHistogramReservoir(MonotonicClock clock)
{
this(DEFAULT_ZERO_CONSIDERATION, DEFAULT_BUCKET_COUNT, DEFAULT_STRIPE_COUNT, clock);
}
@VisibleForTesting
- DecayingEstimatedHistogramReservoir(boolean considerZeroes, int bucketCount, int stripes, Clock clock)
+ DecayingEstimatedHistogramReservoir(boolean considerZeroes, int bucketCount, int stripes, MonotonicClock clock)
{
assert bucketCount <= MAX_BUCKET_COUNT : "bucket count cannot exceed: " + MAX_BUCKET_COUNT;
@@ -218,7 +224,7 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
decayingBuckets = new AtomicLongArray((bucketOffsets.length + 1) * nStripes);
buckets = new AtomicLongArray((bucketOffsets.length + 1) * nStripes);
this.clock = clock;
- decayLandmark = clock.getTime();
+ decayLandmark = clock.now();
int distributionPrime = 1;
for (int prime : DISTRIBUTION_PRIMES)
{
@@ -238,7 +244,7 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
*/
public void update(long value)
{
- long now = clock.getTime();
+ long now = clock.now();
rescaleIfNeeded(now);
int index = findIndex(bucketOffsets, value);
@@ -283,7 +289,7 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
private double forwardDecayWeight(long now)
{
- return Math.exp(((now - decayLandmark) / 1000.0) / MEAN_LIFETIME_IN_S);
+ return Math.exp(TimeUnit.NANOSECONDS.toSeconds(now - decayLandmark) / MEAN_LIFETIME_IN_S);
}
/**
@@ -345,7 +351,7 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
private void rescaleIfNeeded()
{
- rescaleIfNeeded(clock.getTime());
+ rescaleIfNeeded(clock.now());
}
private void rescaleIfNeeded(long now)
@@ -380,7 +386,7 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
private boolean needRescale(long now)
{
- return (now - decayLandmark) > LANDMARK_RESET_INTERVAL_IN_MS;
+ return (now - decayLandmark) > LANDMARK_RESET_INTERVAL_IN_NS;
}
@VisibleForTesting
@@ -452,7 +458,7 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
public EstimatedHistogramReservoirSnapshot(DecayingEstimatedHistogramReservoir reservoir)
{
final int length = reservoir.size();
- final double rescaleFactor = reservoir.forwardDecayWeight(reservoir.clock.getTime());
+ final double rescaleFactor = reservoir.forwardDecayWeight(reservoir.clock.now());
this.decayingBuckets = new long[length];
this.values = new long[length];
@@ -482,7 +488,10 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
final int lastBucket = decayingBuckets.length - 1;
if (decayingBuckets[lastBucket] > 0)
- throw new IllegalStateException("Unable to compute when histogram overflowed");
+ {
+ try { throw new IllegalStateException("EstimatedHistogram overflow: " + Arrays.toString(decayingBuckets)); }
+ catch (IllegalStateException e) { noSpamLogger.warn("", e); }
+ }
final long qcount = (long) Math.ceil(count() * quantile);
if (qcount == 0)
@@ -723,7 +732,7 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
}
}
- public void rebaseReservoir()
+ public void rebaseReservoir()
{
this.reservoir.rebase(this);
}
@@ -753,5 +762,11 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
{
return Objects.hash(min, max);
}
+
+ @Override
+ public String toString()
+ {
+ return "[" + min + ',' + max + ']';
+ }
}
}
diff --git a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
index c611bd0..f580d1c 100644
--- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java
@@ -28,7 +28,7 @@ import com.github.benmanes.caffeine.cache.LoadingCache;
import org.apache.cassandra.concurrent.ImmediateExecutor;
import org.apache.cassandra.db.SystemKeyspace;
import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.utils.UUIDGen;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/test/simulator/main/org/apache/cassandra/simulator/debug/Capture.java b/src/java/org/apache/cassandra/metrics/PaxosMetrics.java
similarity index 65%
copy from test/simulator/main/org/apache/cassandra/simulator/debug/Capture.java
copy to src/java/org/apache/cassandra/metrics/PaxosMetrics.java
index 605866f..62c62d8 100644
--- a/test/simulator/main/org/apache/cassandra/simulator/debug/Capture.java
+++ b/src/java/org/apache/cassandra/metrics/PaxosMetrics.java
@@ -16,18 +16,15 @@
* limitations under the License.
*/
-package org.apache.cassandra.simulator.debug;
+package org.apache.cassandra.metrics;
-public class Capture
-{
- public final boolean waitSites;
- public final boolean wakeSites;
- public final boolean nowSites;
+import com.codahale.metrics.Counter;
+
+import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics;
- public Capture(boolean waitSites, boolean wakeSites, boolean nowSites)
- {
- this.waitSites = waitSites;
- this.wakeSites = wakeSites;
- this.nowSites = nowSites;
- }
+public class PaxosMetrics
+{
+ private static final MetricNameFactory factory = new DefaultNameFactory("Paxos");
+ public static final Counter linearizabilityViolations = Metrics.counter(factory.createMetricName("LinearizabilityViolations"));
+ public static void initialize() {}
}
diff --git a/src/java/org/apache/cassandra/net/Message.java b/src/java/org/apache/cassandra/net/Message.java
index cbe258d..fc0e5c6 100644
--- a/src/java/org/apache/cassandra/net/Message.java
+++ b/src/java/org/apache/cassandra/net/Message.java
@@ -43,7 +43,6 @@ import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.tracing.Tracing.TraceType;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MonotonicClockTranslation;
import org.apache.cassandra.utils.NoSpamLogger;
import org.apache.cassandra.utils.TimeUUID;
@@ -57,6 +56,7 @@ import static org.apache.cassandra.net.MessagingService.VERSION_3014;
import static org.apache.cassandra.net.MessagingService.VERSION_30;
import static org.apache.cassandra.net.MessagingService.VERSION_40;
import static org.apache.cassandra.net.MessagingService.instance;
+import static org.apache.cassandra.utils.FBUtilities.getBroadcastAddressAndPort;
import static org.apache.cassandra.utils.MonotonicClock.Global.approxTime;
import static org.apache.cassandra.utils.vint.VIntCoding.computeUnsignedVIntSize;
import static org.apache.cassandra.utils.vint.VIntCoding.getUnsignedVInt;
@@ -76,7 +76,7 @@ public class Message<T>
public final Header header;
public final T payload;
- private Message(Header header, T payload)
+ Message(Header header, T payload)
{
this.header = header;
this.payload = payload;
@@ -91,7 +91,7 @@ public class Message<T>
/** Whether the message has crossed the node boundary, that is whether it originated from another node. */
public boolean isCrossNode()
{
- return !from().equals(FBUtilities.getBroadcastAddressAndPort());
+ return !from().equals(getBroadcastAddressAndPort());
}
/**
@@ -201,6 +201,11 @@ public class Message<T>
return outWithParam(nextId(), verb, payload, null, null);
}
+ public static <T> Message<T> synthetic(InetAddressAndPort from, Verb verb, T payload)
+ {
+ return new Message<>(new Header(-1, verb, from, -1, -1, 0, NO_PARAMS), payload);
+ }
+
public static <T> Message<T> out(Verb verb, T payload, long expiresAtNanos)
{
return outWithParam(nextId(), verb, expiresAtNanos, payload, 0, null, null);
@@ -218,6 +223,7 @@ public class Message<T>
return outWithParam(nextId(), verb, 0, payload, flag2.addTo(flag1.addTo(0)), null, null);
}
+ @VisibleForTesting
static <T> Message<T> outWithParam(long id, Verb verb, T payload, ParamType paramType, Object paramValue)
{
return outWithParam(id, verb, 0, payload, paramType, paramValue);
@@ -230,10 +236,14 @@ public class Message<T>
private static <T> Message<T> outWithParam(long id, Verb verb, long expiresAtNanos, T payload, int flags, ParamType paramType, Object paramValue)
{
+ return withParam(getBroadcastAddressAndPort(), id, verb, expiresAtNanos, payload, flags, paramType, paramValue);
+ }
+
+ private static <T> Message<T> withParam(InetAddressAndPort from, long id, Verb verb, long expiresAtNanos, T payload, int flags, ParamType paramType, Object paramValue)
+ {
if (payload == null)
throw new IllegalArgumentException();
- InetAddressAndPort from = FBUtilities.getBroadcastAddressAndPort();
long createdAtNanos = approxTime.now();
if (expiresAtNanos == 0)
expiresAtNanos = verb.expiresAtNanos(createdAtNanos);
@@ -270,6 +280,11 @@ public class Message<T>
return outWithParam(id, Verb.FAILURE_RSP, expiresAtNanos, reason, null, null);
}
+ public <V> Message<V> withPayload(V newPayload)
+ {
+ return new Message<>(header, newPayload);
+ }
+
Message<T> withCallBackOnFailure()
{
return new Message<>(header.withFlag(MessageFlag.CALL_BACK_ON_FAILURE), payload);
@@ -452,7 +467,9 @@ public class Message<T>
@Nullable
InetAddressAndPort respondTo()
{
- return (InetAddressAndPort) params.get(ParamType.RESPOND_TO);
+ InetAddressAndPort respondTo = (InetAddressAndPort) params.get(ParamType.RESPOND_TO);
+ if (respondTo == null) respondTo = from;
+ return respondTo;
}
@Nullable
@@ -551,7 +568,7 @@ public class Message<T>
if (expiresAtNanos == 0 && verb != null && createdAtNanos != 0)
expiresAtNanos = verb.expiresAtNanos(createdAtNanos);
if (!this.verb.isResponse() && from == null) // default to sending from self if we're a request verb
- from = FBUtilities.getBroadcastAddressAndPort();
+ from = getBroadcastAddressAndPort();
return this;
}
@@ -812,7 +829,7 @@ public class Message<T>
{
serializeHeaderPost40(message.header, out, version);
out.writeUnsignedVInt(message.payloadSize(version));
- message.getPayloadSerializer().serialize(message.payload, out, version);
+ message.verb().serializer().serialize(message.payload, out, version);
}
private <T> Message<T> deserializePost40(DataInputPlus in, InetAddressAndPort peer, int version) throws IOException
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index e2e3104..ce2fdec 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -206,6 +206,7 @@ public final class MessagingService extends MessagingServiceMBeanImpl
public static final int VERSION_30 = 10;
public static final int VERSION_3014 = 11;
public static final int VERSION_40 = 12;
+ public static final int VERSION_41 = 13;
public static final int minimum_version = VERSION_30;
public static final int current_version = VERSION_40;
static AcceptVersions accept_messaging = new AcceptVersions(minimum_version, current_version);
@@ -367,6 +368,23 @@ public final class MessagingService extends MessagingServiceMBeanImpl
send(message, to, null);
}
+ /**
+ * Send a message to a given endpoint. This method adheres to the fire and forget
+ * style messaging.
+ *
+ * @param message messages to be sent.
+ * @param response
+ */
+ public <V> void respond(V response, Message<?> message)
+ {
+ send(message.responseWith(response), message.respondTo());
+ }
+
+ public <V> void respondWithFailure(RequestFailureReason reason, Message<?> message)
+ {
+ send(Message.failureResponse(message.id(), message.expiresAtNanos(), reason), message.respondTo());
+ }
+
public void send(Message message, InetAddressAndPort to, ConnectionType specifyConnection)
{
if (logger.isTraceEnabled())
diff --git a/src/java/org/apache/cassandra/net/OutboundMessageQueue.java b/src/java/org/apache/cassandra/net/OutboundMessageQueue.java
index 860890a..8280055 100644
--- a/src/java/org/apache/cassandra/net/OutboundMessageQueue.java
+++ b/src/java/org/apache/cassandra/net/OutboundMessageQueue.java
@@ -519,7 +519,6 @@ class OutboundMessageQueue
}
}
- //noinspection UnstableApiUsage
runner.done.awaitUninterruptibly();
return runner.removed.contains(remove);
}
diff --git a/src/java/org/apache/cassandra/net/RequestCallback.java b/src/java/org/apache/cassandra/net/RequestCallback.java
index 5bbe011..bd14cae 100644
--- a/src/java/org/apache/cassandra/net/RequestCallback.java
+++ b/src/java/org/apache/cassandra/net/RequestCallback.java
@@ -41,6 +41,12 @@ public interface RequestCallback<T>
}
/**
+ * Returns true if the callback handles failure reporting - in which case the remove host will be asked to
+ * report failures to us in the event of a problem processing the request.
+ *
+ * TODO: this is an error prone method, and we should be handling failures everywhere
+ * so we should probably just start doing that, and remove this method
+ *
* @return true if the callback should be invoked on failure
*/
default boolean invokeOnFailure()
@@ -56,4 +62,5 @@ public interface RequestCallback<T>
{
return false;
}
+
}
diff --git a/test/unit/org/apache/cassandra/service/reads/repair/InstrumentedReadRepair.java b/src/java/org/apache/cassandra/net/RequestCallbackWithFailure.java
similarity index 63%
copy from test/unit/org/apache/cassandra/service/reads/repair/InstrumentedReadRepair.java
copy to src/java/org/apache/cassandra/net/RequestCallbackWithFailure.java
index 721b6f5..685797a 100644
--- a/test/unit/org/apache/cassandra/service/reads/repair/InstrumentedReadRepair.java
+++ b/src/java/org/apache/cassandra/net/RequestCallbackWithFailure.java
@@ -16,19 +16,23 @@
* limitations under the License.
*/
-package org.apache.cassandra.service.reads.repair;
+package org.apache.cassandra.net;
-import java.util.Set;
-
-import org.apache.cassandra.locator.Endpoints;
+import org.apache.cassandra.exceptions.RequestFailureReason;
import org.apache.cassandra.locator.InetAddressAndPort;
-import org.apache.cassandra.locator.ReplicaPlan;
-import org.apache.cassandra.service.reads.ReadCallback;
-public interface InstrumentedReadRepair<E extends Endpoints<E>, P extends ReplicaPlan.ForRead<E>>
- extends ReadRepair<E, P>
+public interface RequestCallbackWithFailure<T> extends RequestCallback<T>
{
- Set<InetAddressAndPort> getReadRecipients();
+ /**
+ * Called when there is an exception on the remote node or timeout happens
+ */
+ void onFailure(InetAddressAndPort from, RequestFailureReason failureReason);
- ReadCallback getReadCallback();
+ /**
+ * @return true if the callback should be invoked on failure
+ */
+ default boolean invokeOnFailure()
+ {
+ return true;
+ }
}
diff --git a/src/java/org/apache/cassandra/net/RequestCallbacks.java b/src/java/org/apache/cassandra/net/RequestCallbacks.java
index fa1a03e..4409a70 100644
--- a/src/java/org/apache/cassandra/net/RequestCallbacks.java
+++ b/src/java/org/apache/cassandra/net/RequestCallbacks.java
@@ -26,6 +26,7 @@ import javax.annotation.Nullable;
import com.google.common.annotations.VisibleForTesting;
+import org.apache.cassandra.concurrent.ExecutorFactory;
import org.apache.cassandra.concurrent.ScheduledExecutorPlus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -47,6 +48,7 @@ import static java.lang.String.format;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import static org.apache.cassandra.concurrent.ExecutorFactory.Global.executorFactory;
+import static org.apache.cassandra.concurrent.ExecutorFactory.SimulatorSemantics.DISCARD;
import static org.apache.cassandra.concurrent.Stage.INTERNAL_RESPONSE;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
import static org.apache.cassandra.utils.MonotonicClock.Global.preciseTime;
@@ -65,14 +67,14 @@ public class RequestCallbacks implements OutboundMessageCallbacks
private static final Logger logger = LoggerFactory.getLogger(RequestCallbacks.class);
private final MessagingService messagingService;
- private final ScheduledExecutorPlus executor = executorFactory().scheduled("Callback-Map-Reaper");
+ private final ScheduledExecutorPlus executor = executorFactory().scheduled("Callback-Map-Reaper", DISCARD);
private final ConcurrentMap<CallbackKey, CallbackInfo> callbacks = new ConcurrentHashMap<>();
RequestCallbacks(MessagingService messagingService)
{
this.messagingService = messagingService;
- long expirationInterval = DatabaseDescriptor.getMinRpcTimeout(NANOSECONDS) / 2;
+ long expirationInterval = defaultExpirationInterval();
executor.scheduleWithFixedDelay(this::expire, expirationInterval, expirationInterval, NANOSECONDS);
}
@@ -101,12 +103,11 @@ public class RequestCallbacks implements OutboundMessageCallbacks
void addWithExpiration(RequestCallback cb, Message message, InetAddressAndPort to)
{
// mutations need to call the overload with a ConsistencyLevel
- assert message.verb() != Verb.MUTATION_REQ && message.verb() != Verb.COUNTER_MUTATION_REQ && message.verb() != Verb.PAXOS_COMMIT_REQ;
+ assert message.verb() != Verb.MUTATION_REQ && message.verb() != Verb.COUNTER_MUTATION_REQ;
CallbackInfo previous = callbacks.put(key(message.id(), to), new CallbackInfo(message, to, cb));
assert previous == null : format("Callback already exists for id %d/%s! (%s)", message.id(), to, previous);
}
- // FIXME: shouldn't need a special overload for writes; hinting should be part of AbstractWriteResponseHandler
public void addWithExpiration(AbstractWriteResponseHandler<?> cb,
Message<?> message,
Replica to,
@@ -171,14 +172,6 @@ public class RequestCallbacks implements OutboundMessageCallbacks
if (info.invokeOnFailure())
INTERNAL_RESPONSE.submit(() -> info.callback.onFailure(info.peer, RequestFailureReason.TIMEOUT));
-
- // FIXME: this has never belonged here, should be part of onFailure() in AbstractWriteResponseHandler
- if (info.shouldHint())
- {
- WriteCallbackInfo writeCallbackInfo = ((WriteCallbackInfo) info);
- Mutation mutation = writeCallbackInfo.mutation();
- StorageProxy.submitHint(mutation, writeCallbackInfo.getReplica(), null);
- }
}
void shutdownNow(boolean expireCallbacks)
@@ -378,4 +371,9 @@ public class RequestCallbacks implements OutboundMessageCallbacks
if (null != forwardTo)
forwardTo.forEach(this::removeAndExpire);
}
+
+ public static long defaultExpirationInterval()
+ {
+ return DatabaseDescriptor.getMinRpcTimeout(NANOSECONDS) / 2;
+ }
}
diff --git a/src/java/org/apache/cassandra/net/Verb.java b/src/java/org/apache/cassandra/net/Verb.java
index bcd3070..a43372e 100644
--- a/src/java/org/apache/cassandra/net/Verb.java
+++ b/src/java/org/apache/cassandra/net/Verb.java
@@ -74,14 +74,26 @@ import org.apache.cassandra.repair.messages.ValidationRequest;
import org.apache.cassandra.schema.SchemaPullVerbHandler;
import org.apache.cassandra.schema.SchemaPushVerbHandler;
import org.apache.cassandra.schema.SchemaVersionVerbHandler;
+import org.apache.cassandra.service.paxos.PaxosCommit;
+import org.apache.cassandra.service.paxos.PaxosCommitAndPrepare;
+import org.apache.cassandra.service.paxos.PaxosPrepare;
+import org.apache.cassandra.service.paxos.PaxosPrepareRefresh;
+import org.apache.cassandra.service.paxos.PaxosPropose;
+import org.apache.cassandra.service.paxos.PaxosRepair;
+import org.apache.cassandra.service.paxos.cleanup.PaxosCleanupHistory;
+import org.apache.cassandra.service.paxos.cleanup.PaxosCleanupRequest;
+import org.apache.cassandra.service.paxos.cleanup.PaxosCleanupResponse;
+import org.apache.cassandra.service.paxos.cleanup.PaxosCleanupComplete;
+import org.apache.cassandra.service.paxos.cleanup.PaxosStartPrepareCleanup;
+import org.apache.cassandra.service.paxos.cleanup.PaxosFinishPrepareCleanup;
import org.apache.cassandra.utils.BooleanSerializer;
import org.apache.cassandra.service.EchoVerbHandler;
import org.apache.cassandra.service.SnapshotVerbHandler;
import org.apache.cassandra.service.paxos.Commit;
-import org.apache.cassandra.service.paxos.CommitVerbHandler;
+import org.apache.cassandra.service.paxos.Commit.Agreed;
import org.apache.cassandra.service.paxos.PrepareResponse;
-import org.apache.cassandra.service.paxos.PrepareVerbHandler;
-import org.apache.cassandra.service.paxos.ProposeVerbHandler;
+import org.apache.cassandra.service.paxos.v1.PrepareVerbHandler;
+import org.apache.cassandra.service.paxos.v1.ProposeVerbHandler;
import org.apache.cassandra.streaming.ReplicationDoneVerbHandler;
import org.apache.cassandra.utils.UUIDSerializer;
@@ -113,7 +125,7 @@ public enum Verb
PAXOS_PROPOSE_RSP (94, P2, writeTimeout, REQUEST_RESPONSE, () -> BooleanSerializer.serializer, () -> ResponseVerbHandler.instance ),
PAXOS_PROPOSE_REQ (34, P2, writeTimeout, MUTATION, () -> Commit.serializer, () -> ProposeVerbHandler.instance, PAXOS_PROPOSE_RSP ),
PAXOS_COMMIT_RSP (95, P2, writeTimeout, REQUEST_RESPONSE, () -> NoPayload.serializer, () -> ResponseVerbHandler.instance ),
- PAXOS_COMMIT_REQ (35, P2, writeTimeout, MUTATION, () -> Commit.serializer, () -> CommitVerbHandler.instance, PAXOS_COMMIT_RSP ),
+ PAXOS_COMMIT_REQ (35, P2, writeTimeout, MUTATION, () -> Agreed.serializer, () -> PaxosCommit.requestHandler, PAXOS_COMMIT_RSP ),
TRUNCATE_RSP (79, P0, truncateTimeout, REQUEST_RESPONSE, () -> TruncateResponse.serializer, () -> ResponseVerbHandler.instance ),
TRUNCATE_REQ (19, P0, truncateTimeout, MUTATION, () -> TruncateRequest.serializer, () -> TruncateVerbHandler.instance, TRUNCATE_RSP ),
@@ -167,12 +179,34 @@ public enum Verb
SNAPSHOT_RSP (87, P0, rpcTimeout, MISC, () -> NoPayload.serializer, () -> ResponseVerbHandler.instance ),
SNAPSHOT_REQ (27, P0, rpcTimeout, MISC, () -> SnapshotCommand.serializer, () -> SnapshotVerbHandler.instance, SNAPSHOT_RSP ),
+ PAXOS2_COMMIT_REMOTE_REQ (38, P2, writeTimeout, MUTATION, () -> Mutation.serializer, () -> MutationVerbHandler.instance, MUTATION_RSP ),
+ PAXOS2_COMMIT_REMOTE_RSP (39, P2, writeTimeout, REQUEST_RESPONSE, () -> NoPayload.serializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_PREPARE_RSP (50, P2, writeTimeout, REQUEST_RESPONSE, () -> PaxosPrepare.responseSerializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_PREPARE_REQ (40, P2, writeTimeout, MUTATION, () -> PaxosPrepare.requestSerializer, () -> PaxosPrepare.requestHandler, PAXOS2_PREPARE_RSP ),
+ PAXOS2_PREPARE_REFRESH_RSP (51, P2, writeTimeout, REQUEST_RESPONSE, () -> PaxosPrepareRefresh.responseSerializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_PREPARE_REFRESH_REQ (41, P2, writeTimeout, MUTATION, () -> PaxosPrepareRefresh.requestSerializer, () -> PaxosPrepareRefresh.requestHandler, PAXOS2_PREPARE_REFRESH_RSP ),
+ PAXOS2_PROPOSE_RSP (52, P2, writeTimeout, REQUEST_RESPONSE, () -> PaxosPropose.responseSerializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_PROPOSE_REQ (42, P2, writeTimeout, MUTATION, () -> PaxosPropose.requestSerializer, () -> PaxosPropose.requestHandler, PAXOS2_PROPOSE_RSP ),
+ PAXOS2_COMMIT_AND_PREPARE_RSP (53, P2, writeTimeout, REQUEST_RESPONSE, () -> PaxosPrepare.responseSerializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_COMMIT_AND_PREPARE_REQ (43, P2, writeTimeout, MUTATION, () -> PaxosCommitAndPrepare.requestSerializer, () -> PaxosCommitAndPrepare.requestHandler, PAXOS2_COMMIT_AND_PREPARE_RSP ),
+ PAXOS2_REPAIR_RSP (54, P2, writeTimeout, PAXOS_REPAIR, () -> PaxosRepair.responseSerializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_REPAIR_REQ (44, P2, writeTimeout, PAXOS_REPAIR, () -> PaxosRepair.requestSerializer, () -> PaxosRepair.requestHandler, PAXOS2_REPAIR_RSP ),
+ PAXOS2_CLEANUP_START_PREPARE_RSP (55, P2, rpcTimeout, PAXOS_REPAIR, () -> PaxosCleanupHistory.serializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_CLEANUP_START_PREPARE_REQ (45, P2, rpcTimeout, PAXOS_REPAIR, () -> PaxosStartPrepareCleanup.serializer, () -> PaxosStartPrepareCleanup.verbHandler, PAXOS2_CLEANUP_START_PREPARE_RSP ),
+ PAXOS2_CLEANUP_RSP (56, P2, rpcTimeout, PAXOS_REPAIR, () -> NoPayload.serializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_CLEANUP_REQ (46, P2, rpcTimeout, PAXOS_REPAIR, () -> PaxosCleanupRequest.serializer, () -> PaxosCleanupRequest.verbHandler, PAXOS2_CLEANUP_RSP ),
+ PAXOS2_CLEANUP_RSP2 (57, P2, rpcTimeout, PAXOS_REPAIR, () -> PaxosCleanupResponse.serializer, () -> PaxosCleanupResponse.verbHandler ),
+ PAXOS2_CLEANUP_FINISH_PREPARE_RSP(58, P2, rpcTimeout, PAXOS_REPAIR, () -> NoPayload.serializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_CLEANUP_FINISH_PREPARE_REQ(47, P2, rpcTimeout, IMMEDIATE, () -> PaxosCleanupHistory.serializer, () -> PaxosFinishPrepareCleanup.verbHandler, PAXOS2_CLEANUP_FINISH_PREPARE_RSP),
+ PAXOS2_CLEANUP_COMPLETE_RSP (59, P2, rpcTimeout, PAXOS_REPAIR, () -> NoPayload.serializer, () -> ResponseVerbHandler.instance ),
+ PAXOS2_CLEANUP_COMPLETE_REQ (48, P2, rpcTimeout, PAXOS_REPAIR, () -> PaxosCleanupComplete.serializer, () -> PaxosCleanupComplete.verbHandler, PAXOS2_CLEANUP_COMPLETE_RSP ),
+
// generic failure response
FAILURE_RSP (99, P0, noTimeout, REQUEST_RESPONSE, () -> RequestFailureReason.serializer, () -> ResponseVerbHandler.instance ),
// dummy verbs
_TRACE (30, P1, rpcTimeout, TRACING, () -> NoPayload.serializer, () -> null ),
- _SAMPLE (42, P1, rpcTimeout, INTERNAL_RESPONSE, () -> NoPayload.serializer, () -> null ),
+ _SAMPLE (49, P1, rpcTimeout, INTERNAL_RESPONSE, () -> NoPayload.serializer, () -> null ),
_TEST_1 (10, P0, writeTimeout, IMMEDIATE, () -> NoPayload.serializer, () -> null ),
_TEST_2 (11, P1, rpcTimeout, IMMEDIATE, () -> NoPayload.serializer, () -> null ),
@@ -186,7 +220,6 @@ public enum Verb
// CUSTOM VERBS
UNUSED_CUSTOM_VERB (CUSTOM,
0, P1, rpcTimeout, INTERNAL_RESPONSE, () -> null, () -> null ),
-
;
public static final List<Verb> VERBS = ImmutableList.copyOf(Verb.values());
@@ -447,5 +480,5 @@ class VerbTimeouts
static final ToLongFunction<TimeUnit> truncateTimeout = DatabaseDescriptor::getTruncateRpcTimeout;
static final ToLongFunction<TimeUnit> pingTimeout = DatabaseDescriptor::getPingTimeout;
static final ToLongFunction<TimeUnit> longTimeout = units -> Math.max(DatabaseDescriptor.getRpcTimeout(units), units.convert(5L, TimeUnit.MINUTES));
- static final ToLongFunction<TimeUnit> noTimeout = units -> { throw new IllegalStateException(); };
+ static final ToLongFunction<TimeUnit> noTimeout = units -> { throw new IllegalStateException(); };
}
diff --git a/src/java/org/apache/cassandra/repair/AbstractRepairTask.java b/src/java/org/apache/cassandra/repair/AbstractRepairTask.java
index 2446c04..d2a6f1a 100644
--- a/src/java/org/apache/cassandra/repair/AbstractRepairTask.java
+++ b/src/java/org/apache/cassandra/repair/AbstractRepairTask.java
@@ -71,6 +71,8 @@ public abstract class AbstractRepairTask implements RepairTask
options.isPullRepair(),
options.getPreviewKind(),
options.optimiseStreams(),
+ options.repairPaxos(),
+ options.paxosOnly(),
executor,
cfnames);
if (session == null)
diff --git a/src/java/org/apache/cassandra/repair/RepairJob.java b/src/java/org/apache/cassandra/repair/RepairJob.java
index c78cc73..33234e2 100644
--- a/src/java/org/apache/cassandra/repair/RepairJob.java
+++ b/src/java/org/apache/cassandra/repair/RepairJob.java
@@ -18,8 +18,8 @@
package org.apache.cassandra.repair;
import java.util.*;
-import java.util.function.Predicate;
import java.util.function.Function;
+import java.util.function.Predicate;
import java.util.stream.Collectors;
import com.google.common.annotations.VisibleForTesting;
@@ -27,6 +27,8 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.*;
import org.apache.cassandra.concurrent.ExecutorPlus;
+import org.apache.cassandra.schema.Schema;
+import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.utils.concurrent.AsyncFuture;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,6 +46,7 @@ import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.streaming.PreviewKind;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.service.paxos.cleanup.PaxosCleanup;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MerkleTrees;
@@ -52,6 +55,8 @@ import org.apache.cassandra.utils.concurrent.Future;
import org.apache.cassandra.utils.concurrent.FutureCombiner;
import org.apache.cassandra.utils.concurrent.ImmediateFuture;
+import static org.apache.cassandra.config.DatabaseDescriptor.paxosRepairEnabled;
+import static org.apache.cassandra.service.paxos.Paxos.useV2;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
/**
@@ -71,8 +76,7 @@ public class RepairJob extends AsyncFuture<RepairResult> implements Runnable
/**
* Create repair job to run on specific columnfamily
- *
- * @param session RepairSession that this RepairJob belongs
+ * @param session RepairSession that this RepairJob belongs
* @param columnFamily name of the ColumnFamily to repair
*/
public RepairJob(RepairSession session, String columnFamily)
@@ -112,40 +116,77 @@ public class RepairJob extends AsyncFuture<RepairResult> implements Runnable
allEndpoints.add(FBUtilities.getBroadcastAddressAndPort());
Future<List<TreeResponse>> treeResponses;
+ Future<Void> paxosRepair;
+ if (paxosRepairEnabled() && ((useV2() && session.repairPaxos) || session.paxosOnly))
+ {
+ logger.info("{} {}.{} starting paxos repair", session.previewKind.logPrefix(session.getId()), desc.keyspace, desc.columnFamily);
+ TableMetadata metadata = Schema.instance.getTableMetadata(desc.keyspace, desc.columnFamily);
+ paxosRepair = PaxosCleanup.cleanup(allEndpoints, metadata, desc.ranges, session.commonRange.hasSkippedReplicas, taskExecutor);
+ }
+ else
+ {
+ logger.info("{} {}.{} not running paxos repair", session.previewKind.logPrefix(session.getId()), desc.keyspace, desc.columnFamily);
+ paxosRepair = ImmediateFuture.success(null);
+ }
+
+ if (session.paxosOnly)
+ {
+ paxosRepair.addCallback(new FutureCallback<Void>()
+ {
+ public void onSuccess(Void v)
+ {
+ logger.info("{} {}.{} paxos repair completed", session.previewKind.logPrefix(session.getId()), desc.keyspace, desc.columnFamily);
+ trySuccess(new RepairResult(desc, Collections.emptyList()));
+ }
+
+ /**
+ * Snapshot, validation and sync failures are all handled here
+ */
+ public void onFailure(Throwable t)
+ {
+ logger.warn("{} {}.{} paxos repair failed", session.previewKind.logPrefix(session.getId()), desc.keyspace, desc.columnFamily);
+ tryFailure(t);
+ }
+ }, taskExecutor);
+ return;
+ }
+
// Create a snapshot at all nodes unless we're using pure parallel repairs
if (parallelismDegree != RepairParallelism.PARALLEL)
{
- Future<List<InetAddressAndPort>> allSnapshotTasks;
+ Future<?> allSnapshotTasks;
if (session.isIncremental)
{
// consistent repair does it's own "snapshotting"
- allSnapshotTasks = ImmediateFuture.success(allEndpoints);
+ allSnapshotTasks = paxosRepair.map(input -> allEndpoints);
}
else
{
// Request snapshot to all replica
- List<Future<InetAddressAndPort>> snapshotTasks = new ArrayList<>(allEndpoints.size());
- for (InetAddressAndPort endpoint : allEndpoints)
- {
- SnapshotTask snapshotTask = new SnapshotTask(desc, endpoint);
- snapshotTasks.add(snapshotTask);
- taskExecutor.execute(snapshotTask);
- }
- allSnapshotTasks = FutureCombiner.allOf(snapshotTasks);
+ allSnapshotTasks = paxosRepair.flatMap(input -> {
+ List<Future<InetAddressAndPort>> snapshotTasks = new ArrayList<>(allEndpoints.size());
+ for (InetAddressAndPort endpoint : allEndpoints)
+ {
+ SnapshotTask snapshotTask = new SnapshotTask(desc, endpoint);
+ snapshotTasks.add(snapshotTask);
+ taskExecutor.execute(snapshotTask);
+ }
+ return FutureCombiner.allOf(snapshotTasks);
+ });
}
// When all snapshot complete, send validation requests
treeResponses = allSnapshotTasks.flatMap(endpoints -> {
if (parallelismDegree == RepairParallelism.SEQUENTIAL)
- return sendSequentialValidationRequest(endpoints);
+ return sendSequentialValidationRequest(allEndpoints);
else
- return sendDCAwareValidationRequest(endpoints);
- }, taskExecutor);
+ return sendDCAwareValidationRequest(allEndpoints);
+ }, taskExecutor);
}
else
{
// If not sequential, just send validation request to all replica
- treeResponses = sendValidationRequest(allEndpoints);
+ treeResponses = paxosRepair.flatMap(input -> sendValidationRequest(allEndpoints));
}
// When all validations complete, submit sync tasks
diff --git a/src/java/org/apache/cassandra/repair/RepairRunnable.java b/src/java/org/apache/cassandra/repair/RepairRunnable.java
index b58d4f6..7ad2c49 100644
--- a/src/java/org/apache/cassandra/repair/RepairRunnable.java
+++ b/src/java/org/apache/cassandra/repair/RepairRunnable.java
@@ -73,11 +73,9 @@ import org.apache.cassandra.tracing.TraceKeyspace;
import org.apache.cassandra.tracing.TraceState;
import org.apache.cassandra.tracing.Tracing;
import org.apache.cassandra.transport.messages.ResultMessage;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Throwables;
import org.apache.cassandra.utils.WrappedRunnable;
-import org.apache.cassandra.utils.concurrent.Future;
import org.apache.cassandra.utils.progress.ProgressEvent;
import org.apache.cassandra.utils.progress.ProgressEventNotifier;
import org.apache.cassandra.utils.progress.ProgressEventType;
@@ -225,7 +223,7 @@ public class RepairRunnable implements Runnable, ProgressEventNotifier, RepairNo
long durationMillis = currentTimeMillis() - creationTimeMillis;
if (msg == null)
{
- String duration = DurationFormatUtils.formatDurationWords(durationMillis, true, true);
+ String duration = DurationFormatUtils.formatDurationWords(Math.max(0, durationMillis), true, true);
msg = String.format("Repair command #%d finished in %s", cmd, duration);
}
diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java
index 4bce9ea..bfd6a7e 100644
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@ -69,8 +69,11 @@ import org.apache.cassandra.utils.concurrent.Future;
* of column families. For each of the column family to repair, RepairSession
* creates a {@link RepairJob} that handles the repair of that CF.
*
- * A given RepairJob has the 2 main phases:
+ * A given RepairJob has the 3 main phases:
* <ol>
+ * <li>
+ * Paxos repair: unfinished paxos operations in the range/keyspace/table are first completed
+ * </li>
* <li>Validation phase: the job requests merkle trees from each of the replica involves
* ({@link org.apache.cassandra.repair.ValidationTask}) and waits until all trees are received (in
* validationComplete()).
@@ -115,6 +118,8 @@ public class RepairSession extends AsyncFuture<RepairSessionResult> implements I
public final CommonRange commonRange;
public final boolean isIncremental;
public final PreviewKind previewKind;
+ public final boolean repairPaxos;
+ public final boolean paxosOnly;
private final AtomicBoolean isFailed = new AtomicBoolean(false);
@@ -137,6 +142,8 @@ public class RepairSession extends AsyncFuture<RepairSessionResult> implements I
* @param keyspace name of keyspace
* @param parallelismDegree specifies the degree of parallelism when calculating the merkle trees
* @param pullRepair true if the repair should be one way (from remote host to this host and only applicable between two hosts--see RepairOption)
+ * @param repairPaxos true if incomplete paxos operations should be completed as part of repair
+ * @param paxosOnly true if we should only complete paxos operations, not run a normal repair
* @param cfnames names of columnfamilies
*/
public RepairSession(TimeUUID parentRepairSession,
@@ -148,8 +155,12 @@ public class RepairSession extends AsyncFuture<RepairSessionResult> implements I
boolean pullRepair,
PreviewKind previewKind,
boolean optimiseStreams,
+ boolean repairPaxos,
+ boolean paxosOnly,
String... cfnames)
{
+ this.repairPaxos = repairPaxos;
+ this.paxosOnly = paxosOnly;
assert cfnames.length > 0 : "Repairing no column families seems pointless, doesn't it";
this.parentRepairSession = parentRepairSession;
@@ -275,7 +286,7 @@ public class RepairSession extends AsyncFuture<RepairSessionResult> implements I
logger.info("{} parentSessionId = {}: new session: will sync {} on range {} for {}.{}",
previewKind.logPrefix(getId()), parentRepairSession, repairedNodes(), commonRange, keyspace, Arrays.toString(cfnames));
Tracing.traceRepair("Syncing range {}", commonRange);
- if (!previewKind.isPreview())
+ if (!previewKind.isPreview() && !paxosOnly)
{
SystemDistributedKeyspace.startRepairs(getId(), parentRepairSession, keyspace, cfnames, commonRange);
}
diff --git a/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java b/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
index bdd8e95..c9c751a 100644
--- a/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
+++ b/src/java/org/apache/cassandra/repair/consistent/LocalSessions.java
@@ -866,7 +866,6 @@ public class LocalSessions
});
}
-<<<<<<< HEAD
/**
* Checks for the session state, and sets it to prepared unless it is on a failed state.
* Making the checks inside a synchronized block to prevent the session state from
diff --git a/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java b/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
index 1605fae..2d21deb 100644
--- a/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
+++ b/src/java/org/apache/cassandra/repair/consistent/admin/CleanupSummary.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import javax.management.openmbean.ArrayType;
import javax.management.openmbean.CompositeData;
diff --git a/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java b/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
index 49380d7..ac8bc7d 100644
--- a/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
+++ b/src/java/org/apache/cassandra/repair/messages/PrepareMessage.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
-import java.util.UUID;
import com.google.common.base.Preconditions;
diff --git a/src/java/org/apache/cassandra/repair/messages/RepairOption.java b/src/java/org/apache/cassandra/repair/messages/RepairOption.java
index 6a0568e..6bb7fdb 100644
--- a/src/java/org/apache/cassandra/repair/messages/RepairOption.java
+++ b/src/java/org/apache/cassandra/repair/messages/RepairOption.java
@@ -20,6 +20,7 @@ package org.apache.cassandra.repair.messages;
import java.util.*;
import com.google.common.base.Joiner;
+import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,6 +51,8 @@ public class RepairOption
public static final String PREVIEW = "previewKind";
public static final String OPTIMISE_STREAMS_KEY = "optimiseStreams";
public static final String IGNORE_UNREPLICATED_KS = "ignoreUnreplicatedKeyspaces";
+ public static final String REPAIR_PAXOS_KEY = "repairPaxos";
+ public static final String PAXOS_ONLY_KEY = "paxosOnly";
// we don't want to push nodes too much for repair
public static final int MAX_JOB_THREADS = 4;
@@ -179,6 +182,14 @@ public class RepairOption
boolean force = Boolean.parseBoolean(options.get(FORCE_REPAIR_KEY));
boolean pullRepair = Boolean.parseBoolean(options.get(PULL_REPAIR_KEY));
boolean ignoreUnreplicatedKeyspaces = Boolean.parseBoolean(options.get(IGNORE_UNREPLICATED_KS));
+ boolean repairPaxos = Boolean.parseBoolean(options.get(REPAIR_PAXOS_KEY));
+ boolean paxosOnly = Boolean.parseBoolean(options.get(PAXOS_ONLY_KEY));
+
+ if (previewKind != PreviewKind.NONE)
+ {
+ Preconditions.checkArgument(!repairPaxos, "repairPaxos must be set to false for preview repairs");
+ Preconditions.checkArgument(!paxosOnly, "paxosOnly must be set to false for preview repairs");
+ }
int jobThreads = 1;
if (options.containsKey(JOB_THREADS_KEY))
@@ -195,7 +206,7 @@ public class RepairOption
boolean asymmetricSyncing = Boolean.parseBoolean(options.get(OPTIMISE_STREAMS_KEY));
- RepairOption option = new RepairOption(parallelism, primaryRange, incremental, trace, jobThreads, ranges, !ranges.isEmpty(), pullRepair, force, previewKind, asymmetricSyncing, ignoreUnreplicatedKeyspaces);
+ RepairOption option = new RepairOption(parallelism, primaryRange, incremental, trace, jobThreads, ranges, !ranges.isEmpty(), pullRepair, force, previewKind, asymmetricSyncing, ignoreUnreplicatedKeyspaces, repairPaxos, paxosOnly);
// data centers
String dataCentersStr = options.get(DATACENTERS_KEY);
@@ -275,13 +286,15 @@ public class RepairOption
private final PreviewKind previewKind;
private final boolean optimiseStreams;
private final boolean ignoreUnreplicatedKeyspaces;
+ private final boolean repairPaxos;
+ private final boolean paxosOnly;
private final Collection<String> columnFamilies = new HashSet<>();
private final Collection<String> dataCenters = new HashSet<>();
private final Collection<String> hosts = new HashSet<>();
private final Collection<Range<Token>> ranges = new HashSet<>();
- public RepairOption(RepairParallelism parallelism, boolean primaryRange, boolean incremental, boolean trace, int jobThreads, Collection<Range<Token>> ranges, boolean isSubrangeRepair, boolean pullRepair, boolean forceRepair, PreviewKind previewKind, boolean optimiseStreams, boolean ignoreUnreplicatedKeyspaces)
+ public RepairOption(RepairParallelism parallelism, boolean primaryRange, boolean incremental, boolean trace, int jobThreads, Collection<Range<Token>> ranges, boolean isSubrangeRepair, boolean pullRepair, boolean forceRepair, PreviewKind previewKind, boolean optimiseStreams, boolean ignoreUnreplicatedKeyspaces, boolean repairPaxos, boolean paxosOnly)
{
this.parallelism = parallelism;
@@ -296,6 +309,8 @@ public class RepairOption
this.previewKind = previewKind;
this.optimiseStreams = optimiseStreams;
this.ignoreUnreplicatedKeyspaces = ignoreUnreplicatedKeyspaces;
+ this.repairPaxos = repairPaxos;
+ this.paxosOnly = paxosOnly;
}
public RepairParallelism getParallelism()
@@ -403,6 +418,16 @@ public class RepairOption
return ignoreUnreplicatedKeyspaces;
}
+ public boolean repairPaxos()
+ {
+ return repairPaxos;
+ }
+
+ public boolean paxosOnly()
+ {
+ return paxosOnly;
+ }
+
@Override
public String toString()
{
@@ -420,6 +445,8 @@ public class RepairOption
", force repair: " + forceRepair +
", optimise streams: "+ optimiseStreams() +
", ignore unreplicated keyspaces: "+ ignoreUnreplicatedKeyspaces +
+ ", repairPaxos: " + repairPaxos +
+ ", paxosOnly: " + paxosOnly +
')';
}
@@ -440,6 +467,8 @@ public class RepairOption
options.put(FORCE_REPAIR_KEY, Boolean.toString(forceRepair));
options.put(PREVIEW, previewKind.toString());
options.put(OPTIMISE_STREAMS_KEY, Boolean.toString(optimiseStreams));
+ options.put(REPAIR_PAXOS_KEY, Boolean.toString(repairPaxos));
+ options.put(PAXOS_ONLY_KEY, Boolean.toString(paxosOnly));
return options;
}
}
diff --git a/src/java/org/apache/cassandra/schema/MigrationCoordinator.java b/src/java/org/apache/cassandra/schema/MigrationCoordinator.java
index 3050886..399f917 100644
--- a/src/java/org/apache/cassandra/schema/MigrationCoordinator.java
+++ b/src/java/org/apache/cassandra/schema/MigrationCoordinator.java
@@ -40,6 +40,7 @@ import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
import org.apache.cassandra.concurrent.FutureTask;
import org.apache.cassandra.config.CassandraRelevantProperties;
+import org.apache.cassandra.utils.Simulate;
import org.apache.cassandra.utils.concurrent.Future;
import org.apache.cassandra.utils.concurrent.ImmediateFuture;
import org.slf4j.Logger;
@@ -63,8 +64,10 @@ import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.concurrent.WaitQueue;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.Simulate.With.MONITORS;
import static org.apache.cassandra.utils.concurrent.WaitQueue.newWaitQueue;
+@Simulate(with = MONITORS)
public class MigrationCoordinator
{
private static final Logger logger = LoggerFactory.getLogger(MigrationCoordinator.class);
diff --git a/src/java/org/apache/cassandra/io/FSWriteError.java b/src/java/org/apache/cassandra/security/DisableSslContextFactory.java
similarity index 55%
copy from src/java/org/apache/cassandra/io/FSWriteError.java
copy to src/java/org/apache/cassandra/security/DisableSslContextFactory.java
index 481795d..9dab062 100644
--- a/src/java/org/apache/cassandra/io/FSWriteError.java
+++ b/src/java/org/apache/cassandra/security/DisableSslContextFactory.java
@@ -15,38 +15,41 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.io;
+package org.apache.cassandra.security;
-import java.nio.file.Path;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.TrustManagerFactory;
-import org.apache.cassandra.io.util.File;
-
-public class FSWriteError extends FSError
+public class DisableSslContextFactory extends AbstractSslContextFactory
{
- public FSWriteError(Throwable cause, Path path)
+ @Override
+ protected KeyManagerFactory buildKeyManagerFactory() throws SSLException
{
- super(cause, path);
+ throw new UnsupportedOperationException();
}
- public FSWriteError(Throwable cause, File path)
+ @Override
+ protected TrustManagerFactory buildTrustManagerFactory() throws SSLException
{
- super(cause, path);
+ throw new UnsupportedOperationException();
}
- public FSWriteError(Throwable cause, String path)
+ @Override
+ public boolean hasKeystore()
{
- this(cause, new File(path));
+ return false;
}
- public FSWriteError(Throwable cause)
+ @Override
+ public void initHotReloading() throws SSLException
{
- this(cause, new File(""));
}
@Override
- public String toString()
+ public boolean shouldReload()
{
- return "FSWriteError in " + path;
+ return false;
}
}
diff --git a/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java b/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java
deleted file mode 100644
index 9cde1dd..0000000
--- a/src/java/org/apache/cassandra/serializers/TimeUUIDSerializer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.cassandra.serializers;
-
-import org.apache.cassandra.db.marshal.ValueAccessor;
-
-public class TimeUUIDSerializer extends UUIDSerializer
-{
- public static final TimeUUIDSerializer instance = new TimeUUIDSerializer();
-
- public <V> void validate(V value, ValueAccessor<V> accessor) throws MarshalException
- {
- super.validate(value, accessor);
- // Super class only validates the Time UUID
- // version is bits 4-7 of byte 6.
- if (!accessor.isEmpty(value))
- {
- if ((accessor.getByte(value, 6) & 0xf0) != 0x10)
- throw new MarshalException("Invalid version for TimeUUID type.");
- }
- }
-}
diff --git a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
index b249ca6..4d75f19 100644
--- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
@@ -22,10 +22,16 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.function.Supplier;
+
+import javax.annotation.Nullable;
import org.apache.cassandra.db.ConsistencyLevel;
+import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.locator.EndpointsForToken;
+import org.apache.cassandra.locator.ReplicaPlan;
+import org.apache.cassandra.locator.ReplicaPlan.ForWrite;
import org.apache.cassandra.utils.concurrent.Condition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +56,6 @@ import static java.util.stream.Collectors.toList;
import static org.apache.cassandra.config.DatabaseDescriptor.getCounterWriteRpcTimeout;
import static org.apache.cassandra.config.DatabaseDescriptor.getWriteRpcTimeout;
import static org.apache.cassandra.db.WriteType.COUNTER;
-import static org.apache.cassandra.locator.ReplicaPlan.ForTokenWrite;
import static org.apache.cassandra.schema.Schema.instance;
import static org.apache.cassandra.service.StorageProxy.WritePerformer;
import static org.apache.cassandra.utils.concurrent.Condition.newOneTimeCondition;
@@ -64,7 +69,7 @@ public abstract class AbstractWriteResponseHandler<T> implements RequestCallback
//Count down until all responses and expirations have occured before deciding whether the ideal CL was reached.
private AtomicInteger responsesAndExpirations;
private final Condition condition = newOneTimeCondition();
- protected final ForTokenWrite replicaPlan;
+ protected final ReplicaPlan.ForWrite replicaPlan;
protected final Runnable callback;
protected final WriteType writeType;
@@ -73,6 +78,7 @@ public abstract class AbstractWriteResponseHandler<T> implements RequestCallback
private volatile int failures = 0;
private final Map<InetAddressAndPort, RequestFailureReason> failureReasonByEndpoint;
private final long queryStartNanoTime;
+ private @Nullable final Supplier<Mutation> hintOnFailure;
/**
* Delegate to another WriteResponseHandler or possibly this one to track if the ideal consistency level was reached.
@@ -89,16 +95,16 @@ public abstract class AbstractWriteResponseHandler<T> implements RequestCallback
/**
* @param callback A callback to be called when the write is successful.
+ * @param hintOnFailure
* @param queryStartNanoTime
*/
- protected AbstractWriteResponseHandler(ForTokenWrite replicaPlan,
- Runnable callback,
- WriteType writeType,
- long queryStartNanoTime)
+ protected AbstractWriteResponseHandler(ForWrite replicaPlan, Runnable callback, WriteType writeType,
+ Supplier<Mutation> hintOnFailure, long queryStartNanoTime)
{
this.replicaPlan = replicaPlan;
this.callback = callback;
this.writeType = writeType;
+ this.hintOnFailure = hintOnFailure;
this.failureReasonByEndpoint = new ConcurrentHashMap<>();
this.queryStartNanoTime = queryStartNanoTime;
}
@@ -208,7 +214,7 @@ public abstract class AbstractWriteResponseHandler<T> implements RequestCallback
{
// During bootstrap, we have to include the pending endpoints or we may fail the consistency level
// guarantees (see #833)
- return replicaPlan.blockFor();
+ return replicaPlan.writeQuorum();
}
/**
@@ -274,6 +280,9 @@ public abstract class AbstractWriteResponseHandler<T> implements RequestCallback
if (blockFor() + n > candidateReplicaCount())
signal();
+
+ if (hintOnFailure != null)
+ StorageProxy.submitHint(hintOnFailure.get(), replicaPlan.lookup(from), null);
}
@Override
@@ -332,7 +341,7 @@ public abstract class AbstractWriteResponseHandler<T> implements RequestCallback
for (ColumnFamilyStore cf : cfs)
cf.metric.additionalWrites.inc();
- writePerformer.apply(mutation, replicaPlan.withContact(uncontacted),
+ writePerformer.apply(mutation, replicaPlan.withContacts(uncontacted),
(AbstractWriteResponseHandler<IMutation>) this,
localDC);
}
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index da86529..9269e0f 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.management.openmbean.CompositeData;
import java.util.concurrent.atomic.AtomicInteger;
@@ -36,15 +37,23 @@ import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
+import com.google.common.util.concurrent.MoreExecutors;
import org.apache.cassandra.concurrent.ExecutorPlus;
import org.apache.cassandra.config.Config;
import org.apache.cassandra.db.compaction.CompactionManager;
+import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.locator.EndpointsByRange;
import org.apache.cassandra.locator.EndpointsForRange;
+import org.apache.cassandra.utils.ExecutorUtils;
import org.apache.cassandra.utils.Simulate;
+import org.apache.cassandra.locator.EndpointsForToken;
+import org.apache.cassandra.schema.Schema;
+import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.streaming.PreviewKind;
+import org.apache.cassandra.utils.Simulate;
import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
import org.slf4j.Logger;
@@ -74,6 +83,8 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.repair.CommonRange;
import org.apache.cassandra.repair.NoSuchRepairSessionException;
+import org.apache.cassandra.service.paxos.PaxosRepair;
+import org.apache.cassandra.service.paxos.cleanup.PaxosCleanup;
import org.apache.cassandra.repair.RepairJobDesc;
import org.apache.cassandra.repair.RepairParallelism;
import org.apache.cassandra.repair.RepairSession;
@@ -91,12 +102,13 @@ import org.apache.cassandra.repair.messages.RepairOption;
import org.apache.cassandra.repair.messages.SyncResponse;
import org.apache.cassandra.repair.messages.ValidationResponse;
import org.apache.cassandra.schema.TableId;
-import org.apache.cassandra.streaming.PreviewKind;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MBeanWrapper;
import org.apache.cassandra.utils.MerkleTrees;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.concurrent.Future;
+import org.apache.cassandra.utils.concurrent.FutureCombiner;
+import org.apache.cassandra.utils.concurrent.ImmediateFuture;
import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Iterables.transform;
@@ -342,9 +354,14 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
boolean pullRepair,
PreviewKind previewKind,
boolean optimiseStreams,
+ boolean repairPaxos,
+ boolean paxosOnly,
ExecutorPlus executor,
String... cfnames)
{
+ if (repairPaxos && previewKind != PreviewKind.NONE)
+ throw new IllegalArgumentException("cannot repair paxos in a preview repair");
+
if (range.endpoints.isEmpty())
return null;
@@ -353,7 +370,7 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
final RepairSession session = new RepairSession(parentRepairSession, nextTimeUUID(), range, keyspace,
parallelismDegree, isIncremental, pullRepair,
- previewKind, optimiseStreams, cfnames);
+ previewKind, optimiseStreams, repairPaxos, paxosOnly, cfnames);
sessions.put(session.getId(), session);
// register listeners
@@ -418,7 +435,8 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
}
- Pair<ParentRepairStatus, List<String>> getRepairStatus(Integer cmd)
+ @VisibleForTesting
+ public Pair<ParentRepairStatus, List<String>> getRepairStatus(Integer cmd)
{
return repairStatusByCmd.getIfPresent(cmd);
}
@@ -924,4 +942,74 @@ public class ActiveRepairService implements IEndpointStateChangeSubscriber, IFai
{
return parentRepairSessions.size();
}
+
+ public Future<?> repairPaxosForTopologyChange(String ksName, Collection<Range<Token>> ranges, String reason)
+ {
+ if (!paxosRepairEnabled())
+ {
+ logger.warn("Not running paxos repair for topology change because paxos repair has been disabled");
+ return ImmediateFuture.success(null);
+ }
+
+ if (ranges.isEmpty())
+ {
+ logger.warn("Not running paxos repair for topology change because there are no ranges to repair");
+ return ImmediateFuture.success(null);
+ }
+ List<TableMetadata> tables = Lists.newArrayList(Schema.instance.getKeyspaceMetadata(ksName).tables);
+ List<Future<Void>> futures = new ArrayList<>(ranges.size() * tables.size());
+ Keyspace keyspace = Keyspace.open(ksName);
+ AbstractReplicationStrategy replication = keyspace.getReplicationStrategy();
+ for (Range<Token> range: ranges)
+ {
+ for (TableMetadata table : tables)
+ {
+ Set<InetAddressAndPort> endpoints = replication.getNaturalReplicas(range.right).filter(FailureDetector.isReplicaAlive).endpoints();
+ if (!PaxosRepair.hasSufficientLiveNodesForTopologyChange(keyspace, range, endpoints))
+ {
+ Set<InetAddressAndPort> downEndpoints = replication.getNaturalReplicas(range.right).filter(e -> !endpoints.contains(e)).endpoints();
+ downEndpoints.removeAll(endpoints);
+
+ throw new RuntimeException(String.format("Insufficient live nodes to repair paxos for %s in %s for %s.\n" +
+ "There must be enough live nodes to satisfy EACH_QUORUM, but the following nodes are down: %s\n" +
+ "This check can be skipped by setting either the yaml property skip_paxos_repair_on_topology_change or " +
+ "the system property cassandra.skip_paxos_repair_on_topology_change to false. The jmx property " +
+ "StorageService.SkipPaxosRepairOnTopologyChange can also be set to false to temporarily disable without " +
+ "restarting the node\n" +
+ "Individual keyspaces can be skipped with the yaml property skip_paxos_repair_on_topology_change_keyspaces, the" +
+ "system property cassandra.skip_paxos_repair_on_topology_change_keyspaces, or temporarily with the jmx" +
+ "property StorageService.SkipPaxosRepairOnTopologyChangeKeyspaces\n" +
+ "Skipping this check can lead to paxos correctness issues",
+ range, ksName, reason, downEndpoints));
+ }
+ EndpointsForToken pending = StorageService.instance.getTokenMetadata().pendingEndpointsForToken(range.right, ksName);
+ if (pending.size() > 1 && !Boolean.getBoolean("cassandra.paxos_repair_allow_multiple_pending_unsafe"))
+ {
+ throw new RuntimeException(String.format("Cannot begin paxos auto repair for %s in %s.%s, multiple pending endpoints exist for range (%s). " +
+ "Set -Dcassandra.paxos_repair_allow_multiple_pending_unsafe=true to skip this check",
+ range, table.keyspace, table.name, pending));
+
+ }
+ Future<Void> future = PaxosCleanup.cleanup(endpoints, table, Collections.singleton(range), false, repairCommandExecutor());
+ futures.add(future);
+ }
+ }
+
+ return FutureCombiner.allOf(futures);
+ }
+
+ public int getPaxosRepairParallelism()
+ {
+ return DatabaseDescriptor.getPaxosRepairParallelism();
+ }
+
+ public void setPaxosRepairParallelism(int v)
+ {
+ DatabaseDescriptor.setPaxosRepairParallelism(v);
+ }
+
+ public void shutdownNowAndWait(long timeout, TimeUnit unit) throws InterruptedException, TimeoutException
+ {
+ ExecutorUtils.shutdownNowAndWait(timeout, unit, clearSnapshotExecutor);
+ }
}
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java b/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java
index 3f03602..009ad56 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairServiceMBean.java
@@ -55,4 +55,6 @@ public interface ActiveRepairServiceMBean
* @return current size of the internal cache holding {@link ActiveRepairService.ParentRepairSession} instances
*/
int parentRepairSessionsCount();
+ public int getPaxosRepairParallelism();
+ public void setPaxosRepairParallelism(int v);
}
diff --git a/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java b/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java
index 155f42d..c1c828f 100644
--- a/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java
@@ -36,7 +36,7 @@ public class BatchlogResponseHandler<T> extends AbstractWriteResponseHandler<T>
public BatchlogResponseHandler(AbstractWriteResponseHandler<T> wrapped, int requiredBeforeFinish, BatchlogCleanup cleanup, long queryStartNanoTime)
{
- super(wrapped.replicaPlan, wrapped.callback, wrapped.writeType, queryStartNanoTime);
+ super(wrapped.replicaPlan, wrapped.callback, wrapped.writeType, null, queryStartNanoTime);
this.wrapped = wrapped;
this.requiredBeforeFinish = requiredBeforeFinish;
this.cleanup = cleanup;
diff --git a/src/java/org/apache/cassandra/service/CASRequest.java b/src/java/org/apache/cassandra/service/CASRequest.java
index 9197ef0..19966c8 100644
--- a/src/java/org/apache/cassandra/service/CASRequest.java
+++ b/src/java/org/apache/cassandra/service/CASRequest.java
@@ -17,11 +17,11 @@
*/
package org.apache.cassandra.service;
-import org.apache.cassandra.db.SinglePartitionReadQuery;
+import org.apache.cassandra.db.SinglePartitionReadCommand;
import org.apache.cassandra.db.partitions.FilteredPartition;
import org.apache.cassandra.db.partitions.PartitionUpdate;
import org.apache.cassandra.exceptions.InvalidRequestException;
-import org.apache.cassandra.utils.TimeUUID;
+import org.apache.cassandra.service.paxos.Ballot;
/**
* Abstract the conditions and updates for a CAS operation.
@@ -31,7 +31,7 @@ public interface CASRequest
/**
* The command to use to fetch the value to compare for the CAS.
*/
- public SinglePartitionReadQuery readCommand(int nowInSec);
+ public SinglePartitionReadCommand readCommand(int nowInSec);
/**
* Returns whether the provided CF, that represents the values fetched using the
@@ -43,5 +43,5 @@ public interface CASRequest
* The updates to perform of a CAS success. The values fetched using the readFilter()
* are passed as argument.
*/
- public PartitionUpdate makeUpdates(FilteredPartition current, ClientState state, TimeUUID ballot) throws InvalidRequestException;
+ public PartitionUpdate makeUpdates(FilteredPartition current, ClientState clientState, Ballot ballot) throws InvalidRequestException;
}
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 67195d7..7e9c208 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -78,6 +78,7 @@ import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.security.ThreadAwareSecurityManager;
import org.apache.cassandra.streaming.StreamManager;
+import org.apache.cassandra.service.paxos.PaxosState;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.JMXServerUtils;
import org.apache.cassandra.utils.JVMStabilityInspector;
@@ -347,6 +348,9 @@ public class CassandraDaemon
}
// Replay any CommitLogSegments found on disk
+ PaxosState.initializeTrackers();
+
+ // replay the log if necessary
try
{
CommitLog.instance.recoverSegmentsOnDisk();
@@ -359,6 +363,15 @@ public class CassandraDaemon
// Re-populate token metadata after commit log recover (new peers might be loaded onto system keyspace #10293)
StorageService.instance.populateTokenMetadata();
+ try
+ {
+ PaxosState.maybeRebuildUncommittedState();
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+
SystemKeyspace.finishStartup();
// Clean up system.size_estimates entries left lying around from missed keyspace drops (CASSANDRA-14905)
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index 65c562d..c7def84 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -26,8 +26,11 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.LongSupplier;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
@@ -136,6 +139,14 @@ public class ClientState
// is unrealistic expectation, doing it node-wise is easy).
private static final AtomicLong lastTimestampMicros = new AtomicLong(0);
+ @VisibleForTesting
+ public static void resetLastTimestamp(long nowMillis)
+ {
+ long nowMicros = TimeUnit.MILLISECONDS.toMicros(nowMillis);
+ if (lastTimestampMicros.get() > nowMicros)
+ lastTimestampMicros.set(nowMicros);
+ }
+
/**
* Construct a new, empty ClientState for internal calls.
*/
@@ -252,7 +263,7 @@ public class ClientState
* with a clock in the future compared to the local one), we use the last proposal timestamp plus 1, ensuring
* progress.
*
- * @param minTimestampToUse the max timestamp of the last proposal accepted by replica having responded
+ * @param minUnixMicros the max timestamp of the last proposal accepted by replica having responded
* to the prepare phase of the paxos round this is for. In practice, that's the minimum timestamp this method
* may return.
* @return a timestamp suitable for a Paxos proposal (using the reasoning described above). Note that
@@ -261,18 +272,18 @@ public class ClientState
* it may be returned multiple times). Note that we still ensure Paxos "ballot" are unique (for different
* proposal) by (securely) randomizing the non-timestamp part of the UUID.
*/
- public static long getTimestampForPaxos(long minTimestampToUse)
+ public static long getTimestampForPaxos(long minUnixMicros)
{
while (true)
{
- long current = Math.max(currentTimeMillis() * 1000, minTimestampToUse);
+ long current = Math.max(currentTimeMillis() * 1000, minUnixMicros);
long last = lastTimestampMicros.get();
long tstamp = last >= current ? last + 1 : current;
// Note that if we ended up picking minTimestampMicrosToUse (it was "in the future"), we don't
// want to change the local clock, otherwise a single node in the future could corrupt the clock
// of all nodes and for all inserts (since non-paxos inserts also use lastTimestampMicros).
// See CASSANDRA-11991
- if (tstamp == minTimestampToUse || lastTimestampMicros.compareAndSet(last, tstamp))
+ if (tstamp == minUnixMicros || lastTimestampMicros.compareAndSet(last, tstamp))
return tstamp;
}
}
diff --git a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
index 65cf3cc..2e26bb9 100644
--- a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
@@ -20,8 +20,10 @@ package org.apache.cassandra.service;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.locator.NetworkTopologyStrategy;
import org.apache.cassandra.locator.Replica;
@@ -40,13 +42,14 @@ public class DatacenterSyncWriteResponseHandler<T> extends AbstractWriteResponse
private final Map<String, AtomicInteger> responses = new HashMap<String, AtomicInteger>();
private final AtomicInteger acks = new AtomicInteger(0);
- public DatacenterSyncWriteResponseHandler(ReplicaPlan.ForTokenWrite replicaPlan,
+ public DatacenterSyncWriteResponseHandler(ReplicaPlan.ForWrite replicaPlan,
Runnable callback,
WriteType writeType,
+ Supplier<Mutation> hintOnFailure,
long queryStartNanoTime)
{
// Response is been managed by the map so make it 1 for the superclass.
- super(replicaPlan, callback, writeType, queryStartNanoTime);
+ super(replicaPlan, callback, writeType, hintOnFailure, queryStartNanoTime);
assert replicaPlan.consistencyLevel() == ConsistencyLevel.EACH_QUORUM;
if (replicaPlan.replicationStrategy() instanceof NetworkTopologyStrategy)
diff --git a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
index a9583a3..4920a54 100644
--- a/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
@@ -17,27 +17,30 @@
*/
package org.apache.cassandra.service;
+import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.db.WriteType;
-import org.apache.cassandra.locator.InOurDcTester;
+import org.apache.cassandra.locator.InOurDc;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.locator.ReplicaPlan;
import org.apache.cassandra.net.Message;
import java.util.function.Predicate;
+import java.util.function.Supplier;
/**
* This class blocks for a quorum of responses _in the local datacenter only_ (CL.LOCAL_QUORUM).
*/
public class DatacenterWriteResponseHandler<T> extends WriteResponseHandler<T>
{
- private final Predicate<InetAddressAndPort> waitingFor = InOurDcTester.endpoints();
+ private final Predicate<InetAddressAndPort> waitingFor = InOurDc.endpoints();
- public DatacenterWriteResponseHandler(ReplicaPlan.ForTokenWrite replicaPlan,
+ public DatacenterWriteResponseHandler(ReplicaPlan.ForWrite replicaPlan,
Runnable callback,
WriteType writeType,
+ Supplier<Mutation> hintOnFailure,
long queryStartNanoTime)
{
- super(replicaPlan, callback, writeType, queryStartNanoTime);
+ super(replicaPlan, callback, writeType, hintOnFailure, queryStartNanoTime);
assert replicaPlan.consistencyLevel().isDatacenterLocal();
}
diff --git a/src/java/org/apache/cassandra/service/FailureRecordingCallback.java b/src/java/org/apache/cassandra/service/FailureRecordingCallback.java
new file mode 100644
index 0000000..c4ca8e2
--- /dev/null
+++ b/src/java/org/apache/cassandra/service/FailureRecordingCallback.java
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.service;
+
+import java.util.AbstractMap;
+import java.util.AbstractSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
+import org.apache.cassandra.exceptions.RequestFailureReason;
+import org.apache.cassandra.locator.InetAddressAndPort;
+import org.apache.cassandra.net.RequestCallbackWithFailure;
+import org.apache.cassandra.utils.concurrent.IntrusiveStack;
+
+import static org.apache.cassandra.exceptions.RequestFailureReason.TIMEOUT;
+
+public abstract class FailureRecordingCallback<T> implements RequestCallbackWithFailure<T>
+{
+ public static class FailureResponses extends IntrusiveStack<FailureResponses> implements Map.Entry<InetAddressAndPort, RequestFailureReason>
+ {
+ final InetAddressAndPort from;
+ final RequestFailureReason reason;
+
+ public FailureResponses(InetAddressAndPort from, RequestFailureReason reason)
+ {
+ this.from = from;
+ this.reason = reason;
+ }
+
+ @Override
+ public InetAddressAndPort getKey()
+ {
+ return from;
+ }
+
+ @Override
+ public RequestFailureReason getValue()
+ {
+ return reason;
+ }
+
+ @Override
+ public RequestFailureReason setValue(RequestFailureReason value)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public static <O> void push(AtomicReferenceFieldUpdater<O, FailureResponses> headUpdater, O owner, InetAddressAndPort from, RequestFailureReason reason)
+ {
+ push(headUpdater, owner, new FailureResponses(from, reason));
+ }
+
+ public static <O> void pushExclusive(AtomicReferenceFieldUpdater<O, FailureResponses> headUpdater, O owner, InetAddressAndPort from, RequestFailureReason reason)
+ {
+ pushExclusive(headUpdater, owner, new FailureResponses(from, reason));
+ }
+
+ public static FailureResponses pushExclusive(FailureResponses head, InetAddressAndPort from, RequestFailureReason reason)
+ {
+ return IntrusiveStack.pushExclusive(head, new FailureResponses(from, reason));
+ }
+
+ public static int size(FailureResponses head)
+ {
+ return IntrusiveStack.size(head);
+ }
+
+ public static Iterator<FailureResponses> iterator(FailureResponses head)
+ {
+ return IntrusiveStack.iterator(head);
+ }
+
+ public static int failureCount(FailureResponses head)
+ {
+ return (int)IntrusiveStack.accumulate(head, (f, v) -> f.reason == TIMEOUT ? v : v + 1, 0);
+ }
+ }
+
+ public static class AsMap extends AbstractMap<InetAddressAndPort, RequestFailureReason>
+ {
+ final FailureResponses head;
+ int size = -1;
+
+ AsMap(FailureResponses head)
+ {
+ this.head = head;
+ }
+
+ @Override
+ public Set<Map.Entry<InetAddressAndPort, RequestFailureReason>> entrySet()
+ {
+ return new AbstractSet<Map.Entry<InetAddressAndPort, RequestFailureReason>>()
+ {
+ @Override
+ public Iterator<Map.Entry<InetAddressAndPort, RequestFailureReason>> iterator()
+ {
+ return (Iterator<Map.Entry<InetAddressAndPort, RequestFailureReason>>)
+ (Iterator<?>) FailureResponses.iterator(head);
+ }
+
+ @Override
+ public int size()
+ {
+ if (size < 0)
+ size = FailureResponses.size(head);
+ return size;
+ }
+ };
+ }
+
+ public int failureCount()
+ {
+ return FailureResponses.failureCount(head);
+ }
+ }
+
+ private volatile FailureResponses failureResponses;
+ private static final AtomicReferenceFieldUpdater<FailureRecordingCallback, FailureResponses> responsesUpdater = AtomicReferenceFieldUpdater.newUpdater(FailureRecordingCallback.class, FailureResponses.class, "failureResponses");
+
+ @Override
+ public void onFailure(InetAddressAndPort from, RequestFailureReason failureReason)
+ {
+ FailureResponses.push(responsesUpdater, this, from, failureReason);
+ }
+
+ protected void onFailureWithMutex(InetAddressAndPort from, RequestFailureReason failureReason)
+ {
+ FailureResponses.pushExclusive(responsesUpdater, this, from, failureReason);
+ }
+
+ protected AsMap failureReasonsAsMap()
+ {
+ return new AsMap(failureResponses);
+ }
+}
diff --git a/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java b/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
index cb8dbc3..ad0e0e0 100644
--- a/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
+++ b/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
@@ -77,6 +77,12 @@ public class PendingRangeCalculatorService
update.sync();
}
+
+ public void executeWhenFinished(Runnable runnable)
+ {
+ update.runAfter(runnable);
+ }
+
// public & static for testing purposes
public static void calculatePendingRanges(AbstractReplicationStrategy strategy, String keyspaceName)
{
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 267436f..99ed347 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -37,17 +37,16 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;
-import java.util.function.Supplier;
import java.util.stream.Collectors;
import com.google.common.base.Preconditions;
import com.google.common.cache.CacheLoader;
import com.google.common.collect.Iterables;
-import com.google.common.primitives.Ints;
import com.google.common.util.concurrent.Uninterruptibles;
import org.apache.cassandra.config.Config;
import org.apache.cassandra.service.paxos.*;
+import org.apache.cassandra.service.paxos.Paxos;
import org.apache.cassandra.utils.TimeUUID;
import org.apache.cassandra.utils.concurrent.CountDownLatch;
@@ -125,6 +124,8 @@ import org.apache.cassandra.schema.Schema;
import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.schema.TableMetadata;
+import org.apache.cassandra.service.paxos.v1.PrepareCallback;
+import org.apache.cassandra.service.paxos.v1.ProposeCallback;
import org.apache.cassandra.service.reads.AbstractReadExecutor;
import org.apache.cassandra.service.reads.ReadCallback;
import org.apache.cassandra.service.reads.range.RangeCommands;
@@ -154,10 +155,11 @@ import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.writeMetr
import static org.apache.cassandra.net.NoPayload.noPayload;
import static org.apache.cassandra.net.Verb.*;
import static org.apache.cassandra.service.BatchlogResponseHandler.BatchlogCleanup;
-import static org.apache.cassandra.service.paxos.BallotGenerator.Global.nextBallotTimestampMicros;
-import static org.apache.cassandra.service.paxos.BallotGenerator.Global.randomBallot;
-import static org.apache.cassandra.service.paxos.PrepareVerbHandler.doPrepare;
-import static org.apache.cassandra.service.paxos.ProposeVerbHandler.doPropose;
+import static org.apache.cassandra.service.paxos.Ballot.Flag.GLOBAL;
+import static org.apache.cassandra.service.paxos.Ballot.Flag.LOCAL;
+import static org.apache.cassandra.service.paxos.BallotGenerator.Global.nextBallot;
+import static org.apache.cassandra.service.paxos.v1.PrepareVerbHandler.doPrepare;
+import static org.apache.cassandra.service.paxos.v1.ProposeVerbHandler.doPropose;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
import static org.apache.cassandra.utils.TimeUUID.Generator.nextTimeUUID;
@@ -217,7 +219,7 @@ public class StorageProxy implements StorageProxyMBean
{
EndpointsForToken selected = targets.contacts().withoutSelf();
Replicas.temporaryAssertFull(selected); // TODO CASSANDRA-14548
- counterWriteTask(mutation, targets.withContact(selected), responseHandler, localDataCenter).run();
+ counterWriteTask(mutation, targets.withContacts(selected), responseHandler, localDataCenter).run();
};
counterWriteOnCoordinatorPerformer = (mutation, targets, responseHandler, localDataCenter) ->
@@ -225,11 +227,21 @@ public class StorageProxy implements StorageProxyMBean
EndpointsForToken selected = targets.contacts().withoutSelf();
Replicas.temporaryAssertFull(selected); // TODO CASSANDRA-14548
Stage.COUNTER_MUTATION.executor()
- .execute(counterWriteTask(mutation, targets.withContact(selected), responseHandler, localDataCenter));
+ .execute(counterWriteTask(mutation, targets.withContacts(selected), responseHandler, localDataCenter));
};
ReadRepairMetrics.init();
+
+ if (!Paxos.isLinearizable())
+ {
+ logger.warn("This node was started with paxos variant {}. SERIAL (and LOCAL_SERIAL) reads coordinated by this node " +
+ "will not offer linearizability (see CASSANDRA-12126 for details on what this means) with " +
+ "respect to other SERIAL operations. Please note that with this variant, SERIAL reads will be " +
+ "slower than QUORUM reads, yet offer no additional guarantees. This flag should only be used in " +
+ "the restricted case of upgrading from a pre-CASSANDRA-12126 version, and only if you " +
+ "understand the tradeoff.", Paxos.getPaxosVariant());
+ }
}
/**
@@ -279,24 +291,40 @@ public class StorageProxy implements StorageProxyMBean
CASRequest request,
ConsistencyLevel consistencyForPaxos,
ConsistencyLevel consistencyForCommit,
- ClientState state,
+ ClientState clientState,
int nowInSeconds,
long queryStartNanoTime)
throws UnavailableException, IsBootstrappingException, RequestFailureException, RequestTimeoutException, InvalidRequestException, CasWriteUnknownResultException
{
+ if (DatabaseDescriptor.getPartitionDenylistEnabled() && DatabaseDescriptor.getDenylistWritesEnabled() && !partitionDenylist.isKeyPermitted(keyspaceName, cfName, key.getKey()))
+ {
+ denylistMetrics.incrementWritesRejected();
+ throw new InvalidRequestException(String.format("Unable to CAS write to denylisted partition [0x%s] in %s/%s",
+ key.toString(), keyspaceName, cfName));
+ }
+
+ return Paxos.useV2()
+ ? Paxos.cas(key, request, consistencyForPaxos, consistencyForCommit, clientState)
+ : legacyCas(keyspaceName, cfName, key, request, consistencyForPaxos, consistencyForCommit, clientState, nowInSeconds, queryStartNanoTime);
+ }
+
+ public static RowIterator legacyCas(String keyspaceName,
+ String cfName,
+ DecoratedKey key,
+ CASRequest request,
+ ConsistencyLevel consistencyForPaxos,
+ ConsistencyLevel consistencyForCommit,
+ ClientState clientState,
+ int nowInSeconds,
+ long queryStartNanoTime)
+ throws UnavailableException, IsBootstrappingException, RequestFailureException, RequestTimeoutException, InvalidRequestException
+ {
final long startTimeForMetrics = nanoTime();
try
{
TableMetadata metadata = Schema.instance.validateTable(keyspaceName, cfName);
- if (DatabaseDescriptor.getPartitionDenylistEnabled() && DatabaseDescriptor.getDenylistWritesEnabled() && !partitionDenylist.isKeyPermitted(keyspaceName, cfName, key.getKey()))
- {
- denylistMetrics.incrementWritesRejected();
- throw new InvalidRequestException(String.format("Unable to CAS write to denylisted partition [0x%s] in %s/%s",
- key.toString(), keyspaceName, cfName));
- }
-
- Function<TimeUUID, Pair<PartitionUpdate, RowIterator>> updateProposer = ballot ->
+ Function<Ballot, Pair<PartitionUpdate, RowIterator>> updateProposer = ballot ->
{
// read the current values and check they validate the conditions
Tracing.trace("Reading existing values for CAS precondition");
@@ -317,7 +345,7 @@ public class StorageProxy implements StorageProxyMBean
}
// Create the desired updates
- PartitionUpdate updates = request.makeUpdates(current, state, ballot);
+ PartitionUpdate updates = request.makeUpdates(current, clientState, ballot);
long size = updates.dataSize();
casWriteMetrics.mutationSize.update(size);
@@ -435,7 +463,7 @@ public class StorageProxy implements StorageProxyMBean
ConsistencyLevel consistencyForCommit,
long queryStartNanoTime,
CASClientRequestMetrics casMetrics,
- Function<TimeUUID, Pair<PartitionUpdate, RowIterator>> createUpdateProposal)
+ Function<Ballot, Pair<PartitionUpdate, RowIterator>> createUpdateProposal)
throws UnavailableException, IsBootstrappingException, RequestFailureException, RequestTimeoutException, InvalidRequestException
{
int contentions = 0;
@@ -461,7 +489,7 @@ public class StorageProxy implements StorageProxyMBean
consistencyForReplayCommits,
casMetrics);
- final TimeUUID ballot = pair.ballot;
+ final Ballot ballot = pair.ballot;
contentions += pair.contentions;
Pair<PartitionUpdate, RowIterator> proposalPair = createUpdateProposal.apply(ballot);
@@ -489,6 +517,7 @@ public class StorageProxy implements StorageProxyMBean
Tracing.trace("Paxos proposal not accepted (pre-empted by a higher ballot)");
contentions++;
+
Uninterruptibles.sleepUninterruptibly(ThreadLocalRandom.current().nextInt(100), TimeUnit.MILLISECONDS);
// continue to retry
}
@@ -540,10 +569,9 @@ public class StorageProxy implements StorageProxyMBean
// in progress (#5667). Lastly, we don't want to use a timestamp that is older than the last one assigned by ClientState or operations may appear
// out-of-order (#7801).
long minTimestampMicrosToUse = summary == null ? Long.MIN_VALUE : 1 + summary.mostRecentInProgressCommit.ballot.unixMicros();
- long ballotMicros = nextBallotTimestampMicros(minTimestampMicrosToUse);
// Note that ballotMicros is not guaranteed to be unique if two proposal are being handled concurrently by the same coordinator. But we still
// need ballots to be unique for each proposal so we have to use getRandomTimeUUIDFromMicros.
- TimeUUID ballot = randomBallot(ballotMicros, consistencyForPaxos == SERIAL);
+ Ballot ballot = nextBallot(minTimestampMicrosToUse, consistencyForPaxos == SERIAL ? GLOBAL : LOCAL);
// prepare
try
@@ -604,8 +632,7 @@ public class StorageProxy implements StorageProxyMBean
// https://issues.apache.org/jira/browse/CASSANDRA-5062?focusedCommentId=13619810&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13619810)
// Since we waited for quorum nodes, if some of them haven't seen the last commit (which may just be a timing issue, but may also
// mean we lost messages), we pro-actively "repair" those nodes, and retry.
- int nowInSec = Ints.checkedCast(TimeUnit.MICROSECONDS.toSeconds(ballotMicros));
- Iterable<InetAddressAndPort> missingMRC = summary.replicasMissingMostRecentCommit(metadata, nowInSec);
+ Iterable<InetAddressAndPort> missingMRC = summary.replicasMissingMostRecentCommit();
if (Iterables.size(missingMRC) > 0)
{
Tracing.trace("Repairing replicas that missed the most recent commit");
@@ -729,11 +756,11 @@ public class StorageProxy implements StorageProxyMBean
AbstractWriteResponseHandler<Commit> responseHandler = null;
// NOTE: this ReplicaPlan is a lie, this usage of ReplicaPlan could do with being clarified - the selected() collection is essentially (I think) never used
- ReplicaPlan.ForTokenWrite replicaPlan = ReplicaPlans.forWrite(keyspace, consistencyLevel, tk, ReplicaPlans.writeAll);
+ ReplicaPlan.ForWrite replicaPlan = ReplicaPlans.forWrite(keyspace, consistencyLevel, tk, ReplicaPlans.writeAll);
if (shouldBlock)
{
AbstractReplicationStrategy rs = replicaPlan.replicationStrategy();
- responseHandler = rs.getWriteResponseHandler(replicaPlan, null, WriteType.SIMPLE, queryStartNanoTime);
+ responseHandler = rs.getWriteResponseHandler(replicaPlan, null, WriteType.SIMPLE, proposal::makeMutation, queryStartNanoTime);
}
Message<Commit> message = Message.outWithFlag(PAXOS_COMMIT_REQ, proposal, MessageFlag.CALL_BACK_ON_FAILURE);
@@ -786,7 +813,7 @@ public class StorageProxy implements StorageProxyMBean
{
try
{
- PaxosState.commit(message.payload);
+ PaxosState.commitDirect(message.payload);
if (responseHandler != null)
responseHandler.onResponse(null);
}
@@ -993,7 +1020,7 @@ public class StorageProxy implements StorageProxyMBean
ConsistencyLevel consistencyLevel = ConsistencyLevel.ONE;
//Since the base -> view replication is 1:1 we only need to store the BL locally
- ReplicaPlan.ForTokenWrite replicaPlan = ReplicaPlans.forLocalBatchlogWrite();
+ ReplicaPlan.ForWrite replicaPlan = ReplicaPlans.forLocalBatchlogWrite();
BatchlogCleanup cleanup = new BatchlogCleanup(mutations.size(),
() -> asyncRemoveFromBatchlog(replicaPlan, batchUUID));
@@ -1162,7 +1189,7 @@ public class StorageProxy implements StorageProxyMBean
batchConsistencyLevel = consistency_level;
}
- ReplicaPlan.ForTokenWrite replicaPlan = ReplicaPlans.forBatchlogWrite(batchConsistencyLevel == ConsistencyLevel.ANY);
+ ReplicaPlan.ForWrite replicaPlan = ReplicaPlans.forBatchlogWrite(batchConsistencyLevel == ConsistencyLevel.ANY);
final TimeUUID batchUUID = nextTimeUUID();
BatchlogCleanup cleanup = new BatchlogCleanup(mutations.size(),
@@ -1244,11 +1271,12 @@ public class StorageProxy implements StorageProxyMBean
}
}
- private static void syncWriteToBatchlog(Collection<Mutation> mutations, ReplicaPlan.ForTokenWrite replicaPlan, TimeUUID uuid, long queryStartNanoTime)
+ private static void syncWriteToBatchlog(Collection<Mutation> mutations, ReplicaPlan.ForWrite replicaPlan, TimeUUID uuid, long queryStartNanoTime)
throws WriteTimeoutException, WriteFailureException
{
WriteResponseHandler<?> handler = new WriteResponseHandler(replicaPlan,
WriteType.BATCH_LOG,
+ null,
queryStartNanoTime);
Batch batch = Batch.createLocal(uuid, FBUtilities.timestampMicros(), mutations);
@@ -1265,7 +1293,7 @@ public class StorageProxy implements StorageProxyMBean
handler.get();
}
- private static void asyncRemoveFromBatchlog(ReplicaPlan.ForTokenWrite replicaPlan, TimeUUID uuid)
+ private static void asyncRemoveFromBatchlog(ReplicaPlan.ForWrite replicaPlan, TimeUUID uuid)
{
Message<TimeUUID> message = Message.out(Verb.BATCH_REMOVE_REQ, uuid);
for (Replica target : replicaPlan.contacts())
@@ -1285,7 +1313,7 @@ public class StorageProxy implements StorageProxyMBean
for (WriteResponseHandlerWrapper wrapper : wrappers)
{
Replicas.temporaryAssertFull(wrapper.handler.replicaPlan.liveAndDown()); // TODO: CASSANDRA-14549
- ReplicaPlan.ForTokenWrite replicas = wrapper.handler.replicaPlan.withContact(wrapper.handler.replicaPlan.liveAndDown());
+ ReplicaPlan.ForWrite replicas = wrapper.handler.replicaPlan.withContacts(wrapper.handler.replicaPlan.liveAndDown());
try
{
@@ -1307,7 +1335,7 @@ public class StorageProxy implements StorageProxyMBean
{
EndpointsForToken sendTo = wrapper.handler.replicaPlan.liveAndDown();
Replicas.temporaryAssertFull(sendTo); // TODO: CASSANDRA-14549
- sendToHintedReplicas(wrapper.mutation, wrapper.handler.replicaPlan.withContact(sendTo), wrapper.handler, localDataCenter, stage);
+ sendToHintedReplicas(wrapper.mutation, wrapper.handler.replicaPlan.withContacts(sendTo), wrapper.handler, localDataCenter, stage);
}
for (WriteResponseHandlerWrapper wrapper : wrappers)
@@ -1340,9 +1368,9 @@ public class StorageProxy implements StorageProxyMBean
Keyspace keyspace = Keyspace.open(keyspaceName);
Token tk = mutation.key().getToken();
- ReplicaPlan.ForTokenWrite replicaPlan = ReplicaPlans.forWrite(keyspace, consistencyLevel, tk, ReplicaPlans.writeNormal);
+ ReplicaPlan.ForWrite replicaPlan = ReplicaPlans.forWrite(keyspace, consistencyLevel, tk, ReplicaPlans.writeNormal);
AbstractReplicationStrategy rs = replicaPlan.replicationStrategy();
- AbstractWriteResponseHandler<IMutation> responseHandler = rs.getWriteResponseHandler(replicaPlan, callback, writeType, queryStartNanoTime);
+ AbstractWriteResponseHandler<IMutation> responseHandler = rs.getWriteResponseHandler(replicaPlan, callback, writeType, mutation.hintOnFailure(), queryStartNanoTime);
performer.apply(mutation, replicaPlan, responseHandler, localDataCenter);
return responseHandler;
@@ -1359,9 +1387,9 @@ public class StorageProxy implements StorageProxyMBean
Keyspace keyspace = Keyspace.open(mutation.getKeyspaceName());
Token tk = mutation.key().getToken();
- ReplicaPlan.ForTokenWrite replicaPlan = ReplicaPlans.forWrite(keyspace, consistencyLevel, tk, ReplicaPlans.writeNormal);
+ ReplicaPlan.ForWrite replicaPlan = ReplicaPlans.forWrite(keyspace, consistencyLevel, tk, ReplicaPlans.writeNormal);
AbstractReplicationStrategy rs = replicaPlan.replicationStrategy();
- AbstractWriteResponseHandler<IMutation> writeHandler = rs.getWriteResponseHandler(replicaPlan,null, writeType, queryStartNanoTime);
+ AbstractWriteResponseHandler<IMutation> writeHandler = rs.getWriteResponseHandler(replicaPlan, null, writeType, mutation, queryStartNanoTime);
BatchlogResponseHandler<IMutation> batchHandler = new BatchlogResponseHandler<>(writeHandler, batchConsistencyLevel.blockFor(rs), cleanup, queryStartNanoTime);
return new WriteResponseHandlerWrapper(batchHandler, mutation);
}
@@ -1380,12 +1408,12 @@ public class StorageProxy implements StorageProxyMBean
long queryStartNanoTime)
{
Keyspace keyspace = Keyspace.open(mutation.getKeyspaceName());
- ReplicaPlan.ForTokenWrite replicaPlan = ReplicaPlans.forWrite(keyspace, consistencyLevel, liveAndDown, ReplicaPlans.writeAll);
+ ReplicaPlan.ForWrite replicaPlan = ReplicaPlans.forWrite(keyspace, consistencyLevel, liveAndDown, ReplicaPlans.writeAll);
AbstractReplicationStrategy replicationStrategy = replicaPlan.replicationStrategy();
AbstractWriteResponseHandler<IMutation> writeHandler = replicationStrategy.getWriteResponseHandler(replicaPlan, () -> {
long delay = Math.max(0, currentTimeMillis() - baseComplete.get());
viewWriteMetrics.viewWriteLatency.update(delay, MILLISECONDS);
- }, writeType, queryStartNanoTime);
+ }, writeType, mutation, queryStartNanoTime);
BatchlogResponseHandler<IMutation> batchHandler = new ViewWriteMetricsWrapped(writeHandler, batchConsistencyLevel.blockFor(replicationStrategy), cleanup, queryStartNanoTime);
return new WriteResponseHandlerWrapper(batchHandler, mutation);
}
@@ -1421,7 +1449,7 @@ public class StorageProxy implements StorageProxyMBean
* @throws OverloadedException if the hints cannot be written/enqueued
*/
public static void sendToHintedReplicas(final Mutation mutation,
- ReplicaPlan.ForTokenWrite plan,
+ ReplicaPlan.ForWrite plan,
AbstractWriteResponseHandler<IMutation> responseHandler,
String localDataCenter,
Stage stage)
@@ -1658,7 +1686,7 @@ public class StorageProxy implements StorageProxyMBean
// Forward the actual update to the chosen leader replica
AbstractWriteResponseHandler<IMutation> responseHandler = new WriteResponseHandler<>(ReplicaPlans.forForwardingCounterWrite(keyspace, tk, replica),
- WriteType.COUNTER, queryStartNanoTime);
+ WriteType.COUNTER, null, queryStartNanoTime);
Tracing.trace("Enqueuing counter update to {}", replica);
Message message = Message.outWithFlag(Verb.COUNTER_MUTATION_REQ, cm, MessageFlag.CALL_BACK_ON_FAILURE);
@@ -1728,7 +1756,7 @@ public class StorageProxy implements StorageProxyMBean
}
private static Runnable counterWriteTask(final IMutation mutation,
- final ReplicaPlan.ForTokenWrite replicaPlan,
+ final ReplicaPlan.ForWrite replicaPlan,
final AbstractWriteResponseHandler<IMutation> responseHandler,
final String localDataCenter)
{
@@ -1757,28 +1785,14 @@ public class StorageProxy implements StorageProxyMBean
public static RowIterator readOne(SinglePartitionReadCommand command, ConsistencyLevel consistencyLevel, long queryStartNanoTime)
throws UnavailableException, IsBootstrappingException, ReadFailureException, ReadTimeoutException, InvalidRequestException
{
- return readOne(command, consistencyLevel, null, queryStartNanoTime);
- }
-
- public static RowIterator readOne(SinglePartitionReadCommand command, ConsistencyLevel consistencyLevel, ClientState state, long queryStartNanoTime)
- throws UnavailableException, IsBootstrappingException, ReadFailureException, ReadTimeoutException, InvalidRequestException
- {
- return PartitionIterators.getOnlyElement(read(SinglePartitionReadCommand.Group.one(command), consistencyLevel, state, queryStartNanoTime), command);
- }
-
- public static PartitionIterator read(SinglePartitionReadCommand.Group group, ConsistencyLevel consistencyLevel, long queryStartNanoTime)
- throws UnavailableException, IsBootstrappingException, ReadFailureException, ReadTimeoutException, InvalidRequestException
- {
- // When using serial CL, the ClientState should be provided
- assert !consistencyLevel.isSerialConsistency();
- return read(group, consistencyLevel, null, queryStartNanoTime);
+ return PartitionIterators.getOnlyElement(read(SinglePartitionReadCommand.Group.one(command), consistencyLevel, queryStartNanoTime), command);
}
/**
* Performs the actual reading of a row out of the StorageService, fetching
* a specific set of column names from a given column family.
*/
- public static PartitionIterator read(SinglePartitionReadCommand.Group group, ConsistencyLevel consistencyLevel, ClientState state, long queryStartNanoTime)
+ public static PartitionIterator read(SinglePartitionReadCommand.Group group, ConsistencyLevel consistencyLevel, long queryStartNanoTime)
throws UnavailableException, IsBootstrappingException, ReadFailureException, ReadTimeoutException, InvalidRequestException
{
if (StorageService.instance.isBootstrapMode() && !systemKeyspaceQuery(group.queries))
@@ -1804,14 +1818,21 @@ public class StorageProxy implements StorageProxyMBean
}
return consistencyLevel.isSerialConsistency()
- ? readWithPaxos(group, consistencyLevel, state, queryStartNanoTime)
+ ? readWithPaxos(group, consistencyLevel, queryStartNanoTime)
: readRegular(group, consistencyLevel, queryStartNanoTime);
}
- private static PartitionIterator readWithPaxos(SinglePartitionReadCommand.Group group, ConsistencyLevel consistencyLevel, ClientState state, long queryStartNanoTime)
+ private static PartitionIterator readWithPaxos(SinglePartitionReadCommand.Group group, ConsistencyLevel consistencyLevel, long queryStartNanoTime)
+ throws InvalidRequestException, UnavailableException, ReadFailureException, ReadTimeoutException
+ {
+ return Paxos.useV2()
+ ? Paxos.read(group, consistencyLevel)
+ : legacyReadWithPaxos(group, consistencyLevel, queryStartNanoTime);
+ }
+
+ private static PartitionIterator legacyReadWithPaxos(SinglePartitionReadCommand.Group group, ConsistencyLevel consistencyLevel, long queryStartNanoTime)
throws InvalidRequestException, UnavailableException, ReadFailureException, ReadTimeoutException
{
- assert state != null;
if (group.queries.size() > 1)
throw new InvalidRequestException("SERIAL/LOCAL_SERIAL consistency may only be requested for one partition at a time");
@@ -1833,8 +1854,8 @@ public class StorageProxy implements StorageProxyMBean
{
// Commit an empty update to make sure all in-progress updates that should be finished first is, _and_
// that no other in-progress can get resurrected.
- Function<TimeUUID, Pair<PartitionUpdate, RowIterator>> updateProposer =
- Paxos.getPaxosVariant() == Config.PaxosVariant.v1_without_linearizable_reads
+ Function<Ballot, Pair<PartitionUpdate, RowIterator>> updateProposer =
+ !Paxos.isLinearizable()
? ballot -> null
: ballot -> Pair.create(PartitionUpdate.emptyUpdate(metadata, key), null);
// When replaying, we commit at quorum/local quorum, as we want to be sure the following read (done at
@@ -2421,7 +2442,7 @@ public class StorageProxy implements StorageProxyMBean
public interface WritePerformer
{
public void apply(IMutation mutation,
- ReplicaPlan.ForTokenWrite targets,
+ ReplicaPlan.ForWrite targets,
AbstractWriteResponseHandler<IMutation> responseHandler,
String localDataCenter) throws OverloadedException;
}
@@ -2810,10 +2831,10 @@ public class StorageProxy implements StorageProxyMBean
static class PaxosBallotAndContention
{
- final TimeUUID ballot;
+ final Ballot ballot;
final int contentions;
- PaxosBallotAndContention(TimeUUID ballot, int contentions)
+ PaxosBallotAndContention(Ballot ballot, int contentions)
{
this.ballot = ballot;
this.contentions = contentions;
@@ -3032,4 +3053,26 @@ public class StorageProxy implements StorageProxyMBean
{
DatabaseDescriptor.setUseStatementsEnabled(enabled);
}
+
+ public void setPaxosContentionStrategy(String spec)
+ {
+ ContentionStrategy.setStrategy(spec);
+ }
+
+ public String getPaxosContentionStrategy()
+ {
+ return ContentionStrategy.getStrategySpec();
+ }
+
+ @Override
+ public void setPaxosCoordinatorLockingDisabled(boolean disabled)
+ {
+ PaxosState.setDisableCoordinatorLocking(disabled);
+ }
+
+ @Override
+ public boolean getPaxosCoordinatorLockingDisabled()
+ {
+ return PaxosState.getDisableCoordinatorLocking();
+ }
}
diff --git a/src/java/org/apache/cassandra/service/StorageProxyMBean.java b/src/java/org/apache/cassandra/service/StorageProxyMBean.java
index 0f69032..416a312 100644
--- a/src/java/org/apache/cassandra/service/StorageProxyMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageProxyMBean.java
@@ -126,4 +126,10 @@ public interface StorageProxyMBean
boolean getUseStatementsEnabled();
void setUseStatementsEnabled(boolean enabled);
+
+ void setPaxosContentionStrategy(String variant);
+ String getPaxosContentionStrategy();
+
+ void setPaxosCoordinatorLockingDisabled(boolean disabled);
+ boolean getPaxosCoordinatorLockingDisabled();
}
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 1a7b457..83fc2d8 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -54,6 +54,7 @@ import javax.management.openmbean.TabularData;
import javax.management.openmbean.TabularDataSupport;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -71,6 +72,9 @@ import org.apache.cassandra.fql.FullQueryLoggerOptionsCompositeData;
import org.apache.cassandra.io.util.File;
import org.apache.cassandra.locator.ReplicaCollection.Builder.Conflict;
import org.apache.cassandra.utils.concurrent.Future;
+import org.apache.cassandra.schema.TableId;
+import org.apache.cassandra.utils.concurrent.Future;
+import org.apache.cassandra.utils.concurrent.FutureCombiner;
import org.apache.cassandra.utils.concurrent.ImmediateFuture;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -79,6 +83,10 @@ import org.slf4j.LoggerFactory;
import org.apache.cassandra.audit.AuditLogManager;
import org.apache.cassandra.audit.AuditLogOptions;
import org.apache.cassandra.auth.AuthCacheService;
+import org.apache.cassandra.config.Config.PaxosStatePurging;
+import org.apache.cassandra.service.paxos.*;
+import org.apache.cassandra.service.paxos.cleanup.*;
+import org.apache.cassandra.utils.progress.ProgressListener;
import org.apache.cassandra.auth.AuthKeyspace;
import org.apache.cassandra.auth.AuthSchemaChangeListener;
import org.apache.cassandra.batchlog.BatchlogManager;
@@ -129,6 +137,8 @@ import org.apache.cassandra.schema.TableMetadataRef;
import org.apache.cassandra.schema.ViewMetadata;
import org.apache.cassandra.service.snapshot.SnapshotManager;
import org.apache.cassandra.service.snapshot.TableSnapshot;
+import org.apache.cassandra.net.AsyncOneResponse;
+import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.streaming.*;
import org.apache.cassandra.tracing.TraceKeyspace;
import org.apache.cassandra.transport.ClientResourceLimits;
@@ -140,7 +150,6 @@ import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
import org.apache.cassandra.utils.logging.LoggingSupportFactory;
import org.apache.cassandra.utils.progress.ProgressEvent;
import org.apache.cassandra.utils.progress.ProgressEventType;
-import org.apache.cassandra.utils.progress.ProgressListener;
import org.apache.cassandra.utils.progress.jmx.JMXBroadcastExecutor;
import org.apache.cassandra.utils.progress.jmx.JMXProgressSupport;
@@ -148,19 +157,23 @@ import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Iterables.tryFind;
import static java.util.Arrays.asList;
import static java.util.Arrays.stream;
+import static java.util.concurrent.TimeUnit.MICROSECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toMap;
import static org.apache.cassandra.config.CassandraRelevantProperties.BOOTSTRAP_SCHEMA_DELAY_MS;
import static org.apache.cassandra.config.CassandraRelevantProperties.BOOTSTRAP_SKIP_SCHEMA_CHECK;
import static org.apache.cassandra.config.CassandraRelevantProperties.REPLACEMENT_ALLOW_EMPTY;
+import static org.apache.cassandra.config.Config.PaxosStatePurging.repaired;
import static org.apache.cassandra.index.SecondaryIndexManager.getIndexName;
import static org.apache.cassandra.index.SecondaryIndexManager.isIndexColumnFamily;
import static org.apache.cassandra.net.NoPayload.noPayload;
import static org.apache.cassandra.net.Verb.REPLICATION_DONE_REQ;
import static org.apache.cassandra.schema.MigrationManager.evolveSystemKeyspace;
+import static org.apache.cassandra.service.ActiveRepairService.*;
import static org.apache.cassandra.utils.Clock.Global.currentTimeMillis;
import static org.apache.cassandra.utils.Clock.Global.nanoTime;
import static org.apache.cassandra.service.ActiveRepairService.*;
@@ -252,6 +265,16 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
.getAddressReplicas(FBUtilities.getBroadcastAddressAndPort());
}
+ public List<Range<Token>> getLocalRanges(String ks)
+ {
+ InetAddressAndPort broadcastAddress = FBUtilities.getBroadcastAddressAndPort();
+ Keyspace keyspace = Keyspace.open(ks);
+ List<Range<Token>> ranges = new ArrayList<>();
+ for (Replica r : keyspace.getReplicationStrategy().getAddressReplicas(broadcastAddress))
+ ranges.add(r.range());
+ return ranges;
+ }
+
public List<Range<Token>> getLocalAndPendingRanges(String ks)
{
InetAddressAndPort broadcastAddress = FBUtilities.getBroadcastAddressAndPort();
@@ -1280,18 +1303,20 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
throw new IllegalStateException("Node is still rebuilding. Check nodetool netstats.");
}
- // check the arguments
- if (keyspace == null && tokens != null)
+ try
{
- throw new IllegalArgumentException("Cannot specify tokens without keyspace.");
- }
+ // check the arguments
+ if (keyspace == null && tokens != null)
+ {
+ throw new IllegalArgumentException("Cannot specify tokens without keyspace.");
+ }
- logger.info("rebuild from dc: {}, {}, {}", sourceDc == null ? "(any dc)" : sourceDc,
- keyspace == null ? "(All keyspaces)" : keyspace,
- tokens == null ? "(All tokens)" : tokens);
+ logger.info("rebuild from dc: {}, {}, {}", sourceDc == null ? "(any dc)" : sourceDc,
+ keyspace == null ? "(All keyspaces)" : keyspace,
+ tokens == null ? "(All tokens)" : tokens);
+
+ repairPaxosForTopologyChange("rebuild");
- try
- {
RangeStreamer streamer = new RangeStreamer(tokenMetadata,
null,
FBUtilities.getBroadcastAddressAndPort(),
@@ -1862,6 +1887,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
// Force disk boundary invalidation now that local tokens are set
invalidateDiskBoundaries();
+ repairPaxosForTopologyChange("bootstrap");
Future<StreamState> bootstrapStream = startBootstrap(tokens);
try
@@ -4300,16 +4326,100 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return new FutureTask<>(task);
}
- public void forceTerminateAllRepairSessions()
+ private void tryRepairPaxosForTopologyChange(String reason)
{
- ActiveRepairService.instance.terminateSessions();
+ try
+ {
+ startRepairPaxosForTopologyChange(reason).get();
+ }
+ catch (InterruptedException e)
+ {
+ logger.error("Error during paxos repair", e);
+ throw new AssertionError(e);
+ }
+ catch (ExecutionException e)
+ {
+ logger.error("Error during paxos repair", e);
+ throw new RuntimeException(e);
+ }
}
- // TODO: remove this after forward-porting Paxos, before final commit
+ private void repairPaxosForTopologyChange(String reason)
+ {
+ if (getSkipPaxosRepairOnTopologyChange() || !Paxos.useV2())
+ {
+ logger.info("skipping paxos repair for {}. skip_paxos_repair_on_topology_change is set, or v2 paxos variant is not being used", reason);
+ return;
+ }
+
+ logger.info("repairing paxos for {}", reason);
+
+ int retries = 0;
+ int maxRetries = Integer.getInteger("cassandra.paxos_repair_on_topology_change_retries", 10);
+ int delaySec = Integer.getInteger("cassandra.paxos_repair_on_topology_change_retry_delay_seconds", 10);
+
+ boolean completed = false;
+ while (!completed)
+ {
+ try
+ {
+ tryRepairPaxosForTopologyChange(reason);
+ completed = true;
+ }
+ catch (Exception e)
+ {
+ if (retries >= maxRetries)
+ throw e;
+
+ retries++;
+ int sleep = delaySec * retries;
+ logger.info("Sleeping {} seconds before retrying paxos repair...", sleep);
+ Uninterruptibles.sleepUninterruptibly(sleep, TimeUnit.SECONDS);
+ logger.info("Retrying paxos repair for {}. Retry {}/{}", reason, retries, maxRetries);
+ }
+ }
+
+ logger.info("paxos repair for {} complete", reason);
+ }
+
+ @VisibleForTesting
public Future<?> startRepairPaxosForTopologyChange(String reason)
{
- // PLACEHOLDER METHOD for simple porting of Simulator without breaking correctness
- return ImmediateFuture.success(null);
+ logger.info("repairing paxos for {}", reason);
+
+ List<Future<?>> futures = new ArrayList<>();
+
+ List<String> keyspaces = Schema.instance.getNonLocalStrategyKeyspaces() ;
+ for (String ksName : keyspaces)
+ {
+ if (SchemaConstants.REPLICATED_SYSTEM_KEYSPACE_NAMES.contains(ksName))
+ continue;
+
+ if (DatabaseDescriptor.skipPaxosRepairOnTopologyChangeKeyspaces().contains(ksName))
+ continue;
+
+ List<Range<Token>> ranges = getLocalAndPendingRanges(ksName);
+ futures.add(ActiveRepairService.instance.repairPaxosForTopologyChange(ksName, ranges, reason));
+ }
+
+ return FutureCombiner.allOf(futures);
+ }
+
+ public Future<?> autoRepairPaxos(TableId tableId)
+ {
+ TableMetadata table = Schema.instance.getTableMetadata(tableId);
+ if (table == null)
+ return ImmediateFuture.success(null);
+
+ List<Range<Token>> ranges = getLocalAndPendingRanges(table.keyspace);
+ PaxosCleanupLocalCoordinator coordinator = PaxosCleanupLocalCoordinator.createForAutoRepair(tableId, ranges);
+ ScheduledExecutors.optionalTasks.submit(coordinator::start);
+ return coordinator;
+ }
+
+ public void forceTerminateAllRepairSessions()
+ {
+ ActiveRepairService.instance.terminateSessions();
}
@Nullable
@@ -4719,6 +4829,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
setMode(Mode.LEAVING, "replaying batch log and streaming data to other nodes", true);
+ repairPaxosForTopologyChange("decommission");
// Start with BatchLog replay, which may create hints but no writes since this is no longer a valid endpoint.
Future<?> batchlogReplay = BatchlogManager.instance.startBatchlogReplay();
Future<StreamState> streamSuccess = startStreaming.get();
@@ -4834,6 +4945,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
RangeRelocator relocator = new RangeRelocator(Collections.singleton(newToken), keyspacesToProcess, tokenMetadata);
relocator.calculateToFromStreams();
+ repairPaxosForTopologyChange("move");
if (relocator.streamsNeeded())
{
setMode(Mode.MOVING, "fetching new ranges and streaming old ranges", true);
@@ -6401,4 +6513,188 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
{
return DatabaseDescriptor.getMinimumKeyspaceRF();
}
+
+ public boolean getSkipPaxosRepairOnTopologyChange()
+ {
+ return DatabaseDescriptor.skipPaxosRepairOnTopologyChange();
+ }
+
+ public void setSkipPaxosRepairOnTopologyChange(boolean v)
+ {
+ DatabaseDescriptor.setSkipPaxosRepairOnTopologyChange(v);
+ logger.info("paxos skip topology change repair {} via jmx", v ? "enabled" : "disabled");
+ }
+
+ public String getSkipPaxosRepairOnTopologyChangeKeyspaces()
+ {
+ return Joiner.on(',').join(DatabaseDescriptor.skipPaxosRepairOnTopologyChangeKeyspaces());
+ }
+
+ public void setSkipPaxosRepairOnTopologyChangeKeyspaces(String v)
+ {
+ DatabaseDescriptor.setSkipPaxosRepairOnTopologyChangeKeyspaces(v);
+ logger.info("paxos skip topology change repair keyspaces set to {} via jmx", v);
+ }
+
+ public int getPaxosAutoRepairThresholdMb()
+ {
+ return DatabaseDescriptor.getPaxosAutoRepairThresholdMB();
+ }
+
+ public void setPaxosAutoRepairThresholdMb(int threshold)
+ {
+ if (threshold < 0)
+ throw new RuntimeException("Paxos auto repair threshold must not be negative");
+
+ int oldThreshold = getPaxosAutoRepairThresholdMb();
+ if (oldThreshold == threshold)
+ {
+ logger.info("Supplied paxos auto repair threshold is the same as current value");
+ }
+ else
+ {
+ logger.info("Changing paxos auto repair threshold (MiB) from {} to {}", getPaxosAutoRepairThresholdMb(), threshold);
+ DatabaseDescriptor.setPaxosAutoRepairThresholdMB(threshold);
+ }
+ }
+
+ public boolean getPaxosAutoRepairsEnabled()
+ {
+ return PaxosState.uncommittedTracker().isAutoRepairsEnabled();
+ }
+
+ public void setPaxosAutoRepairsEnabled(boolean enabled)
+ {
+ PaxosState.uncommittedTracker().setAutoRepairsEnabled(enabled);
+ logger.info("paxos auto repairs {} via jmx", enabled ? "enabled" : "disabled");
+ }
+
+ public boolean getPaxosStateFlushEnabled()
+ {
+ return PaxosState.uncommittedTracker().isStateFlushEnabled();
+ }
+
+ public void setPaxosStateFlushEnabled(boolean enabled)
+ {
+ PaxosState.uncommittedTracker().setStateFlushEnabled(enabled);
+ logger.info("paxos state flush {} via jmx", enabled ? "enabled" : "disabled");
+ }
+
+ public List<String> getPaxosAutoRepairTables()
+ {
+ Set<TableId> tableIds = PaxosState.uncommittedTracker().tableIds();
+ List<String> tables = new ArrayList<>(tableIds.size());
+ for (TableId tableId : tableIds)
+ {
+ TableMetadata table = Schema.instance.getTableMetadata(tableId);
+ if (table == null)
+ continue;
+ tables.add(table.keyspace + '.' + table.name);
+ }
+ return tables;
+ }
+
+ public long getPaxosPurgeGraceSeconds()
+ {
+ return DatabaseDescriptor.getPaxosPurgeGrace(SECONDS);
+ }
+
+ public void setPaxosPurgeGraceSeconds(long v)
+ {
+ DatabaseDescriptor.setPaxosPurgeGrace(v, SECONDS);
+ logger.info("paxos purging grace seconds set to {} via jmx", v);
+ }
+
+ public String getPaxosOnLinearizabilityViolations()
+ {
+ return DatabaseDescriptor.paxosOnLinearizabilityViolations().toString();
+ }
+
+ public void setPaxosOnLinearizabilityViolations(String v)
+ {
+ DatabaseDescriptor.setPaxosOnLinearizabilityViolations(Config.PaxosOnLinearizabilityViolation.valueOf(v));
+ logger.info("paxos on linearizability violations {} via jmx", v);
+ }
+
+ public String getPaxosStatePurging()
+ {
+ return DatabaseDescriptor.paxosStatePurging().name();
+ }
+
+ public void setPaxosStatePurging(String v)
+ {
+ DatabaseDescriptor.setPaxosStatePurging(PaxosStatePurging.valueOf(v));
+ logger.info("paxos state purging {} via jmx", v);
+ }
+
+ public boolean getPaxosRepairEnabled()
+ {
+ return DatabaseDescriptor.paxosRepairEnabled();
+ }
+
+ public void setPaxosRepairEnabled(boolean enabled)
+ {
+ DatabaseDescriptor.setPaxosRepairEnabled(enabled);
+ logger.info("paxos repair {} via jmx", enabled ? "enabled" : "disabled");
+ }
+
+ public boolean getPaxosDcLocalCommitEnabled()
+ {
+ return PaxosCommit.getEnableDcLocalCommit();
+ }
+
+ public void setPaxosDcLocalCommitEnabled(boolean enabled)
+ {
+ PaxosCommit.setEnableDcLocalCommit(enabled);
+ logger.info("paxos dc local commit {} via jmx", enabled ? "enabled" : "disabled");
+ }
+
+ public String getPaxosBallotLowBound(String ksName, String tblName, String key)
+ {
+ Keyspace keyspace = Keyspace.open(ksName);
+ if (keyspace == null)
+ throw new IllegalArgumentException("Unknown keyspace '" + ksName + "'");
+
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(tblName);
+ if (cfs == null)
+ throw new IllegalArgumentException("Unknown table '" + tblName + "' in keyspace '" + ksName + "'");
+
+ TableMetadata table = cfs.metadata.get();
+ DecoratedKey dk = table.partitioner.decorateKey(table.partitionKeyType.fromString(key));
+ return cfs.getPaxosRepairHistory().ballotForToken(dk.getToken()).toString();
+ }
+
+ public Long getRepairRpcTimeout()
+ {
+ return DatabaseDescriptor.getRepairRpcTimeout();
+ }
+
+ public void setRepairRpcTimeout(Long timeoutInMillis)
+ {
+ Preconditions.checkState(timeoutInMillis > 0);
+ DatabaseDescriptor.setRepairRpcTimeout(timeoutInMillis);
+ logger.info("RepairRpcTimeout set to {}ms via JMX", timeoutInMillis);
+ }
+ public void evictHungRepairs()
+ {
+ logger.info("StorageService#clearPaxosRateLimiters called via jmx");
+ Paxos.evictHungRepairs();
+ }
+
+ public void clearPaxosRepairs()
+ {
+ logger.info("StorageService#clearPaxosRepairs called via jmx");
+ PaxosTableRepairs.clearRepairs();
+ }
+
+ public void setSkipPaxosRepairCompatibilityCheck(boolean v)
+ {
+ PaxosRepair.setSkipPaxosRepairCompatibilityCheck(v);
+ logger.info("SkipPaxosRepairCompatibilityCheck set to {} via jmx", v);
+ }
+
+ public boolean getSkipPaxosRepairCompatibilityCheck()
+ {
+ return PaxosRepair.getSkipPaxosRepairCompatibilityCheck();
+ }
}
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 213c5a9..d87f5b5 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -939,4 +939,46 @@ public interface StorageServiceMBean extends NotificationEmitter
public int getDefaultKeyspaceReplicationFactor();
public void setMinimumKeyspaceReplicationFactor(int value);
public int getMinimumKeyspaceReplicationFactor();
+
+ boolean getSkipPaxosRepairOnTopologyChange();
+ void setSkipPaxosRepairOnTopologyChange(boolean v);
+
+ String getSkipPaxosRepairOnTopologyChangeKeyspaces();
+ void setSkipPaxosRepairOnTopologyChangeKeyspaces(String v);
+
+ int getPaxosAutoRepairThresholdMb();
+ void setPaxosAutoRepairThresholdMb(int threshold);
+
+ boolean getPaxosAutoRepairsEnabled();
+ void setPaxosAutoRepairsEnabled(boolean enabled);
+
+ boolean getPaxosStateFlushEnabled();
+ void setPaxosStateFlushEnabled(boolean enabled);
+
+ List<String> getPaxosAutoRepairTables();
+
+ long getPaxosPurgeGraceSeconds();
+ void setPaxosPurgeGraceSeconds(long v);
+
+ String getPaxosOnLinearizabilityViolations();
+ void setPaxosOnLinearizabilityViolations(String v);
+
+ String getPaxosStatePurging();
+ void setPaxosStatePurging(String v);
+
+ boolean getPaxosRepairEnabled();
+ void setPaxosRepairEnabled(boolean v);
+
+ boolean getPaxosDcLocalCommitEnabled();
+ void setPaxosDcLocalCommitEnabled(boolean v);
+
+ String getPaxosBallotLowBound(String keyspace, String table, String key);
+
+ public Long getRepairRpcTimeout();
+ public void setRepairRpcTimeout(Long timeoutInMillis);
+
+ public void evictHungRepairs();
+ public void clearPaxosRepairs();
+ public void setSkipPaxosRepairCompatibilityCheck(boolean v);
+ public boolean getSkipPaxosRepairCompatibilityCheck();
}
diff --git a/src/java/org/apache/cassandra/service/WriteResponseHandler.java b/src/java/org/apache/cassandra/service/WriteResponseHandler.java
index 94f5a80..6fe9e52 100644
--- a/src/java/org/apache/cassandra/service/WriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/WriteResponseHandler.java
@@ -18,7 +18,9 @@
package org.apache.cassandra.service;
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.function.Supplier;
+import org.apache.cassandra.db.Mutation;
import org.apache.cassandra.locator.ReplicaPlan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,18 +39,19 @@ public class WriteResponseHandler<T> extends AbstractWriteResponseHandler<T>
private static final AtomicIntegerFieldUpdater<WriteResponseHandler> responsesUpdater
= AtomicIntegerFieldUpdater.newUpdater(WriteResponseHandler.class, "responses");
- public WriteResponseHandler(ReplicaPlan.ForTokenWrite replicaPlan,
+ public WriteResponseHandler(ReplicaPlan.ForWrite replicaPlan,
Runnable callback,
WriteType writeType,
+ Supplier<Mutation> hintOnFailure,
long queryStartNanoTime)
{
- super(replicaPlan, callback, writeType, queryStartNanoTime);
+ super(replicaPlan, callback, writeType, hintOnFailure, queryStartNanoTime);
responses = blockFor();
}
- public WriteResponseHandler(ReplicaPlan.ForTokenWrite replicaPlan, WriteType writeType, long queryStartNanoTime)
+ public WriteResponseHandler(ReplicaPlan.ForWrite replicaPlan, WriteType writeType, Supplier<Mutation> hintOnFailure, long queryStartNanoTime)
{
- this(replicaPlan, null, writeType, queryStartNanoTime);
+ this(replicaPlan, null, writeType, hintOnFailure, queryStartNanoTime);
}
public void onResponse(Message<T> m)
diff --git a/src/java/org/apache/cassandra/service/paxos/AbstractPaxosRepair.java b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosRepair.java
new file mode 100644
index 0000000..05c67da
--- /dev/null
+++ b/src/java/org/apache/cassandra/service/paxos/AbstractPaxosRepair.java
@@ -0,0 +1,290 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.service.paxos;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Consumer;
+
+import com.google.common.base.Preconditions;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.apache.cassandra.db.DecoratedKey;
+import org.apache.cassandra.utils.Throwables;
+
+import static org.apache.cassandra.service.paxos.AbstractPaxosRepair.Result.Outcome;
+import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+
+public abstract class AbstractPaxosRepair
+{
+ private static final Logger logger = LoggerFactory.getLogger(AbstractPaxosRepair.class);
+
+ public static class State {}
+
+ public interface StateUpdater<S, I, T extends Throwable>
+ {
+ State apply(S in, I param) throws T;
+ }
+
+ public interface Listener
+ {
+ void onComplete(AbstractPaxosRepair repair, Result result);
+ }
+
+ abstract class ConsumerState<T> extends State implements Consumer<T>
+ {
+ public void accept(T input)
+ {
+ updateState(this, input, ConsumerState::execute);
+ }
+
+ abstract State execute(T input) throws Throwable;
+ }
+
+ public static class Result extends State
+ {
+ enum Outcome { DONE, CANCELLED, FAILURE }
+
+ final Outcome outcome;
+
+ public Result(Outcome outcome)
+ {
+ this.outcome = outcome;
+ }
+
+ public String toString()
+ {
+ return outcome.toString();
+ }
+
+ public boolean wasSuccessful()
+ {
+ return outcome == Outcome.DONE;
+ }
+ }
+
+ static boolean isResult(State state)
+ {
+ return state instanceof Result;
+ }
+
+ public static final Result DONE = new Result(Outcome.DONE);
+
+ public static final Result CANCELLED = new Result(Outcome.CANCELLED);
+
+ public static final class Failure extends Result
+ {
+ public final Throwable failure;
+
+ Failure(Throwable failure)
+ {
+ super(Outcome.FAILURE);
+ this.failure = failure;
+ }
+
+ public String toString()
+ {
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ if (failure != null)
+ failure.printStackTrace(pw);
+ return outcome.toString() + ": " + sw;
+ }
+
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Failure failure1 = (Failure) o;
+ return Objects.equals(failure, failure1.failure);
+ }
+
+ public int hashCode()
+ {
+ return Objects.hash(failure);
+ }
+ }
+
+ private final DecoratedKey partitionKey;
+ private final Ballot incompleteBallot;
+ private List<Listener> listeners = null;
+ private volatile State state;
+ private volatile long startedNanos = Long.MIN_VALUE;
+
+ public AbstractPaxosRepair(DecoratedKey partitionKey, Ballot incompleteBallot)
+ {
+ this.partitionKey = partitionKey;
+ this.incompleteBallot = incompleteBallot;
+ }
+
+ public State state()
+ {
+ return state;
+ }
+
+ public long startedNanos()
+ {
+ return startedNanos;
+ }
+
+ public boolean isStarted()
+ {
+ return startedNanos != Long.MIN_VALUE;
+ }
+
+ public boolean isComplete()
+ {
+ return isResult(state);
+ }
+
+ public Ballot incompleteBallot()
+ {
+ return incompleteBallot;
+ }
+
+ /**
+ * add a listener to this repair, or if the repair has already completed, call the listener with the result
+ */
+ public AbstractPaxosRepair addListener(Listener listener)
+ {
+ Result result = null;
+ synchronized (this)
+ {
+ if (isResult(state))
+ {
+ result = (Result) state;
+ }
+ else
+ {
+ if (listeners == null)
+ listeners = new ArrayList<>();
+
+ listeners.add(listener);
+ }
+ }
+
+ if (result != null)
+ listener.onComplete(this, result);
+
+ return this;
+ }
+
+ public AbstractPaxosRepair addListener(Consumer<Result> listener)
+ {
+ return addListener(((repair, result) -> listener.accept(result)));
+ }
+
+ public final DecoratedKey partitionKey()
+ {
+ return partitionKey;
+ }
+
+ public State restart(State state) { return restart(state, Long.MIN_VALUE); }
+ public abstract State restart(State state, long waitUntil);
+
+ public final synchronized AbstractPaxosRepair start()
+ {
+ updateState(null, null, (state, i2) -> {
+ Preconditions.checkState(!isStarted());
+ startedNanos = Math.max(Long.MIN_VALUE + 1, nanoTime());
+ return restart(state);
+ });
+ return this;
+ }
+
+ public final void cancel()
+ {
+ set(CANCELLED);
+ }
+
+ public final void cancelUnexceptionally()
+ {
+ try
+ {
+ cancel();
+ }
+ catch (Throwable t)
+ {
+ logger.error("Exception cancelling paxos repair", t);
+ }
+ }
+
+ public final synchronized Result await() throws InterruptedException
+ {
+ while (!isResult(state))
+ wait();
+ return (Result) state;
+ }
+
+ protected void set(Result result)
+ {
+ updateState(state(), null, (i1, i2) -> result);
+ }
+
+ protected <S extends State, I, T extends Throwable> void updateState(S expect, I param, StateUpdater<S, I, T> transform)
+ {
+ Result result = null;
+ List<Listener> listeners = null;
+ synchronized (this)
+ {
+ State next;
+ try
+ {
+ if (state != expect)
+ return;
+
+ state = next = transform.apply(expect, param);
+ }
+ catch (Throwable t)
+ {
+ state = next = new Failure(t);
+ }
+
+ if (isResult(next))
+ {
+ notifyAll();
+ result = (Result) next;
+ listeners = this.listeners;
+ this.listeners = null;
+ }
+ }
+
+ if (result != null && listeners != null)
+ {
+ Throwable t = null;
+ for (int i=0, mi=listeners.size(); i<mi; i++)
+ {
+ try
+ {
+ listeners.get(i).onComplete(this, result);
+ }
+ catch (Throwable throwable)
+ {
+ t = Throwables.merge(t, throwable);
+ }
+ }
+ Throwables.maybeFail(t);
+ }
+ }
+}
diff --git a/src/java/org/apache/cassandra/service/paxos/Ballot.java b/src/java/org/apache/cassandra/service/paxos/Ballot.java
new file mode 100644
index 0000000..1787e34
--- /dev/null
+++ b/src/java/org/apache/cassandra/service/paxos/Ballot.java
@@ -0,0 +1,151 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.service.paxos;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.UUID;
+
+import org.apache.cassandra.db.marshal.ValueAccessor;
+import org.apache.cassandra.io.IVersionedSerializer;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.utils.Shared;
+import org.apache.cassandra.utils.TimeUUID;
+
+import static org.apache.cassandra.service.paxos.Ballot.Flag.NONE;
+import static org.apache.cassandra.utils.ByteArrayUtil.getLong;
+import static org.apache.cassandra.utils.Shared.Recursive.INTERFACES;
+import static org.apache.cassandra.utils.Shared.Scope.SIMULATION;
+
+@Shared(scope = SIMULATION, inner = INTERFACES)
+public class Ballot extends TimeUUID
+{
+ public static final long serialVersionUID = 1L;
+
+ public enum Flag
+ {
+ NONE, LOCAL, GLOBAL;
+ static final Flag[] FLAGS = values();
+ }
+
+ private static final Ballot epoch = atUnixMicrosWithLsb(0, 0, NONE);
+
+ public static Ballot none()
+ {
+ return epoch;
+ }
+
+ private Ballot(long rawTimestamp, long lsb)
+ {
+ super(rawTimestamp, lsb);
+ }
+
+ public boolean equals(Object that)
+ {
+ if (that == null) return false;
+ if (that == this) return true;
+ if (that.getClass() != Ballot.class) return false;
+ return super.equals((TimeUUID) that);
+ }
+
+ public static Ballot atUnixMicrosWithLsb(long unixMicros, long uniqueLsb, Flag flag)
+ {
+ return new Ballot(unixMicrosToRawTimestamp(unixMicros) + flag.ordinal(), uniqueLsb);
+ }
+
+ public static Ballot fromUuid(UUID uuid)
+ {
+ return fromBytes(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
+ }
+
+ public static Ballot fromBytes(long msb, long lsb)
+ {
+ return new Ballot(msbToRawTimestamp(msb), lsb);
+ }
+
+ public static Ballot fromString(String uuidString)
+ {
+ return fromUuid(UUID.fromString(uuidString));
+ }
+
+ public static Ballot deserialize(byte[] bytes)
+ {
+ if (bytes.length == 0)
+ return null;
+ return fromBytes(getLong(bytes, 0), getLong(bytes, 8));
+ }
+
+ public static Ballot deserialize(ByteBuffer buffer)
+ {
+ if (!buffer.hasRemaining())
+ return null;
+ return fromBytes(buffer.getLong(buffer.position()), buffer.getLong(buffer.position() + 8));
+ }
+
+ public static Ballot deserialize(DataInputPlus in) throws IOException
+ {
+ long msb = in.readLong();
+ long lsb = in.readLong();
+ return fromBytes(msb, lsb);
+ }
+
+ public Flag flag()
+ {
+ int i = (int)(uuidTimestamp() % 10);
+ if (i < Flag.FLAGS.length)
+ return Flag.FLAGS[i];
+ return NONE;
+ }
+
+
+ public static class Serializer extends AbstractSerializer<Ballot> implements IVersionedSerializer<Ballot>
+ {
+ public static final Serializer instance = new Serializer();
+
+ public <V> Ballot deserialize(V value, ValueAccessor<V> accessor)
+ {
+ return accessor.isEmpty(value) ? null : accessor.toBallot(value);
+ }
+
+ public Class<Ballot> getType()
+ {
+ return Ballot.class;
+ }
+
+ @Override
+ public void serialize(Ballot t, DataOutputPlus out, int version) throws IOException
+ {
+ t.serialize(out);
+ }
+
+ @Override
+ public Ballot deserialize(DataInputPlus in, int version) throws IOException
+ {
+ return Ballot.deserialize(in);
+ }
+
+ @Override
+ public long serializedSize(Ballot t, int version)
+ {
+ return sizeInBytes();
+ }
+ }
+
+}
diff --git a/src/java/org/apache/cassandra/service/paxos/BallotGenerator.java b/src/java/org/apache/cassandra/service/paxos/BallotGenerator.java
index 2355bbe..f746c4e 100644
--- a/src/java/org/apache/cassandra/service/paxos/BallotGenerator.java
+++ b/src/java/org/apache/cassandra/service/paxos/BallotGenerator.java
@@ -19,13 +19,13 @@
package org.apache.cassandra.service.paxos;
import java.security.SecureRandom;
-import java.util.UUID;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.cassandra.service.ClientState;
+import org.apache.cassandra.service.paxos.Ballot.Flag;
import org.apache.cassandra.utils.Shared;
-import org.apache.cassandra.utils.TimeUUID;
+import static org.apache.cassandra.service.paxos.Ballot.atUnixMicrosWithLsb;
import static org.apache.cassandra.utils.Shared.Scope.SIMULATION;
@Shared(scope = SIMULATION)
@@ -35,23 +35,29 @@ public interface BallotGenerator
{
private static final SecureRandom secureRandom = new SecureRandom();
- public TimeUUID randomBallot(long whenInMicros, boolean isSerial)
+ public Ballot atUnixMicros(long unixMicros, Flag flag)
{
- return TimeUUID.atUnixMicrosWithLsb(whenInMicros, secureRandom.nextLong(), isSerial);
+ return atUnixMicrosWithLsb(unixMicros, secureRandom.nextLong(), flag);
}
- public TimeUUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial)
+ public Ballot next(long minUnixMicros, Flag flag)
{
- long timestampMicros = ThreadLocalRandom.current().nextLong(fromInMicros, toInMicros);
- return randomBallot(timestampMicros, isSerial);
+ long unixMicros = ClientState.getTimestampForPaxos(minUnixMicros);
+ return atUnixMicros(unixMicros, flag);
}
- public long nextBallotTimestampMicros(long minTimestamp)
+ public Ballot stale(long fromInMicros, long toInMicros, Flag flag)
+ {
+ long unixMicros = ThreadLocalRandom.current().nextLong(fromInMicros, toInMicros);
+ return atUnixMicros(unixMicros, flag);
+ }
+
+ public long next(long minTimestamp)
{
return ClientState.getTimestampForPaxos(minTimestamp);
}
- public long prevBallotTimestampMicros()
+ public long prevUnixMicros()
{
return ClientState.getLastTimestampMicros();
}
@@ -60,10 +66,11 @@ public interface BallotGenerator
static class Global
{
private static BallotGenerator instance = new Default();
- public static TimeUUID randomBallot(long whenInMicros, boolean isSerial) { return instance.randomBallot(whenInMicros, isSerial); }
- public static TimeUUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial) { return instance.randomBallot(fromInMicros, toInMicros, isSerial); }
- public static long nextBallotTimestampMicros(long minWhenInMicros) { return instance.nextBallotTimestampMicros(minWhenInMicros); }
- public static long prevBallotTimestampMicros() { return instance.prevBallotTimestampMicros(); }
+ public static Ballot atUnixMicros(long unixMicros, Flag flag) { return instance.atUnixMicros(unixMicros, flag); }
+ public static Ballot nextBallot(Flag flag) { return instance.next(Long.MIN_VALUE, flag); }
+ public static Ballot nextBallot(long minUnixMicros, Flag flag) { return instance.next(minUnixMicros, flag); }
+ public static Ballot staleBallot(long fromUnixMicros, long toUnixMicros, Flag flag) { return instance.stale(fromUnixMicros, toUnixMicros, flag); }
+ public static long prevUnixMicros() { return instance.prevUnixMicros(); }
public static void unsafeSet(BallotGenerator newInstance)
{
@@ -71,8 +78,8 @@ public interface BallotGenerator
}
}
- TimeUUID randomBallot(long whenInMicros, boolean isSerial);
- TimeUUID randomBallot(long fromInMicros, long toInMicros, boolean isSerial);
- long nextBallotTimestampMicros(long minWhenInMicros);
- long prevBallotTimestampMicros();
+ Ballot atUnixMicros(long unixMicros, Flag flag);
+ Ballot next(long minUnixMicros, Flag flag);
+ Ballot stale(long fromUnixMicros, long toUnixMicros, Flag flag);
+ long prevUnixMicros();
}
\ No newline at end of file
diff --git a/src/java/org/apache/cassandra/service/paxos/Commit.java b/src/java/org/apache/cassandra/service/paxos/Commit.java
index 2ada45b..88ab5ea 100644
--- a/src/java/org/apache/cassandra/service/paxos/Commit.java
+++ b/src/java/org/apache/cassandra/service/paxos/Commit.java
@@ -22,31 +22,235 @@ package org.apache.cassandra.service.paxos;
import java.io.IOException;
-import java.util.UUID;
+import java.util.function.BiFunction;
import javax.annotation.Nullable;
import com.google.common.base.Objects;
-import org.apache.cassandra.schema.TableMetadata;
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.rows.*;
import org.apache.cassandra.db.partitions.PartitionUpdate;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataInputPlus;
import org.apache.cassandra.io.util.DataOutputPlus;
-import org.apache.cassandra.utils.TimeUUID;
-import org.apache.cassandra.utils.UUIDGen;
-import org.apache.cassandra.utils.UUIDSerializer;
+import org.apache.cassandra.schema.TableMetadata;
+
+import static org.apache.cassandra.db.SystemKeyspace.*;
+import static org.apache.cassandra.service.paxos.Commit.CompareResult.AFTER;
+import static org.apache.cassandra.service.paxos.Commit.CompareResult.BEFORE;
+import static org.apache.cassandra.service.paxos.Commit.CompareResult.IS_REPROPOSAL;
+import static org.apache.cassandra.service.paxos.Commit.CompareResult.WAS_REPROPOSED_BY;
+import static org.apache.cassandra.service.paxos.Commit.CompareResult.SAME;
+import static org.apache.cassandra.utils.FBUtilities.nowInSeconds;
public class Commit
{
- public static final CommitSerializer serializer = new CommitSerializer();
+ enum CompareResult { SAME, BEFORE, AFTER, IS_REPROPOSAL, WAS_REPROPOSED_BY}
+
+ public static final CommitSerializer<Commit> serializer = new CommitSerializer<>(Commit::new);
+
+ public static class Proposal extends Commit
+ {
+ public static final CommitSerializer<Proposal> serializer = new CommitSerializer<>(Proposal::new);
+
+ public Proposal(Ballot ballot, PartitionUpdate update)
+ {
+ super(ballot, update);
+ }
+
+ public String toString()
+ {
+ return toString("Proposal");
+ }
+
+ public static Proposal of(Ballot ballot, PartitionUpdate update)
+ {
+ update = withTimestamp(update, ballot.unixMicros());
+ return new Proposal(ballot, update);
+ }
+
+ public static Proposal empty(Ballot ballot, DecoratedKey partitionKey, TableMetadata metadata)
+ {
+ return new Proposal(ballot, PartitionUpdate.emptyUpdate(metadata, partitionKey));
+ }
+
+ public Accepted accepted()
+ {
+ return new Accepted(ballot, update);
+ }
+
+ public Agreed agreed()
+ {
+ return new Agreed(ballot, update);
+ }
+ }
+
+ public static class Accepted extends Proposal
+ {
+ public static final CommitSerializer<Accepted> serializer = new CommitSerializer<>(Accepted::new);
+
+ public static Accepted none(DecoratedKey partitionKey, TableMetadata metadata)
+ {
+ return new Accepted(Ballot.none(), PartitionUpdate.emptyUpdate(metadata, partitionKey));
+ }
+
+ public Accepted(Ballot ballot, PartitionUpdate update)
+ {
+ super(ballot, update);
+ }
+
+ public Accepted(Commit commit)
+ {
+ super(commit.ballot, commit.update);
+ }
+
+ Committed committed()
+ {
+ return new Committed(ballot, update);
+ }
+
+ boolean isExpired(int nowInSec)
+ {
+ return false;
+ }
+
+ public String toString()
+ {
+ return toString("Accepted");
+ }
+
+ /**
+ * Like {@link #latest(Commit, Commit)} but also takes into account deletion time
+ */
+ public static Accepted latestAccepted(Accepted a, Accepted b)
+ {
+ int c = compare(a, b);
+ if (c != 0)
+ return c > 0 ? a : b;
+ return a instanceof AcceptedWithTTL ? ((AcceptedWithTTL)a).lastDeleted(b) : a;
+ }
+ }
+
+ public static class AcceptedWithTTL extends Accepted
+ {
+ public static AcceptedWithTTL withDefaultTTL(Commit copy)
+ {
+ return new AcceptedWithTTL(copy, nowInSeconds() + legacyPaxosTtlSec(copy.update.metadata()));
+ }
+
+ public final int localDeletionTime;
+
+ public AcceptedWithTTL(Commit copy, int localDeletionTime)
+ {
+ super(copy);
+ this.localDeletionTime = localDeletionTime;
+ }
+
+ public AcceptedWithTTL(Ballot ballot, PartitionUpdate update, int localDeletionTime)
+ {
+ super(ballot, update);
+ this.localDeletionTime = localDeletionTime;
+ }
+
+ boolean isExpired(int nowInSec)
+ {
+ return nowInSec >= localDeletionTime;
+ }
+
+ Accepted lastDeleted(Accepted b)
+ {
+ return b instanceof AcceptedWithTTL && localDeletionTime >= ((AcceptedWithTTL) b).localDeletionTime
+ ? this : b;
+ }
+ }
+
+ // might prefer to call this Commit, but would mean refactoring more legacy code
+ public static class Agreed extends Accepted
+ {
+ public static final CommitSerializer<Agreed> serializer = new CommitSerializer<>(Agreed::new);
+
+ public Agreed(Ballot ballot, PartitionUpdate update)
+ {
+ super(ballot, update);
+ }
+
+ public Agreed(Commit copy)
+ {
+ super(copy);
+ }
+ }
+
+ public static class Committed extends Agreed
+ {
+ public static final CommitSerializer<Committed> serializer = new CommitSerializer<>(Committed::new);
+
+ public static Committed none(DecoratedKey partitionKey, TableMetadata metadata)
+ {
+ return new Committed(Ballot.none(), PartitionUpdate.emptyUpdate(metadata, partitionKey));
+ }
+
+ public Committed(Ballot ballot, PartitionUpdate update)
+ {
+ super(ballot, update);
+ }
+
+ public Committed(Commit copy)
+ {
+ super(copy);
+ }
- public final TimeUUID ballot;
+ public String toString()
+ {
+ return toString("Committed");
+ }
+
+ public static Committed latestCommitted(Committed a, Committed b)
+ {
+ int c = compare(a, b);
+ if (c != 0)
+ return c > 0 ? a : b;
+ return a instanceof CommittedWithTTL ? ((CommittedWithTTL)a).lastDeleted(b) : a;
+ }
+ }
+
+ public static class CommittedWithTTL extends Committed
+ {
+ public static CommittedWithTTL withDefaultTTL(Commit copy)
+ {
+ return new CommittedWithTTL(copy, nowInSeconds() + legacyPaxosTtlSec(copy.update.metadata()));
+ }
+
+ public final int localDeletionTime;
+
+ public CommittedWithTTL(Ballot ballot, PartitionUpdate update, int localDeletionTime)
+ {
+ super(ballot, update);
+ this.localDeletionTime = localDeletionTime;
+ }
+
+ public CommittedWithTTL(Commit copy, int localDeletionTime)
+ {
+ super(copy);
+ this.localDeletionTime = localDeletionTime;
+ }
+
+ boolean isExpired(int nowInSec)
+ {
+ return nowInSec >= localDeletionTime;
+ }
+
+ Committed lastDeleted(Committed b)
+ {
+ return b instanceof CommittedWithTTL && localDeletionTime >= ((CommittedWithTTL) b).localDeletionTime
+ ? this : b;
+ }
+ }
+
+ public final Ballot ballot;
public final PartitionUpdate update;
- public Commit(TimeUUID ballot, PartitionUpdate update)
+ public Commit(Ballot ballot, PartitionUpdate update)
{
assert ballot != null;
assert update != null;
@@ -55,36 +259,51 @@ public class Commit
this.update = update;
}
- public static Commit newPrepare(DecoratedKey key, TableMetadata metadata, TimeUUID ballot)
+ public static Commit newPrepare(DecoratedKey partitionKey, TableMetadata metadata, Ballot ballot)
{
- return new Commit(ballot, PartitionUpdate.emptyUpdate(metadata, key));
+ return new Commit(ballot, PartitionUpdate.emptyUpdate(metadata, partitionKey));
}
- public static Commit newProposal(TimeUUID ballot, PartitionUpdate update)
+ public static Commit emptyCommit(DecoratedKey partitionKey, TableMetadata metadata)
{
- PartitionUpdate withNewTimestamp = new PartitionUpdate.Builder(update, 0).updateAllTimestamp(ballot.unixMicros()).build();
- return new Commit(ballot, withNewTimestamp);
+ return new Commit(Ballot.none(), PartitionUpdate.emptyUpdate(metadata, partitionKey));
}
- public static Commit emptyCommit(DecoratedKey key, TableMetadata metadata)
+ @Deprecated
+ public static Commit newProposal(Ballot ballot, PartitionUpdate update)
{
- return new Commit(TimeUUID.minAtUnixMillis(0), PartitionUpdate.emptyUpdate(metadata, key));
+ update = withTimestamp(update, ballot.unixMicros());
+ return new Commit(ballot, update);
}
public boolean isAfter(Commit other)
{
- return ballot.rawTimestamp() > other.ballot.rawTimestamp();
+ return other == null || ballot.uuidTimestamp() > other.ballot.uuidTimestamp();
+ }
+
+ public boolean isSameOrAfter(@Nullable Ballot otherBallot)
+ {
+ return otherBallot == null || otherBallot.equals(ballot) || ballot.uuidTimestamp() > otherBallot.uuidTimestamp();
}
- public boolean hasBallot(TimeUUID ballot)
+ public boolean isAfter(@Nullable Ballot otherBallot)
+ {
+ return otherBallot == null || ballot.uuidTimestamp() > otherBallot.uuidTimestamp();
+ }
+
+ public boolean isBefore(@Nullable Ballot otherBallot)
+ {
+ return otherBallot != null && ballot.uuidTimestamp() < otherBallot.uuidTimestamp();
+ }
+
+ public boolean hasBallot(Ballot ballot)
{
return this.ballot.equals(ballot);
}
- /** Whether this is an empty commit, that is one with no updates. */
- public boolean isEmpty()
+ public boolean hasSameBallot(Commit other)
{
- return update.isEmpty();
+ return this.ballot.equals(other.ballot);
}
public Mutation makeMutation()
@@ -112,7 +331,68 @@ public class Commit
@Override
public String toString()
{
- return String.format("Commit(%s, %s)", ballot, update);
+ return toString("Commit");
+ }
+
+ public String toString(String kind)
+ {
+ return String.format("%s(%d:%s, %d:%s)", kind, ballot.uuidTimestamp(), ballot, update.stats().minTimestamp, update.toString(false));
+ }
+
+ /**
+ * We can witness reproposals of the latest successful commit; we can detect this by comparing the timestamp of
+ * the update with our ballot; if it is the same, we are not a reproposal. If it is the same as either the
+ * ballot timestamp or update timestamp of the latest committed proposal, then we are reproposing it and can
+ * instead simpy commit it.
+ */
+ public boolean isReproposalOf(Commit older)
+ {
+ return isReproposal(older, older.ballot.uuidTimestamp(), this, this.ballot.uuidTimestamp());
+ }
+
+ private boolean isReproposal(Commit older, long ballotOfOlder, Commit newer, long ballotOfNewer)
+ {
+ // NOTE: it would in theory be possible to just check
+ // newer.update.stats().minTimestamp == older.update.stats().minTimestamp
+ // however this could be brittle, if for some reason they don't get updated;
+ // the logic below is fail-safe, in that if minTimestamp is not set we will treat it as not a reproposal
+ // which is the safer way to get it wrong.
+
+ // the timestamp of a mutation stays unchanged as we repropose it, so the timestamp of the mutation
+ // is the timestamp of the ballot that originally proposed it
+ long originalBallotOfNewer = newer.update.stats().minTimestamp;
+
+ // so, if the mutation and ballot timestamps match, this is not a reproposal but a first proposal
+ if (ballotOfNewer == originalBallotOfNewer)
+ return false;
+
+ // otherwise, if the original proposing ballot matches the older proposal's ballot, it is reproposing it
+ if (originalBallotOfNewer == ballotOfOlder)
+ return true;
+
+ // otherwise, it could be that both are reproposals, so just check both for the "original" ballot timestamp
+ return originalBallotOfNewer == older.update.stats().minTimestamp;
+ }
+
+ public CompareResult compareWith(Commit that)
+ {
+ long thisBallot = this.ballot.uuidTimestamp();
+ long thatBallot = that.ballot.uuidTimestamp();
+ // by the time we reach proposal and commit, timestamps are unique so we can assert identity
+ if (thisBallot == thatBallot)
+ return SAME;
+
+ if (thisBallot < thatBallot)
+ return isReproposal(this, thisBallot, that, thatBallot) ? WAS_REPROPOSED_BY : BEFORE;
+ else
+ return isReproposal(that, thatBallot, this, thisBallot) ? IS_REPROPOSAL : AFTER;
+ }
+
+ private static int compare(@Nullable Commit a, @Nullable Commit b)
+ {
+ if (a == null) return 1;
+ if (b == null) return -1;
+ return Long.compare(a.ballot.uuidTimestamp(), b.ballot.uuidTimestamp());
}
/**
@@ -126,46 +406,95 @@ public class Commit
/**
* @return testIfAfter.isAfter(testIfBefore), with non-null > null
*/
- public static boolean isAfter(@Nullable TimeUUID testIsAfter, @Nullable Commit testIsBefore)
+ public static boolean isAfter(@Nullable Ballot testIsAfter, @Nullable Commit testIsBefore)
{
- return testIsAfter != null && (testIsBefore == null || testIsAfter.rawTimestamp() > testIsBefore.ballot.rawTimestamp());
+ return testIsAfter != null && (testIsBefore == null || testIsAfter.uuidTimestamp() > testIsBefore.ballot.uuidTimestamp());
}
/**
* @return testIfAfter.isAfter(testIfBefore), with non-null > null
*/
- public static boolean isAfter(@Nullable Commit testIsAfter, @Nullable TimeUUID testIsBefore)
+ public static boolean isAfter(@Nullable Commit testIsAfter, @Nullable Ballot testIsBefore)
{
- return testIsAfter != null && (testIsBefore == null || testIsAfter.ballot.rawTimestamp() > testIsBefore.rawTimestamp());
+ return testIsAfter != null && (testIsBefore == null || testIsAfter.ballot.uuidTimestamp() > testIsBefore.uuidTimestamp());
}
/**
* @return testIfAfter.isAfter(testIfBefore), with non-null > null
*/
- public static boolean isAfter(@Nullable UUID testIsAfter, @Nullable UUID testIsBefore)
+ public static boolean isAfter(@Nullable Ballot testIsAfter, @Nullable Ballot testIsBefore)
{
- return testIsAfter != null && (testIsBefore == null || testIsAfter.timestamp() > testIsBefore.timestamp());
+ return testIsAfter != null && (testIsBefore == null || testIsAfter.uuidTimestamp() > testIsBefore.uuidTimestamp());
}
- public static class CommitSerializer implements IVersionedSerializer<Commit>
+ /**
+ * the latest of two ballots, or the first ballot if equal timestamps
+ */
+ public static <C extends Commit> C latest(@Nullable C a, @Nullable C b)
{
- public void serialize(Commit commit, DataOutputPlus out, int version) throws IOException
+ return (a == null | b == null) ? (a == null ? b : a) : a.ballot.uuidTimestamp() >= b.ballot.uuidTimestamp() ? a : b;
+ }
+
+ /**
+ * the latest of two ballots, or the first ballot if equal timestamps
+ */
+ public static Ballot latest(@Nullable Commit a, @Nullable Ballot b)
+ {
+ return (a == null | b == null) ? (a == null ? b : a.ballot) : a.ballot.uuidTimestamp() >= b.uuidTimestamp() ? a.ballot : b;
+ }
+
+ /**
+ * the latest of two ballots, or the first ballot if equal timestamps
+ */
+ public static Ballot latest(@Nullable Ballot a, @Nullable Ballot b)
+ {
+ return (a == null | b == null) ? (a == null ? b : a) : a.uuidTimestamp() >= b.uuidTimestamp() ? a : b;
+ }
+
+ /**
+ * unequal ballots with same timestamp
+ */
+ public static boolean timestampsClash(@Nullable Commit a, @Nullable Ballot b)
+ {
+ return a != null && b != null && !a.ballot.equals(b) && a.ballot.uuidTimestamp() == b.uuidTimestamp();
+ }
+
+ public static boolean timestampsClash(@Nullable Ballot a, @Nullable Ballot b)
+ {
+ return a != null && b != null && !a.equals(b) && a.uuidTimestamp() == b.uuidTimestamp();
+ }
+
+ private static PartitionUpdate withTimestamp(PartitionUpdate update, long timestamp)
+ {
+ return new PartitionUpdate.Builder(update, 0).updateAllTimestamp(timestamp).build();
+ }
+
+ public static class CommitSerializer<T extends Commit> implements IVersionedSerializer<T>
+ {
+ final BiFunction<Ballot, PartitionUpdate, T> constructor;
+ public CommitSerializer(BiFunction<Ballot, PartitionUpdate, T> constructor)
+ {
+ this.constructor = constructor;
+ }
+
+ public void serialize(T commit, DataOutputPlus out, int version) throws IOException
{
commit.ballot.serialize(out);
PartitionUpdate.serializer.serialize(commit.update, out, version);
}
- public Commit deserialize(DataInputPlus in, int version) throws IOException
+ public T deserialize(DataInputPlus in, int version) throws IOException
{
- TimeUUID ballot = TimeUUID.deserialize(in);
+ Ballot ballot = Ballot.deserialize(in);
PartitionUpdate update = PartitionUpdate.serializer.deserialize(in, version, DeserializationHelper.Flag.LOCAL);
- return new Commit(ballot, update);
+ return constructor.apply(ballot, update);
}
- public long serializedSize(Commit commit, int version)
+ public long serializedSize(T commit, int version)
{
- return TimeUUID.sizeInBytes()
- + PartitionUpdate.serializer.serializedSize(commit.update, version);
+ return Ballot.sizeInBytes()
+ + PartitionUpdate.serializer.serializedSize(commit.update, version);
}
}
+
}
diff --git a/src/java/org/apache/cassandra/service/paxos/CommitVerbHandler.java b/src/java/org/apache/cassandra/service/paxos/CommitVerbHandler.java
deleted file mode 100644
index 12466dd..0000000
--- a/src/java/org/apache/cassandra/service/paxos/CommitVerbHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-package org.apache.cassandra.service.paxos;
-
-import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
-import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.tracing.Tracing;
-
-public class CommitVerbHandler implements IVerbHandler<Commit>
-{
- public static final CommitVerbHandler instance = new CommitVerbHandler();
-
- public void doVerb(Message<Commit> message)
- {
- PaxosState.commit(message.payload);
-
- Tracing.trace("Enqueuing acknowledge to {}", message.from());
- MessagingService.instance().send(message.emptyResponse(), message.from());
- }
-}
diff --git a/src/java/org/apache/cassandra/service/paxos/ContentionStrategy.java b/src/java/org/apache/cassandra/service/paxos/ContentionStrategy.java
new file mode 100644
index 0000000..7d0cb74
--- /dev/null
+++ b/src/java/org/apache/cassandra/service/paxos/ContentionStrategy.java
@@ -0,0 +1,651 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.service.paxos;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+
+import com.codahale.metrics.Snapshot;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.ConsistencyLevel;
+import org.apache.cassandra.db.DecoratedKey;
+import org.apache.cassandra.schema.TableMetadata;
+import org.apache.cassandra.tracing.Tracing;
+import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.utils.NoSpamLogger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.DoubleSupplier;
+import java.util.function.LongBinaryOperator;
+import java.util.function.Supplier;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.lang.Double.parseDouble;
+import static java.lang.Integer.parseInt;
+import static java.lang.Math.*;
+import static java.util.Arrays.stream;
+import static java.util.concurrent.TimeUnit.*;
+import static org.apache.cassandra.config.DatabaseDescriptor.*;
+import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.casReadMetrics;
+import static org.apache.cassandra.metrics.ClientRequestsMetricsHolder.casWriteMetrics;
+import static org.apache.cassandra.utils.Clock.Global.nanoTime;
+import static org.apache.cassandra.utils.Clock.waitUntil;
+
+/**
+ * <p>A strategy for making back-off decisions for Paxos operations that fail to make progress because of other paxos operations.
+ * The strategy is defined by four factors: <ul>
+ * <li> {@link #min}
+ * <li> {@link #max}
+ * <li> {@link #minDelta}
+ * <li> {@link #waitRandomizer}
+ * </ul>
+ *
+ * <p>The first three represent time periods, and may be defined dynamically based on a simple calculation over: <ul>
+ * <li> {@code pX()} recent experienced latency distribution for successful operations,
+ * e.g. {@code p50(rw)} the maximum of read and write median latencies,
+ * {@code p999(r)} the 99.9th percentile of read latencies
+ * <li> {@code attempts} the number of failed attempts made by the operation so far
+ * <li> {@code constant} a user provided floating point constant
+ * </ul>
+ *
+ * <p>Their calculation may take any of these forms
+ * <li> constant {@code $constant$[mu]s}
+ * <li> dynamic constant {@code pX() * constant}
+ * <li> dynamic linear {@code pX() * constant * attempts}
+ * <li> dynamic exponential {@code pX() * constant ^ attempts}
+ *
+ * <p>Furthermore, the dynamic calculations can be bounded with a min/max, like so:
+ * {@code min[mu]s <= dynamic expr <= max[mu]s}
+ *
+ * e.g.
+ * <li> {@code 10ms <= p50(rw)*0.66}
+ * <li> {@code 10ms <= p95(rw)*1.8^attempts <= 100ms}
+ * <li> {@code 5ms <= p50(rw)*0.5}
+ *
+ * <p>These calculations are put together to construct a range from which we draw a random number.
+ * The period we wait for {@code X} will be drawn so that {@code min <= X < max}.
+ *
+ * <p>With the constraint that {@code max} must be {@code minDelta} greater than {@code min},
+ * but no greater than its expression-defined maximum. {@code max} will be increased up until
+ * this point, after which {@code min} will be decreased until this gap is imposed.
+ *
+ * <p>The {@link #waitRandomizer} property specifies the manner in which a random value is drawn from the range.
+ * It is defined using one of the following specifiers:
+ * <li> uniform
+ * <li> exp($power$) or exponential($power$)
+ * <li> qexp($power$) or qexponential($power$) or quantizedexponential($power$)
+ *
+ * The uniform specifier is self-explanatory, selecting all values in the range with equal probability.
+ * The exponential specifier draws values towards the end of the range with higher probability, raising
+ * a floating point number in the range [0..1.0) to the power provided, and translating the resulting value
+ * to a uniform value in the range.
+ * The quantized exponential specifier partitions the range into {@code attempts} buckets, then applies the pure
+ * exponential approach to draw values from [0..attempts), before drawing a uniform value from the corresponding bucket
+ *
+ * <p>Finally, there is also a {@link #traceAfterAttempts} property that permits initiating tracing of operations
+ * that experience a certain minimum number of failed paxos rounds due to contention. A setting of 0 or 1 will initiate
+ * a trace session after the first failed ballot.
+ */
+public class ContentionStrategy
+{
+ private static final Logger logger = LoggerFactory.getLogger(ContentionStrategy.class);
+
+ private static final Pattern BOUND = Pattern.compile(
+ "(?<const>0|[0-9]+[mu]s)" +
+ "|((?<min>0|[0-9]+[mu]s) *<= *)?" +
+ "(p(?<perc>[0-9]+)\\((?<rw>r|w|rw|wr)\\)|(?<constbase>0|[0-9]+[mu]s))" +
+ "\\s*([*]\\s*(?<mod>[0-9.]+)?\\s*(?<modkind>[*^]\\s*attempts)?)?" +
+ "( *<= *(?<max>0|[0-9]+[mu]s))?");
+ private static final Pattern TIME = Pattern.compile(
+ "0|([0-9]+)ms|([0-9]+)us");
+ private static final Pattern RANDOMIZER = Pattern.compile(
+ "uniform|exp(onential)?[(](?<exp>[0-9.]+)[)]|q(uantized)?exp(onential)?[(](?<qexp>[0-9.]+)[)]");
+ private static final String DEFAULT_WAIT_RANDOMIZER = "qexp(1.5)"; // at least 0ms, and at least 66% of median latency
+ private static final String DEFAULT_MIN = "0 <= p50(rw)*0.66"; // at least 0ms, and at least 66% of median latency
+ private static final String DEFAULT_MAX = "10ms <= p95(rw)*1.8^attempts <= 100ms"; // p95 latency with exponential back-off at rate of 1.8^attempts
+ private static final String DEFAULT_MIN_DELTA = "5ms <= p50(rw)*0.5"; // at least 5ms, and at least 50% of median latency
+
+ private static volatile ContentionStrategy current;
+
+ // Factories can be useful for testing purposes, to supply custom implementations of selectors and modifiers.
+ final static LatencySelectorFactory selectors = new LatencySelectorFactory(){};
+ final static LatencyModifierFactory modifiers = new LatencyModifierFactory(){};
+ final static WaitRandomizerFactory randomizers = new WaitRandomizerFactory(){};
+
+ static
+ {
+ current = new ContentionStrategy(defaultWaitRandomizer(), defaultMinWait(), defaultMaxWait(), defaultMinDelta(), Integer.MAX_VALUE);
+ }
+
+ static interface LatencyModifierFactory
+ {
+ default LatencyModifier identity() { return (l, a) -> l; }
+ default LatencyModifier multiply(double constant) { return (l, a) -> saturatedCast(l * constant); }
+ default LatencyModifier multiplyByAttempts(double multiply) { return (l, a) -> saturatedCast(l * multiply * a); }
+ default LatencyModifier multiplyByAttemptsExp(double base) { return (l, a) -> saturatedCast(l * pow(base, a)); }
+ }
+
+ static interface LatencySupplier
+ {
+ abstract long get(double percentile);
+ }
+
+ static interface LatencySelector
+ {
+ abstract long select(LatencySupplier readLatencyHistogram, LatencySupplier writeLatencyHistogram);
+ }
+
+ static interface LatencySelectorFactory
+ {
+ default LatencySelector constant(long latency) { return (read, write) -> latency; }
+ default LatencySelector read(double percentile) { return (read, write) -> read.get(percentile); }
+ default LatencySelector write(double percentile) { return (read, write) -> write.get(percentile); }
+ default LatencySelector maxReadWrite(double percentile) { return (read, write) -> max(read.get(percentile), write.get(percentile)); }
+ }
+
+ static interface LatencyModifier
+ {
+ long modify(long latency, int attempts);
+ }
+
+ static interface WaitRandomizer
+ {
+ abstract long wait(long min, long max, int attempts);
+ }
+
+ static interface WaitRandomizerFactory
+ {
+ default LongBinaryOperator uniformLongSupplier() { return (min, max) -> ThreadLocalRandom.current().nextLong(min, max); } // DO NOT USE METHOD HANDLES (want to fetch afresh each time)
+ default DoubleSupplier uniformDoubleSupplier() { return () -> ThreadLocalRandom.current().nextDouble(); }
+
+ default WaitRandomizer uniform() { return new Uniform(uniformLongSupplier()); }
+ default WaitRandomizer exponential(double power) { return new Exponential(uniformLongSupplier(), uniformDoubleSupplier(), power); }
+ default WaitRandomizer quantizedExponential(double power) { return new QuantizedExponential(uniformLongSupplier(), uniformDoubleSupplier(), power); }
+
+ static class Uniform implements WaitRandomizer
+ {
+ final LongBinaryOperator uniformLong;
+
+ public Uniform(LongBinaryOperator uniformLong)
+ {
+ this.uniformLong = uniformLong;
+ }
+
+ @Override
+ public long wait(long min, long max, int attempts)
+ {
+ return uniformLong.applyAsLong(min, max);
+ }
+ }
+
+ static abstract class AbstractExponential implements WaitRandomizer
+ {
+ final LongBinaryOperator uniformLong;
+ final DoubleSupplier uniformDouble;
+ final double power;
+
+ public AbstractExponential(LongBinaryOperator uniformLong, DoubleSupplier uniformDouble, double power)
+ {
+ this.uniformLong = uniformLong;
+ this.uniformDouble = uniformDouble;
+ this.power = power;
+ }
+ }
+
+ static class Exponential extends AbstractExponential
+ {
+ public Exponential(LongBinaryOperator uniformLong, DoubleSupplier uniformDouble, double power)
+ {
+ super(uniformLong, uniformDouble, power);
+ }
+
+ @Override
+ public long wait(long min, long max, int attempts)
+ {
+ if (attempts == 1)
+ return uniformLong.applyAsLong(min, max);
+
+ double p = uniformDouble.getAsDouble();
+ long delta = max - min;
+ delta *= Math.pow(p, power);
+ return max - delta;
+ }
+ }
+
+ static class QuantizedExponential extends AbstractExponential
+ {
+ public QuantizedExponential(LongBinaryOperator uniformLong, DoubleSupplier uniformDouble, double power)
+ {
+ super(uniformLong, uniformDouble, power);
+ }
+
+ @Override
+ public long wait(long min, long max, int attempts)
+ {
+ long quanta = (max - min) / attempts;
+ if (attempts == 1 || quanta == 0)
+ return uniformLong.applyAsLong(min, max);
+
+ double p = uniformDouble.getAsDouble();
+ int base = (int) (attempts * Math.pow(p, power));
+ return max - ThreadLocalRandom.current().nextLong(quanta * base, quanta * (base + 1));
+ }
+ }
+ }
+
+ static class SnapshotAndTime
+ {
+ final long validUntil;
+ final Snapshot snapshot;
+
+ SnapshotAndTime(long validUntil, Snapshot snapshot)
+ {
+ this.validUntil = validUntil;
+ this.snapshot = snapshot;
+ }
+ }
+
+ static class TimeLimitedLatencySupplier extends AtomicReference<SnapshotAndTime> implements LatencySupplier
+ {
+ final Supplier<Snapshot> snapshotSupplier;
+ final long validForNanos;
+
+ TimeLimitedLatencySupplier(Supplier<Snapshot> snapshotSupplier, long time, TimeUnit units)
+ {
+ this.snapshotSupplier = snapshotSupplier;
+ this.validForNanos = units.toNanos(time);
+ }
+
+ private Snapshot getSnapshot()
+ {
+ long now = nanoTime();
+
+ SnapshotAndTime cur = get();
+ if (cur != null && cur.validUntil > now)
+ return cur.snapshot;
+
+ Snapshot newSnapshot = snapshotSupplier.get();
+ SnapshotAndTime next = new SnapshotAndTime(now + validForNanos, newSnapshot);
+ if (compareAndSet(cur, next))
+ return next.snapshot;
+
+ return accumulateAndGet(next, (a, b) -> a.validUntil > b.validUntil ? a : b).snapshot;
+ }
+
+ @Override
+ public long get(double percentile)
+ {
+ return (long)getSnapshot().getValue(percentile);
+ }
+ }
+
+ static class Bound
+ {
+ final long min, max, onFailure;
+ final LatencyModifier modifier;
+ final LatencySelector selector;
+ final LatencySupplier reads, writes;
+
+ Bound(long min, long max, long onFailure, LatencyModifier modifier, LatencySelector selector)
+ {
+ Preconditions.checkArgument(min<=max, "min (%s) must be less than or equal to max (%s)", min, max);
+ this.min = min;
+ this.max = max;
+ this.onFailure = onFailure;
+ this.modifier = modifier;
+ this.selector = selector;
+ this.reads = new TimeLimitedLatencySupplier(casReadMetrics.latency::getSnapshot, 10L, SECONDS);
+ this.writes = new TimeLimitedLatencySupplier(casWriteMetrics.latency::getSnapshot, 10L, SECONDS);
+ }
+
+ long get(int attempts)
+ {
+ try
+ {
+ long base = selector.select(reads, writes);
+ return max(min, min(max, modifier.modify(base, attempts)));
+ }
+ catch (Throwable t)
+ {
+ NoSpamLogger.getLogger(logger, 1L, MINUTES).info("", t);
+ return onFailure;
+ }
+ }
+
+ public String toString()
+ {
+ return "Bound{" +
+ "min=" + min +
+ ", max=" + max +
+ ", onFailure=" + onFailure +
+ ", modifier=" + modifier +
+ ", selector=" + selector +
+ '}';
+ }
+ }
+
+ final WaitRandomizer waitRandomizer;
+ final Bound min, max, minDelta;
+ final int traceAfterAttempts;
+
+ public ContentionStrategy(String waitRandomizer, String min, String max, String minDelta, int traceAfterAttempts)
+ {
+ this.waitRandomizer = parseWaitRandomizer(waitRandomizer);
+ this.min = parseBound(min, true);
+ this.max = parseBound(max, false);
+ this.minDelta = parseBound(minDelta, true);
+ this.traceAfterAttempts = traceAfterAttempts;
+ }
+
+ public enum Type
+ {
+ READ("Contended Paxos Read"), WRITE("Contended Paxos Write"), REPAIR("Contended Paxos Repair");
+
+ final String traceTitle;
+ final String lowercase;
+
+ Type(String traceTitle)
+ {
+ this.traceTitle = traceTitle;
+ this.lowercase = name().toLowerCase();
+ }
+ }
+
+ private long computeWaitUntilForContention(int attempts, TableMetadata table, DecoratedKey partitionKey, ConsistencyLevel consistency, Type type)
+ {
+ if (attempts >= traceAfterAttempts && !Tracing.isTracing())
+ {
+ Tracing.instance.newSession(Tracing.TraceType.QUERY);
+ Tracing.instance.begin(type.traceTitle,
+ ImmutableMap.of(
+ "keyspace", table.keyspace,
+ "table", table.name,
+ "partitionKey", table.partitionKeyType.getString(partitionKey.getKey()),
+ "consistency", consistency.name(),
+ "kind", type.lowercase
+ ));
+
+ logger.info("Tracing contended paxos {} for key {} on {}.{} with trace id {}",
+ type.lowercase,
+ ByteBufferUtil.bytesToHex(partitionKey.getKey()),
+ table.keyspace, table.name,
+ Tracing.instance.getSessionId());
+ }
+
+ long minWaitMicros = min.get(attempts);
+ long maxWaitMicros = max.get(attempts);
+ long minDeltaMicros = minDelta.get(attempts);
+
+ if (minWaitMicros + minDeltaMicros > maxWaitMicros)
+ {
+ maxWaitMicros = minWaitMicros + minDeltaMicros;
+ if (maxWaitMicros > this.max.max)
+ {
+ maxWaitMicros = this.max.max;
+ minWaitMicros = max(this.min.min, min(this.min.max, maxWaitMicros - minDeltaMicros));
+ }
+ }
+
+ long wait = waitRandomizer.wait(minWaitMicros, maxWaitMicros, attempts);
+ return nanoTime() + wait;
+ }
+
+ private boolean doWaitForContention(long deadline, int attempts, TableMetadata table, DecoratedKey partitionKey, ConsistencyLevel consistency, Type type)
+ {
+ long until = computeWaitUntilForContention(attempts, table, partitionKey, consistency, type);
+ if (until >= deadline)
+ return false;
+
+ try
+ {
+ waitUntil(until);
+ }
+ catch (InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
+ return false;
+ }
+ return true;
+ }
+
+ static boolean waitForContention(long deadline, int attempts, TableMetadata table, DecoratedKey partitionKey, ConsistencyLevel consistency, Type type)
+ {
+ return current.doWaitForContention(deadline, attempts, table, partitionKey, consistency, type);
+ }
+
+ static long waitUntilForContention(int attempts, TableMetadata table, DecoratedKey partitionKey, ConsistencyLevel consistency, Type type)
+ {
+ return current.computeWaitUntilForContention(attempts, table, partitionKey, consistency, type);
+ }
+
+ static class ParsedStrategy
+ {
+ final String waitRandomizer, min, max, minDelta;
+ final ContentionStrategy strategy;
+
+ ParsedStrategy(String waitRandomizer, String min, String max, String minDelta, ContentionStrategy strategy)
+ {
+ this.waitRandomizer = waitRandomizer;
+ this.min = min;
+ this.max = max;
+ this.minDelta = minDelta;
+ this.strategy = strategy;
+ }
+ }
+
+ @VisibleForTesting
+ static ParsedStrategy parseStrategy(String spec)
+ {
+ String[] args = spec.split(",");
+ String waitRandomizer = find(args, "random");
+ String min = find(args, "min");
... 31057 lines suppressed ...
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/03: [CASSANDRA-17177] List Appends Are Not Linearizable
Posted by be...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
benedict pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 8960b4d8513e22c4c11c181c520380342935aee7
Author: Benedict Elliott Smith <be...@apple.com>
AuthorDate: Tue Nov 30 17:00:45 2021 +0000
[CASSANDRA-17177] List Appends Are Not Linearizable
---
.../cassandra/cql3/statements/CQL3CasRequest.java | 38 +++++++++++++++-------
.../cql3/statements/ModificationStatement.java | 2 +-
.../org/apache/cassandra/service/CASRequest.java | 3 +-
.../org/apache/cassandra/service/StorageProxy.java | 16 ++++-----
4 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
index 2a87592..376a65f 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java
@@ -232,11 +232,12 @@ public class CQL3CasRequest implements CASRequest
return builder.build();
}
- public PartitionUpdate makeUpdates(FilteredPartition current, ClientState state) throws InvalidRequestException
+ public PartitionUpdate makeUpdates(FilteredPartition current, ClientState state, TimeUUID ballot) throws InvalidRequestException
{
PartitionUpdate.Builder updateBuilder = new PartitionUpdate.Builder(metadata, key, updatedColumns(), conditions.size());
+ long timeUuidNanos = 0;
for (RowUpdate upd : updates)
- upd.applyUpdates(current, updateBuilder, state);
+ timeUuidNanos = upd.applyUpdates(current, updateBuilder, state, ballot.msb(), timeUuidNanos);
for (RangeDeletion upd : rangeDeletions)
upd.applyUpdates(current, updateBuilder, state);
@@ -246,6 +247,24 @@ public class CQL3CasRequest implements CASRequest
return partitionUpdate;
}
+ private static class CASUpdateParameters extends UpdateParameters
+ {
+ final long timeUuidMsb;
+ long timeUuidNanos;
+
+ public CASUpdateParameters(TableMetadata metadata, RegularAndStaticColumns updatedColumns, ClientState state, QueryOptions options, long timestamp, int nowInSec, int ttl, Map<DecoratedKey, Partition> prefetchedRows, long timeUuidMsb, long timeUuidNanos) throws InvalidRequestException
+ {
+ super(metadata, updatedColumns, state, options, timestamp, nowInSec, ttl, prefetchedRows);
+ this.timeUuidMsb = timeUuidMsb;
+ this.timeUuidNanos = timeUuidNanos;
+ }
+
+ public byte[] nextTimeUUIDAsBytes()
+ {
+ return TimeUUID.toBytes(timeUuidMsb, TimeUUIDType.signedBytesToNativeLong(timeUuidNanos++));
+ }
+ }
+
/**
* Due to some operation on lists, we can't generate the update that a given Modification statement does before
* we get the values read by the initial read of Paxos. A RowUpdate thus just store the relevant information
@@ -269,19 +288,14 @@ public class CQL3CasRequest implements CASRequest
this.nowInSeconds = nowInSeconds;
}
- void applyUpdates(FilteredPartition current, PartitionUpdate.Builder updateBuilder, ClientState state)
+ long applyUpdates(FilteredPartition current, PartitionUpdate.Builder updateBuilder, ClientState state, long timeUuidMsb, long timeUuidNanos)
{
Map<DecoratedKey, Partition> map = stmt.requiresRead() ? Collections.singletonMap(key, current) : null;
- UpdateParameters params =
- new UpdateParameters(metadata,
- updateBuilder.columns(),
- state,
- options,
- timestamp,
- nowInSeconds,
- stmt.getTimeToLive(options),
- map);
+ CASUpdateParameters params =
+ new CASUpdateParameters(metadata, updateBuilder.columns(), state, options, timestamp, nowInSeconds,
+ stmt.getTimeToLive(options), map, timeUuidMsb, timeUuidNanos);
stmt.addUpdateForKey(updateBuilder, clustering, params);
+ return params.timeUuidNanos;
}
}
diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
index 42b4d45..fd2f044 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
@@ -673,7 +673,7 @@ public abstract class ModificationStatement implements CQLStatement.SingleKeyspa
if (!request.appliesTo(current))
return current.rowIterator();
- PartitionUpdate updates = request.makeUpdates(current, state);
+ PartitionUpdate updates = request.makeUpdates(current, state, ballot);
updates = TriggerExecutor.instance.execute(updates);
Commit proposal = Commit.newProposal(ballot, updates);
diff --git a/src/java/org/apache/cassandra/service/CASRequest.java b/src/java/org/apache/cassandra/service/CASRequest.java
index 77d1f5d..9197ef0 100644
--- a/src/java/org/apache/cassandra/service/CASRequest.java
+++ b/src/java/org/apache/cassandra/service/CASRequest.java
@@ -21,6 +21,7 @@ import org.apache.cassandra.db.SinglePartitionReadQuery;
import org.apache.cassandra.db.partitions.FilteredPartition;
import org.apache.cassandra.db.partitions.PartitionUpdate;
import org.apache.cassandra.exceptions.InvalidRequestException;
+import org.apache.cassandra.utils.TimeUUID;
/**
* Abstract the conditions and updates for a CAS operation.
@@ -42,5 +43,5 @@ public interface CASRequest
* The updates to perform of a CAS success. The values fetched using the readFilter()
* are passed as argument.
*/
- public PartitionUpdate makeUpdates(FilteredPartition current, ClientState state) throws InvalidRequestException;
+ public PartitionUpdate makeUpdates(FilteredPartition current, ClientState state, TimeUUID ballot) throws InvalidRequestException;
}
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 10785a9..267436f 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
import java.util.function.Supplier;
import java.util.stream.Collectors;
@@ -136,7 +137,6 @@ import org.apache.cassandra.utils.MBeanWrapper;
import org.apache.cassandra.utils.MonotonicClock;
import org.apache.cassandra.utils.NoSpamLogger;
import org.apache.cassandra.utils.Pair;
-import org.apache.cassandra.utils.UUIDGen;
import org.apache.cassandra.utils.concurrent.UncheckedInterruptedException;
import static com.google.common.collect.Iterables.concat;
@@ -296,7 +296,7 @@ public class StorageProxy implements StorageProxyMBean
key.toString(), keyspaceName, cfName));
}
- Supplier<Pair<PartitionUpdate, RowIterator>> updateProposer = () ->
+ Function<TimeUUID, Pair<PartitionUpdate, RowIterator>> updateProposer = ballot ->
{
// read the current values and check they validate the conditions
Tracing.trace("Reading existing values for CAS precondition");
@@ -317,7 +317,7 @@ public class StorageProxy implements StorageProxyMBean
}
// Create the desired updates
- PartitionUpdate updates = request.makeUpdates(current, state);
+ PartitionUpdate updates = request.makeUpdates(current, state, ballot);
long size = updates.dataSize();
casWriteMetrics.mutationSize.update(size);
@@ -435,7 +435,7 @@ public class StorageProxy implements StorageProxyMBean
ConsistencyLevel consistencyForCommit,
long queryStartNanoTime,
CASClientRequestMetrics casMetrics,
- Supplier<Pair<PartitionUpdate, RowIterator>> createUpdateProposal)
+ Function<TimeUUID, Pair<PartitionUpdate, RowIterator>> createUpdateProposal)
throws UnavailableException, IsBootstrappingException, RequestFailureException, RequestTimeoutException, InvalidRequestException
{
int contentions = 0;
@@ -464,7 +464,7 @@ public class StorageProxy implements StorageProxyMBean
final TimeUUID ballot = pair.ballot;
contentions += pair.contentions;
- Pair<PartitionUpdate, RowIterator> proposalPair = createUpdateProposal.get();
+ Pair<PartitionUpdate, RowIterator> proposalPair = createUpdateProposal.apply(ballot);
// See method javadoc: null here is code for "stop here and return null".
if (proposalPair == null)
return null;
@@ -1833,10 +1833,10 @@ public class StorageProxy implements StorageProxyMBean
{
// Commit an empty update to make sure all in-progress updates that should be finished first is, _and_
// that no other in-progress can get resurrected.
- Supplier<Pair<PartitionUpdate, RowIterator>> updateProposer =
+ Function<TimeUUID, Pair<PartitionUpdate, RowIterator>> updateProposer =
Paxos.getPaxosVariant() == Config.PaxosVariant.v1_without_linearizable_reads
- ? () -> null
- : () -> Pair.create(PartitionUpdate.emptyUpdate(metadata, key), null);
+ ? ballot -> null
+ : ballot -> Pair.create(PartitionUpdate.emptyUpdate(metadata, key), null);
// When replaying, we commit at quorum/local quorum, as we want to be sure the following read (done at
// quorum/local_quorum) sees any replayed updates. Our own update is however empty, and those don't even
// get committed due to an optimiation described in doPaxos/beingRepairAndPaxos, so the commit
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org