You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/27 11:32:02 UTC
[6/16] git commit: [3649] Strip end of line whitespaces
[3649] Strip end of line whitespaces
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07cdfd07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07cdfd07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07cdfd07
Branch: refs/heads/trunk
Commit: 07cdfd07a3dc1fe9f9d6e1c24ad926eecae4017a
Parents: 185e025
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Feb 27 11:21:34 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Feb 27 11:21:34 2012 +0100
----------------------------------------------------------------------
.../cassandra/auth/AllowAllAuthenticator.java | 10 +-
.../apache/cassandra/auth/AllowAllAuthority.java | 8 +-
.../apache/cassandra/auth/AuthenticatedUser.java | 8 +-
.../org/apache/cassandra/auth/IAuthenticator.java | 8 +-
src/java/org/apache/cassandra/auth/IAuthority.java | 16 +-
src/java/org/apache/cassandra/auth/Permission.java | 8 +-
src/java/org/apache/cassandra/auth/Resources.java | 8 +-
.../apache/cassandra/cache/AutoSavingCache.java | 2 +-
.../cassandra/cache/ConcurrentLinkedHashCache.java | 8 +-
.../cache/ConcurrentLinkedHashCacheProvider.java | 8 +-
.../org/apache/cassandra/cache/FreeableMemory.java | 8 +-
src/java/org/apache/cassandra/cache/ICache.java | 8 +-
.../apache/cassandra/cache/IRowCacheProvider.java | 8 +-
.../apache/cassandra/cache/InstrumentingCache.java | 8 +-
.../apache/cassandra/cache/SerializingCache.java | 10 +-
.../cassandra/cache/SerializingCacheProvider.java | 8 +-
src/java/org/apache/cassandra/cli/CliClient.java | 146 ++++++------
src/java/org/apache/cassandra/cli/CliCompiler.java | 16 +-
.../org/apache/cassandra/cli/CliCompleter.java | 4 +-
src/java/org/apache/cassandra/cli/CliMain.java | 20 +-
.../org/apache/cassandra/cli/CliSessionState.java | 4 +-
src/java/org/apache/cassandra/cli/CliUtils.java | 8 +-
.../org/apache/cassandra/client/RingCache.java | 4 +-
.../concurrent/CreationTimeAwareFuture.java | 8 +-
.../DebuggableScheduledThreadPoolExecutor.java | 8 +-
.../concurrent/DebuggableThreadPoolExecutor.java | 8 +-
.../JMXConfigurableThreadPoolExecutor.java | 6 +-
.../concurrent/JMXEnabledThreadPoolExecutor.java | 4 +-
.../cassandra/concurrent/NamedThreadFactory.java | 6 +-
.../org/apache/cassandra/concurrent/Stage.java | 8 +-
.../apache/cassandra/concurrent/StageManager.java | 6 +-
.../org/apache/cassandra/config/CFMetaData.java | 14 +-
.../apache/cassandra/config/ColumnDefinition.java | 32 ++--
src/java/org/apache/cassandra/config/Config.java | 36 ++--
.../cassandra/config/DatabaseDescriptor.java | 26 +-
.../cassandra/config/RequestSchedulerOptions.java | 8 +-
.../apache/cassandra/config/SeedProviderDef.java | 2 +-
.../org/apache/cassandra/cql/CQLStatement.java | 10 +-
.../cassandra/cql/CreateColumnFamilyStatement.java | 28 ++--
.../apache/cassandra/cql/CreateIndexStatement.java | 16 +-
.../cassandra/cql/CreateKeyspaceStatement.java | 22 +-
.../org/apache/cassandra/cql/DeleteStatement.java | 10 +-
.../org/apache/cassandra/cql/QueryProcessor.java | 98 ++++----
src/java/org/apache/cassandra/cql/Relation.java | 24 +-
.../org/apache/cassandra/cql/SelectExpression.java | 36 ++--
.../org/apache/cassandra/cql/SelectStatement.java | 36 ++--
.../org/apache/cassandra/cql/StatementType.java | 10 +-
src/java/org/apache/cassandra/cql/Term.java | 44 ++--
.../org/apache/cassandra/cql/UpdateStatement.java | 36 ++--
src/java/org/apache/cassandra/cql/WhereClause.java | 24 +-
.../cassandra/cql/jdbc/AbstractJdbcType.java | 8 +-
.../cassandra/cql/jdbc/AbstractJdbcUUID.java | 10 +-
.../org/apache/cassandra/cql/jdbc/JdbcAscii.java | 14 +-
.../org/apache/cassandra/cql/jdbc/JdbcBoolean.java | 16 +-
.../org/apache/cassandra/cql/jdbc/JdbcBytes.java | 12 +-
.../cassandra/cql/jdbc/JdbcCounterColumn.java | 10 +-
.../org/apache/cassandra/cql/jdbc/JdbcDate.java | 18 +-
.../org/apache/cassandra/cql/jdbc/JdbcDecimal.java | 18 +-
.../org/apache/cassandra/cql/jdbc/JdbcDouble.java | 16 +-
.../org/apache/cassandra/cql/jdbc/JdbcFloat.java | 16 +-
.../org/apache/cassandra/cql/jdbc/JdbcInt32.java | 8 +-
.../org/apache/cassandra/cql/jdbc/JdbcInteger.java | 12 +-
.../apache/cassandra/cql/jdbc/JdbcLexicalUUID.java | 12 +-
.../org/apache/cassandra/cql/jdbc/JdbcLong.java | 8 +-
.../apache/cassandra/cql/jdbc/JdbcTimeUUID.java | 12 +-
.../org/apache/cassandra/cql/jdbc/JdbcUTF8.java | 12 +-
.../org/apache/cassandra/cql/jdbc/JdbcUUID.java | 14 +-
.../cassandra/cql/jdbc/MarshalException.java | 8 +-
.../org/apache/cassandra/cql/jdbc/TypesMap.java | 12 +-
.../statements/CreateColumnFamilyStatement.java | 2 +-
.../apache/cassandra/db/CollationController.java | 2 +-
src/java/org/apache/cassandra/db/Column.java | 2 +-
src/java/org/apache/cassandra/db/ColumnFamily.java | 2 +-
.../cassandra/db/ColumnFamilySerializer.java | 8 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 18 +-
.../org/apache/cassandra/db/ColumnSerializer.java | 10 +-
.../org/apache/cassandra/db/DeletedColumn.java | 4 +-
src/java/org/apache/cassandra/db/EchoedRow.java | 8 +-
.../org/apache/cassandra/db/ExpiringColumn.java | 4 +-
.../org/apache/cassandra/db/IColumnContainer.java | 8 +-
.../org/apache/cassandra/db/IndexScanCommand.java | 4 +-
src/java/org/apache/cassandra/db/Memtable.java | 2 +-
.../org/apache/cassandra/db/MeteredFlusher.java | 8 +-
.../org/apache/cassandra/db/RangeSliceCommand.java | 2 +-
src/java/org/apache/cassandra/db/ReadCommand.java | 4 +-
.../apache/cassandra/db/ReadRepairVerbHandler.java | 6 +-
src/java/org/apache/cassandra/db/ReadResponse.java | 12 +-
.../apache/cassandra/db/RowIteratorFactory.java | 2 +-
.../cassandra/db/RowMutationVerbHandler.java | 6 +-
.../cassandra/db/SchemaCheckVerbHandler.java | 2 +-
.../cassandra/db/SliceByNamesReadCommand.java | 2 +-
.../org/apache/cassandra/db/SnapshotCommand.java | 8 +-
src/java/org/apache/cassandra/db/SystemTable.java | 14 +-
src/java/org/apache/cassandra/db/Table.java | 20 +-
.../db/UnserializableColumnFamilyException.java | 2 +-
.../org/apache/cassandra/db/WriteResponse.java | 6 +-
.../db/columniterator/IColumnIterator.java | 8 +-
.../columniterator/ICountableColumnIterator.java | 8 +-
.../db/columniterator/IdentityQueryFilter.java | 8 +-
.../db/columniterator/IndexedSliceReader.java | 8 +-
.../db/columniterator/SSTableNamesIterator.java | 8 +-
.../db/columniterator/SSTableSliceIterator.java | 8 +-
.../SimpleAbstractColumnIterator.java | 8 +-
.../db/columniterator/SimpleSliceReader.java | 8 +-
.../AbstractCommitLogExecutorService.java | 8 +-
.../commitlog/BatchCommitLogExecutorService.java | 8 +-
.../apache/cassandra/db/commitlog/CommitLog.java | 14 +-
.../cassandra/db/commitlog/CommitLogAllocator.java | 4 +-
.../cassandra/db/commitlog/CommitLogSegment.java | 14 +-
.../db/commitlog/ICommitLogExecutorService.java | 8 +-
.../PeriodicCommitLogExecutorService.java | 8 +-
.../cassandra/db/commitlog/ReplayPosition.java | 8 +-
.../db/compaction/AbstractCompactedRow.java | 8 +-
.../db/compaction/AbstractCompactionIterable.java | 8 +-
.../compaction/CompactionInterruptedException.java | 8 +-
.../db/compaction/CompactionIterable.java | 8 +-
.../cassandra/db/compaction/CompactionManager.java | 16 +-
.../db/compaction/LazilyCompactedRow.java | 8 +-
.../db/compaction/LeveledCompactionStrategy.java | 8 +-
.../db/compaction/LeveledCompactionTask.java | 8 +-
.../cassandra/db/compaction/LeveledManifest.java | 8 +-
.../cassandra/db/compaction/OperationType.java | 8 +-
.../cassandra/db/compaction/PrecompactedRow.java | 8 +-
.../db/filter/AbstractColumnIterator.java | 8 +-
.../apache/cassandra/db/filter/ExtendedFilter.java | 8 +-
.../cassandra/db/filter/NamesQueryFilter.java | 10 +-
.../apache/cassandra/db/filter/QueryFilter.java | 8 +-
.../org/apache/cassandra/db/filter/QueryPath.java | 12 +-
.../cassandra/db/filter/SliceQueryFilter.java | 14 +-
.../db/index/PerColumnSecondaryIndex.java | 14 +-
.../cassandra/db/index/PerRowSecondaryIndex.java | 16 +-
.../apache/cassandra/db/index/SecondaryIndex.java | 80 ++++----
.../cassandra/db/index/SecondaryIndexBuilder.java | 2 +-
.../cassandra/db/index/SecondaryIndexManager.java | 182 +++++++-------
.../cassandra/db/index/SecondaryIndexSearcher.java | 2 +-
.../apache/cassandra/db/index/keys/KeysIndex.java | 22 +-
.../cassandra/db/index/keys/KeysSearcher.java | 6 +-
.../db/marshal/AbstractCommutativeType.java | 8 +-
.../apache/cassandra/db/marshal/AbstractType.java | 12 +-
.../org/apache/cassandra/db/marshal/AsciiType.java | 8 +-
.../apache/cassandra/db/marshal/BooleanType.java | 18 +-
.../org/apache/cassandra/db/marshal/BytesType.java | 12 +-
.../cassandra/db/marshal/CounterColumnType.java | 8 +-
.../org/apache/cassandra/db/marshal/DateType.java | 20 +-
.../apache/cassandra/db/marshal/DecimalType.java | 14 +-
.../apache/cassandra/db/marshal/DoubleType.java | 22 +-
.../org/apache/cassandra/db/marshal/FloatType.java | 20 +-
.../org/apache/cassandra/db/marshal/Int32Type.java | 12 +-
.../apache/cassandra/db/marshal/IntegerType.java | 2 +-
.../cassandra/db/marshal/LexicalUUIDType.java | 8 +-
.../cassandra/db/marshal/LocalByPartionerType.java | 4 +-
.../org/apache/cassandra/db/marshal/LongType.java | 12 +-
.../cassandra/db/marshal/MarshalException.java | 8 +-
.../apache/cassandra/db/marshal/TimeUUIDType.java | 16 +-
.../org/apache/cassandra/db/marshal/UTF8Type.java | 18 +-
.../org/apache/cassandra/db/marshal/UUIDType.java | 10 +-
.../cassandra/db/migration/AddColumnFamily.java | 2 +-
.../apache/cassandra/db/migration/AddKeyspace.java | 2 +-
.../cassandra/db/migration/DropColumnFamily.java | 2 +-
.../cassandra/db/migration/DropKeyspace.java | 4 +-
.../apache/cassandra/db/migration/Migration.java | 6 +-
.../org/apache/cassandra/dht/AbstractBounds.java | 8 +-
.../org/apache/cassandra/dht/BootStrapper.java | 6 +-
src/java/org/apache/cassandra/dht/Bounds.java | 8 +-
src/java/org/apache/cassandra/dht/BytesToken.java | 6 +-
.../org/apache/cassandra/dht/IPartitioner.java | 6 +-
.../org/apache/cassandra/dht/LocalPartitioner.java | 4 +-
.../cassandra/dht/OrderPreservingPartitioner.java | 2 +-
.../apache/cassandra/dht/RandomPartitioner.java | 2 +-
.../org/apache/cassandra/gms/ApplicationState.java | 8 +-
.../org/apache/cassandra/gms/EndpointState.java | 22 +-
.../org/apache/cassandra/gms/FailureDetector.java | 48 ++--
.../org/apache/cassandra/gms/GossipDigest.java | 20 +-
.../cassandra/gms/GossipDigestAck2Message.java | 10 +-
.../cassandra/gms/GossipDigestAck2VerbHandler.java | 8 +-
.../cassandra/gms/GossipDigestAckMessage.java | 10 +-
.../cassandra/gms/GossipDigestAckVerbHandler.java | 8 +-
.../cassandra/gms/GossipDigestSynMessage.java | 26 +-
.../cassandra/gms/GossipDigestSynVerbHandler.java | 8 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 34 ++--
.../org/apache/cassandra/gms/HeartBeatState.java | 14 +-
.../gms/IEndpointStateChangeSubscriber.java | 4 +-
.../gms/IFailureDetectionEventListener.java | 2 +-
.../org/apache/cassandra/gms/IFailureDetector.java | 26 +-
.../apache/cassandra/gms/IFailureNotification.java | 2 +-
.../org/apache/cassandra/gms/VersionGenerator.java | 4 +-
.../org/apache/cassandra/gms/VersionedValue.java | 6 +-
.../apache/cassandra/hadoop/BulkOutputFormat.java | 12 +-
.../apache/cassandra/hadoop/BulkRecordWriter.java | 10 +-
.../cassandra/hadoop/ColumnFamilyInputFormat.java | 4 +-
.../cassandra/hadoop/ColumnFamilyOutputFormat.java | 22 +-
.../cassandra/hadoop/ColumnFamilyRecordReader.java | 42 ++--
.../cassandra/hadoop/ColumnFamilyRecordWriter.java | 26 +-
.../apache/cassandra/hadoop/ColumnFamilySplit.java | 10 +-
.../org/apache/cassandra/hadoop/ConfigHelper.java | 24 +-
.../cassandra/hadoop/pig/CassandraStorage.java | 10 +-
src/java/org/apache/cassandra/io/ISerializer.java | 8 +-
.../apache/cassandra/io/IVersionedSerializer.java | 8 +-
.../io/compress/CompressedSequentialWriter.java | 4 +-
.../cassandra/io/sstable/BloomFilterTracker.java | 8 +-
.../org/apache/cassandra/io/sstable/Component.java | 10 +-
.../apache/cassandra/io/sstable/Descriptor.java | 10 +-
.../apache/cassandra/io/sstable/KeyIterator.java | 8 +-
.../cassandra/io/sstable/ReducingKeyIterator.java | 8 +-
.../org/apache/cassandra/io/sstable/SSTable.java | 4 +-
.../io/sstable/SSTableIdentityIterator.java | 8 +-
.../cassandra/io/sstable/SSTableMetadata.java | 4 +-
.../apache/cassandra/io/sstable/SSTableWriter.java | 6 +-
.../cassandra/io/util/BufferedSegmentedFile.java | 8 +-
.../apache/cassandra/io/util/ColumnSortedMap.java | 8 +-
.../apache/cassandra/io/util/DataOutputBuffer.java | 8 +-
.../io/util/FastByteArrayInputStream.java | 22 +-
.../io/util/FastByteArrayOutputStream.java | 24 +-
.../apache/cassandra/io/util/FileDataInput.java | 8 +-
.../org/apache/cassandra/io/util/FileMark.java | 8 +-
.../org/apache/cassandra/io/util/FileUtils.java | 8 +-
.../apache/cassandra/io/util/IIterableColumns.java | 8 +-
.../cassandra/io/util/MemoryInputStream.java | 20 +-
.../cassandra/io/util/MemoryOutputStream.java | 14 +-
.../cassandra/io/util/MmappedSegmentedFile.java | 8 +-
.../org/apache/cassandra/io/util/OutputBuffer.java | 6 +-
.../apache/cassandra/io/util/SegmentedFile.java | 4 +-
.../cassandra/locator/DynamicEndpointSnitch.java | 4 +-
.../cassandra/locator/Ec2MultiRegionSnitch.java | 22 +-
.../org/apache/cassandra/locator/Ec2Snitch.java | 2 +-
.../cassandra/locator/EndpointSnitchInfoMBean.java | 2 +-
.../cassandra/locator/NetworkTopologyStrategy.java | 8 +-
.../org/apache/cassandra/locator/SeedProvider.java | 4 +-
.../cassandra/locator/SimpleSeedProvider.java | 12 +-
.../apache/cassandra/locator/TokenMetadata.java | 4 +-
src/java/org/apache/cassandra/net/AsyncResult.java | 16 +-
.../cassandra/net/CachingMessageProducer.java | 10 +-
.../org/apache/cassandra/net/CallbackInfo.java | 2 +-
.../net/CompactEndpointSerializationHelper.java | 4 +-
src/java/org/apache/cassandra/net/Header.java | 8 +-
src/java/org/apache/cassandra/net/HeaderTypes.java | 2 +-
.../org/apache/cassandra/net/IAsyncResult.java | 4 +-
.../org/apache/cassandra/net/IMessageCallback.java | 8 +-
.../cassandra/net/IncomingTcpConnection.java | 20 +-
src/java/org/apache/cassandra/net/Message.java | 12 +-
.../org/apache/cassandra/net/MessageProducer.java | 8 +-
.../org/apache/cassandra/net/MessagingService.java | 4 +-
.../cassandra/net/OutboundTcpConnection.java | 10 +-
.../cassandra/net/OutboundTcpConnectionPool.java | 8 +-
.../apache/cassandra/net/ResponseVerbHandler.java | 2 +-
.../cassandra/notifications/INotification.java | 8 +-
.../notifications/INotificationConsumer.java | 8 +-
.../notifications/SSTableAddedNotification.java | 8 +-
.../SSTableListChangedNotification.java | 8 +-
.../cassandra/scheduler/IRequestScheduler.java | 10 +-
.../apache/cassandra/scheduler/NoScheduler.java | 10 +-
.../cassandra/scheduler/RoundRobinScheduler.java | 14 +-
.../apache/cassandra/scheduler/WeightedQueue.java | 8 +-
.../cassandra/scheduler/WeightedQueueMBean.java | 8 +-
.../org/apache/cassandra/security/SSLFactory.java | 2 +-
.../cassandra/service/AbstractCassandraDaemon.java | 38 ++--
.../cassandra/service/AbstractRowResolver.java | 8 +-
.../service/AbstractWriteResponseHandler.java | 8 +-
.../cassandra/service/AntiEntropyService.java | 20 +-
.../cassandra/service/AsyncRepairCallback.java | 8 +-
.../apache/cassandra/service/CassandraDaemon.java | 26 +-
.../org/apache/cassandra/service/ClientState.java | 12 +-
.../cassandra/service/DatacenterReadCallback.java | 10 +-
.../DatacenterSyncWriteResponseHandler.java | 8 +-
.../service/DatacenterWriteResponseHandler.java | 10 +-
.../service/EmbeddedCassandraService.java | 8 +-
.../org/apache/cassandra/service/GCInspector.java | 18 +-
.../org/apache/cassandra/service/IReadCommand.java | 8 +-
.../apache/cassandra/service/RepairCallback.java | 8 +-
.../service/SocketSessionManagementService.java | 8 +-
.../org/apache/cassandra/service/StorageProxy.java | 16 +-
.../apache/cassandra/service/StorageService.java | 20 +-
.../cassandra/service/StorageServiceMBean.java | 6 +-
.../apache/cassandra/streaming/FileStreamTask.java | 4 +-
.../apache/cassandra/streaming/PendingFile.java | 16 +-
.../streaming/ReplicationFinishedVerbHandler.java | 8 +-
.../apache/cassandra/streaming/StreamHeader.java | 2 +-
.../org/apache/cassandra/streaming/StreamIn.java | 8 +-
.../org/apache/cassandra/streaming/StreamOut.java | 4 +-
.../cassandra/streaming/StreamOutSession.java | 4 +-
.../apache/cassandra/streaming/StreamReply.java | 8 +-
.../cassandra/streaming/StreamRequestMessage.java | 16 +-
.../streaming/StreamRequestVerbHandler.java | 2 +-
.../cassandra/streaming/StreamingService.java | 2 +-
.../cassandra/streaming/StreamingServiceMBean.java | 2 +-
.../apache/cassandra/thrift/CassandraDaemon.java | 28 ++--
.../apache/cassandra/thrift/CassandraServer.java | 56 +++---
.../apache/cassandra/thrift/CustomTHsHaServer.java | 34 ++--
.../cassandra/thrift/CustomTNonBlockingServer.java | 8 +-
.../cassandra/thrift/CustomTThreadPoolServer.java | 6 +-
.../org/apache/cassandra/thrift/RequestType.java | 8 +-
.../thrift/TCustomNonblockingServerSocket.java | 10 +-
.../cassandra/thrift/TCustomServerSocket.java | 10 +-
.../org/apache/cassandra/thrift/TCustomSocket.java | 48 ++--
.../apache/cassandra/thrift/ThriftValidation.java | 16 +-
src/java/org/apache/cassandra/tools/NodeCmd.java | 56 +++---
src/java/org/apache/cassandra/tools/NodeProbe.java | 46 ++--
.../org/apache/cassandra/tools/SSTableExport.java | 16 +-
.../org/apache/cassandra/tools/SSTableImport.java | 10 +-
src/java/org/apache/cassandra/utils/Allocator.java | 2 +-
.../cassandra/utils/BloomFilterSerializer.java | 8 +-
.../org/apache/cassandra/utils/ByteBufferUtil.java | 42 ++--
.../apache/cassandra/utils/BytesReadTracker.java | 4 +-
src/java/org/apache/cassandra/utils/CLibrary.java | 6 +-
.../apache/cassandra/utils/CloseableIterator.java | 8 +-
.../org/apache/cassandra/utils/DefaultDouble.java | 14 +-
.../org/apache/cassandra/utils/DefaultInteger.java | 16 +-
.../apache/cassandra/utils/EstimatedHistogram.java | 6 +-
.../org/apache/cassandra/utils/FBUtilities.java | 4 +-
.../cassandra/utils/FastByteComparisons.java | 6 +-
.../org/apache/cassandra/utils/GuidGenerator.java | 6 +-
src/java/org/apache/cassandra/utils/Hex.java | 8 +-
.../org/apache/cassandra/utils/IMergeIterator.java | 8 +-
.../cassandra/utils/IntervalTree/Interval.java | 8 +-
.../cassandra/utils/IntervalTree/IntervalNode.java | 8 +-
.../cassandra/utils/IntervalTree/IntervalTree.java | 8 +-
.../org/apache/cassandra/utils/LatencyTracker.java | 8 +-
.../utils/LegacyBloomFilterSerializer.java | 8 +-
.../org/apache/cassandra/utils/MerkleTree.java | 42 ++--
.../org/apache/cassandra/utils/MurmurHash.java | 4 +-
src/java/org/apache/cassandra/utils/Mx4jTool.java | 8 +-
src/java/org/apache/cassandra/utils/Pair.java | 4 +-
.../apache/cassandra/utils/ResourceWatcher.java | 10 +-
.../apache/cassandra/utils/SimpleCondition.java | 10 +-
.../cassandra/utils/SkipNullRepresenter.java | 8 +-
.../org/apache/cassandra/utils/SlabAllocator.java | 2 +-
.../org/apache/cassandra/utils/StatusLogger.java | 10 +-
src/java/org/apache/cassandra/utils/Throttle.java | 2 +-
src/java/org/apache/cassandra/utils/UUIDGen.java | 60 +++---
.../apache/cassandra/utils/WrappedRunnable.java | 8 +-
.../org/apache/cassandra/utils/obs/OpenBitSet.java | 16 +-
.../apache/cassandra/db/MeteredFlusherTest.java | 8 +-
.../cassandra/AbstractSerializationsTester.java | 18 +-
test/unit/org/apache/cassandra/EmbeddedServer.java | 12 +-
test/unit/org/apache/cassandra/SchemaLoader.java | 6 +-
test/unit/org/apache/cassandra/Util.java | 12 +-
.../apache/cassandra/cache/CacheProviderTest.java | 12 +-
test/unit/org/apache/cassandra/cli/CliTest.java | 2 +-
.../org/apache/cassandra/client/TestRingCache.java | 6 +-
.../DebuggableThreadPoolExecutorTest.java | 8 +-
.../cassandra/config/ColumnDefinitionTest.java | 8 +-
.../cassandra/config/DatabaseDescriptorTest.java | 2 +-
.../apache/cassandra/cql/jdbc/ClientUtilsTest.java | 8 +-
.../cassandra/db/ArrayBackedSortedColumnsTest.java | 8 +-
.../apache/cassandra/db/ColumnFamilyStoreTest.java | 104 ++++----
.../org/apache/cassandra/db/CommitLogTest.java | 4 +-
test/unit/org/apache/cassandra/db/DefsTest.java | 82 ++++----
.../unit/org/apache/cassandra/db/KeyCacheTest.java | 8 +-
.../org/apache/cassandra/db/MultitableTest.java | 8 +-
.../org/apache/cassandra/db/ReadMessageTest.java | 34 ++--
.../apache/cassandra/db/RecoveryManager2Test.java | 8 +-
.../apache/cassandra/db/RecoveryManager3Test.java | 8 +-
test/unit/org/apache/cassandra/db/ScrubTest.java | 40 ++--
.../apache/cassandra/db/SerializationsTest.java | 80 ++++----
.../org/apache/cassandra/db/SuperColumnTest.java | 4 +-
.../org/apache/cassandra/db/SystemTableTest.java | 8 +-
test/unit/org/apache/cassandra/db/TableTest.java | 34 ++--
.../cassandra/db/context/CounterContextTest.java | 12 +-
.../cassandra/db/marshal/DecimalTypeTest.java | 28 ++--
.../apache/cassandra/db/marshal/RoundTripTest.java | 30 ++--
.../cassandra/db/marshal/TimeUUIDTypeTest.java | 12 +-
.../cassandra/db/marshal/TypeCompareTest.java | 12 +-
.../cassandra/db/marshal/TypeValidationTest.java | 34 ++--
.../apache/cassandra/db/marshal/UUIDTypeTest.java | 8 +-
.../org/apache/cassandra/dht/BootStrapperTest.java | 30 ++--
.../apache/cassandra/dht/PartitionerTestCase.java | 6 +-
.../cassandra/dht/RandomPartitionerTest.java | 8 +-
.../apache/cassandra/gms/ArrivalWindowTest.java | 12 +-
.../org/apache/cassandra/gms/GossipDigestTest.java | 12 +-
.../apache/cassandra/gms/SerializationsTest.java | 26 +-
.../hadoop/ColumnFamilyInputFormatTest.java | 8 +-
.../cassandra/io/BloomFilterTrackerTest.java | 8 +-
.../apache/cassandra/io/CompactSerializerTest.java | 24 +-
.../cassandra/io/LazilyCompactedRowTest.java | 8 +-
.../cassandra/io/sstable/DescriptorTest.java | 8 +-
.../cassandra/io/sstable/SSTableReaderTest.java | 8 +-
.../apache/cassandra/locator/EC2SnitchTest.java | 14 +-
.../cassandra/locator/SimpleStrategyTest.java | 6 +-
.../apache/cassandra/net/MessageSerializer.java | 8 +-
.../service/AntiEntropyServiceCounterTest.java | 8 +-
.../service/AntiEntropyServiceStandardTest.java | 8 +-
.../service/AntiEntropyServiceTestAbstract.java | 6 +-
.../service/EmbeddedCassandraServiceTest.java | 2 +-
.../apache/cassandra/service/InitClientTest.java | 2 +-
.../apache/cassandra/service/RowResolverTest.java | 8 +-
.../cassandra/service/SerializationsTest.java | 20 +-
.../cassandra/streaming/SerializationsTest.java | 36 ++--
.../org/apache/cassandra/streaming/StreamUtil.java | 4 +-
.../cassandra/streaming/StreamingTransferTest.java | 8 +-
.../cassandra/thrift/ThriftValidationTest.java | 8 +-
.../apache/cassandra/tools/SSTableExportTest.java | 40 ++--
.../apache/cassandra/tools/SSTableImportTest.java | 4 +-
.../cassandra/utils/BoundedStatsDequeTest.java | 18 +-
.../apache/cassandra/utils/FBUtilitiesTest.java | 4 +-
test/unit/org/apache/cassandra/utils/HexTest.java | 2 +-
.../org/apache/cassandra/utils/IntervalTest.java | 8 +-
.../apache/cassandra/utils/IntervalTreeTest.java | 8 +-
.../cassandra/utils/LegacyBloomFilterTest.java | 2 +-
.../apache/cassandra/utils/MergeIteratorTest.java | 6 +-
.../org/apache/cassandra/utils/MerkleTreeTest.java | 30 ++--
.../apache/cassandra/utils/SerializationsTest.java | 30 ++--
.../unit/org/apache/cassandra/utils/UUIDTests.java | 10 +-
.../stress/operations/CqlCounterAdder.java | 8 +-
.../stress/operations/CqlCounterGetter.java | 8 +-
.../stress/operations/CqlIndexedRangeSlicer.java | 8 +-
.../cassandra/stress/operations/CqlInserter.java | 20 +-
.../stress/operations/CqlMultiGetter.java | 8 +-
.../stress/operations/CqlRangeSlicer.java | 12 +-
.../cassandra/stress/operations/CqlReader.java | 8 +-
409 files changed, 2680 insertions(+), 2680 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java b/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java
index e2a2a6c..bbe44e4 100644
--- a/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java
+++ b/src/java/org/apache/cassandra/auth/AllowAllAuthenticator.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.auth;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.auth;
* 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.
- *
+ *
*/
import java.util.Map;
@@ -38,7 +38,7 @@ public class AllowAllAuthenticator implements IAuthenticator
{
return USER;
}
-
+
public void validateConfiguration() throws ConfigurationException
{
// pass
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/auth/AllowAllAuthority.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/AllowAllAuthority.java b/src/java/org/apache/cassandra/auth/AllowAllAuthority.java
index c2622da..f41e00f 100644
--- a/src/java/org/apache/cassandra/auth/AllowAllAuthority.java
+++ b/src/java/org/apache/cassandra/auth/AllowAllAuthority.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.auth;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.auth;
* 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.
- *
+ *
*/
import java.util.EnumSet;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/auth/AuthenticatedUser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/AuthenticatedUser.java b/src/java/org/apache/cassandra/auth/AuthenticatedUser.java
index ccd5b4b..846810f 100644
--- a/src/java/org/apache/cassandra/auth/AuthenticatedUser.java
+++ b/src/java/org/apache/cassandra/auth/AuthenticatedUser.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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.auth;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/auth/IAuthenticator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/IAuthenticator.java b/src/java/org/apache/cassandra/auth/IAuthenticator.java
index 113a646..05e034f 100644
--- a/src/java/org/apache/cassandra/auth/IAuthenticator.java
+++ b/src/java/org/apache/cassandra/auth/IAuthenticator.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.auth;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.auth;
* 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.
- *
+ *
*/
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/auth/IAuthority.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/IAuthority.java b/src/java/org/apache/cassandra/auth/IAuthority.java
index 99bc49a..09ae175 100644
--- a/src/java/org/apache/cassandra/auth/IAuthority.java
+++ b/src/java/org/apache/cassandra/auth/IAuthority.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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.auth;
@@ -29,7 +29,7 @@ import org.apache.cassandra.config.ConfigurationException;
/**
* Cassandra's resource hierarchy looks something like:
* {{/cassandra/keyspaces/$ks_name/...}}
- *
+ *
* In table form:
* /cassandra/
* - no checked permissions
@@ -44,11 +44,11 @@ import org.apache.cassandra.config.ConfigurationException;
* - String
* * An individual keyspace: READ/WRITE permissions apply to the entire namespace and control the ability to both
* view and manipulate column families, and to read and write the data contained within.
- *
+ *
* Over time Cassandra _may_ add additional authorize calls for resources higher or lower in the hierarchy and
* IAuthority implementations should be able to handle these calls (although many will choose to ignore them
* completely).
- *
+ *
* NB: {{/cassandra/}} will not be checked for permissions via a call to IAuthority.authorize, so IAuthority
* implementations can only deny access when a user attempts to access an ancestor resource.
*/
@@ -57,7 +57,7 @@ public interface IAuthority
/**
* @param user An authenticated user from a previous call to IAuthenticator.authenticate.
* @param resource A List of Objects containing Strings and byte[]s: represents a resource in the hierarchy
- * described in the Javadocs.
+ * described in the Javadocs.
* @return An AccessLevel representing the permissions for the user and resource: should never return null.
*/
public EnumSet<Permission> authorize(AuthenticatedUser user, List<Object> resource);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/auth/Permission.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/Permission.java b/src/java/org/apache/cassandra/auth/Permission.java
index e968bac..4e48539 100644
--- a/src/java/org/apache/cassandra/auth/Permission.java
+++ b/src/java/org/apache/cassandra/auth/Permission.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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.auth;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/auth/Resources.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/Resources.java b/src/java/org/apache/cassandra/auth/Resources.java
index 06ff3bb..4fc03c7 100644
--- a/src/java/org/apache/cassandra/auth/Resources.java
+++ b/src/java/org/apache/cassandra/auth/Resources.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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.auth;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/AutoSavingCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index a605690..e2901a7 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -52,7 +52,7 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K
protected volatile ScheduledFuture<?> saveTask;
protected final CacheService.CacheType cacheType;
-
+
public AutoSavingCache(ICache<K, V> cache, CacheService.CacheType cacheType)
{
super(cache);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
index 4b5a795..8f4d2f0 100644
--- a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
+++ b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCache.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java
index 4352e12..851d4c5 100644
--- a/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java
+++ b/src/java/org/apache/cassandra/cache/ConcurrentLinkedHashCacheProvider.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
import org.apache.cassandra.db.ColumnFamily;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/FreeableMemory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/FreeableMemory.java b/src/java/org/apache/cassandra/cache/FreeableMemory.java
index 52189c8..0df1a6a 100644
--- a/src/java/org/apache/cassandra/cache/FreeableMemory.java
+++ b/src/java/org/apache/cassandra/cache/FreeableMemory.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
import java.util.concurrent.atomic.AtomicInteger;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/ICache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/ICache.java b/src/java/org/apache/cassandra/cache/ICache.java
index e0d0faf..48e045c 100644
--- a/src/java/org/apache/cassandra/cache/ICache.java
+++ b/src/java/org/apache/cassandra/cache/ICache.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/IRowCacheProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/IRowCacheProvider.java b/src/java/org/apache/cassandra/cache/IRowCacheProvider.java
index 3411350..9209ced 100644
--- a/src/java/org/apache/cassandra/cache/IRowCacheProvider.java
+++ b/src/java/org/apache/cassandra/cache/IRowCacheProvider.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
import org.apache.cassandra.db.ColumnFamily;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/InstrumentingCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/InstrumentingCache.java b/src/java/org/apache/cassandra/cache/InstrumentingCache.java
index a3c34ae..36630ac 100644
--- a/src/java/org/apache/cassandra/cache/InstrumentingCache.java
+++ b/src/java/org/apache/cassandra/cache/InstrumentingCache.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/SerializingCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/SerializingCache.java b/src/java/org/apache/cassandra/cache/SerializingCache.java
index b9506ac..b8844cb 100644
--- a/src/java/org/apache/cassandra/cache/SerializingCache.java
+++ b/src/java/org/apache/cassandra/cache/SerializingCache.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
@@ -45,7 +45,7 @@ public class SerializingCache<K, V> implements ICache<K, V>
{
private static final Logger logger = LoggerFactory.getLogger(SerializingCache.class);
private static final int DEFAULT_CONCURENCY_LEVEL = 64;
-
+
private final ConcurrentLinkedHashMap<K, FreeableMemory> map;
private final ISerializer<V> serializer;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java b/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java
index af65321..f71684b 100644
--- a/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java
+++ b/src/java/org/apache/cassandra/cache/SerializingCacheProvider.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.cache;
* 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.
- *
+ *
*/
import org.apache.cassandra.db.ColumnFamily;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index f9bbd42..a4641b6 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -187,7 +187,7 @@ public class CliClient
sessionState.out.println(getHelp().banner);
}
- // Execute a CLI Statement
+ // Execute a CLI Statement
public void executeCLIStatement(String statement) throws CharacterCodingException, TException, TimedOutException, NotFoundException, NoSuchFieldException, InvalidRequestException, UnavailableException, InstantiationException, IllegalAccessException, ClassNotFoundException, SchemaDisagreementException
{
Tree tree = CliCompiler.compileQuery(statement);
@@ -301,14 +301,14 @@ public class CliClient
CliMain.disconnect();
System.exit(0);
}
-
+
public KsDef getKSMetaData(String keyspace)
throws NotFoundException, InvalidRequestException, TException
{
// Lazily lookup keyspace meta-data.
if (!(keyspacesMap.containsKey(keyspace)))
keyspacesMap.put(keyspace, thriftClient.describe_keyspace(keyspace));
-
+
return keyspacesMap.get(keyspace);
}
@@ -342,9 +342,9 @@ public class CliClient
String columnFamily = CliCompiler.getColumnFamily(columnFamilySpec, keyspacesMap.get(keySpace).cf_defs);
int columnSpecCnt = CliCompiler.numColumnSpecifiers(columnFamilySpec);
-
+
ColumnParent colParent = new ColumnParent(columnFamily).setSuper_column((ByteBuffer) null);
-
+
if (columnSpecCnt != 0)
{
Tree columnTree = columnFamilySpec.getChild(2);
@@ -362,8 +362,8 @@ public class CliClient
int count = thriftClient.get_count(getKeyAsBytes(columnFamily, columnFamilySpec.getChild(1)), colParent, predicate, consistencyLevel);
sessionState.out.printf("%d columns%n", count);
}
-
- private void executeDelete(Tree statement)
+
+ private void executeDelete(Tree statement)
throws TException, InvalidRequestException, UnavailableException, TimedOutException
{
if (!CliMain.isConnected() || !hasKeySpace())
@@ -380,7 +380,7 @@ public class CliClient
byte[] superColumnName = null;
byte[] columnName = null;
boolean isSuper = cfDef.column_type.equals("Super");
-
+
if ((columnSpecCnt < 0) || (columnSpecCnt > 2))
{
sessionState.out.println("Invalid row, super column, or column specification.");
@@ -445,7 +445,7 @@ public class CliClient
private void doSlice(String keyspace, ByteBuffer key, String columnFamily, byte[] superColumnName, int limit)
throws InvalidRequestException, UnavailableException, TimedOutException, TException, IllegalAccessException, NotFoundException, InstantiationException, NoSuchFieldException
{
-
+
long startTime = System.currentTimeMillis();
ColumnParent parent = new ColumnParent(columnFamily);
if(superColumnName != null)
@@ -475,7 +475,7 @@ public class CliClient
validator.getString(col.value), col.timestamp,
col.isSetTtl() ? String.format(", ttl=%d", col.getTtl()) : "");
}
-
+
sessionState.out.println(")");
}
else if (cosc.isSetColumn())
@@ -514,7 +514,7 @@ public class CliClient
sessionState.out.printf("=> (counter=%s, value=%s)%n", formattedName, column.value);
}
}
-
+
sessionState.out.println("Returned " + columns.size() + " results.");
elapsedTime(startTime);
}
@@ -557,7 +557,7 @@ public class CliClient
int columnSpecCnt = CliCompiler.numColumnSpecifiers(columnFamilySpec);
CfDef cfDef = getCfDef(columnFamily);
boolean isSuper = cfDef.column_type.equals("Super");
-
+
byte[] superColumnName = null;
ByteBuffer columnName;
@@ -647,7 +647,7 @@ public class CliClient
return;
}
- byte[] columnValue = column.getValue();
+ byte[] columnValue = column.getValue();
String valueAsString;
// we have ^(CONVERT_TO_TYPE <type>) inside of GET statement
@@ -725,7 +725,7 @@ public class CliClient
String columnFamily = CliCompiler.getColumnFamily(statement, keyspacesMap.get(keySpace).cf_defs);
// ^(CONDITIONS ^(CONDITION $column $value) ...)
Tree conditions = statement.getChild(1);
-
+
// fetching column family definition
CfDef columnFamilyDef = getCfDef(columnFamily);
@@ -785,8 +785,8 @@ public class CliClient
{
throw new IllegalArgumentException("LIMIT should be greater than zero.");
}
-
- clause.setCount(limitValue);
+
+ clause.setCount(limitValue);
}
try
@@ -812,7 +812,7 @@ public class CliClient
{
if (!CliMain.isConnected() || !hasKeySpace())
return;
-
+
long startTime = System.currentTimeMillis();
// ^(NODE_COLUMN_ACCESS <cf> <key> <column>)
Tree columnFamilySpec = statement.getChild(0);
@@ -869,7 +869,7 @@ public class CliClient
parent.setSuper_column(superColumnName);
Column columnToInsert = new Column(columnName).setValue(columnValueInBytes).setTimestamp(FBUtilities.timestampMicros());
-
+
// children count = 3 mean that we have ttl in arguments
if (statement.getChildCount() == 3)
{
@@ -908,7 +908,7 @@ public class CliClient
String columnFamily = CliCompiler.getColumnFamily(columnFamilySpec, keyspacesMap.get(keySpace).cf_defs);
ByteBuffer key = getKeyAsBytes(columnFamily, columnFamilySpec.getChild(1));
int columnSpecCnt = CliCompiler.numColumnSpecifiers(columnFamilySpec);
-
+
byte[] superColumnName = null;
ByteBuffer columnName;
@@ -967,7 +967,7 @@ public class CliClient
{
if (!CliMain.isConnected())
return;
-
+
sessionState.out.println(thriftClient.describe_cluster_name());
}
@@ -980,7 +980,7 @@ public class CliClient
if (!CliMain.isConnected())
return;
-
+
// first value is the keyspace name, after that it is all key=value
String keyspaceName = statement.getChild(0).getText();
KsDef ksDef = new KsDef(keyspaceName, DEFAULT_PLACEMENT_STRATEGY, new LinkedList<CfDef>());
@@ -1108,9 +1108,9 @@ public class CliClient
{
KsDef ksDef = new KsDef(ksDefToUpdate);
- // removing all column definitions - thrift system_update_keyspace method requires that
+ // removing all column definitions - thrift system_update_keyspace method requires that
ksDef.setCf_defs(new LinkedList<CfDef>());
-
+
for(int i = 1; i < statement.getChildCount(); i += 2)
{
String currentStatement = statement.getChild(i).getText().toUpperCase();
@@ -1119,7 +1119,7 @@ public class CliClient
switch(mArgument)
{
- case PLACEMENT_STRATEGY:
+ case PLACEMENT_STRATEGY:
ksDef.setStrategy_class(CliUtils.unescapeSQLString(mValue));
break;
case STRATEGY_OPTIONS:
@@ -1152,7 +1152,7 @@ public class CliClient
return ksDef;
}
-
+
/**
* Update column family definition attributes
* @param statement - ANTLR tree representing current statement
@@ -1258,7 +1258,7 @@ public class CliClient
* @throws TException - exception
* @throws InvalidRequestException - exception
* @throws NotFoundException - exception
- * @throws SchemaDisagreementException
+ * @throws SchemaDisagreementException
*/
private void executeDelKeySpace(Tree statement)
throws TException, InvalidRequestException, NotFoundException, SchemaDisagreementException
@@ -1270,7 +1270,7 @@ public class CliClient
String version = thriftClient.system_drop_keyspace(keyspaceName);
sessionState.out.println(version);
validateSchemaIsSettled(version);
-
+
if (keyspaceName.equals(keySpace)) //we just deleted the keyspace we were authenticated too
keySpace = null;
}
@@ -1281,9 +1281,9 @@ public class CliClient
* @throws TException - exception
* @throws InvalidRequestException - exception
* @throws NotFoundException - exception
- * @throws SchemaDisagreementException
+ * @throws SchemaDisagreementException
*/
- private void executeDelColumnFamily(Tree statement)
+ private void executeDelColumnFamily(Tree statement)
throws TException, InvalidRequestException, NotFoundException, SchemaDisagreementException
{
if (!CliMain.isConnected() || !hasKeySpace())
@@ -1414,7 +1414,7 @@ public class CliClient
if (!CliMain.isConnected() || !hasKeySpace())
return;
- // getting CfDef, it will fail if there is no such column family in current keySpace.
+ // getting CfDef, it will fail if there is no such column family in current keySpace.
CfDef cfDef = getCfDef(CliCompiler.getColumnFamily(columnFamily, keyspacesMap.get(keySpace).cf_defs));
thriftClient.truncate(cfDef.getName());
@@ -1513,7 +1513,7 @@ public class CliClient
{
if (!CliMain.isConnected())
return;
-
+
sessionState.out.println(thriftClient.describe_version());
}
@@ -1790,34 +1790,34 @@ public class CliClient
* Returns true if this.keySpace is set, false otherwise
* @return boolean
*/
- private boolean hasKeySpace()
+ private boolean hasKeySpace()
{
if (keySpace == null)
{
sessionState.out.println("Not authenticated to a working keyspace.");
return false;
}
-
+
return true;
}
-
- public String getKeySpace()
+
+ public String getKeySpace()
{
return keySpace == null ? "unknown" : keySpace;
}
-
- public void setKeySpace(String keySpace) throws NotFoundException, InvalidRequestException, TException
+
+ public void setKeySpace(String keySpace) throws NotFoundException, InvalidRequestException, TException
{
this.keySpace = keySpace;
// We do nothing with the return value, but it hits a cache and the tab-completer.
getKSMetaData(keySpace);
}
-
- public String getUsername()
+
+ public String getUsername()
{
return username == null ? "default" : username;
}
-
+
public void setUsername(String username)
{
this.username = username;
@@ -1840,14 +1840,14 @@ public class CliClient
username = statement.getChild(1).getText();
password = statement.getChild(2).getText();
}
-
+
if (keySpaceName == null)
{
sessionState.out.println("Keyspace argument required");
return;
}
-
- try
+
+ try
{
AuthenticationRequest authRequest;
Map<String, String> credentials = new HashMap<String, String>();
@@ -1856,7 +1856,7 @@ public class CliClient
thriftClient.set_keyspace(keySpaceName);
- if (username != null && password != null)
+ if (username != null && password != null)
{
/* remove quotes */
password = password.replace("\'", "");
@@ -1865,19 +1865,19 @@ public class CliClient
authRequest = new AuthenticationRequest(credentials);
thriftClient.login(authRequest);
}
-
+
keySpace = keySpaceName;
this.username = username != null ? username : "default";
-
+
CliMain.updateCompletor(CliUtils.getCfNamesByKeySpace(getKSMetaData(keySpace)));
sessionState.out.println("Authenticated to keyspace: " + keySpace);
- }
- catch (AuthenticationException e)
+ }
+ catch (AuthenticationException e)
{
sessionState.err.println("Exception during authentication to the cassandra node: " +
"verify keyspace exists, and you are using correct credentials.");
- }
- catch (AuthorizationException e)
+ }
+ catch (AuthorizationException e)
{
sessionState.err.println("You are not authorized to use keyspace: " + keySpaceName);
}
@@ -1888,8 +1888,8 @@ public class CliClient
catch (NotFoundException e)
{
sessionState.err.println(keySpaceName + " does not exist.");
- }
- catch (TException e)
+ }
+ catch (TException e)
{
if (sessionState.debug)
e.printStackTrace(sessionState.err);
@@ -2145,12 +2145,12 @@ public class CliClient
int portNumber = Integer.parseInt(statement.getChild(1).getText());
StringBuilder hostName = new StringBuilder();
- int idCount = idList.getChildCount();
+ int idCount = idList.getChildCount();
for (int idx = 0; idx < idCount; idx++)
{
hostName.append(idList.getChild(idx).getText());
}
-
+
// disconnect current connection, if any.
// This is a no-op, if you aren't currently connected.
CliMain.disconnect();
@@ -2172,13 +2172,13 @@ public class CliClient
/**
* To get Column Family Definition object from specified keyspace
* @param keySpaceName key space name to search for specific column family
- * @param columnFamilyName column family name
+ * @param columnFamilyName column family name
* @return CfDef - Column family definition object
*/
private CfDef getCfDef(String keySpaceName, String columnFamilyName)
{
KsDef keySpaceDefinition = keyspacesMap.get(keySpaceName);
-
+
for (CfDef columnFamilyDef : keySpaceDefinition.cf_defs)
{
if (columnFamilyDef.name.equals(columnFamilyName))
@@ -2213,24 +2213,24 @@ public class CliClient
/**
* Used to parse meta tree and compile meta attributes into List<ColumnDef>
- * @param cfDef - column family definition
+ * @param cfDef - column family definition
* @param meta (Tree representing Array of the hashes with metadata attributes)
* @return List<ColumnDef> List of the ColumnDef's
- *
+ *
* meta is in following format - ^(ARRAY ^(HASH ^(PAIR .. ..) ^(PAIR .. ..)) ^(HASH ...))
*/
private List<ColumnDef> getCFColumnMetaFromTree(CfDef cfDef, Tree meta)
{
// this list will be returned
List<ColumnDef> columnDefinitions = new ArrayList<ColumnDef>();
-
+
// each child node is a ^(HASH ...)
for (int i = 0; i < meta.getChildCount(); i++)
{
Tree metaHash = meta.getChild(i);
ColumnDef columnDefinition = new ColumnDef();
-
+
// each child node is ^(PAIR $key $value)
for (int j = 0; j < metaHash.getChildCount(); j++)
{
@@ -2262,11 +2262,11 @@ public class CliClient
}
else if (metaKey.equals("index_name"))
{
- columnDefinition.setIndex_name(metaVal);
+ columnDefinition.setIndex_name(metaVal);
}
}
- // validating columnDef structure, 'name' and 'validation_class' must be set
+ // validating columnDef structure, 'name' and 'validation_class' must be set
try
{
columnDefinition.validate();
@@ -2284,7 +2284,7 @@ public class CliClient
/**
* Getting IndexType object from indexType string
- * @param indexTypeAsString - string return by parser corresponding to IndexType
+ * @param indexTypeAsString - string return by parser corresponding to IndexType
* @return IndexType - an IndexType object
*/
private IndexType getIndexTypeFromString(String indexTypeAsString)
@@ -2336,14 +2336,14 @@ public class CliClient
throw new RuntimeException(e);
}
}
-
+
/**
* Converts column name into byte[] according to comparator type
* @param column - column name from parser
* @param columnFamily - column family name from parser
* @return ByteBuffer - bytes into which column name was converted according to comparator type
*/
- private ByteBuffer columnNameAsBytes(String column, String columnFamily)
+ private ByteBuffer columnNameAsBytes(String column, String columnFamily)
{
CfDef columnFamilyDef = getCfDef(columnFamily);
return columnNameAsBytes(column, columnFamilyDef);
@@ -2354,7 +2354,7 @@ public class CliClient
* @param columnFamilyDef - column family from parser
* @return ByteBuffer bytes - into which column name was converted according to comparator type
*/
- private ByteBuffer columnNameAsBytes(String column, CfDef columnFamilyDef)
+ private ByteBuffer columnNameAsBytes(String column, CfDef columnFamilyDef)
{
String comparatorClass = columnFamilyDef.comparator_type;
return getBytesAccordingToType(column, getFormatType(comparatorClass));
@@ -2400,7 +2400,7 @@ public class CliClient
* @param columnFamilyDef - column family from parser
* @return ByteBuffer bytes - into which column name was converted according to comparator type
*/
- private ByteBuffer subColumnNameAsBytes(String superColumn, CfDef columnFamilyDef)
+ private ByteBuffer subColumnNameAsBytes(String superColumn, CfDef columnFamilyDef)
{
String comparatorClass = columnFamilyDef.subcomparator_type;
@@ -2466,7 +2466,7 @@ public class CliClient
private AbstractType<?> getValidatorForValue(CfDef ColumnFamilyDef, byte[] columnNameInBytes)
{
String defaultValidator = ColumnFamilyDef.default_validation_class;
-
+
for (ColumnDef columnDefinition : ColumnFamilyDef.getColumn_metadata())
{
byte[] nameInBytes = columnDefinition.getName();
@@ -2477,7 +2477,7 @@ public class CliClient
}
}
- if (defaultValidator != null && !defaultValidator.isEmpty())
+ if (defaultValidator != null && !defaultValidator.isEmpty())
{
return getFormatType(defaultValidator);
}
@@ -2516,7 +2516,7 @@ public class CliClient
// current $value
String val = CliUtils.unescapeSQLString(optionPair.getChild(1).getText());
- strategyOptions.put(key, val);
+ strategyOptions.put(key, val);
}
return strategyOptions;
@@ -2526,15 +2526,15 @@ public class CliClient
* Used to convert value (function argument, string) into byte[]
* calls convertValueByFunction method with "withUpdate" set to false
* @param functionCall - tree representing function call ^(FUNCTION_CALL function_name value)
- * @param columnFamily - column family definition (CfDef)
+ * @param columnFamily - column family definition (CfDef)
* @param columnName - also updates column family metadata for given column
- * @return byte[] - string value as byte[]
+ * @return byte[] - string value as byte[]
*/
private ByteBuffer convertValueByFunction(Tree functionCall, CfDef columnFamily, ByteBuffer columnName)
{
return convertValueByFunction(functionCall, columnFamily, columnName, false);
}
-
+
/**
* Used to convert value (function argument, string) into byte[]
* @param functionCall - tree representing function call ^(FUNCTION_CALL function_name value)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cli/CliCompiler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliCompiler.java b/src/java/org/apache/cassandra/cli/CliCompiler.java
index d07e408..5a0252d 100644
--- a/src/java/org/apache/cassandra/cli/CliCompiler.java
+++ b/src/java/org/apache/cassandra/cli/CliCompiler.java
@@ -36,7 +36,7 @@ public class CliCompiler
// of the ANTLRStringStream class. Note: This doesn't change the
// token text-- but just relaxes the matching rules to match
// in upper case. [Logic borrowed from Hive code.]
- //
+ //
// Also see discussion on this topic in:
// http://www.antlr.org/wiki/pages/viewpage.action?pageId=1782.
public static class ANTLRNoCaseStringStream extends ANTLRStringStream
@@ -45,15 +45,15 @@ public class CliCompiler
{
super(input);
}
-
+
public int LA(int i)
{
int returnChar = super.LA(i);
if (returnChar == CharStream.EOF)
{
- return returnChar;
+ return returnChar;
}
- else if (returnChar == 0)
+ else if (returnChar == 0)
{
return returnChar;
}
@@ -65,7 +65,7 @@ public class CliCompiler
public static Tree compileQuery(String query)
{
Tree queryTree;
-
+
try
{
ANTLRStringStream input = new ANTLRNoCaseStringStream(query);
@@ -87,7 +87,7 @@ public class CliCompiler
// if there was an exception we don't want to process request any further
throw new RuntimeException(e.getMessage(), e);
}
-
+
return queryTree;
}
/*
@@ -167,7 +167,7 @@ public class CliCompiler
public static String getColumn(Tree astNode, int pos)
{
// Skip over table, column family and rowKey
- return CliUtils.unescapeSQLString(astNode.getChild(pos + 2).getText());
+ return CliUtils.unescapeSQLString(astNode.getChild(pos + 2).getText());
}
-
+
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cli/CliCompleter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliCompleter.java b/src/java/org/apache/cassandra/cli/CliCompleter.java
index 6f4e583..7384131 100644
--- a/src/java/org/apache/cassandra/cli/CliCompleter.java
+++ b/src/java/org/apache/cassandra/cli/CliCompleter.java
@@ -38,7 +38,7 @@ public class CliCompleter extends SimpleCompletor
"rename keyspace",
"rename column family",
"consistencylevel",
-
+
"help connect",
"help describe keyspace",
"help exit",
@@ -77,7 +77,7 @@ public class CliCompleter extends SimpleCompletor
{
super(commands);
}
-
+
String[] getKeyspaceCommands()
{
return keyspaceCommands;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cli/CliMain.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliMain.java b/src/java/org/apache/cassandra/cli/CliMain.java
index 5d2e633..2d900ba 100644
--- a/src/java/org/apache/cassandra/cli/CliMain.java
+++ b/src/java/org/apache/cassandra/cli/CliMain.java
@@ -66,7 +66,7 @@ public class CliMain
{
transport = new TFramedTransport(socket);
}
- else
+ else
{
transport = socket;
}
@@ -88,7 +88,7 @@ public class CliMain
thriftClient = cassandraClient;
cliClient = new CliClient(sessionState, thriftClient);
-
+
if ((sessionState.username != null) && (sessionState.password != null))
{
// Authenticate
@@ -121,7 +121,7 @@ public class CliMain
return;
}
}
-
+
if (sessionState.keyspace != null)
{
try
@@ -192,7 +192,7 @@ public class CliMain
}
return true;
}
-
+
public static void updateCompletor(Set<String> candidates)
{
Set<String> actions = new HashSet<String>();
@@ -201,9 +201,9 @@ public class CliMain
for (String cmd : completer.getKeyspaceCommands())
actions.add(String.format("%s %s", cmd, cf));
}
-
+
String[] strs = Arrays.copyOf(actions.toArray(), actions.toArray().length, String[].class);
-
+
completer.setCandidateStrings(strs);
}
@@ -252,14 +252,14 @@ public class CliMain
{
try
{
- connect(sessionState.hostName, sessionState.thriftPort);
+ connect(sessionState.hostName, sessionState.thriftPort);
}
catch (RuntimeException e)
{
sessionState.err.println(e.getMessage());
}
}
-
+
if ( cliClient == null )
{
// Connection parameter was either invalid or not present.
@@ -287,12 +287,12 @@ public class CliMain
}
ConsoleReader reader = new ConsoleReader();
-
+
if (!sessionState.batch)
{
reader.addCompletor(completer);
reader.setBellEnabled(false);
-
+
String historyFile = System.getProperty("user.home") + File.separator + HISTORYFILE;
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cli/CliSessionState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliSessionState.java b/src/java/org/apache/cassandra/cli/CliSessionState.java
index 4156f22..9f956fd 100644
--- a/src/java/org/apache/cassandra/cli/CliSessionState.java
+++ b/src/java/org/apache/cassandra/cli/CliSessionState.java
@@ -31,7 +31,7 @@ public class CliSessionState
public String hostName; // cassandra server name
public int thriftPort; // cassandra server's thrift port
- public boolean framed = true; // cassandra server's framed transport
+ public boolean framed = true; // cassandra server's framed transport
public boolean debug = false; // print stack traces when errors occur in the CLI
public String username; // cassandra login name (if SimpleAuthenticator is used)
public String password; // cassandra login password (if SimpleAuthenticator is used)
@@ -57,7 +57,7 @@ public class CliSessionState
public void setOut(PrintStream newOut)
{
- this.out = newOut;
+ this.out = newOut;
}
public void setErr(PrintStream newErr)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/cli/CliUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliUtils.java b/src/java/org/apache/cassandra/cli/CliUtils.java
index 4797f28..a8e883b 100644
--- a/src/java/org/apache/cassandra/cli/CliUtils.java
+++ b/src/java/org/apache/cassandra/cli/CliUtils.java
@@ -9,7 +9,7 @@ import org.apache.cassandra.thrift.IndexOperator;
import org.apache.cassandra.thrift.KsDef;
import org.apache.commons.lang.StringEscapeUtils;
/*
- *
+ *
* 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
@@ -17,16 +17,16 @@ import org.apache.commons.lang.StringEscapeUtils;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/client/RingCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/client/RingCache.java b/src/java/org/apache/cassandra/client/RingCache.java
index 9b28a83..28c44ba 100644
--- a/src/java/org/apache/cassandra/client/RingCache.java
+++ b/src/java/org/apache/cassandra/client/RingCache.java
@@ -62,12 +62,12 @@ public class RingCache
public void refreshEndpointMap()
{
try {
-
+
Cassandra.Client client = ConfigHelper.getClientFromOutputAddressList(conf);
List<TokenRange> ring = client.describe_ring(ConfigHelper.getOutputKeyspace(conf));
rangeMap = ArrayListMultimap.create();
-
+
for (TokenRange range : ring)
{
Token<?> left = partitioner.getTokenFactory().fromString(range.start_token);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java b/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java
index d08c9b3..2858570 100644
--- a/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java
+++ b/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java
@@ -32,27 +32,27 @@ import java.util.concurrent.TimeoutException;
*
* @param <V>
*/
-public class CreationTimeAwareFuture<V> implements Future<V>
+public class CreationTimeAwareFuture<V> implements Future<V>
{
private long creationTime = System.currentTimeMillis();
private Future<V> future;
- public CreationTimeAwareFuture(Future<V> future)
+ public CreationTimeAwareFuture(Future<V> future)
{
this.future = future;
creationTime = System.currentTimeMillis();
}
- public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
+ public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
{
timeout = unit.toMillis(timeout);
long overallTimeout = timeout - (System.currentTimeMillis() - creationTime);
return future.get(overallTimeout, TimeUnit.MILLISECONDS);
}
- public boolean cancel(boolean mayInterruptIfRunning)
+ public boolean cancel(boolean mayInterruptIfRunning)
{
return future.cancel(mayInterruptIfRunning);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java b/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java
index fcbaf67..fb8d9e0 100644
--- a/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.concurrent;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.concurrent;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java b/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
index 29a457a..74b2ad9 100644
--- a/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.concurrent;
/*
- *
+ *
* 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
@@ -8,16 +8,16 @@ package org.apache.cassandra.concurrent;
* 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.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java b/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java
index dbcd641..65b3af9 100644
--- a/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java
@@ -21,17 +21,17 @@ package org.apache.cassandra.concurrent;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.TimeUnit;
-public class JMXConfigurableThreadPoolExecutor extends JMXEnabledThreadPoolExecutor implements JMXConfigurableThreadPoolExecutorMBean
+public class JMXConfigurableThreadPoolExecutor extends JMXEnabledThreadPoolExecutor implements JMXConfigurableThreadPoolExecutorMBean
{
public JMXConfigurableThreadPoolExecutor(int corePoolSize,
long keepAliveTime,
TimeUnit unit,
- BlockingQueue<Runnable> workQueue,
+ BlockingQueue<Runnable> workQueue,
NamedThreadFactory threadFactory,
String jmxPath)
{
super(corePoolSize, keepAliveTime, unit, workQueue, threadFactory, jmxPath);
}
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java b/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java
index 8fd7a31..b3ee971 100644
--- a/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/JMXEnabledThreadPoolExecutor.java
@@ -29,7 +29,7 @@ import javax.management.ObjectName;
/**
* This is a wrapper class for the <i>ScheduledThreadPoolExecutor</i>. It provides an implementation
- * for the <i>afterExecute()</i> found in the <i>ThreadPoolExecutor</i> class to log any unexpected
+ * for the <i>afterExecute()</i> found in the <i>ThreadPoolExecutor</i> class to log any unexpected
* Runtime Exceptions.
*/
@@ -64,7 +64,7 @@ public class JMXEnabledThreadPoolExecutor extends DebuggableThreadPoolExecutor i
{
this(corePoolSize, corePoolSize, keepAliveTime, unit, workQueue, threadFactory, jmxPath);
}
-
+
public JMXEnabledThreadPoolExecutor(int corePoolSize,
int maxPoolSize,
long keepAliveTime,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/07cdfd07/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java b/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java
index a60a0d5..3765601 100644
--- a/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java
+++ b/src/java/org/apache/cassandra/concurrent/NamedThreadFactory.java
@@ -22,8 +22,8 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * This class is an implementation of the <i>ThreadFactory</i> interface. This
- * is useful to give Java threads meaningful names which is useful when using
+ * This class is an implementation of the <i>ThreadFactory</i> interface. This
+ * is useful to give Java threads meaningful names which is useful when using
* a tool like JConsole.
*/
@@ -46,7 +46,7 @@ public class NamedThreadFactory implements ThreadFactory
}
public Thread newThread(Runnable runnable)
- {
+ {
String name = id + ":" + n.getAndIncrement();
Thread thread = new Thread(runnable, name);
thread.setPriority(priority);