You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by vi...@apache.org on 2012/02/14 19:50:38 UTC
[1/2] git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Updated Branches:
refs/heads/trunk e533b9fd8 -> d56d74052
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d56d7405
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d56d7405
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d56d7405
Branch: refs/heads/trunk
Commit: d56d74052eef7c6b8332c469e5d07c7314d4da56
Parents: 1ae32c9 e533b9f
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Tue Feb 14 10:50:25 2012 -0800
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Tue Feb 14 10:50:25 2012 -0800
----------------------------------------------------------------------
CHANGES.txt | 9 +-
examples/pig/test/populate-cli.txt | 67 +++
examples/pig/test/test_storage.pig | 22 +
src/java/org/apache/cassandra/config/Config.java | 11 +
.../cassandra/config/DatabaseDescriptor.java | 68 ++--
.../db/AbstractThreadUnsafeSortedColumns.java | 2 +-
.../apache/cassandra/db/AtomicSortedColumns.java | 4 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 4 +-
.../org/apache/cassandra/db/ISortedColumns.java | 8 +-
src/java/org/apache/cassandra/db/Table.java | 2 +-
.../cassandra/db/compaction/CompactionManager.java | 26 +-
.../apache/cassandra/hadoop/BulkRecordWriter.java | 28 +-
.../org/apache/cassandra/hadoop/ConfigHelper.java | 40 ++
.../cassandra/hadoop/pig/CassandraStorage.java | 310 ++++++++++-----
.../io/sstable/AbstractSSTableSimpleWriter.java | 10 +-
.../apache/cassandra/io/sstable/SSTableLoader.java | 8 +
.../io/sstable/SSTableSimpleUnsortedWriter.java | 20 +-
.../cassandra/io/sstable/SSTableSimpleWriter.java | 9 +-
.../cassandra/locator/NetworkTopologyStrategy.java | 2 +-
.../apache/cassandra/locator/TokenMetadata.java | 28 +-
.../apache/cassandra/service/StorageService.java | 37 +-
.../apache/cassandra/streaming/FileStreamTask.java | 8 +-
.../cassandra/streaming/StreamOutSession.java | 3 +-
src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +-
.../io/sstable/SSTableSimpleWriterTest.java | 5 +-
25 files changed, 518 insertions(+), 215 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d56d7405/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d56d7405/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d56d7405/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d56d7405/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------