You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/09/01 13:52:42 UTC
[1/3] cassandra git commit: Fix backward compatibility issues on
SELECT DISTINCT queries
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 139289356 -> 5847222d9
refs/heads/trunk 5f99740c7 -> 2f044b0f7
Fix backward compatibility issues on SELECT DISTINCT queries
patch by Sylvain Lebresne; reviewed by Benjamin Lerer for CASSANDRA-11126
This fixes 2 problems:
- Broken logic for deciding if a query involve static columns when
serializating range slice to old nodes.
- Invalid cellname in paging state when the "row marker" should be sent.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5847222d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5847222d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5847222d
Branch: refs/heads/cassandra-3.0
Commit: 5847222d9b2428c201a534876f86a0ec6f6f436f
Parents: 1392893
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Aug 4 15:38:39 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 1 15:49:03 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ReadCommand.java | 2 +-
src/java/org/apache/cassandra/service/pager/PagingState.java | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5847222d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d111d11..e5e2b9c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * select_distinct_with_deletions_test failing on non-vnode environments (CASSANDRA-11126)
* Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
* Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
* Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5847222d/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 36969f8..c1762f1 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -744,7 +744,7 @@ public abstract class ReadCommand implements ReadQuery
out.writeInt(LegacyReadCommandSerializer.updateLimitForQuery(rangeCommand.limits().count(), filter.requestedSlices()));
int compositesToGroup;
- boolean selectsStatics = !rangeCommand.columnFilter().fetchedColumns().statics.isEmpty() || filter.requestedSlices().selects(Clustering.STATIC_CLUSTERING);
+ boolean selectsStatics = !rangeCommand.columnFilter().fetchedColumns().statics.isEmpty() && filter.requestedSlices().selects(Clustering.STATIC_CLUSTERING);
if (limits.kind() == DataLimits.Kind.THRIFT_LIMIT)
compositesToGroup = -1;
else if (limits.isDistinct() && !selectsStatics)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5847222d/src/java/org/apache/cassandra/service/pager/PagingState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/PagingState.java b/src/java/org/apache/cassandra/service/pager/PagingState.java
index 611523f..30e14c3 100644
--- a/src/java/org/apache/cassandra/service/pager/PagingState.java
+++ b/src/java/org/apache/cassandra/service/pager/PagingState.java
@@ -213,7 +213,10 @@ public class PagingState
Iterator<Cell> cells = row.cellsInLegacyOrder(metadata, true).iterator();
if (!cells.hasNext())
{
- mark = LegacyLayout.encodeClustering(metadata, row.clustering());
+ // If the last returned row has no cell, this means in 2.1/2.2 terms that we stopped on the row
+ // marker. Note that this shouldn't happen if the table is COMPACT.
+ assert !metadata.isCompactTable();
+ mark = LegacyLayout.encodeCellName(metadata, row.clustering(), ByteBufferUtil.EMPTY_BYTE_BUFFER, null);
}
else
{
@@ -258,7 +261,7 @@ public class PagingState
@Override
public String toString()
{
- return ByteBufferUtil.bytesToHex(mark);
+ return mark == null ? "null" : ByteBufferUtil.bytesToHex(mark);
}
}
}
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into trunk
* cassandra-3.0:
Fix backward compatibility issues on SELECT DISTINCT queries
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2f044b0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f044b0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f044b0f
Branch: refs/heads/trunk
Commit: 2f044b0f77c0492919154f309ad5cb013349db5f
Parents: 5f99740 5847222
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Sep 1 15:50:09 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 1 15:50:09 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ReadCommand.java | 2 +-
src/java/org/apache/cassandra/service/pager/PagingState.java | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f044b0f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4850510,e5e2b9c..f567892
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,61 -1,5 +1,62 @@@
-3.0.9
+3.10
+ * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567)
+ * Add keep-alive to streaming (CASSANDRA-11841)
+ * Tracing payload is passed through newSession(..) (CASSANDRA-11706)
+ * avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261)
+ * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486)
+ * Retry all internode messages once after a connection is
+ closed and reopened (CASSANDRA-12192)
+ * Add support to rebuild from targeted replica (CASSANDRA-9875)
+ * Add sequence distribution type to cassandra stress (CASSANDRA-12490)
+ * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154)
+ * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474)
+ * Extend read/write failure messages with a map of replica addresses
+ to error codes in the v5 native protocol (CASSANDRA-12311)
+ * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374)
+ * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054, 12550)
+ * Fix clustering indexes in presence of static columns in SASI (CASSANDRA-12378)
+ * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223)
+ * Added slow query log (CASSANDRA-12403)
+ * Count full coordinated request against timeout (CASSANDRA-12256)
+ * Allow TTL with null value on insert and update (CASSANDRA-12216)
+ * Make decommission operation resumable (CASSANDRA-12008)
+ * Add support to one-way targeted repair (CASSANDRA-9876)
+ * Remove clientutil jar (CASSANDRA-11635)
+ * Fix compaction throughput throttle (CASSANDRA-12366)
+ * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358)
+ * Cassandra stress should dump all setting on startup (CASSANDRA-11914)
+ * Make it possible to compact a given token range (CASSANDRA-10643)
+ * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179)
+ * Collect metrics on queries by consistency level (CASSANDRA-7384)
+ * Add support for GROUP BY to SELECT statement (CASSANDRA-10707)
+ * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228)
+ * Upgrade to OHC 0.4.4 (CASSANDRA-12133)
+ * Add version command to cassandra-stress (CASSANDRA-12258)
+ * Create compaction-stress tool (CASSANDRA-11844)
+ * Garbage-collecting compaction operation and schema option (CASSANDRA-7019)
+ * Add beta protocol flag for v5 native protocol (CASSANDRA-12142)
+ * Support filtering on non-PRIMARY KEY columns in the CREATE
+ MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368)
+ * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004)
+ * COPY FROM should raise error for non-existing input files (CASSANDRA-12174)
+ * Faster write path (CASSANDRA-12269)
+ * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424)
+ * Support json/yaml output in nodetool tpstats (CASSANDRA-12035)
+ * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635)
+ * Prepend snapshot name with "truncated" or "dropped" when a snapshot
+ is taken before truncating or dropping a table (CASSANDRA-12178)
+ * Optimize RestrictionSet (CASSANDRA-12153)
+ * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150)
+ * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613)
+ * Create a system table to expose prepared statements (CASSANDRA-8831)
+ * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
+ * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
+ * Add supplied username to authentication error messages (CASSANDRA-12076)
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+ * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
+ * Restore resumable hints delivery (CASSANDRA-11960)
+Merged from 3.0:
+ * select_distinct_with_deletions_test failing on non-vnode environments (CASSANDRA-11126)
* Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
* Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
* Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f044b0f/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
[2/3] cassandra git commit: Fix backward compatibility issues on
SELECT DISTINCT queries
Posted by sl...@apache.org.
Fix backward compatibility issues on SELECT DISTINCT queries
patch by Sylvain Lebresne; reviewed by Benjamin Lerer for CASSANDRA-11126
This fixes 2 problems:
- Broken logic for deciding if a query involve static columns when
serializating range slice to old nodes.
- Invalid cellname in paging state when the "row marker" should be sent.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5847222d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5847222d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5847222d
Branch: refs/heads/trunk
Commit: 5847222d9b2428c201a534876f86a0ec6f6f436f
Parents: 1392893
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Aug 4 15:38:39 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Sep 1 15:49:03 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ReadCommand.java | 2 +-
src/java/org/apache/cassandra/service/pager/PagingState.java | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5847222d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d111d11..e5e2b9c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.9
+ * select_distinct_with_deletions_test failing on non-vnode environments (CASSANDRA-11126)
* Stack Overflow returned to queries while upgrading (CASSANDRA-12527)
* Fix legacy regex for temporary files from 2.2 (CASSANDRA-12565)
* Add option to state current gc_grace_seconds to tools/bin/sstablemetadata (CASSANDRA-12208)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5847222d/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 36969f8..c1762f1 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -744,7 +744,7 @@ public abstract class ReadCommand implements ReadQuery
out.writeInt(LegacyReadCommandSerializer.updateLimitForQuery(rangeCommand.limits().count(), filter.requestedSlices()));
int compositesToGroup;
- boolean selectsStatics = !rangeCommand.columnFilter().fetchedColumns().statics.isEmpty() || filter.requestedSlices().selects(Clustering.STATIC_CLUSTERING);
+ boolean selectsStatics = !rangeCommand.columnFilter().fetchedColumns().statics.isEmpty() && filter.requestedSlices().selects(Clustering.STATIC_CLUSTERING);
if (limits.kind() == DataLimits.Kind.THRIFT_LIMIT)
compositesToGroup = -1;
else if (limits.isDistinct() && !selectsStatics)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5847222d/src/java/org/apache/cassandra/service/pager/PagingState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/pager/PagingState.java b/src/java/org/apache/cassandra/service/pager/PagingState.java
index 611523f..30e14c3 100644
--- a/src/java/org/apache/cassandra/service/pager/PagingState.java
+++ b/src/java/org/apache/cassandra/service/pager/PagingState.java
@@ -213,7 +213,10 @@ public class PagingState
Iterator<Cell> cells = row.cellsInLegacyOrder(metadata, true).iterator();
if (!cells.hasNext())
{
- mark = LegacyLayout.encodeClustering(metadata, row.clustering());
+ // If the last returned row has no cell, this means in 2.1/2.2 terms that we stopped on the row
+ // marker. Note that this shouldn't happen if the table is COMPACT.
+ assert !metadata.isCompactTable();
+ mark = LegacyLayout.encodeCellName(metadata, row.clustering(), ByteBufferUtil.EMPTY_BYTE_BUFFER, null);
}
else
{
@@ -258,7 +261,7 @@ public class PagingState
@Override
public String toString()
{
- return ByteBufferUtil.bytesToHex(mark);
+ return mark == null ? "null" : ByteBufferUtil.bytesToHex(mark);
}
}
}