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/d7a03e6c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7a03e6c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7a03e6c Branch: refs/heads/cassandra-2.2 Commit: d7a03e6c78ed759338663661fd6ed1e7a3b0d130 Parents: a65953d e726cf6 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Jul 21 22:02:08 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Jul 21 22:02:08 2015 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/SelectStatement.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d7a03e6c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index e2708cd,26a1ee1..cd0eeaa --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@@ -1053,10 -2379,12 +1053,11 @@@ public class SelectStatement implement public static class Parameters { - private final Map<ColumnIdentifier.Raw, Boolean> orderings; - private final boolean isDistinct; - private final boolean allowFiltering; + // Public because CASSANDRA-9858 + public final Map<ColumnIdentifier.Raw, Boolean> orderings; + public final boolean isDistinct; - public final boolean isCount; - public final ColumnIdentifier countAlias; + public final boolean allowFiltering; + public final boolean isJson; public Parameters(Map<ColumnIdentifier.Raw, Boolean> orderings, boolean isDistinct,
