Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bff5f57 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bff5f57 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bff5f57 Branch: refs/heads/cassandra-1.2 Commit: 0bff5f57dc6b27522cf0c1add526fcbbd322edce Parents: 082684d 155afa1 Author: Dave Brosius <dbros...@apache.org> Authored: Sun Jun 16 13:18:47 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sun Jun 16 13:18:47 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/statements/SelectStatement.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bff5f57/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9e68257,69df3de..c28d4d7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,142 -1,14 +1,143 @@@ -1.1.12 +1.2.6 + * Reduce SSTableLoader memory usage (CASSANDRA-5555) + * Scale hinted_handoff_throttle_in_kb to cluster size (CASSANDRA-5272) + * (Hadoop) Add CQL3 input/output formats (CASSANDRA-4421) + * (Hadoop) Fix InputKeyRange in CFIF (CASSANDRA-5536) + * Fix dealing with ridiculously large max sstable sizes in LCS (CASSANDRA-5589) + * Ignore pre-truncate hints (CASSANDRA-4655) + * Move System.exit on OOM into a separate thread (CASSANDRA-5273) + * Write row markers when serializing schema (CASSANDRA-5572) + * Check only SSTables for the requested range when streaming (CASSANDRA-5569) + * Improve batchlog replay behavior and hint ttl handling (CASSANDRA-5314) + * Exclude localTimestamp from validation for tombstones (CASSANDRA-5398) + * cqlsh: add custom prompt support (CASSANDRA-5539) + * Reuse prepared statements in hot auth queries (CASSANDRA-5594) + * cqlsh: add vertical output option (see EXPAND) (CASSANDRA-5597) + * Add a rate limit option to stress (CASSANDRA-5004) + * have BulkLoader ignore snapshots directories (CASSANDRA-5587) + * fix SnitchProperties logging context (CASSANDRA-5602) + * Expose whether jna is enabled and memory is locked via JMX (CASSANDRA-5508) + * cqlsh: fix COPY FROM with ReversedType (CASSANDRA-5610) + * Allow creating CUSTOM indexes on collections (CASSANDRA-5615) + * Evaluate now() function at execution time (CASSANDRA-5616) + * Expose detailed read repair metrics (CASSANDRA-5618) + * Correct blob literal + ReversedType parsing (CASSANDRA-5629) + * Allow GPFS to prefer the internal IP like EC2MRS (CASSANDRA-5630) + * fix help text for -tspw cassandra-cli (CASSANDRA-5643) + * don't throw away initial causes exceptions for internode encryption issues (CASSANDRA-5644) ++ * Fix message spelling errors for cql select statements (CASSANDRA-5647) +Merged from 1.1: + * Remove buggy thrift max message length option (CASSANDRA-5529) + * Fix NPE in Pig's widerow mode (CASSANDRA-5488) + * Add split size parameter to Pig and disable split combination (CASSANDRA-5544) + + +1.2.5 + * make BytesToken.toString only return hex bytes (CASSANDRA-5566) + * Ensure that submitBackground enqueues at least one task (CASSANDRA-5554) + * fix 2i updates with identical values and timestamps (CASSANDRA-5540) + * fix compaction throttling bursty-ness (CASSANDRA-4316) + * reduce memory consumption of IndexSummary (CASSANDRA-5506) + * remove per-row column name bloom filters (CASSANDRA-5492) + * Include fatal errors in trace events (CASSANDRA-5447) + * Ensure that PerRowSecondaryIndex is notified of row-level deletes + (CASSANDRA-5445) + * Allow empty blob literals in CQL3 (CASSANDRA-5452) + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418) + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468) + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496) + * Don't provide oldCfId for post-1.1 system cfs (CASSANDRA-5490) + * Fix primary range ignores replication strategy (CASSANDRA-5424) + * Fix shutdown of binary protocol server (CASSANDRA-5507) + * Fix repair -snapshot not working (CASSANDRA-5512) + * Set isRunning flag later in binary protocol server (CASSANDRA-5467) + * Fix use of CQL3 functions with descending clustering order (CASSANDRA-5472) + * Disallow renaming columns one at a time for thrift table in CQL3 + (CASSANDRA-5531) + * cqlsh: add CLUSTERING ORDER BY support to DESCRIBE (CASSANDRA-5528) + * Add custom secondary index support to CQL3 (CASSANDRA-5484) + * Fix repair hanging silently on unexpected error (CASSANDRA-5229) + * Fix Ec2Snitch regression introduced by CASSANDRA-5171 (CASSANDRA-5432) + * Add nodetool enablebackup/disablebackup (CASSANDRA-5556) + * cqlsh: fix DESCRIBE after case insensitive USE (CASSANDRA-5567) +Merged from 1.1 * Remove buggy thrift max message length option (CASSANDRA-5529) * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) - * Use allocator information to improve memtable memory usage estimate + * Use allocator information to improve memtable memory usage estimate (CASSANDRA-5497) + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) * fsync leveled manifest to avoid corruption (CASSANDRA-5535) * Fix Bound intersection computation (CASSANDRA-5551) - * Fix NPE in Pig's widerow mode (CASSANDRA-5488) + * sstablescrub now respects max memory size in cassandra.in.sh (CASSANDRA-5562) + + +1.2.4 + * Ensure that PerRowSecondaryIndex updates see the most recent values + (CASSANDRA-5397) + * avoid duplicate index entries ind PrecompactedRow and + ParallelCompactionIterable (CASSANDRA-5395) + * remove the index entry on oldColumn when new column is a tombstone + (CASSANDRA-5395) + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036) + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187) + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354) + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) + * Improve asynchronous hint delivery (CASSANDRA-5179) + * Fix Guava dependency version (12.0 -> 13.0.1) for Maven (CASSANDRA-5364) + * Validate that provided CQL3 collection value are < 64K (CASSANDRA-5355) + * Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366) + * Optimize min/max timestamp collection (CASSANDRA-5373) + * Invalid streamId in cql binary protocol when using invalid CL + (CASSANDRA-5164) + * Fix validation for IN where clauses with collections (CASSANDRA-5376) + * Copy resultSet on count query to avoid ConcurrentModificationException + (CASSANDRA-5382) + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386) + * Fix streaming compressed files when using encryption (CASSANDRA-5391) + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392) + * Fix writetime/ttl functions on null values (CASSANDRA-5341) + * Fix NPE during cql3 select with token() (CASSANDRA-5404) + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385) + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413) + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783) + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423) + * Fix potential incremental backups race (CASSANDRA-5410) + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415) + * Allow overriding superuser setup delay (CASSANDRA-5430) + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431) +Merged from 1.1: + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) + * Fix cf name extraction from manifest in Directories.migrateFile() + (CASSANDRA-5242) + * Support pluggable internode authentication (CASSANDRA-5401) -1.1.11 +1.2.3 + * add check for sstable overlap within a level on startup (CASSANDRA-5327) + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) + * Avoid allocating SSTableBoundedScanner during repair when the range does + not intersect the sstable (CASSANDRA-5249) + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292) + * Fix composite comparator with super columns (CASSANDRA-5287) + * Fix insufficient validation of UPDATE queries against counter cfs + (CASSANDRA-5300) + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285) + * Handle null values when executing prepared statement (CASSANDRA-5081) + * Add netty to pom dependencies (CASSANDRA-5181) + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311) + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182) + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309) + * Re-enable unknown option in replication/compaction strategies option for + backward compatibility (CASSANDRA-4795) + * Add binary protocol support to stress (CASSANDRA-4993) + * cqlsh: Fix COPY FROM value quoting and null handling (CASSANDRA-5305) + * Fix repair -pr for vnodes (CASSANDRA-5329) + * Relax CL for auth queries for non-default users (CASSANDRA-5310) + * Fix AssertionError during repair (CASSANDRA-5245) + * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334) +Merged from 1.1: * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) * Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195) * add tmp flag to Descriptor hashcode (CASSANDRA-4021) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bff5f57/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 061e0ac,d2ceecb..57913fe --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@@ -1208,15 -1208,8 +1208,16 @@@ public class SelectStatement implement break; case IN: if (restriction != null) - throw new InvalidRequestException(String.format("%s cannot be restricted by more than one reation if it includes a IN", name)); + throw new InvalidRequestException(String.format("%s cannot be restricted by more than one relation if it includes a IN", name)); - restriction = new Restriction(newRel.getInValues()); + List<Term> inValues = new ArrayList<Term>(newRel.getInValues().size()); + for (Term.Raw raw : newRel.getInValues()) + { + Term t = raw.prepare(receiver); + t.collectMarkerSpecification(boundNames); + inValues.add(t); + } + restriction = new Restriction(inValues); ++ break; case GT: case GTE: