You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/11/19 11:12:48 UTC
[1/5] cassandra git commit: sstableloader does not use MAX_HEAP_SIZE
env parameter
Repository: cassandra
Updated Branches:
refs/heads/trunk c4a54978c -> b636b0742
sstableloader does not use MAX_HEAP_SIZE env parameter
patch by Michael Shuler; reviewed by Robert Stupp for CASSANDRA-10188
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f2337f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f2337f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f2337f6
Branch: refs/heads/trunk
Commit: 4f2337f6d04669f2032f612ff556c025c85fadb0
Parents: 1b629c1
Author: Michael Shuler <mi...@pbandjelly.org>
Authored: Thu Nov 19 11:07:29 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Nov 19 11:08:14 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/sstableloader | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f2337f6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 42dcf3e..94a9ae2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188)
* (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
* Don't remove level info when running upgradesstables (CASSANDRA-10692)
* Create compression chunk for sending file only (CASSANDRA-10680)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f2337f6/bin/sstableloader
----------------------------------------------------------------------
diff --git a/bin/sstableloader b/bin/sstableloader
index 26b1e3f..67829b8 100755
--- a/bin/sstableloader
+++ b/bin/sstableloader
@@ -43,7 +43,11 @@ if [ -z "$CLASSPATH" ]; then
exit 1
fi
-"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx256M \
+if [ "x$MAX_HEAP_SIZE" = "x" ]; then
+ MAX_HEAP_SIZE="256M"
+fi
+
+"$JAVA" $JAVA_AGENT -ea -cp "$CLASSPATH" $JVM_OPTS -Xmx$MAX_HEAP_SIZE \
-Dcassandra.storagedir="$cassandra_storagedir" \
-Dlogback.configurationFile=logback-tools.xml \
org.apache.cassandra.tools.BulkLoader "$@"
[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sn...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/95feab66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/95feab66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/95feab66
Branch: refs/heads/trunk
Commit: 95feab6631f96315db3587f42c6c190a9745c2a7
Parents: 4e48324 4f2337f
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Nov 19 11:09:11 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Nov 19 11:09:11 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
bin/sstableloader | 6 +++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/95feab66/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4e19b23,94a9ae2..14e8c3d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,19 @@@
-2.1.12
+2.2.4
+ * Don't do anticompaction after subrange repair (CASSANDRA-10422)
+ * Fix SimpleDateType type compatibility (CASSANDRA-10027)
+ * (Hadoop) fix splits calculation (CASSANDRA-10640)
+ * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
+ * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
+ * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
+ * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
+ * Expose phi values from failure detector via JMX and tweak debug
+ and trace logging (CASSANDRA-9526)
+ * Fix RangeNamesQueryPager (CASSANDRA-10509)
+ * Deprecate Pig support (CASSANDRA-10542)
+ * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
+Merged from 2.1:
- * * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
+ * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188)
+ * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
* Don't remove level info when running upgradesstables (CASSANDRA-10692)
* Create compression chunk for sending file only (CASSANDRA-10680)
* Make buffered read size configurable (CASSANDRA-10249)
[5/5] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b636b074
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b636b074
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b636b074
Branch: refs/heads/trunk
Commit: b636b0742372229bb518ef865fe88fcf529c3274
Parents: c4a5497 28e51d6
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Nov 19 11:11:46 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Nov 19 11:11:46 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/sstableloader | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b636b074/CHANGES.txt
----------------------------------------------------------------------
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by sn...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/28e51d66
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28e51d66
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28e51d66
Branch: refs/heads/trunk
Commit: 28e51d66f3b986989e2580869b428e7d48c253b1
Parents: d1103f5 747e5fd
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Nov 19 11:11:30 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Nov 19 11:11:30 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/sstableloader | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/28e51d66/CHANGES.txt
----------------------------------------------------------------------
[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/747e5fd4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/747e5fd4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/747e5fd4
Branch: refs/heads/trunk
Commit: 747e5fd4ad54c9d5d691897db941dd10aa5bdabc
Parents: 46da70e 95feab6
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Nov 19 11:11:24 2015 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Nov 19 11:11:24 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/sstableloader | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/747e5fd4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2a9fbe7,14e8c3d..5e44f27
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,9 -3,20 +9,10 @@@ Merged from 2.2
* Fix SimpleDateType type compatibility (CASSANDRA-10027)
* (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
- * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
- * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
- * Expose phi values from failure detector via JMX and tweak debug
- and trace logging (CASSANDRA-9526)
- * Fix RangeNamesQueryPager (CASSANDRA-10509)
- * Deprecate Pig support (CASSANDRA-10542)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
Merged from 2.1:
+ * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188)
* (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)
- * Don't remove level info when running upgradesstables (CASSANDRA-10692)
* Create compression chunk for sending file only (CASSANDRA-10680)
- * Make buffered read size configurable (CASSANDRA-10249)
* Forbid compact clustering column type changes in ALTER TABLE (CASSANDRA-8879)
* Reject incremental repair with subrange repair (CASSANDRA-10422)
* Add a nodetool command to refresh size_estimates (CASSANDRA-9579)