[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-19 Thread yukim 
Updated Branches:
  refs/heads/cassandra-1.2 0207bdf5f - bebaf453c
  refs/heads/cassandra-1.2.0 620a4b7a4 - e7ae7c904
  refs/heads/trunk 9bc9853e2 - 8e7abe0ad


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 8e7abe0ada0ec3d06da99771a1c3af35e3affd52
Parents: 9bc9853 bebaf45
Author: Yuki Morishita yu...@apache.org
Authored: Wed Dec 19 12:43:42 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Dec 19 12:43:42 2012 -0600

--
 CHANGES.txt|1 +
 .../apache/cassandra/dht/Murmur3Partitioner.java   |   14 +++--
 .../apache/cassandra/dht/PartitionerTestCase.java  |   40 ++-
 3 files changed, 48 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e7abe0a/CHANGES.txt
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-18 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 63c5a9e2b - a6d4f7a4e
  refs/heads/cassandra-1.2.0 bc598b5a0 - d67816bee
  refs/heads/trunk 02c8e233b - 77fb2080f


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 77fb2080f3fb3a9c17e020656e186dbc23c03578
Parents: 02c8e23 a6d4f7a
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 18 14:32:32 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 18 14:32:32 2012 -0600

--
 CHANGES.txt|1 +
 .../apache/cassandra/service/StorageService.java   |   18 --
 2 files changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/77fb2080/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/77fb2080/src/java/org/apache/cassandra/service/StorageService.java
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-10 Thread slebresne 
Updated Branches:
  refs/heads/trunk b241bcd08 - 647ef5aeb


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 647ef5aeb3bd06018d5b7a50f756ce59f8e65fff
Parents: b241bcd df580d4
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Tue Dec 11 08:54:58 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Tue Dec 11 08:54:58 2012 +0100

--
 CHANGES.txt|1 +
 .../cassandra/cql3/statements/SelectStatement.java |2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/647ef5ae/CHANGES.txt
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-06 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.2 4154434cf - 12948f652
  refs/heads/cassandra-1.2.0 a90b310e6 - 7322f8238
  refs/heads/trunk 7fdd4ccbd - fa9c54ef6


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: fa9c54ef6e57a2a7bfe78f09063b2a922ff3cd9e
Parents: 7fdd4cc 12948f6
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Dec 6 08:25:55 2012 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Dec 6 08:25:55 2012 -0600

--
 .../org/apache/cassandra/config/CFMetaData.java|4 +-
 src/java/org/apache/cassandra/db/SystemTable.java  |   26 --
 .../apache/cassandra/service/StorageService.java   |4 ++-
 3 files changed, 27 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa9c54ef/src/java/org/apache/cassandra/config/CFMetaData.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa9c54ef/src/java/org/apache/cassandra/service/StorageService.java
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-06 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 32b842b13 - 8c1683345
  refs/heads/cassandra-1.2.0 b537567b3 - b4f369301
  refs/heads/trunk 6c3e437ab - ef379f280


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: ef379f280a4c181b1eb45717d970f6b30026cbec
Parents: 6c3e437 8c16833
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Dec 6 16:22:00 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Dec 6 16:22:00 2012 -0600

--
 .../apache/cassandra/service/MigrationManager.java |   17 --
 1 files changed, 5 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ef379f28/src/java/org/apache/cassandra/service/MigrationManager.java
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-04 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 b58e1b853 - d25182f0d
  refs/heads/cassandra-1.2.0 66026510d - 0d6990167
  refs/heads/trunk b57d25020 - bb229f25f


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: bb229f25f4585993fa8aff6467c501486a6492b2
Parents: b57d250 d25182f
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 14:49:22 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 14:49:22 2012 -0600

--
 .../apache/cassandra/service/MigrationManager.java |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb229f25/src/java/org/apache/cassandra/service/MigrationManager.java
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-04 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 d25182f0d - 6bd56cf04
  refs/heads/cassandra-1.2.0 0d6990167 - ffb2eba6c
  refs/heads/trunk bb229f25f - a6dd34a0b


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: a6dd34a0b9d20c54dafa416bcc5d2765afe3e28d
Parents: bb229f2 6bd56cf
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 14:56:50 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 14:56:50 2012 -0600

--
 CHANGES.txt |   35 ++-
 1 files changed, 10 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6dd34a0/CHANGES.txt
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-04 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 6bd56cf04 - 07c6ff1b3
  refs/heads/cassandra-1.2.0 ffb2eba6c - aaf9409f5
  refs/heads/trunk a6dd34a0b - 387b10226


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 387b10226d885dde467da3697c78299287911d7e
Parents: a6dd34a 07c6ff1
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 16:19:38 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 16:19:38 2012 -0600

--
 CHANGES.txt |   18 ++
 1 files changed, 10 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/387b1022/CHANGES.txt
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-04 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 07c6ff1b3 - dfc7b2753
  refs/heads/cassandra-1.2.0 aaf9409f5 - 8a96ec702
  refs/heads/trunk 387b10226 - 513f0a065


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 513f0a065311daaf4c47e18aa73bd926faf0cc80
Parents: 387b102 dfc7b27
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 21:46:07 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 21:46:07 2012 -0600

--
 CHANGES.txt|4 +++
 conf/cassandra.yaml|   15 +--
 src/java/org/apache/cassandra/config/Config.java   |   10 +++---
 .../cassandra/config/DatabaseDescriptor.java   |   20 +++---
 .../org/apache/cassandra/net/MessagingService.java |2 +-
 5 files changed, 27 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/513f0a06/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/513f0a06/conf/cassandra.yaml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/513f0a06/src/java/org/apache/cassandra/config/Config.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/513f0a06/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-04 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 dfc7b2753 - 0f7521526
  refs/heads/cassandra-1.2.0 8a96ec702 - 40e22489c
  refs/heads/trunk 513f0a065 - 19b96b5da


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 19b96b5da5e65a61338e3c601828039d0eda8bb4
Parents: 513f0a0 0f75215
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 21:58:32 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 21:58:32 2012 -0600

--
 test/conf/cassandra.yaml |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-12-04 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 0f7521526 - dc682de2e
  refs/heads/cassandra-1.2.0 40e22489c - 215813157
  refs/heads/trunk 19b96b5da - 47e6f3799


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 47e6f37994a3c43028cec5a8907f10144550d2b3
Parents: 19b96b5 dc682de
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Dec 4 23:18:18 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Dec 4 23:18:18 2012 -0600

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/config/CFMetaData.java|2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/47e6f379/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/47e6f379/src/java/org/apache/cassandra/config/CFMetaData.java
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-27 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 21f2094c7 - 9a58e7e2e
  refs/heads/cassandra-1.2.0 93738e312 - 7b4639ab2
  refs/heads/trunk d436aed39 - 555295017


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 555295017e9bd33f25e007e76d2003aa3a15ae8a
Parents: d436aed 9a58e7e
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 28 00:36:03 2012 +0900
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 28 00:36:03 2012 +0900

--
 .../apache/cassandra/io/sstable/SSTableReader.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-26 Thread slebresne 
Updated Branches:
  refs/heads/trunk 26834f0a4 - 352993e06


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 352993e06dbcb4b519d1139497d39d84bc655e29
Parents: 26834f0 6e21cad
Author: Sylvain Lebresne sylv...@datastax.com
Authored: Mon Nov 26 19:23:15 2012 +0100
Committer: Sylvain Lebresne sylv...@datastax.com
Committed: Mon Nov 26 19:23:15 2012 +0100

--
 CHANGES.txt|2 ++
 .../statements/CreateColumnFamilyStatement.java|3 +++
 .../cassandra/cql3/statements/SelectStatement.java |5 +
 3 files changed, 10 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/352993e0/CHANGES.txt
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-21 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 fb577447b - b960b2b82
  refs/heads/cassandra-1.2.0 9366fb323 - cc166a525
  refs/heads/trunk f49ca707d - 6f5fc0a4b


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 6f5fc0a4b28f67e2ba0c992f41eaebcca6009df7
Parents: f49ca70 b960b2b
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 21 15:02:26 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 21 15:02:26 2012 -0600

--
 .../apache/cassandra/thrift/CassandraServer.java   |  140 +++
 1 files changed, 63 insertions(+), 77 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-21 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 b960b2b82 - 354cb093d
  refs/heads/cassandra-1.2.0 cc166a525 - ad36c8fd8
  refs/heads/trunk 6f5fc0a4b - cf706f26c


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: cf706f26cafe81d602b2cf2fcfd9df5efa41e6c2
Parents: 6f5fc0a 354cb09
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Nov 21 16:45:40 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Nov 21 16:45:40 2012 -0600

--
 .../cassandra/io/LazilyCompactedRowTest.java   |6 --
 .../cassandra/io/sstable/SSTableReaderTest.java|5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-21 Thread yukim 
Updated Branches:
  refs/heads/cassandra-1.2 354cb093d - c3acf269f
  refs/heads/cassandra-1.2.0 ad36c8fd8 - 8c24d019f
  refs/heads/trunk cf706f26c - 374359112


Merge branch 'cassandra-1.2' into trunk

Conflicts:
src/java/org/apache/cassandra/db/ColumnFamilyStore.java


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

Branch: refs/heads/trunk
Commit: 3743591120326ea8b04d159522d5f187d73b0826
Parents: cf706f2 c3acf26
Author: Yuki Morishita yu...@apache.org
Authored: Wed Nov 21 17:12:01 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Nov 21 17:12:01 2012 -0600

--
 CHANGES.txt|1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |   24 -
 .../cassandra/db/ColumnFamilyStoreMBean.java   |6 +-
 .../org/apache/cassandra/service/PBSPredictor.java |   10 +-
 .../cassandra/service/PBSPredictorMBean.java   |2 +-
 .../apache/cassandra/service/StorageService.java   |   84 +++
 .../cassandra/service/StorageServiceMBean.java |   25 ++---
 src/java/org/apache/cassandra/tools/NodeCmd.java   |6 +-
 src/java/org/apache/cassandra/tools/NodeProbe.java |   13 +--
 9 files changed, 104 insertions(+), 67 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/37435911/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/37435911/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index c1e0c97,9cb4c66..c90e481
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -205,34 -206,17 +205,41 @@@ public class ColumnFamilyStore implemen
  }
  }
  
 +void scheduleFlush()
 +{
 +int period = metadata.getMemtableFlushPeriod();
 +if (period  0)
 +{
 +logger.debug(scheduling flush in {} ms, period);
 +WrappedRunnable runnable = new WrappedRunnable()
 +{
 +protected void runMayThrow() throws Exception
 +{
 +if (getMemtableThreadSafe().isExpired())
 +{
 +Future? future = forceFlush();
 +// if memtable is already expired but didn't flush 
because it's empty,
 +// then schedule another flush.
 +if (future == null)
 +scheduleFlush();
 +}
 +}
 +};
 +StorageService.scheduledTasks.schedule(runnable, period, 
TimeUnit.MILLISECONDS);
 +}
 +}
 +
