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/12/07 10:21:25 UTC
[6/6] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Merge branch 'cassandra-3.X' into trunk
* cassandra-3.X:
CQL often queries static columns unnecessarily
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8253912a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8253912a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8253912a
Branch: refs/heads/trunk
Commit: 8253912a607e6ead437bd7f19f76fd723077f754
Parents: c582336 57c2003
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Dec 7 11:19:08 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Dec 7 11:19:08 2016 +0100
----------------------------------------------------------------------
.../cql3/statements/SelectStatement.java | 26 ++++--
.../cassandra/db/filter/ColumnFilter.java | 92 +++++++++++++-------
.../org/apache/cassandra/db/rows/BTreeRow.java | 2 +-
.../apache/cassandra/schema/SchemaKeyspace.java | 2 +-
.../apache/cassandra/db/ReadCommandTest.java | 2 +-
5 files changed, 84 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8253912a/src/java/org/apache/cassandra/schema/SchemaKeyspace.java
----------------------------------------------------------------------