You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/09/13 20:54:37 UTC

[1/6] git commit: make sstablesplit respect default size

Updated Branches:
  refs/heads/cassandra-1.2 08c07f5f3 -> b281dd15d
  refs/heads/cassandra-2.0 c9f4f0d64 -> ab7fed683
  refs/heads/trunk 19c9a1ef4 -> 02eacf93a


make sstablesplit respect default size


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

Branch: refs/heads/cassandra-1.2
Commit: b281dd15db9139a50493aa35c85ea270cc9e84ef
Parents: 08c07f5
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 13:53:32 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 13:53:32 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b281dd15/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
index 1ce94be..4876a4e 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
@@ -211,6 +211,7 @@ public class StandaloneSplitter
                 opts.debug = cmd.hasOption(DEBUG_OPTION);
                 opts.verbose = cmd.hasOption(VERBOSE_OPTION);
                 opts.snapshot = !cmd.hasOption(NO_SNAPSHOT_OPTION);
+                opts.sizeInMB = DEFAULT_SSTABLE_SIZE;
 
                 if (cmd.hasOption(SIZE_OPTION))
                     opts.sizeInMB = Integer.valueOf(cmd.getOptionValue(SIZE_OPTION));

[5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/cassandra-2.0
Commit: ab7fed6834ca675520651c2d3bf9dc1a8109fa36
Parents: c9f4f0d b281dd1
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 13:53:51 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 13:53:51 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab7fed68/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------

[4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0


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

Branch: refs/heads/trunk
Commit: ab7fed6834ca675520651c2d3bf9dc1a8109fa36
Parents: c9f4f0d b281dd1
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 13:53:51 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 13:53:51 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab7fed68/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------

[2/6] git commit: make sstablesplit respect default size

Posted by br...@apache.org.
make sstablesplit respect default size


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

Branch: refs/heads/cassandra-2.0
Commit: b281dd15db9139a50493aa35c85ea270cc9e84ef
Parents: 08c07f5
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 13:53:32 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 13:53:32 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b281dd15/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
index 1ce94be..4876a4e 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
@@ -211,6 +211,7 @@ public class StandaloneSplitter
                 opts.debug = cmd.hasOption(DEBUG_OPTION);
                 opts.verbose = cmd.hasOption(VERBOSE_OPTION);
                 opts.snapshot = !cmd.hasOption(NO_SNAPSHOT_OPTION);
+                opts.sizeInMB = DEFAULT_SSTABLE_SIZE;
 
                 if (cmd.hasOption(SIZE_OPTION))
                     opts.sizeInMB = Integer.valueOf(cmd.getOptionValue(SIZE_OPTION));

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

Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 02eacf93a518636802dfb16ad1b45fa1a5b61e7b
Parents: 19c9a1e ab7fed6
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 13:54:05 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 13:54:05 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/02eacf93/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------

[3/6] git commit: make sstablesplit respect default size

Posted by br...@apache.org.
make sstablesplit respect default size


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

Branch: refs/heads/trunk
Commit: b281dd15db9139a50493aa35c85ea270cc9e84ef
Parents: 08c07f5
Author: Brandon Williams <br...@apache.org>
Authored: Fri Sep 13 13:53:32 2013 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Sep 13 13:53:32 2013 -0500

----------------------------------------------------------------------
 src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b281dd15/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
index 1ce94be..4876a4e 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java
@@ -211,6 +211,7 @@ public class StandaloneSplitter
                 opts.debug = cmd.hasOption(DEBUG_OPTION);
                 opts.verbose = cmd.hasOption(VERBOSE_OPTION);
                 opts.snapshot = !cmd.hasOption(NO_SNAPSHOT_OPTION);
+                opts.sizeInMB = DEFAULT_SSTABLE_SIZE;
 
                 if (cmd.hasOption(SIZE_OPTION))
                     opts.sizeInMB = Integer.valueOf(cmd.getOptionValue(SIZE_OPTION));