- public void setCompactionStrategyClass(String compactionStrategyClass) 
throws ConfigurationException
+ public void setCompactionStrategyClass(String compactionStrategyClass)
  {
- metadata.compactionStrategyClass = 
CFMetaData.createCompactionStrategy(compactionStrategyClass);
- maybeReloadCompactionStrategy();
+ try
+ {
+ metadata.compactionStrategyClass = 
CFMetaData.createCompactionStrategy(compactionStrategyClass);
+ maybeReloadCompactionStrategy();
+ }
+ catch (ConfigurationException e)
+ {
+ throw new IllegalArgumentException(e.getMessage());
+ }
  }
  
  public String getCompactionStrategyClass()

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-21 Thread yukim 
Updated Branches:
  refs/heads/cassandra-1.2 c3acf269f - 42fdf107d
  refs/heads/cassandra-1.2.0 8c24d019f - 92f33391e
  refs/heads/trunk 374359112 - e0948fc80


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: e0948fc80d5aabe6b0cf400a0b91c503e4a8d049
Parents: 3743591 42fdf10
Author: Yuki Morishita yu...@apache.org
Authored: Wed Nov 21 17:34:51 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Wed Nov 21 17:34:51 2012 -0600

--
 .../serialization/1.2/db.RangeSliceCommand.bin |  Bin 733 - 735 bytes
 .../1.2/db.SliceByNamesReadCommand.bin |  Bin 367 - 373 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-20 Thread yukim 
