Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 9DDE3200B95 for ; Tue, 27 Sep 2016 09:23:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 9ABCA160AD3; Tue, 27 Sep 2016 07:23:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B174A160AE5 for ; Tue, 27 Sep 2016 09:23:12 +0200 (CEST) Received: (qmail 44162 invoked by uid 500); 27 Sep 2016 07:23:11 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 44014 invoked by uid 99); 27 Sep 2016 07:23:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Sep 2016 07:23:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3F3C2E08AE; Tue, 27 Sep 2016 07:23:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Tue, 27 Sep 2016 07:23:13 -0000 Message-Id: In-Reply-To: <447bbcb5bebd4ce18dfef08ba1d2dbc7@git.apache.org> References: <447bbcb5bebd4ce18dfef08ba1d2dbc7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk archived-at: Tue, 27 Sep 2016 07:23:13 -0000 Merge branch 'cassandra-3.0' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/57770133 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/57770133 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/57770133 Branch: refs/heads/trunk Commit: 5777013368fd549bf603d1a108bb2dad714c8b55 Parents: 979af88 b7da003 Author: Marcus Eriksson Authored: Tue Sep 27 09:11:37 2016 +0200 Committer: Marcus Eriksson Committed: Tue Sep 27 09:13:49 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/compaction/CompactionIterator.java | 2 +- .../db/RepairedDataTombstonesTest.java | 78 ++++++++++++-------- 3 files changed, 50 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57770133/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 0a7f9b0,0524e49..e10b870 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,73 -1,4 +1,74 @@@ -3.0.10 +3.10 + * Tune compaction thread count via nodetool (CASSANDRA-12248) + * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232) + * Include repair session IDs in repair start message (CASSANDRA-12532) + * Add a blocking task to Index, run before joining the ring (CASSANDRA-12039) + * Fix NPE when using CQLSSTableWriter (CASSANDRA-12667) + * Support optional backpressure strategies at the coordinator (CASSANDRA-9318) + * Make randompartitioner work with new vnode allocation (CASSANDRA-12647) + * Fix cassandra-stress graphing (CASSANDRA-12237) + * Allow filtering on partition key columns for queries without secondary indexes (CASSANDRA-11031) + * Fix Cassandra Stress reporting thread model and precision (CASSANDRA-12585) + * Add JMH benchmarks.jar (CASSANDRA-12586) + * Add row offset support to SASI (CASSANDRA-11990) + * Cleanup uses of AlterTableStatementColumn (CASSANDRA-12567) + * Add keep-alive to streaming (CASSANDRA-11841) + * Tracing payload is passed through newSession(..) (CASSANDRA-11706) + * avoid deleting non existing sstable files and improve related log messages (CASSANDRA-12261) + * json/yaml output format for nodetool compactionhistory (CASSANDRA-12486) + * Retry all internode messages once after a connection is + closed and reopened (CASSANDRA-12192) + * Add support to rebuild from targeted replica (CASSANDRA-9875) + * Add sequence distribution type to cassandra stress (CASSANDRA-12490) + * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154) + * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474) + * Extend read/write failure messages with a map of replica addresses + to error codes in the v5 native protocol (CASSANDRA-12311) + * Fix rebuild of SASI indexes with existing index files (CASSANDRA-12374) + * Let DatabaseDescriptor not implicitly startup services (CASSANDRA-9054, 12550) + * Fix clustering indexes in presence of static columns in SASI (CASSANDRA-12378) + * Fix queries on columns with reversed type on SASI indexes (CASSANDRA-12223) + * Added slow query log (CASSANDRA-12403) + * Count full coordinated request against timeout (CASSANDRA-12256) + * Allow TTL with null value on insert and update (CASSANDRA-12216) + * Make decommission operation resumable (CASSANDRA-12008) + * Add support to one-way targeted repair (CASSANDRA-9876) + * Remove clientutil jar (CASSANDRA-11635) + * Fix compaction throughput throttle (CASSANDRA-12366) + * Delay releasing Memtable memory on flush until PostFlush has finished running (CASSANDRA-12358) + * Cassandra stress should dump all setting on startup (CASSANDRA-11914) + * Make it possible to compact a given token range (CASSANDRA-10643) + * Allow updating DynamicEndpointSnitch properties via JMX (CASSANDRA-12179) + * Collect metrics on queries by consistency level (CASSANDRA-7384) + * Add support for GROUP BY to SELECT statement (CASSANDRA-10707) + * Deprecate memtable_cleanup_threshold and update default for memtable_flush_writers (CASSANDRA-12228) + * Upgrade to OHC 0.4.4 (CASSANDRA-12133) + * Add version command to cassandra-stress (CASSANDRA-12258) + * Create compaction-stress tool (CASSANDRA-11844) + * Garbage-collecting compaction operation and schema option (CASSANDRA-7019) + * Add beta protocol flag for v5 native protocol (CASSANDRA-12142) + * Support filtering on non-PRIMARY KEY columns in the CREATE + MATERIALIZED VIEW statement's WHERE clause (CASSANDRA-10368) + * Unify STDOUT and SYSTEMLOG logback format (CASSANDRA-12004) + * COPY FROM should raise error for non-existing input files (CASSANDRA-12174) + * Faster write path (CASSANDRA-12269) + * Option to leave omitted columns in INSERT JSON unset (CASSANDRA-11424) + * Support json/yaml output in nodetool tpstats (CASSANDRA-12035) + * Expose metrics for successful/failed authentication attempts (CASSANDRA-10635) + * Prepend snapshot name with "truncated" or "dropped" when a snapshot + is taken before truncating or dropping a table (CASSANDRA-12178) + * Optimize RestrictionSet (CASSANDRA-12153) + * cqlsh does not automatically downgrade CQL version (CASSANDRA-12150) + * Omit (de)serialization of state variable in UDAs (CASSANDRA-9613) + * Create a system table to expose prepared statements (CASSANDRA-8831) + * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970) + * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580) + * Add supplied username to authentication error messages (CASSANDRA-12076) + * Remove pre-startup check for open JMX port (CASSANDRA-12074) + * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738) + * Restore resumable hints delivery (CASSANDRA-11960) +Merged from 3.0: ++ * Make sure repaired tombstones are dropped when only_purge_repaired_tombstones is enabled (CASSANDRA-12703) * Skip writing MV mutations to commitlog on mutation.applyUnsafe() (CASSANDRA-11670) * Establish consistent distinction between non-existing partition and NULL value for LWTs on static columns (CASSANDRA-12060) * Extend ColumnIdentifier.internedInstances key to include the type that generated the byte buffer (CASSANDRA-12516) http://git-wip-us.apache.org/repos/asf/cassandra/blob/57770133/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/57770133/test/unit/org/apache/cassandra/db/RepairedDataTombstonesTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/RepairedDataTombstonesTest.java index ad009a4,e0d68a4..ea9f88a --- a/test/unit/org/apache/cassandra/db/RepairedDataTombstonesTest.java +++ b/test/unit/org/apache/cassandra/db/RepairedDataTombstonesTest.java @@@ -233,8 -236,10 +237,10 @@@ public class RepairedDataTombstonesTes { ReadCommand cmd = Util.cmd(getCurrentColumnFamilyStore()).build(); int foundRows = 0; - try (ReadOrderGroup orderGroup = cmd.startOrderGroup(); + try (ReadExecutionController executionController = cmd.executionController(); - UnfilteredPartitionIterator iterator = cmd.executeLocally(executionController)) + UnfilteredPartitionIterator iterator = - includePurgeable ? cmd.queryStorage(getCurrentColumnFamilyStore(), orderGroup) : - cmd.executeLocally(orderGroup)) ++ includePurgeable ? cmd.queryStorage(getCurrentColumnFamilyStore(), executionController) : ++ cmd.executeLocally(executionController)) { while (iterator.hasNext()) { @@@ -265,8 -278,10 +279,10 @@@ { ReadCommand cmd = Util.cmd(getCurrentColumnFamilyStore(), Util.dk(ByteBufferUtil.bytes(key))).build(); int foundRows = 0; - try (ReadOrderGroup orderGroup = cmd.startOrderGroup(); + try (ReadExecutionController executionController = cmd.executionController(); - UnfilteredPartitionIterator iterator = cmd.executeLocally(executionController)) + UnfilteredPartitionIterator iterator = - includePurgeable ? cmd.queryStorage(getCurrentColumnFamilyStore(), orderGroup) : - cmd.executeLocally(orderGroup)) ++ includePurgeable ? cmd.queryStorage(getCurrentColumnFamilyStore(), executionController) : ++ cmd.executeLocally(executionController)) { while (iterator.hasNext()) {