Merge branch cassandra-3.11 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f74b0ea7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f74b0ea7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f74b0ea7 Branch: refs/heads/trunk Commit: f74b0ea752419c6b08cf6be63ace55948fdf0a83 Parents: 6544040 515f07b Author: Benjamin Lerer <[email protected]> Authored: Thu Feb 15 11:01:48 2018 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Thu Feb 15 11:04:24 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 + .../cassandra/cql3/selection/Selection.java | 14 + .../cql3/statements/SelectStatement.java | 37 +- .../cql3/validation/entities/JsonTest.java | 25 ++ .../operations/SelectGroupByTest.java | 345 +++++++++++++++++++ 5 files changed, 415 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74b0ea7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 5fcb335,e858781..c37901a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,198 -1,7 +1,201 @@@ +4.0 + * Add a few options to nodetool verify (CASSANDRA-14201) + * CVE-2017-5929 Security vulnerability and redefine default log rotation policy (CASSANDRA-14183) + * Use JVM default SSL validation algorithm instead of custom default (CASSANDRA-13259) + * Better document in code InetAddressAndPort usage post 7544, incorporate port into UUIDGen node (CASSANDRA-14226) + * Fix sstablemetadata date string for minLocalDeletionTime (CASSANDRA-14132) + * Make it possible to change neverPurgeTombstones during runtime (CASSANDRA-14214) + * Remove GossipDigestSynVerbHandler#doSort() (CASSANDRA-14174) + * Add nodetool clientlist (CASSANDRA-13665) + * Revert ProtocolVersion changes from CASSANDRA-7544 (CASSANDRA-14211) + * Non-disruptive seed node list reload (CASSANDRA-14190) + * Nodetool tablehistograms to print statics for all the tables (CASSANDRA-14185) + * Migrate dtests to use pytest and python3 (CASSANDRA-14134) + * Allow storage port to be configurable per node (CASSANDRA-7544) + * Make sub-range selection for non-frozen collections return null instead of empty (CASSANDRA-14182) + * BloomFilter serialization format should not change byte ordering (CASSANDRA-9067) + * Remove unused on-heap BloomFilter implementation (CASSANDRA-14152) + * Delete temp test files on exit (CASSANDRA-14153) + * Make PartitionUpdate and Mutation immutable (CASSANDRA-13867) + * Fix CommitLogReplayer exception for CDC data (CASSANDRA-14066) + * Fix cassandra-stress startup failure (CASSANDRA-14106) + * Remove initialDirectories from CFS (CASSANDRA-13928) + * Fix trivial log format error (CASSANDRA-14015) + * Allow sstabledump to do a json object per partition (CASSANDRA-13848) + * Add option to optimise merkle tree comparison across replicas (CASSANDRA-3200) + * Remove unused and deprecated methods from AbstractCompactionStrategy (CASSANDRA-14081) + * Fix Distribution.average in cassandra-stress (CASSANDRA-14090) + * Support a means of logging all queries as they were invoked (CASSANDRA-13983) + * Presize collections (CASSANDRA-13760) + * Add GroupCommitLogService (CASSANDRA-13530) + * Parallelize initial materialized view build (CASSANDRA-12245) + * Fix flaky SecondaryIndexManagerTest.assert[Not]MarkedAsBuilt (CASSANDRA-13965) + * Make LWTs send resultset metadata on every request (CASSANDRA-13992) + * Fix flaky indexWithFailedInitializationIsNotQueryableAfterPartialRebuild (CASSANDRA-13963) + * Introduce leaf-only iterator (CASSANDRA-9988) + * Upgrade Guava to 23.3 and Airline to 0.8 (CASSANDRA-13997) + * Allow only one concurrent call to StatusLogger (CASSANDRA-12182) + * Refactoring to specialised functional interfaces (CASSANDRA-13982) + * Speculative retry should allow more friendly params (CASSANDRA-13876) + * Throw exception if we send/receive repair messages to incompatible nodes (CASSANDRA-13944) + * Replace usages of MessageDigest with Guava's Hasher (CASSANDRA-13291) + * Add nodetool cmd to print hinted handoff window (CASSANDRA-13728) + * Fix some alerts raised by static analysis (CASSANDRA-13799) + * Checksum sstable metadata (CASSANDRA-13321, CASSANDRA-13593) + * Add result set metadata to prepared statement MD5 hash calculation (CASSANDRA-10786) + * Refactor GcCompactionTest to avoid boxing (CASSANDRA-13941) + * Expose recent histograms in JmxHistograms (CASSANDRA-13642) + * Fix buffer length comparison when decompressing in netty-based streaming (CASSANDRA-13899) + * Properly close StreamCompressionInputStream to release any ByteBuf (CASSANDRA-13906) + * Add SERIAL and LOCAL_SERIAL support for cassandra-stress (CASSANDRA-13925) + * LCS needlessly checks for L0 STCS candidates multiple times (CASSANDRA-12961) + * Correctly close netty channels when a stream session ends (CASSANDRA-13905) + * Update lz4 to 1.4.0 (CASSANDRA-13741) + * Optimize Paxos prepare and propose stage for local requests (CASSANDRA-13862) + * Throttle base partitions during MV repair streaming to prevent OOM (CASSANDRA-13299) + * Use compaction threshold for STCS in L0 (CASSANDRA-13861) + * Fix problem with min_compress_ratio: 1 and disallow ratio < 1 (CASSANDRA-13703) + * Add extra information to SASI timeout exception (CASSANDRA-13677) + * Add incremental repair support for --hosts, --force, and subrange repair (CASSANDRA-13818) + * Rework CompactionStrategyManager.getScanners synchronization (CASSANDRA-13786) + * Add additional unit tests for batch behavior, TTLs, Timestamps (CASSANDRA-13846) + * Add keyspace and table name in schema validation exception (CASSANDRA-13845) + * Emit metrics whenever we hit tombstone failures and warn thresholds (CASSANDRA-13771) + * Make netty EventLoopGroups daemon threads (CASSANDRA-13837) + * Race condition when closing stream sessions (CASSANDRA-13852) + * NettyFactoryTest is failing in trunk on macOS (CASSANDRA-13831) + * Allow changing log levels via nodetool for related classes (CASSANDRA-12696) + * Add stress profile yaml with LWT (CASSANDRA-7960) + * Reduce memory copies and object creations when acting on ByteBufs (CASSANDRA-13789) + * Simplify mx4j configuration (Cassandra-13578) + * Fix trigger example on 4.0 (CASSANDRA-13796) + * Force minumum timeout value (CASSANDRA-9375) + * Use netty for streaming (CASSANDRA-12229) + * Use netty for internode messaging (CASSANDRA-8457) + * Add bytes repaired/unrepaired to nodetool tablestats (CASSANDRA-13774) + * Don't delete incremental repair sessions if they still have sstables (CASSANDRA-13758) + * Fix pending repair manager index out of bounds check (CASSANDRA-13769) + * Don't use RangeFetchMapCalculator when RF=1 (CASSANDRA-13576) + * Don't optimise trivial ranges in RangeFetchMapCalculator (CASSANDRA-13664) + * Use an ExecutorService for repair commands instead of new Thread(..).start() (CASSANDRA-13594) + * Fix race / ref leak in anticompaction (CASSANDRA-13688) + * Expose tasks queue length via JMX (CASSANDRA-12758) + * Fix race / ref leak in PendingRepairManager (CASSANDRA-13751) + * Enable ppc64le runtime as unsupported architecture (CASSANDRA-13615) + * Improve sstablemetadata output (CASSANDRA-11483) + * Support for migrating legacy users to roles has been dropped (CASSANDRA-13371) + * Introduce error metrics for repair (CASSANDRA-13387) + * Refactoring to primitive functional interfaces in AuthCache (CASSANDRA-13732) + * Update metrics to 3.1.5 (CASSANDRA-13648) + * batch_size_warn_threshold_in_kb can now be set at runtime (CASSANDRA-13699) + * Avoid always rebuilding secondary indexes at startup (CASSANDRA-13725) + * Upgrade JMH from 1.13 to 1.19 (CASSANDRA-13727) + * Upgrade SLF4J from 1.7.7 to 1.7.25 (CASSANDRA-12996) + * Default for start_native_transport now true if not set in config (CASSANDRA-13656) + * Don't add localhost to the graph when calculating where to stream from (CASSANDRA-13583) + * Make CDC availability more deterministic via hard-linking (CASSANDRA-12148) + * Allow skipping equality-restricted clustering columns in ORDER BY clause (CASSANDRA-10271) + * Use common nowInSec for validation compactions (CASSANDRA-13671) + * Improve handling of IR prepare failures (CASSANDRA-13672) + * Send IR coordinator messages synchronously (CASSANDRA-13673) + * Flush system.repair table before IR finalize promise (CASSANDRA-13660) + * Fix column filter creation for wildcard queries (CASSANDRA-13650) + * Add 'nodetool getbatchlogreplaythrottle' and 'nodetool setbatchlogreplaythrottle' (CASSANDRA-13614) + * fix race condition in PendingRepairManager (CASSANDRA-13659) + * Allow noop incremental repair state transitions (CASSANDRA-13658) + * Run repair with down replicas (CASSANDRA-10446) + * Added started & completed repair metrics (CASSANDRA-13598) + * Added started & completed repair metrics (CASSANDRA-13598) + * Improve secondary index (re)build failure and concurrency handling (CASSANDRA-10130) + * Improve calculation of available disk space for compaction (CASSANDRA-13068) + * Change the accessibility of RowCacheSerializer for third party row cache plugins (CASSANDRA-13579) + * Allow sub-range repairs for a preview of repaired data (CASSANDRA-13570) + * NPE in IR cleanup when columnfamily has no sstables (CASSANDRA-13585) + * Fix Randomness of stress values (CASSANDRA-12744) + * Allow selecting Map values and Set elements (CASSANDRA-7396) + * Fast and garbage-free Streaming Histogram (CASSANDRA-13444) + * Update repairTime for keyspaces on completion (CASSANDRA-13539) + * Add configurable upper bound for validation executor threads (CASSANDRA-13521) + * Bring back maxHintTTL propery (CASSANDRA-12982) + * Add testing guidelines (CASSANDRA-13497) + * Add more repair metrics (CASSANDRA-13531) + * RangeStreamer should be smarter when picking endpoints for streaming (CASSANDRA-4650) + * Avoid rewrapping an exception thrown for cache load functions (CASSANDRA-13367) + * Log time elapsed for each incremental repair phase (CASSANDRA-13498) + * Add multiple table operation support to cassandra-stress (CASSANDRA-8780) + * Fix incorrect cqlsh results when selecting same columns multiple times (CASSANDRA-13262) + * Fix WriteResponseHandlerTest is sensitive to test execution order (CASSANDRA-13421) + * Improve incremental repair logging (CASSANDRA-13468) + * Start compaction when incremental repair finishes (CASSANDRA-13454) + * Add repair streaming preview (CASSANDRA-13257) + * Cleanup isIncremental/repairedAt usage (CASSANDRA-13430) + * Change protocol to allow sending key space independent of query string (CASSANDRA-10145) + * Make gc_log and gc_warn settable at runtime (CASSANDRA-12661) + * Take number of files in L0 in account when estimating remaining compaction tasks (CASSANDRA-13354) + * Skip building views during base table streams on range movements (CASSANDRA-13065) + * Improve error messages for +/- operations on maps and tuples (CASSANDRA-13197) + * Remove deprecated repair JMX APIs (CASSANDRA-11530) + * Fix version check to enable streaming keep-alive (CASSANDRA-12929) + * Make it possible to monitor an ideal consistency level separate from actual consistency level (CASSANDRA-13289) + * Outbound TCP connections ignore internode authenticator (CASSANDRA-13324) + * Upgrade junit from 4.6 to 4.12 (CASSANDRA-13360) + * Cleanup ParentRepairSession after repairs (CASSANDRA-13359) + * Upgrade snappy-java to 1.1.2.6 (CASSANDRA-13336) + * Incremental repair not streaming correct sstables (CASSANDRA-13328) + * Upgrade the jna version to 4.3.0 (CASSANDRA-13300) + * Add the currentTimestamp, currentDate, currentTime and currentTimeUUID functions (CASSANDRA-13132) + * Remove config option index_interval (CASSANDRA-10671) + * Reduce lock contention for collection types and serializers (CASSANDRA-13271) + * Make it possible to override MessagingService.Verb ids (CASSANDRA-13283) + * Avoid synchronized on prepareForRepair in ActiveRepairService (CASSANDRA-9292) + * Adds the ability to use uncompressed chunks in compressed files (CASSANDRA-10520) + * Don't flush sstables when streaming for incremental repair (CASSANDRA-13226) + * Remove unused method (CASSANDRA-13227) + * Fix minor bugs related to #9143 (CASSANDRA-13217) + * Output warning if user increases RF (CASSANDRA-13079) + * Remove pre-3.0 streaming compatibility code for 4.0 (CASSANDRA-13081) + * Add support for + and - operations on dates (CASSANDRA-11936) + * Fix consistency of incrementally repaired data (CASSANDRA-9143) + * Increase commitlog version (CASSANDRA-13161) + * Make TableMetadata immutable, optimize Schema (CASSANDRA-9425) + * Refactor ColumnCondition (CASSANDRA-12981) + * Parallelize streaming of different keyspaces (CASSANDRA-4663) + * Improved compactions metrics (CASSANDRA-13015) + * Speed-up start-up sequence by avoiding un-needed flushes (CASSANDRA-13031) + * Use Caffeine (W-TinyLFU) for on-heap caches (CASSANDRA-10855) + * Thrift removal (CASSANDRA-11115) + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716) + * Add column definition kind to dropped columns in schema (CASSANDRA-12705) + * Add (automate) Nodetool Documentation (CASSANDRA-12672) + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736) + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681) + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422) + * Use new token allocation for non bootstrap case as well (CASSANDRA-13080) + * Avoid byte-array copy when key cache is disabled (CASSANDRA-13084) + * Require forceful decommission if number of nodes is less than replication factor (CASSANDRA-12510) + * Allow IN restrictions on column families with collections (CASSANDRA-12654) + * Log message size in trace message in OutboundTcpConnection (CASSANDRA-13028) + * Add timeUnit Days for cassandra-stress (CASSANDRA-13029) + * Add mutation size and batch metrics (CASSANDRA-12649) + * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999) + * Expose time spent waiting in thread pool queue (CASSANDRA-8398) + * Conditionally update index built status to avoid unnecessary flushes (CASSANDRA-12969) + * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) + * Add support for arithmetic operators (CASSANDRA-11935) + * Add histogram for delay to deliver hints (CASSANDRA-13234) + * Fix cqlsh automatic protocol downgrade regression (CASSANDRA-13307) + * Changing `max_hint_window_in_ms` at runtime (CASSANDRA-11720) + * Trivial format error in StorageProxy (CASSANDRA-13551) + * Nodetool repair can hang forever if we lose the notification for the repair completing/failing (CASSANDRA-13480) + * Anticompaction can cause noisy log messages (CASSANDRA-13684) + * Switch to client init for sstabledump (CASSANDRA-13683) + * CQLSH: Don't pause when capturing data (CASSANDRA-13743) + * nodetool clearsnapshot requires --all to clear all snapshots (CASSANDRA-13391) + * Correctly count range tombstones in traces and tombstone thresholds (CASSANDRA-8527) + + 3.11.3 + * Fix wildcard GROUP BY queries (CASSANDRA-14209) -Merged from 2.1 - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt (CASSANDRA-14183) ++ 3.11.2 * Fix ReadCommandTest (CASSANDRA-14234) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74b0ea7/src/java/org/apache/cassandra/cql3/selection/Selection.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/selection/Selection.java index 80494ba,93a71b8..aaef468 --- a/src/java/org/apache/cassandra/cql3/selection/Selection.java +++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java @@@ -24,15 -24,21 +24,16 @@@ import com.google.common.base.MoreObjec import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; ++import com.google.common.collect.Lists; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.cql3.*; import org.apache.cassandra.cql3.functions.Function; -import org.apache.cassandra.db.Clustering; -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.aggregation.AggregationSpecification; -import org.apache.cassandra.db.aggregation.GroupMaker; -import org.apache.cassandra.db.context.CounterContext; +import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.exceptions.InvalidRequestException; +import org.apache.cassandra.schema.ColumnMetadata; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.transport.ProtocolVersion; -import org.apache.cassandra.utils.ByteBufferUtil; public abstract class Selection { @@@ -99,16 -140,35 +100,29 @@@ return new ResultSet.ResultMetadata(Arrays.asList(jsonSpec)); } - public static Selection wildcard(CFMetaData cfm) + public static Selection wildcard(TableMetadata table, boolean isJson) { - List<ColumnDefinition> all = new ArrayList<>(cfm.allColumns().size()); - Iterators.addAll(all, cfm.allColumnsInSelectOrder()); - return new SimpleSelection(cfm, all, true); + List<ColumnMetadata> all = new ArrayList<>(table.columns().size()); + Iterators.addAll(all, table.allColumnsInSelectOrder()); + return new SimpleSelection(table, all, Collections.emptySet(), true, isJson); } - public static Selection wildcardWithGroupBy(CFMetaData cfm, VariableSpecifications boundNames) ++ public static Selection wildcardWithGroupBy(TableMetadata table, ++ VariableSpecifications boundNames, ++ boolean isJson) + { - List<RawSelector> rawSelectors = new ArrayList<>(cfm.allColumns().size()); - Iterator<ColumnDefinition> iter = cfm.allColumnsInSelectOrder(); - while (iter.hasNext()) - { - ColumnDefinition.Raw raw = ColumnDefinition.Raw.forColumn(iter.next()); - rawSelectors.add(new RawSelector(raw, null)); - } - return fromSelectors(cfm, rawSelectors, boundNames, true); - } - - public static Selection forColumns(CFMetaData cfm, List<ColumnDefinition> columns) - { - return new SimpleSelection(cfm, columns, false); ++ return fromSelectors(table, ++ Lists.newArrayList(table.allColumnsInSelectOrder()), ++ boundNames, ++ Collections.emptySet(), ++ Collections.emptySet(), ++ true, ++ isJson); + } + - public int addColumnForOrdering(ColumnDefinition c) + public static Selection forColumns(TableMetadata table, List<ColumnMetadata> columns) { - columns.add(c); - metadata.addNonSerializedColumn(c); - return columns.size() - 1; + return new SimpleSelection(table, columns, Collections.emptySet(), false, false); } public void addFunctionsTo(List<Function> functions) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74b0ea7/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 3754ee6,a7ba6aa..ae206a5 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@@ -929,36 -948,19 +929,32 @@@ public class SelectStatement implement this.perPartitionLimit = perPartitionLimit; } - public ParsedStatement.Prepared prepare(ClientState clientState) throws InvalidRequestException + public ParsedStatement.Prepared prepare() throws InvalidRequestException { - return prepare(false, clientState); + return prepare(false); } - public ParsedStatement.Prepared prepare(boolean forView, ClientState clientState) throws InvalidRequestException + public ParsedStatement.Prepared prepare(boolean forView) throws InvalidRequestException { - CFMetaData cfm = ThriftValidation.validateColumnFamilyWithCompactMode(keyspace(), columnFamily(), clientState.isNoCompactMode()); + TableMetadata table = Schema.instance.validateTable(keyspace(), columnFamily()); VariableSpecifications boundNames = getBoundVariables(); - Selection selection = prepareSelection(cfm, boundNames); + List<Selectable> selectables = RawSelector.toSelectables(selectClause, table); + boolean containsOnlyStaticColumns = selectOnlyStaticColumns(table, selectables); + + StatementRestrictions restrictions = prepareRestrictions(table, boundNames, containsOnlyStaticColumns, forView); + + // If we order post-query, the sorted column needs to be in the ResultSet for sorting, + // even if we don't ultimately ship them to the client (CASSANDRA-4911). + Map<ColumnMetadata, Boolean> orderingColumns = getOrderingColumns(table); + Set<ColumnMetadata> resultSetOrderingColumns = restrictions.keyIsInRelation() ? orderingColumns.keySet() + : Collections.emptySet(); - Selection selection = selectables.isEmpty() - ? Selection.wildcard(table, parameters.isJson) - : Selection.fromSelectors(table, - selectables, - boundNames, - resultSetOrderingColumns, - restrictions.nonPKRestrictedColumns(false), - !parameters.groups.isEmpty(), - parameters.isJson); - StatementRestrictions restrictions = prepareRestrictions(cfm, boundNames, selection, forView); ++ Selection selection = prepareSelection(table, ++ selectables, ++ boundNames, ++ resultSetOrderingColumns, ++ restrictions); if (parameters.isDistinct) { @@@ -1000,41 -1002,24 +996,64 @@@ prepareLimit(boundNames, limit, keyspace(), limitReceiver()), prepareLimit(boundNames, perPartitionLimit, keyspace(), perPartitionLimitReceiver())); - return new ParsedStatement.Prepared(stmt, boundNames, boundNames.getPartitionKeyBindIndexes(cfm)); + return new ParsedStatement.Prepared(stmt, boundNames, boundNames.getPartitionKeyBindIndexes(table)); + } + ++ private Selection prepareSelection(TableMetadata table, ++ List<Selectable> selectables, ++ VariableSpecifications boundNames, ++ Set<ColumnMetadata> resultSetOrderingColumns, ++ StatementRestrictions restrictions) ++ { ++ boolean hasGroupBy = !parameters.groups.isEmpty(); ++ ++ if (selectables.isEmpty()) // wildcard query ++ { ++ return hasGroupBy ? Selection.wildcardWithGroupBy(table, boundNames, parameters.isJson) ++ : Selection.wildcard(table, parameters.isJson); ++ } ++ ++ return Selection.fromSelectors(table, ++ selectables, ++ boundNames, ++ resultSetOrderingColumns, ++ restrictions.nonPKRestrictedColumns(false), ++ hasGroupBy, ++ parameters.isJson); + } + /** - * Prepares the selection to use for the statement. + * Checks if the specified selectables select only partition key columns or static columns * - * @param cfm the table metadata - * @param boundNames the bound names - * @return the selection to use for the statement + * @param table the table metadata + * @param selectables the selectables to check + * @return {@code true} if the specified selectables select only partition key columns or static columns, + * {@code false} otherwise. */ - private Selection prepareSelection(CFMetaData cfm, VariableSpecifications boundNames) + private boolean selectOnlyStaticColumns(TableMetadata table, List<Selectable> selectables) { - boolean hasGroupBy = !parameters.groups.isEmpty(); + if (table.isStaticCompactTable() || !table.hasStaticColumns() || selectables.isEmpty()) + return false; - if (selectClause.isEmpty()) - return hasGroupBy ? Selection.wildcardWithGroupBy(cfm, boundNames) : Selection.wildcard(cfm); + return Selectable.selectColumns(selectables, (column) -> column.isStatic()) + && !Selectable.selectColumns(selectables, (column) -> !column.isPartitionKey() && !column.isStatic()); + } + + /** + * Returns the columns used to order the data. + * @return the columns used to order the data. + */ + private Map<ColumnMetadata, Boolean> getOrderingColumns(TableMetadata table) + { + if (parameters.orderings.isEmpty()) + return Collections.emptyMap(); - return Selection.fromSelectors(cfm, selectClause, boundNames, hasGroupBy); + Map<ColumnMetadata, Boolean> orderingColumns = new LinkedHashMap<>(); + for (Map.Entry<ColumnMetadata.Raw, Boolean> entry : parameters.orderings.entrySet()) + { + orderingColumns.put(entry.getKey().prepare(table), entry.getValue()); + } + return orderingColumns; } /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/f74b0ea7/test/unit/org/apache/cassandra/cql3/validation/entities/JsonTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