Updated Branches:
  refs/heads/cassandra-1.2 efded0046 - c235229e9
  refs/heads/cassandra-1.2.0 edf63d8a5 - 553b9e86d
  refs/heads/trunk 633dbbd7a - 44b7b7a62


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 44b7b7a62bf54b084a2696bb7f6a9985fcde54cc
Parents: 633dbbd c235229
Author: Yuki Morishita yu...@apache.org
Authored: Tue Nov 20 12:20:20 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Nov 20 12:20:20 2012 -0600

--
 .../apache/cassandra/service/StorageService.java   |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-19 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.2 e329c3078 - efded0046
  refs/heads/cassandra-1.2.0 3957df175 - edf63d8a5
  refs/heads/trunk 1a0bc5991 - 633dbbd7a


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 633dbbd7a156e91460817ec8bdb460aa2cdcfb11
Parents: 1a0bc59 efded00
Author: Brandon Williams brandonwilli...@apache.org
Authored: Mon Nov 19 14:26:49 2012 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Mon Nov 19 14:26:49 2012 -0600

--
 .../apache/cassandra/hadoop/BulkOutputFormat.java  |4 ++--
 .../apache/cassandra/hadoop/BulkRecordWriter.java  |   15 ++-
 2 files changed, 12 insertions(+), 7 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-18 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 1a93de3b3 - 33ae0908a
  refs/heads/cassandra-1.2.0 b226ae593 - 6cdbb2d7b
  refs/heads/trunk a8e848241 - 58daf


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 58daf9b29627dd2f6413cdb966c295c3c25c
Parents: a8e8482 33ae090
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:20:35 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:20:35 2012 +0100

