You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2016/01/14 18:14:03 UTC
[01/10] cassandra git commit: (cqlsh) fix cqlsh_copy_tests when
vnodes are disabled
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 26dc07b7d -> c42716f2a
refs/heads/cassandra-2.2 101cd72e5 -> e253bfee1
refs/heads/cassandra-3.0 a3ae9d8bd -> 58643b0af
refs/heads/cassandra-3.3 628c07678 -> ed13e05bd
(cqlsh) fix cqlsh_copy_tests when vnodes are disabled
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c42716f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c42716f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c42716f2
Branch: refs/heads/cassandra-2.1
Commit: c42716f2a91ff4e0e8b1ed50eb01edb46978a562
Parents: 26dc07b
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Jan 12 12:12:34 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:09:40 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c73adf..74fd45b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
* (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
* (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
* Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 381701e..b015a77 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -492,30 +492,33 @@ class ExportTask(CopyTask):
ring = shell.get_ring(self.ks).items()
ring.sort()
- # If the ring is empty we get the entire ring from the host we are currently connected to
if not ring:
+ # If the ring is empty we get the entire ring from the host we are currently connected to
ranges[(begin_token, end_token)] = make_range_data()
- return ranges
-
- first_range_data = None
- previous = None
- for token, replicas in ring:
- if previous is None and token.value == min_token:
- continue # avoids looping entire ring
-
- if previous is None: # we use it at the end when wrapping around
- first_range_data = make_range_data(replicas)
-
- current_range = make_range(previous, token.value)
- if not current_range:
- continue
-
- ranges[current_range] = make_range_data(replicas)
- previous = token.value
-
- # For the last ring interval we query the same replicas that hold the first token in the ring
- if previous is not None and (not end_token or previous < end_token):
- ranges[(previous, end_token)] = first_range_data
+ elif len(ring) == 1:
+ # If there is only one token we get the entire ring from the replicas for that token
+ ranges[(begin_token, end_token)] = make_range_data(ring[0][1])
+ else:
+ # else we loop on the ring
+ first_range_data = None
+ previous = None
+ for token, replicas in ring:
+ if not first_range_data:
+ first_range_data = make_range_data(replicas) # we use it at the end when wrapping around
+
+ if token.value == min_token:
+ continue # avoids looping entire ring
+
+ current_range = make_range(previous, token.value)
+ if not current_range:
+ continue
+
+ ranges[current_range] = make_range_data(replicas)
+ previous = token.value
+
+ # For the last ring interval we query the same replicas that hold the first token in the ring
+ if previous is not None and (not end_token or previous < end_token):
+ ranges[(previous, end_token)] = first_range_data
if not ranges:
shell.printerr('Found no ranges to query, check begin and end tokens: %s - %s' % (begin_token, end_token))
[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed13e05b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed13e05b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed13e05b
Branch: refs/heads/cassandra-3.3
Commit: ed13e05bdcb1370d81c931add2ca0f689c104fc2
Parents: 628c076 58643b0
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 17:12:44 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:12:44 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed13e05b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bfe1730,a1835bd..4c44120
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -18,7 -26,16 +18,8 @@@ Merged from 2.2
* Optimize pending range computation (CASSANDRA-9258)
* Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
* drop/alter user should be case sensitive (CASSANDRA-10817)
- * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
- * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
- * Add new types to Stress (CASSANDRA-9556)
- * Add property to allow listening on broadcast interface (CASSANDRA-9748)
- * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
- * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
- * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
- * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
* (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
* Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
* If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed13e05b/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@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/58643b0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58643b0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58643b0a
Branch: refs/heads/cassandra-3.3
Commit: 58643b0afe1521e1d99be1fc4532deb9b902d767
Parents: a3ae9d8 e253bfe
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 17:12:24 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:12:24 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58643b0a/CHANGES.txt
----------------------------------------------------------------------
[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@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/e253bfee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e253bfee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e253bfee
Branch: refs/heads/cassandra-3.0
Commit: e253bfee13166fb1e49949236feaa0175d6dc7ee
Parents: 101cd72 c42716f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 17:12:09 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:12:09 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 52e3d4d,74fd45b..9d1cb88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
-2.1.13
+2.2.5
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
+ * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
+ * Fix error streaming section more than 2GB (CASSANDRA-10961)
+ * (cqlsh) Also apply --connect-timeout to control connection
+ timeout (CASSANDRA-10959)
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
- * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
* (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
* Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
* If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[03/10] cassandra git commit: (cqlsh) fix cqlsh_copy_tests when
vnodes are disabled
Posted by al...@apache.org.
(cqlsh) fix cqlsh_copy_tests when vnodes are disabled
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c42716f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c42716f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c42716f2
Branch: refs/heads/cassandra-3.0
Commit: c42716f2a91ff4e0e8b1ed50eb01edb46978a562
Parents: 26dc07b
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Jan 12 12:12:34 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:09:40 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c73adf..74fd45b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
* (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
* (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
* Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 381701e..b015a77 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -492,30 +492,33 @@ class ExportTask(CopyTask):
ring = shell.get_ring(self.ks).items()
ring.sort()
- # If the ring is empty we get the entire ring from the host we are currently connected to
if not ring:
+ # If the ring is empty we get the entire ring from the host we are currently connected to
ranges[(begin_token, end_token)] = make_range_data()
- return ranges
-
- first_range_data = None
- previous = None
- for token, replicas in ring:
- if previous is None and token.value == min_token:
- continue # avoids looping entire ring
-
- if previous is None: # we use it at the end when wrapping around
- first_range_data = make_range_data(replicas)
-
- current_range = make_range(previous, token.value)
- if not current_range:
- continue
-
- ranges[current_range] = make_range_data(replicas)
- previous = token.value
-
- # For the last ring interval we query the same replicas that hold the first token in the ring
- if previous is not None and (not end_token or previous < end_token):
- ranges[(previous, end_token)] = first_range_data
+ elif len(ring) == 1:
+ # If there is only one token we get the entire ring from the replicas for that token
+ ranges[(begin_token, end_token)] = make_range_data(ring[0][1])
+ else:
+ # else we loop on the ring
+ first_range_data = None
+ previous = None
+ for token, replicas in ring:
+ if not first_range_data:
+ first_range_data = make_range_data(replicas) # we use it at the end when wrapping around
+
+ if token.value == min_token:
+ continue # avoids looping entire ring
+
+ current_range = make_range(previous, token.value)
+ if not current_range:
+ continue
+
+ ranges[current_range] = make_range_data(replicas)
+ previous = token.value
+
+ # For the last ring interval we query the same replicas that hold the first token in the ring
+ if previous is not None and (not end_token or previous < end_token):
+ ranges[(previous, end_token)] = first_range_data
if not ranges:
shell.printerr('Found no ranges to query, check begin and end tokens: %s - %s' % (begin_token, end_token))
[04/10] cassandra git commit: (cqlsh) fix cqlsh_copy_tests when
vnodes are disabled
Posted by al...@apache.org.
(cqlsh) fix cqlsh_copy_tests when vnodes are disabled
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c42716f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c42716f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c42716f2
Branch: refs/heads/cassandra-3.3
Commit: c42716f2a91ff4e0e8b1ed50eb01edb46978a562
Parents: 26dc07b
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Jan 12 12:12:34 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:09:40 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c73adf..74fd45b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
* (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
* (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
* Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 381701e..b015a77 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -492,30 +492,33 @@ class ExportTask(CopyTask):
ring = shell.get_ring(self.ks).items()
ring.sort()
- # If the ring is empty we get the entire ring from the host we are currently connected to
if not ring:
+ # If the ring is empty we get the entire ring from the host we are currently connected to
ranges[(begin_token, end_token)] = make_range_data()
- return ranges
-
- first_range_data = None
- previous = None
- for token, replicas in ring:
- if previous is None and token.value == min_token:
- continue # avoids looping entire ring
-
- if previous is None: # we use it at the end when wrapping around
- first_range_data = make_range_data(replicas)
-
- current_range = make_range(previous, token.value)
- if not current_range:
- continue
-
- ranges[current_range] = make_range_data(replicas)
- previous = token.value
-
- # For the last ring interval we query the same replicas that hold the first token in the ring
- if previous is not None and (not end_token or previous < end_token):
- ranges[(previous, end_token)] = first_range_data
+ elif len(ring) == 1:
+ # If there is only one token we get the entire ring from the replicas for that token
+ ranges[(begin_token, end_token)] = make_range_data(ring[0][1])
+ else:
+ # else we loop on the ring
+ first_range_data = None
+ previous = None
+ for token, replicas in ring:
+ if not first_range_data:
+ first_range_data = make_range_data(replicas) # we use it at the end when wrapping around
+
+ if token.value == min_token:
+ continue # avoids looping entire ring
+
+ current_range = make_range(previous, token.value)
+ if not current_range:
+ continue
+
+ ranges[current_range] = make_range_data(replicas)
+ previous = token.value
+
+ # For the last ring interval we query the same replicas that hold the first token in the ring
+ if previous is not None and (not end_token or previous < end_token):
+ ranges[(previous, end_token)] = first_range_data
if not ranges:
shell.printerr('Found no ranges to query, check begin and end tokens: %s - %s' % (begin_token, end_token))
[02/10] cassandra git commit: (cqlsh) fix cqlsh_copy_tests when
vnodes are disabled
Posted by al...@apache.org.
(cqlsh) fix cqlsh_copy_tests when vnodes are disabled
patch by Stefania Alborghetti; reviewed by Paulo Motta for CASSANDRA-10997
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c42716f2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c42716f2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c42716f2
Branch: refs/heads/cassandra-2.2
Commit: c42716f2a91ff4e0e8b1ed50eb01edb46978a562
Parents: 26dc07b
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Tue Jan 12 12:12:34 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:09:40 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9c73adf..74fd45b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
* (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
* (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
* Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c42716f2/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/copyutil.py b/pylib/cqlshlib/copyutil.py
index 381701e..b015a77 100644
--- a/pylib/cqlshlib/copyutil.py
+++ b/pylib/cqlshlib/copyutil.py
@@ -492,30 +492,33 @@ class ExportTask(CopyTask):
ring = shell.get_ring(self.ks).items()
ring.sort()
- # If the ring is empty we get the entire ring from the host we are currently connected to
if not ring:
+ # If the ring is empty we get the entire ring from the host we are currently connected to
ranges[(begin_token, end_token)] = make_range_data()
- return ranges
-
- first_range_data = None
- previous = None
- for token, replicas in ring:
- if previous is None and token.value == min_token:
- continue # avoids looping entire ring
-
- if previous is None: # we use it at the end when wrapping around
- first_range_data = make_range_data(replicas)
-
- current_range = make_range(previous, token.value)
- if not current_range:
- continue
-
- ranges[current_range] = make_range_data(replicas)
- previous = token.value
-
- # For the last ring interval we query the same replicas that hold the first token in the ring
- if previous is not None and (not end_token or previous < end_token):
- ranges[(previous, end_token)] = first_range_data
+ elif len(ring) == 1:
+ # If there is only one token we get the entire ring from the replicas for that token
+ ranges[(begin_token, end_token)] = make_range_data(ring[0][1])
+ else:
+ # else we loop on the ring
+ first_range_data = None
+ previous = None
+ for token, replicas in ring:
+ if not first_range_data:
+ first_range_data = make_range_data(replicas) # we use it at the end when wrapping around
+
+ if token.value == min_token:
+ continue # avoids looping entire ring
+
+ current_range = make_range(previous, token.value)
+ if not current_range:
+ continue
+
+ ranges[current_range] = make_range_data(replicas)
+ previous = token.value
+
+ # For the last ring interval we query the same replicas that hold the first token in the ring
+ if previous is not None and (not end_token or previous < end_token):
+ ranges[(previous, end_token)] = first_range_data
if not ranges:
shell.printerr('Found no ranges to query, check begin and end tokens: %s - %s' % (begin_token, end_token))
[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@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/58643b0a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58643b0a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/58643b0a
Branch: refs/heads/cassandra-3.0
Commit: 58643b0afe1521e1d99be1fc4532deb9b902d767
Parents: a3ae9d8 e253bfe
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 17:12:24 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:12:24 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/58643b0a/CHANGES.txt
----------------------------------------------------------------------
[07/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@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/e253bfee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e253bfee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e253bfee
Branch: refs/heads/cassandra-3.3
Commit: e253bfee13166fb1e49949236feaa0175d6dc7ee
Parents: 101cd72 c42716f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 17:12:09 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:12:09 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 52e3d4d,74fd45b..9d1cb88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
-2.1.13
+2.2.5
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
+ * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
+ * Fix error streaming section more than 2GB (CASSANDRA-10961)
+ * (cqlsh) Also apply --connect-timeout to control connection
+ timeout (CASSANDRA-10959)
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
- * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
* (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
* Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
* If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------
[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@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/e253bfee
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e253bfee
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e253bfee
Branch: refs/heads/cassandra-2.2
Commit: e253bfee13166fb1e49949236feaa0175d6dc7ee
Parents: 101cd72 c42716f
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Jan 14 17:12:09 2016 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Jan 14 17:12:09 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
pylib/cqlshlib/copyutil.py | 47 ++++++++++++++++++++++-------------------
2 files changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 52e3d4d,74fd45b..9d1cb88
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,6 +1,25 @@@
-2.1.13
+2.2.5
+ * Avoid NPE when performing sstable tasks (scrub etc.) (CASSANDRA-10980)
+ * Make sure client gets tombstone overwhelmed warning (CASSANDRA-9465)
+ * Fix error streaming section more than 2GB (CASSANDRA-10961)
+ * (cqlsh) Also apply --connect-timeout to control connection
+ timeout (CASSANDRA-10959)
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * (cqlsh) fix cqlsh_copy_tests when vnodes are disabled (CASSANDRA-10997)
- * (cqlsh) fix formatting bytearray values (CASSANDRA-10839)
* (cqlsh) Add request timeout option to cqlsh (CASSANDRA-10686)
* Avoid AssertionError while submitting hint with LWT (CASSANDRA-10477)
* If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e253bfee/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------