Merge branch 'cassandra-3.0' into cassandra-3.X * cassandra-3.0: Make distinction between unset row and non-existing partition for LWTs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26339b3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26339b3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26339b3f Branch: refs/heads/trunk Commit: 26339b3f23a87898e163fedec8b8038b8bd36aa6 Parents: 7eac22d d9b06e8 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Dec 8 17:26:48 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Dec 8 17:26:48 2016 +0100 ---------------------------------------------------------------------- .../cql3/statements/CQL3CasRequest.java | 10 +++--- .../cassandra/db/filter/ColumnFilter.java | 9 ++++++ .../operations/InsertUpdateIfConditionTest.java | 32 +++++++++++++++++++- 3 files changed, 46 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26339b3f/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26339b3f/src/java/org/apache/cassandra/db/filter/ColumnFilter.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/filter/ColumnFilter.java index 0dd0aac,2377ad0..d320fc3 --- a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java @@@ -105,10 -95,22 +105,19 @@@ public class ColumnFilte return new ColumnFilter(false, null, columns, null); } + /** + * A filter that fetches all columns for the provided table, but returns + * only the queried ones. + */ + public static ColumnFilter selection(CFMetaData metadata, PartitionColumns queried) + { + return new ColumnFilter(true, metadata, queried, null); + } + /** - * The columns that needs to be fetched internally for this selection. - * <p> - * This is the columns that must be present in the internal rows returned by queries using this selection, - * not the columns that are actually queried by the user (see the class javadoc for details). + * The columns that needs to be fetched internally for this filter. * - * @return the column to fetch for this selection. + * @return the columns to fetch for this filter. */ public PartitionColumns fetchedColumns() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/26339b3f/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java ----------------------------------------------------------------------