--
 doc/cql3/CQL.textile   |2 +-
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/58da/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 61cefff,5b29a2a..65309d6
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@@ -42,9 -46,8 +42,9 @@@ public class CFPropDefs extends Propert
  public static final String KW_REPLICATEONWRITE = replicate_on_write;
  public static final String KW_CACHING = caching;
  public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 +public static final String KW_MEMTABLE_FLUSH_PERIOD = 
memtable_flush_period_in_ms;
  
- public static final String KW_COMPACTION = compaction;
+ public static final String KW_COMPACTION = compaction_strategy;
  public static final String KW_COMPRESSION = compression;
  
  public static final String COMPACTION_STRATEGY_CLASS_KEY = class;

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-18 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 33ae0908a - 2a41dcd00
  refs/heads/cassandra-1.2.0 6cdbb2d7b - 6e332e340
  refs/heads/trunk 58daf - 192b20875


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 192b20875df5399e9b26f1ceb499e04e3a40b507
Parents: 58d 2a41dcd
Author: Jonathan Ellis jbel...@apache.org
Authored: Sun Nov 18 21:26:47 2012 +0100
Committer: Jonathan Ellis jbel...@apache.org
Committed: Sun Nov 18 21:26:47 2012 +0100

--
 src/java/org/apache/cassandra/cql3/CFPropDefs.java |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/192b2087/src/java/org/apache/cassandra/cql3/CFPropDefs.java
--
diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java
index 65309d6,0b563cc..61cefff
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@@ -42,9 -46,8 +42,9 @@@ public class CFPropDefs extends Propert
  public static final String KW_REPLICATEONWRITE = replicate_on_write;
  public static final String KW_CACHING = caching;
  public static final String KW_BF_FP_CHANCE = bloom_filter_fp_chance;
 +public static final String KW_MEMTABLE_FLUSH_PERIOD = 
memtable_flush_period_in_ms;
  
