You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2016/01/27 21:38:51 UTC
[1/5] cassandra git commit: Fix paging on DISTINCT queries repeats
result when first row in partition changes
Repository: cassandra
Updated Branches:
refs/heads/trunk 02d8ebd8a -> 7230a6631
Fix paging on DISTINCT queries repeats result when first row in partition changes
patch by Benjamin Lerer; reviewed by Sylvain Lebresne for CASSANDRA-10010
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa2fa602
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa2fa602
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa2fa602
Branch: refs/heads/trunk
Commit: fa2fa602d989ed911b60247e3dd8f2d580188782
Parents: dd76858
Author: Benjamin Lerer <b....@gmail.com>
Authored: Wed Jan 27 17:21:22 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Wed Jan 27 17:21:22 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../cassandra/service/pager/RangeSliceQueryPager.java | 10 ++++++++++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa2fa602/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cdc3b34..9847371 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,5 @@
+2.2.6
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes (CASSANDRA-10010)
2.2.5
* maxPurgeableTimestamp needs to check memtables too (CASSANDRA-9949)
* Apply change to compaction throughput in real time (CASSANDRA-10025)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa2fa602/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
index 10e470b..8ec9f4c 100644
--- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
+++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java
@@ -97,6 +97,10 @@ public class RangeSliceQueryPager extends AbstractQueryPager
if (lastReturnedKey == null || !lastReturnedKey.equals(first.key))
return false;
+ // If the query is a DISTINCT one we can stop there
+ if (isDistinct())
+ return true;
+
// Same as SliceQueryPager, we ignore a deleted column
Cell firstCell = isReversed() ? lastCell(first.cf) : firstNonStaticCell(first.cf);
// If the row was containing only static columns it has already been returned and we can skip it.
@@ -109,6 +113,12 @@ public class RangeSliceQueryPager extends AbstractQueryPager
&& firstCell.name().isSameCQL3RowAs(metadata.comparator, lastReturnedName);
}
+ private boolean isDistinct()
+ {
+ // As this pager is never used for Thrift queries, checking the countCQL3Rows is enough.
+ return !command.countCQL3Rows;
+ }
+
protected boolean recordLast(Row last)
{
lastReturnedKey = last.key;
[2/5] cassandra git commit: Merge branch cassandra-2.2 into
cassandra-3.0
Posted by ty...@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/22d6f649
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22d6f649
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/22d6f649
Branch: refs/heads/trunk
Commit: 22d6f649ffae901f2893dc973c324e8fbb8eea69
Parents: 3e37b4a fa2fa60
Author: Benjamin Lerer <b....@gmail.com>
Authored: Wed Jan 27 17:29:33 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Wed Jan 27 17:29:51 2016 +0100
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by ty...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a31958b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a31958b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a31958b
Branch: refs/heads/trunk
Commit: 1a31958bfa2adb04ec965e6e2776862eee30ecf4
Parents: 5956000 414c1c5
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Jan 27 14:36:37 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Jan 27 14:36:37 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a31958b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c78dd10,1a1abc0..f9af204
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,6 +1,8 @@@
-3.0.3
+3.3
+ * Avoid bootstrap hanging when existing nodes have no data to stream (CASSANDRA-11010)
+Merged from 3.0:
+ * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
+ (CASSANDRA-11003)
* Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
* Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
* Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a31958b/bin/cqlsh.py
----------------------------------------------------------------------
[5/5] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7230a663
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7230a663
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7230a663
Branch: refs/heads/trunk
Commit: 7230a66318ce8add742959d095900d5870689f0c
Parents: 02d8ebd 1a31958
Author: Tyler Hobbs <ty...@gmail.com>
Authored: Wed Jan 27 14:37:03 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Jan 27 14:37:03 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7230a663/CHANGES.txt
----------------------------------------------------------------------
[3/5] cassandra git commit: cqlsh: Fix INSERT and UPDATE LWT handling
Posted by ty...@apache.org.
cqlsh: Fix INSERT and UPDATE LWT handling
Patch by Eduard Tudenhoefner; reviewed by Tyler Hobbs for
CASSANDRA-11003
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/414c1c57
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/414c1c57
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/414c1c57
Branch: refs/heads/trunk
Commit: 414c1c5771ca05c23c8c1279dbdb90a673dda040
Parents: 22d6f64
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Fri Jan 22 15:49:11 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Jan 27 14:35:46 2016 -0600
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/414c1c57/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8daeb2d..1a1abc0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.3
+ * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
+ (CASSANDRA-11003)
* Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
* Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
* Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/414c1c57/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 5d7d9e7..74e7103 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1269,7 +1269,7 @@ class Shell(cmd.Cmd):
elif result:
# CAS INSERT/UPDATE
self.writeresult("")
- self.print_static_result(result.column_names, list(result), self.parse_for_table_meta(statement.query_string))
+ self.print_static_result(result.column_names, list(result), self.parse_for_update_meta(statement.query_string))
self.flush_output()
return True, future