cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [1/2] git commit: Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1
Date Mon, 21 May 2012 23:20:04 GMT
Updated Branches:
  refs/heads/cassandra-1.1 eef779635 -> 2236b1533


Merge branch 'cassandra-1.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2236b153
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2236b153
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2236b153

Branch: refs/heads/cassandra-1.1
Commit: 2236b1533cfefa20b30722dac21cc4a0d2da5d97
Parents: e515e4b eef7796
Author: Dave Brosius <dbrosius@apache.org>
Authored: Mon May 21 19:17:40 2012 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Mon May 21 19:17:40 2012 -0400

----------------------------------------------------------------------
 CHANGES.txt                                        |   89 +-
 NEWS.txt                                           |   70 +-
 NOTICE.txt                                         |    4 +
 bin/cqlsh                                          |  688 ++++++----
 build.xml                                          |    9 +-
 debian/cassandra.install                           |    1 +
 debian/changelog                                   |    6 +
 debian/rules                                       |    4 +
 examples/pig/test/populate-cli.txt                 |    6 +
 interface/cassandra.thrift                         |    5 +-
 .../org/apache/cassandra/thrift/Cassandra.java     |  352 +++---
 .../org/apache/cassandra/thrift/Constants.java     |    2 +-
 .../apache/cassandra/thrift/CqlPreparedResult.java |  139 ++-
 lib/concurrentlinkedhashmap-lru-1.2.jar            |  Bin 53011 -> 0 bytes
 lib/concurrentlinkedhashmap-lru-1.3.jar            |  Bin 0 -> 54345 bytes
 lib/licenses/snaptree-0.1-SNAPSHOT.txt             |  776 -----------
 lib/licenses/snaptree-0.1.txt                      |  776 +++++++++++
 pylib/cqlshlib/cql3handling.py                     |  805 +++++++++++
 pylib/cqlshlib/cqlhandling.py                      | 1037 +++++++--------
 pylib/cqlshlib/pylexotron.py                       |   30 +-
 pylib/cqlshlib/util.py                             |   74 +
 .../cassandra/cache/ConcurrentLinkedHashCache.java |   10 +-
 .../cache/ConcurrentLinkedHashCacheProvider.java   |    2 +-
 .../org/apache/cassandra/cache/FreeableMemory.java |    8 -
 src/java/org/apache/cassandra/cache/ICache.java    |    6 +-
 .../apache/cassandra/cache/IRowCacheProvider.java  |    2 +-
 .../apache/cassandra/cache/InstrumentingCache.java |    8 +-
 .../apache/cassandra/cache/SerializingCache.java   |    8 +-
 .../cassandra/cache/SerializingCacheProvider.java  |    2 +-
 .../concurrent/DebuggableThreadPoolExecutor.java   |   27 +-
 .../apache/cassandra/concurrent/StageManager.java  |   14 +-
 .../org/apache/cassandra/config/CFMetaData.java    |   43 +-
 src/java/org/apache/cassandra/config/Config.java   |    4 +-
 .../cassandra/config/DatabaseDescriptor.java       |    6 +-
 .../org/apache/cassandra/config/KSMetaData.java    |    2 +-
 src/java/org/apache/cassandra/config/Schema.java   |    2 +-
 .../org/apache/cassandra/cql/SelectStatement.java  |    2 -
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |   85 +-
 src/java/org/apache/cassandra/cql3/Cql.g           |  118 ++-
 .../org/apache/cassandra/cql3/QueryProcessor.java  |   19 +-
 src/java/org/apache/cassandra/cql3/Relation.java   |   13 +-
 src/java/org/apache/cassandra/cql3/Term.java       |   70 +-
 .../cql3/statements/AlterTableStatement.java       |   38 +-
 .../cassandra/cql3/statements/BatchStatement.java  |   16 +-
 .../statements/CreateColumnFamilyStatement.java    |   72 +-
 .../cassandra/cql3/statements/DeleteStatement.java |   13 +-
 .../cql3/statements/DropIndexStatement.java        |   17 +-
 .../cql3/statements/ModificationStatement.java     |    3 +
 .../cassandra/cql3/statements/ParsedStatement.java |    8 +-
 .../cassandra/cql3/statements/SelectStatement.java |  322 +++--
 .../cassandra/cql3/statements/UpdateStatement.java |   21 +-
 .../apache/cassandra/db/CollationController.java   |   50 +-
 src/java/org/apache/cassandra/db/ColumnFamily.java |    8 +-
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   54 +-
 src/java/org/apache/cassandra/db/DefsTable.java    |    2 +-
 src/java/org/apache/cassandra/db/Directories.java  |   33 +-
 src/java/org/apache/cassandra/db/Memtable.java     |   12 +-
 .../apache/cassandra/db/commitlog/CommitLog.java   |   19 +-
 .../cassandra/db/commitlog/CommitLogAllocator.java |    4 +
 .../cassandra/db/commitlog/CommitLogSegment.java   |    9 +-
 .../db/compaction/AbstractCompactionIterable.java  |   17 +-
 .../db/compaction/AbstractCompactionStrategy.java  |   23 +-
 .../db/compaction/CompactionIterable.java          |   20 +-
 .../cassandra/db/compaction/CompactionManager.java |   18 +-
 .../cassandra/db/compaction/CompactionTask.java    |   27 +-
 .../db/compaction/ICompactionScanner.java          |   34 +
 .../db/compaction/LeveledCompactionStrategy.java   |  133 ++-
 .../db/compaction/LeveledCompactionTask.java       |    5 +
 .../cassandra/db/compaction/LeveledManifest.java   |    5 +-
 .../db/compaction/ParallelCompactionIterable.java  |   24 +-
 .../apache/cassandra/db/index/keys/KeysIndex.java  |   19 +
 .../org/apache/cassandra/db/marshal/DateType.java  |   14 +-
 .../apache/cassandra/db/marshal/TimeUUIDType.java  |   27 +-
 .../org/apache/cassandra/dht/RangeStreamer.java    |    4 +
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |    3 +-
 .../cassandra/hadoop/pig/CassandraStorage.java     |    4 +-
 .../apache/cassandra/io/sstable/Descriptor.java    |   15 +-
 .../cassandra/io/sstable/SSTableMetadata.java      |    4 +-
 .../apache/cassandra/io/sstable/SSTableReader.java |    8 +-
 .../cassandra/io/sstable/SSTableScanner.java       |   13 +-
 src/java/org/apache/cassandra/io/util/Memory.java  |   14 -
 .../locator/AbstractReplicationStrategy.java       |    9 +
 .../apache/cassandra/locator/LocalStrategy.java    |    1 +
 .../apache/cassandra/locator/SimpleStrategy.java   |    3 +
 .../org/apache/cassandra/net/MessagingService.java |    7 +-
 .../cassandra/service/AntiEntropyService.java      |    4 +-
 .../org/apache/cassandra/service/CacheService.java |   20 +-
 .../cassandra/service/CacheServiceMBean.java       |   16 +-
 .../apache/cassandra/service/StorageService.java   |    8 +-
 .../cassandra/streaming/AbstractStreamSession.java |    5 +
 .../apache/cassandra/streaming/StreamHeader.java   |    5 +
 .../cassandra/streaming/StreamInSession.java       |   31 +-
 .../cassandra/streaming/StreamOutSession.java      |   22 +-
 src/java/org/apache/cassandra/tools/NodeCmd.java   |   42 +-
 .../cassandra/tools/SSTableMetadataViewer.java     |   75 ++
 .../org/apache/cassandra/utils/ByteBufferUtil.java |   10 +-
 src/java/org/apache/cassandra/utils/CLibrary.java  |    3 +-
 .../org/apache/cassandra/utils/FBUtilities.java    |    2 +-
 test/conf/cassandra.yaml                           |    1 +
 test/unit/org/apache/cassandra/SchemaLoader.java   |    9 +-
 .../apache/cassandra/cache/CacheProviderTest.java  |    2 +-
 .../apache/cassandra/cql/jdbc/JdbcDecimalTest.java |   21 +
 .../cassandra/db/CollationControllerTest.java      |   83 ++
 .../org/apache/cassandra/db/CommitLogTest.java     |    6 +-
 .../compaction/LeveledCompactionStrategyTest.java  |   87 ++
 .../cassandra/io/LazilyCompactedRowTest.java       |   14 +-
 .../cassandra/io/sstable/DescriptorTest.java       |    2 -
 .../cassandra/io/sstable/SSTableWriterTest.java    |   56 +
 tools/bin/cassandra-stress                         |   44 +
 tools/bin/cassandra-stress.bat                     |   31 +
 tools/bin/cassandra-stressd                        |   84 ++
 tools/bin/cassandra.in.sh                          |   42 +
 tools/bin/sstablemetadata                          |   46 +
 tools/bin/sstablemetadata.bat                      |   30 +
 tools/bin/stress                                   |   48 -
 tools/bin/stress.bat                               |   31 -
 tools/bin/stressd                                  |   84 --
 tools/stress/README.txt                            |   14 +-
 .../src/org/apache/cassandra/stress/Stress.java    |    9 +-
 .../org/apache/cassandra/stress/StressAction.java  |   34 +-
 120 files changed, 4890 insertions(+), 2607 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2236b153/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------


Mime
View raw message