- public static final String KW_COMPACTION = compaction_strategy;
+ public static final String KW_COMPACTION = compaction;
  public static final String KW_COMPRESSION = compression;
  
  public static final String COMPACTION_STRATEGY_CLASS_KEY = class;

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-15 Thread brandonwilliams 
Updated Branches:
  refs/heads/cassandra-1.2 275fae9cf - 2f3b8d4b3
  refs/heads/cassandra-1.2.0 309666b4d - add2d2db6
  refs/heads/trunk db555f7f0 - 0608330c5


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 0608330c55c3c15de280c3e2a137ed798e122a6e
Parents: db555f7 2f3b8d4
Author: Brandon Williams brandonwilli...@apache.org
Authored: Thu Nov 15 11:58:07 2012 -0600
Committer: Brandon Williams brandonwilli...@apache.org
Committed: Thu Nov 15 11:58:07 2012 -0600

--
 .../apache/cassandra/db/HintedHandOffManager.java  |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-13 Thread yukim 
Updated Branches:
  refs/heads/cassandra-1.2 90d2f8e8e - a878a02fb
  refs/heads/cassandra-1.2.0 228d1cf6e - 901a54a6d
  refs/heads/trunk 1650ae8f6 - 49db94437


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 49db94437005495367b3c28a5c98411f8fd19a9a
Parents: 1650ae8 a878a02
Author: Yuki Morishita yu...@apache.org
Authored: Tue Nov 13 16:18:58 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Nov 13 16:18:58 2012 -0600

--
 CHANGES.txt|1 +
 .../cassandra/net/OutboundTcpConnectionPool.java   |2 +-
 .../cassandra/streaming/AbstractStreamSession.java |   20 ++---
 .../apache/cassandra/streaming/FileStreamTask.java |4 +-
 .../cassandra/streaming/IncomingStreamReader.java  |9 +-
 .../apache/cassandra/streaming/StreamHeader.java   |   54 +++
 .../cassandra/streaming/StreamInSession.java   |   70 +--
 .../cassandra/streaming/StreamOutSession.java  |   53 ---
 .../apache/cassandra/streaming/StreamReply.java|   10 ++-
 .../streaming/StreamReplyVerbHandler.java  |2 +-
 .../apache/cassandra/streaming/StreamRequest.java  |   21 +++--
 .../serialization/1.2/streaming.StreamHeader.bin   |  Bin 175902 - 175917 
bytes
 .../serialization/1.2/streaming.StreamReply.bin|  Bin 73 - 89 bytes
 .../1.2/streaming.StreamRequestMessage.bin |  Bin 7167 - 7215 bytes
 .../cassandra/streaming/SerializationsTest.java|   27 +++---
 .../cassandra/streaming/StreamingTransferTest.java |6 +-
 16 files changed, 106 insertions(+), 173 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-13 Thread jbellis 
Updated Branches:
  refs/heads/cassandra-1.2 a878a02fb - 4576ccba6
  refs/heads/cassandra-1.2.0 901a54a6d - acda52799
  refs/heads/trunk 49db94437 - ac16a54a1


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: ac16a54a163d27a09e5506dafa7a24062f962d0c
Parents: 49db944 4576ccb
Author: Jonathan Ellis jbel...@apache.org
Authored: Tue Nov 13 16:48:43 2012 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Tue Nov 13 16:48:43 2012 -0600

--
 .../org/apache/cassandra/cql3/QueryProcessor.java  |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
--

[1/6] git commit: Merge branch 'cassandra-1.2' into trunk

2012-11-13 Thread yukim 
Updated Branches:
  refs/heads/cassandra-1.2 4576ccba6 - 4208a3f56
  refs/heads/cassandra-1.2.0 acda52799 - 9dffa5736
  refs/heads/trunk ac16a54a1 - 47fb7d534


Merge branch 'cassandra-1.2' into trunk


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

Branch: refs/heads/trunk
Commit: 47fb7d5349eadd2f5cb4dba6a9dc657a5ef6bdf2
Parents: ac16a54 4208a3f
Author: Yuki Morishita yu...@apache.org
Authored: Tue Nov 13 17:54:17 2012 -0600
Committer: Yuki Morishita yu...@apache.org
Committed: Tue Nov 13 17:54:17 2012 -0600

--
 CHANGES.txt|1 +
 .../apache/cassandra/io/sstable/SSTableLoader.java |2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)
--