[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aleksey]

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/b871decb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b871decb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b871decb

Branch: refs/heads/trunk
Commit: b871decba274be126fc94ab3ab48f75a95be9d94
Parents: 33eada0 2edd6fd
Author: Aleksey Yeshchenko 
Authored: Mon Dec 10 18:23:39 2018 +
Committer: Aleksey Yeshchenko 
Committed: Mon Dec 10 18:23:39 2018 +

--
 .../operations/SelectOrderByTest.java   | 78 
 1 file changed, 78 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b871decb/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
index fd44c50,06aa2fd..8a3ae03
--- 
a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderByTest.java
@@@ -639,132 -702,84 +639,210 @@@ public class SelectOrderByTest extends 
  }
  }
  
 +/**
 + * Test that ORDER BY columns allow skipping equality-restricted 
clustering columns, see CASSANDRA-10271.
 + */
 +@Test
 +public void 
testAllowSkippingEqualityAndSingleValueInRestrictedClusteringColumns() throws 
Throwable
 +{
 +createTable("CREATE TABLE %s (a int, b int, c int, d int, PRIMARY KEY 
(a, b, c))");
 +execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 0, 
0);
 +execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 1, 
1);
 +execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 0, 2, 
2);
 +execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 0, 
3);
 +execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 1, 
4);
 +execute("INSERT INTO %s (a, b, c, d) VALUES (?, ?, ?, ?)", 0, 1, 2, 
5);
 +
 +assertInvalidMessage("Order by is currently only supported on the 
clustered columns of the PRIMARY KEY, got d",
 + "SELECT * FROM %s WHERE a=? ORDER BY d DESC", 0);
 +
 +assertInvalidMessage("Order by is currently only supported on the 
clustered columns of the PRIMARY KEY, got d",
 + "SELECT * FROM %s WHERE a=? ORDER BY b ASC, c 
ASC, d ASC", 0);
 +
 +String errorMsg = "Order by currently only supports the ordering of 
columns following their declared order in the PRIMARY KEY";
 +
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND b=? ORDER BY c", 
0, 0),
 +   row(0, 0, 0, 0),
 +   row(0, 0, 1, 1),
 +   row(0, 0, 2, 2)
 +);
 +
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND b=? ORDER BY c 
ASC", 0, 0),
 +   row(0, 0, 0, 0),
 +   row(0, 0, 1, 1),
 +   row(0, 0, 2, 2)
 +);
 +
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND b=? ORDER BY c 
DESC", 0, 0),
 +   row(0, 0, 2, 2),
 +   row(0, 0, 1, 1),
 +   row(0, 0, 0, 0)
 +);
 +
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND b=? AND c>=? ORDER 
BY c ASC", 0, 0, 1),
 +   row(0, 0, 1, 1),
 +   row(0, 0, 2, 2));
 +
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND b=? AND c>=? ORDER 
BY c DESC", 0, 0, 1),
 +   row(0, 0, 2, 2),
 +   row(0, 0, 1, 1));
 +
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND b=? AND c IN (?, 
?) ORDER BY c ASC", 0, 0, 1, 2),
 +   row(0, 0, 1, 1),
 +   row(0, 0, 2, 2));
 +
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND b=? AND c IN (?, 
?) ORDER BY c DESC", 0, 0, 1, 2),
 +   row(0, 0, 2, 2),
 +   row(0, 0, 1, 1));
 +
 +assertInvalidMessage(errorMsg, "SELECT * FROM %s WHERE a=? AND b (?, ?) ORDER BY c", 0, 0, 0);
 +assertInvalidMessage(errorMsg, "SELECT * FROM %s WHERE a=? AND (b, c) 
>= (?, ?) ORDER BY c", 0, 0, 0);
 +assertInvalidMessage(errorMsg, "SELECT * FROM %s WHERE a=? AND (b, c) 
< (?, ?) ORDER BY c", 0, 0, 0);
 +assertInvalidMessage(errorMsg, "SELECT * FROM %s WHERE a=? AND (b, c) 
<= (?, ?) ORDER BY c", 0, 0, 0);
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND (b, c) = (?, ?) 
ORDER BY c ASC", 0, 0, 0),
 +   row(0, 0, 0, 0));
 +assertRows(execute("SELECT * FROM %s WHERE a=? AND (b, c) = (?, ?) 
ORDER BY c DESC", 0, 0, 0),
 +   row(0, 0, 0, 0));
 +
 +

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aleksey]

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/325d70d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/325d70d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/325d70d5

Branch: refs/heads/trunk
Commit: 325d70d5a62e92c64aa5e0331e24390604a45d8f
Parents: 9944d9e 54be1fa
Author: Aleksey Yeshchenko 
Authored: Tue Nov 20 15:25:38 2018 +
Committer: Aleksey Yeshchenko 
Committed: Tue Nov 20 15:25:38 2018 +

--
 .../SelectMultiColumnRelationTest.java  | 25 
 1 file changed, 25 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/325d70d5/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
index 52a7f47,30c727b..5062448
--- 
a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectMultiColumnRelationTest.java
@@@ -1561,317 -1603,346 +1561,342 @@@ public class SelectMultiColumnRelationT
  @Test
  public void testMixedOrderColumns4() throws Throwable
  {
 -for (String compactOption : new String[]{"", " COMPACT STORAGE AND "})
 -{
 -createTable("CREATE TABLE %s (a int, b int, c int, d int, e int, 
PRIMARY KEY (a, b, c, d, e)) WITH " +
 -compactOption +
 -"CLUSTERING ORDER BY (b ASC, c DESC, d DESC, e ASC)");
 -
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 2, 0, -1, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 2, 0, -1, 1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 2, 0, 1, 1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 2, -1, 1, 1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 2, -3, 1, 1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, -1, 0, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, -1, 1, 1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, -1, 1, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 0, 1, -1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 0, 1, 1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 0, 0, -1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 0, 0, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 0, 0, 1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 0, -1, -1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 1, 0, -1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 1, 0, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 1, 0, -1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 1, 0, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 1, 0, 1);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 1, 1, -1, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, 0, 0, 0, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, -1, 0, -1, 0);
 -execute("INSERT INTO %s (a, b, c, d, e) VALUES (?, ?, ?, ?, ?)", 
0, -1, 0, 0, 0);
 -
 -assertRows(execute(
 -"SELECT * FROM %s" +
 -" WHERE a = ? " +
 -"AND (b,c,d,e)<(?,?,?,?) " +
 -"AND (b,c,d,e)>(?,?,?,?)", 0, 2, 0, 1, 1, -1, 0, -1, -1),
 -
 -   row(0, -1, 0, 0, 0),
 -   row(0, -1, 0, -1, 0),
 -   row(0, 0, 0, 0, 0),
 -   row(0, 1, 1, 0, -1),
 -   row(0, 1, 1, 0, 0),
 -   row(0, 1, 1, 0, 1),
 -   row(0, 1, 1, -1, 0),
 -   row(0, 1, 0, 1, -1),
 -   row(0, 1, 0, 1, 1),
 -   row(0, 1, 0, 0, -1),
 -   row(0, 1, 0, 0, 0),
 -   row(0, 1, 0, 0, 1),
 -   row(0, 1, 0, -1, -1),
 -   row(0, 1, -1, 1, 0),
 -   row(0, 1, -1, 1, 

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[spod]

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/2adf5d1d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2adf5d1d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2adf5d1d

Branch: refs/heads/trunk
Commit: 2adf5d1df6963b1f9b8dd59f4ce911c1c9456859
Parents: f24e23c 9afd3a5
Author: Stefan Podkowinski 
Authored: Mon Oct 15 09:44:34 2018 +0200
Committer: Stefan Podkowinski 
Committed: Mon Oct 15 09:44:52 2018 +0200

--
 .circleci/config.yml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[mck]

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/744973e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/744973e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/744973e4

Branch: refs/heads/trunk
Commit: 744973e4cb659c774e817b4fc553c6361f1f05ec
Parents: d26f142 0aca1b9
Author: Mick Semb Wever 
Authored: Wed Sep 5 11:25:17 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Sep 5 11:25:17 2018 +1000

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[blambov]

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/8b9515bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b9515bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b9515bd

Branch: refs/heads/trunk
Commit: 8b9515bd2e410c634e4a31fe3e93890f1a1f8f71
Parents: ac1bb75 991e197
Author: Branimir Lambov 
Authored: Tue Aug 21 11:56:30 2018 +0300
Committer: Branimir Lambov 
Committed: Tue Aug 21 11:56:30 2018 +0300

--
 .../io/sstable/IndexSummaryBuilder.java |  4 +-
 .../cassandra/io/util/DataOutputBuffer.java |  8 +-
 .../io/util/DataOutputBufferFixed.java  |  2 +-
 .../cassandra/io/util/SafeMemoryWriter.java | 16 ++--
 .../cassandra/io/util/DataOutputTest.java   |  4 +-
 .../cassandra/io/util/SafeMemoryWriterTest.java | 90 
 6 files changed, 110 insertions(+), 14 deletions(-)
--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/9c142f91
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c142f91
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9c142f91

Branch: refs/heads/trunk
Commit: 9c142f91598bdac122c0d5cc1dee296997084b92
Parents: 521f50b f8acbd2
Author: Benjamin Lerer 
Authored: Thu Aug 2 15:20:27 2018 +0200
Committer: Benjamin Lerer 
Committed: Thu Aug 2 15:20:59 2018 +0200

--
 CHANGES.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9c142f91/CHANGES.txt
--
diff --cc CHANGES.txt
index 53babca,ab64ab9..e310589
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -321,7 -56,8 +323,6 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
-  * Returns null instead of NaN or Infinity in JSON strings (CASSANDRA-14377)
 - * Fix bug that prevented compaction of SSTables after full repairs 
(CASSANDRA-14423)
 - * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[mck]

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/f081558d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f081558d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f081558d

Branch: refs/heads/trunk
Commit: f081558d68e0af4968f05687cc9587aa9bdf1bd6
Parents: 28217f8 6bcc60a
Author: Mick Semb Wever 
Authored: Wed Jul 11 10:17:04 2018 +1000
Committer: Mick Semb Wever 
Committed: Wed Jul 11 10:17:04 2018 +1000

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[mck]

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/5cc68a87
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cc68a87
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cc68a87

Branch: refs/heads/trunk
Commit: 5cc68a87359dd02412bdb70a52dfcd718d44a5ba
Parents: 4cb83cb bba0d03
Author: Mick Semb Wever 
Authored: Fri Jun 29 17:00:24 2018 +1000
Committer: Mick Semb Wever 
Committed: Fri Jun 29 17:00:24 2018 +1000

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[mck]

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/3b56d4df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b56d4df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3b56d4df

Branch: refs/heads/trunk
Commit: 3b56d4df40800f76dcf2c0019af43b7dbc244c57
Parents: bdb5280 f0403b4
Author: Mick Semb Wever 
Authored: Thu Jun 14 09:33:41 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu Jun 14 09:36:28 2018 +1000

--
 CHANGES.txt| 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3b56d4df/CHANGES.txt
--
diff --cc CHANGES.txt
index 49738cd,083f480..24aaabb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -293,7 -45,7 +293,6 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
-  * CqlRecordReader no longer quotes the keyspace when connecting, as the java 
driver will (CASSANDRA-10751)
 - * Incorrect counting of pending messages in OutboundTcpConnection 
(CASSANDRA-11551)
   * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[marcuse]

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/800f0b39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/800f0b39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/800f0b39

Branch: refs/heads/trunk
Commit: 800f0b3948aa0a9095f78ed29d8d9cbc23a57581
Parents: 84fb7fa b174819
Author: Marcus Eriksson 
Authored: Thu Jun 7 08:40:20 2018 -0700
Committer: Marcus Eriksson 
Committed: Thu Jun 7 08:40:20 2018 -0700

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[mck]

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/dd091d41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd091d41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd091d41

Branch: refs/heads/trunk
Commit: dd091d417ccca7764cdf016c2921d97121a236c5
Parents: 60ed982 73f5b8f
Author: Mick Semb Wever 
Authored: Thu May 3 19:27:12 2018 +1000
Committer: Mick Semb Wever 
Committed: Thu May 3 19:52:28 2018 +1000

--
 CHANGES.txt| 1 +
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd091d41/CHANGES.txt
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jzhuang]

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/e9418f80
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9418f80
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9418f80

Branch: refs/heads/trunk
Commit: e9418f808c03b82837a1ab7627abe08057c1388f
Parents: 2fe4b9d 783bbb3
Author: Jay Zhuang 
Authored: Tue May 1 15:16:05 2018 -0700
Committer: Jay Zhuang 
Committed: Tue May 1 15:18:26 2018 -0700

--
 CHANGES.txt |   1 +
 .../io/compress/CompressedSequentialWriter.java |  17 ++-
 .../CompressedSequentialWriterReopenTest.java   | 148 +++
 .../CompressedSequentialWriterTest.java |   6 +
 4 files changed, 170 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/CHANGES.txt
--
diff --cc CHANGES.txt
index 33c81d1,443c298..2545e83
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -264,11 -31,13 +264,12 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
+  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
   * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
 - * Backport circleci yaml (CASSANDRA-14240)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)
 - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  
  
  3.11.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
--
diff --cc 
src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 8955d4f,5694616..c35ecc8
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@@ -165,13 -155,13 +165,13 @@@ public class CompressedSequentialWrite
  chunkCount++;
  
  // write out the compressed data
 -compressed.flip();
 -channel.write(compressed);
 +toWrite.flip();
 +channel.write(toWrite);
  
  // write corresponding checksum
 -compressed.rewind();
 -crcMetadata.appendDirect(compressed, true);
 +toWrite.rewind();
 +crcMetadata.appendDirect(toWrite, true);
- lastFlushOffset += compressedLength + 4;
+ lastFlushOffset = uncompressedSize;
  }
  catch (IOException e)
  {

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9418f80/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[marcuse]

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/1d387f5e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1d387f5e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1d387f5e

Branch: refs/heads/trunk
Commit: 1d387f5e7f688150c09b7eb14a036d153017ec02
Parents: 1a2eb5e 684120d
Author: Marcus Eriksson 
Authored: Tue Apr 24 08:56:34 2018 +0200
Committer: Marcus Eriksson 
Committed: Tue Apr 24 08:56:34 2018 +0200

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|  80 +++---
 .../db/compaction/AntiCompactionTest.java   | 105 ++-
 .../org/apache/cassandra/schema/MockSchema.java |  16 ++-
 4 files changed, 161 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d387f5e/CHANGES.txt
--
diff --cc CHANGES.txt
index 6976c7f,5450322..784fa2b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -261,10 -30,12 +261,11 @@@ Merged from 3.0
   * Fully utilise specified compaction threads (CASSANDRA-14210)
   * Pre-create deletion log records to finish compactions quicker 
(CASSANDRA-12763)
  Merged from 2.2:
+  * Use Bounds instead of Range for sstables in anticompaction 
(CASSANDRA-14411)
   * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)
 - * Backport circleci yaml (CASSANDRA-14240)
 + * CQL fromJson(null) throws NullPointerException (CASSANDRA-13891)
  Merged from 2.1:
   * Check checksum before decompressing data (CASSANDRA-14284)
 - * CVE-2017-5929 Security vulnerability in Logback warning in NEWS.txt 
(CASSANDRA-14183)
  
  
  3.11.2

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1d387f5e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 5672dfe,f0a4de5..831d8ca
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -648,63 -645,67 +648,30 @@@ public class CompactionManager implemen
Refs validatedForRepair,
LifecycleTransaction txn,
long repairedAt,
 +  UUID pendingRepair,
UUID parentRepairSession) throws 
InterruptedException, IOException
  {
 -logger.info("[repair #{}] Starting anticompaction for {}.{} on {}/{} 
sstables", parentRepairSession, cfs.keyspace.getName(), cfs.getTableName(), 
validatedForRepair.size(), cfs.getLiveSSTables());
 -logger.trace("[repair #{}] Starting anticompaction for ranges {}", 
parentRepairSession, ranges);
 -Set sstables = new HashSet<>(validatedForRepair);
 -Set mutatedRepairStatuses = new HashSet<>();
 -// we should only notify that repair status changed if it actually 
did:
 -Set mutatedRepairStatusToNotify = new HashSet<>();
 -Map wasRepairedBefore = new HashMap<>();
 -for (SSTableReader sstable : sstables)
 -wasRepairedBefore.put(sstable, sstable.isRepaired());
 -
 -Set nonAnticompacting = new HashSet<>();
 -
 -Iterator sstableIterator = sstables.iterator();
  try
  {
 -List normalizedRanges = Range.normalize(ranges);
 -
 -while (sstableIterator.hasNext())
 -{
 -SSTableReader sstable = sstableIterator.next();
 +ActiveRepairService.ParentRepairSession prs = 
ActiveRepairService.instance.getParentRepairSession(parentRepairSession);
 +Preconditions.checkArgument(!prs.isPreview(), "Cannot anticompact 
for previews");
  
 -Bounds sstableBounds = new 
Bounds<>(sstable.first.getToken(), sstable.last.getToken());
 +logger.info("{} Starting anticompaction for {}.{} on {}/{} 
sstables", PreviewKind.NONE.logPrefix(parentRepairSession), 
cfs.keyspace.getName(), cfs.getTableName(), validatedForRepair.size(), 
cfs.getLiveSSTables().size());
 +logger.trace("{} Starting anticompaction for ranges {}", 
PreviewKind.NONE.logPrefix(parentRepairSession), ranges);
 +Set sstables = new HashSet<>(validatedForRepair);
  
- Set nonAnticompacting = new HashSet<>();
- 
 -boolean shouldAnticompact = false;
 +Iterator sstableIterator = sstables.iterator();
 +List normalizedRanges = Range.normalize(ranges);

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/05d7661d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05d7661d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05d7661d

Branch: refs/heads/trunk
Commit: 05d7661d04b2cd47b29a767986d4b6d283419db2
Parents: 09f3c96 95cfee6
Author: Benjamin Lerer 
Authored: Tue Apr 17 12:28:16 2018 +0200
Committer: Benjamin Lerer 
Committed: Tue Apr 17 12:30:53 2018 +0200

--
 CHANGES.txt |  6 +-
 .../cassandra/cql3/selection/Selection.java | 66 +---
 .../cql3/statements/SelectStatement.java| 23 +--
 .../cql3/validation/entities/JsonTest.java  | 39 
 4 files changed, 103 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/05d7661d/CHANGES.txt
--
diff --cc CHANGES.txt
index 71d947a,42ea3b4..4c557b4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,229 -1,7 +1,228 @@@
 +4.0
 + * Use standard Amazon naming for datacenter and rack in Ec2Snitch 
(CASSANDRA-7839)
 + * Fix junit failure for SSTableReaderTest (CASSANDRA-14387)
 + * Abstract write path for pluggable storage (CASSANDRA-14118)
 + * nodetool describecluster should be more informative (CASSANDRA-13853)
 + * Compaction performance improvements (CASSANDRA-14261) 
 + * Refactor Pair usage to avoid boxing ints/longs (CASSANDRA-14260)
 + * Add options to nodetool tablestats to sort and limit output 
(CASSANDRA-13889)
 + * Rename internals to reflect CQL vocabulary (CASSANDRA-14354)
 + * Add support for hybrid MIN(), MAX() speculative retry policies
 +   (CASSANDRA-14293, CASSANDRA-14338, CASSANDRA-14352)
 + * Fix some regressions caused by 14058 (CASSANDRA-14353)
 + * Abstract repair for pluggable storage (CASSANDRA-14116)
 + * Add meaningful toString() impls (CASSANDRA-13653)
 + * Add sstableloader option to accept target keyspace name (CASSANDRA-13884)
 + * Move processing of EchoMessage response to gossip stage (CASSANDRA-13713)
 + * Add coordinator write metric per CF (CASSANDRA-14232)
 + * Correct and clarify SSLFactory.getSslContext method and call sites 
(CASSANDRA-14314)
 + * Handle static and partition deletion properly on 
ThrottledUnfilteredIterator (CASSANDRA-14315)
 + * NodeTool clientstats should show SSL Cipher (CASSANDRA-14322)
 + * Add ability to specify driver name and version (CASSANDRA-14275)
 + * Abstract streaming for pluggable storage (CASSANDRA-14115)
 + * Forced incremental repairs should promote sstables if they can 
(CASSANDRA-14294)
 + * Use Murmur3 for validation compactions (CASSANDRA-14002)
 + * Comma at the end of the seed list is interpretated as localhost 
(CASSANDRA-14285)
 + * Refactor read executor and response resolver, abstract read repair 
(CASSANDRA-14058)
 + * Add optional startup delay to wait until peers are ready (CASSANDRA-13993)
 + * 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)
 + * 

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jasobrown]

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/1fafcb01
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fafcb01
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1fafcb01

Branch: refs/heads/trunk
Commit: 1fafcb0190fec34ca38ca6294dd7919b0fe5aacc
Parents: 946aaa7 ad52c95
Author: Jason Brown 
Authored: Thu Apr 5 06:21:53 2018 -0700
Committer: Jason Brown 
Committed: Thu Apr 5 06:21:53 2018 -0700

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[paulo]

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/b08b4dcc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b08b4dcc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b08b4dcc

Branch: refs/heads/trunk
Commit: b08b4dcc72a8d9b4fa5b92dae97ba527161f130d
Parents: c22ee2b 6f30677
Author: Paulo Motta 
Authored: Fri Mar 30 12:16:19 2018 -0300
Committer: Paulo Motta 
Committed: Fri Mar 30 12:16:19 2018 -0300

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jasobrown]

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/32110d6d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32110d6d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32110d6d

Branch: refs/heads/trunk
Commit: 32110d6d2905d0579c99a9b2e0c646dd15a2e3be
Parents: a75b48b a798257
Author: Jason Brown 
Authored: Mon Feb 19 05:51:16 2018 -0800
Committer: Jason Brown 
Committed: Mon Feb 19 05:51:16 2018 -0800

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/92d4f7b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92d4f7b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92d4f7b4

Branch: refs/heads/trunk
Commit: 92d4f7b482315a0106905233b0c06515e798b3c0
Parents: d569c83 95c8aef
Author: Benjamin Lerer 
Authored: Thu Dec 14 15:02:03 2017 +0100
Committer: Benjamin Lerer 
Committed: Thu Dec 14 15:02:32 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/service/StartupChecks.java |  34 +-
 .../org/apache/cassandra/utils/JavaUtils.java   | 115 +++
 .../apache/cassandra/utils/JavaUtilsTest.java   |  52 +
 4 files changed, 171 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d4f7b4/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/92d4f7b4/src/java/org/apache/cassandra/service/StartupChecks.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[paulo]

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/dc9bb8df
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc9bb8df
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dc9bb8df

Branch: refs/heads/trunk
Commit: dc9bb8df03e0bcfeda6d3deeacf4cb750ca1d7f5
Parents: e5bb7f3 f6381db
Author: Paulo Motta 
Authored: Wed Dec 13 06:43:12 2017 +1100
Committer: Paulo Motta 
Committed: Wed Dec 13 06:44:13 2017 +1100

--
 CHANGES.txt |  1 +
 .../db/compaction/CompactionManager.java| 15 +
 .../db/compaction/CompactionsBytemanTest.java   | 22 
 3 files changed, 34 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc9bb8df/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc9bb8df/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index cc4d078,9cd18a9..bf3b815
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -124,10 -120,10 +124,11 @@@ public class CompactionManager implemen
  private final CompactionExecutor executor = new CompactionExecutor();
  private final CompactionExecutor validationExecutor = new 
ValidationExecutor();
  private final static CompactionExecutor cacheCleanupExecutor = new 
CacheCleanupExecutor();
 +private final CompactionExecutor viewBuildExecutor = new 
ViewBuildExecutor();
  
 -private final CompactionMetrics metrics = new CompactionMetrics(executor, 
validationExecutor);
 +private final CompactionMetrics metrics = new CompactionMetrics(executor, 
validationExecutor, viewBuildExecutor);
- private final Multiset compactingCF = 
ConcurrentHashMultiset.create();
+ @VisibleForTesting
+ final Multiset compactingCF = 
ConcurrentHashMultiset.create();
  
  private final RateLimiter compactionRateLimiter = 
RateLimiter.create(Double.MAX_VALUE);
  

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc9bb8df/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java
--
diff --cc 
test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java
index 3ca01c1,0b391a5..2519389
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsBytemanTest.java
@@@ -25,8 -23,9 +25,9 @@@ import org.junit.runner.RunWith
  
  import org.apache.cassandra.cql3.CQLTester;
  import org.apache.cassandra.db.ColumnFamilyStore;
 -import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.utils.FBUtilities;
  import org.jboss.byteman.contrib.bmunit.BMRule;
 +import org.jboss.byteman.contrib.bmunit.BMRules;
  import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
  
  import static org.junit.Assert.assertEquals;
@@@ -34,89 -33,24 +35,110 @@@
  @RunWith(BMUnitRunner.class)
  public class CompactionsBytemanTest extends CQLTester
  {
 +/*
 +Return false for the first time hasAvailableDiskSpace is called. i.e 
first SSTable is too big
 +Create 5 SSTables. After compaction, there should be 2 left - 1 as the 9 
SStables which were merged,
 +and the other the SSTable that was 'too large' and failed the 
hasAvailableDiskSpace check
 + */
 +@Test
 +@BMRules(rules = { @BMRule(name = "One SSTable too big for remaining disk 
space test",
 +targetClass = "Directories",
 +targetMethod = "hasAvailableDiskSpace",
 +condition = "not flagged(\"done\")",
 +action = "flag(\"done\"); return false;") } )
 +public void testSSTableNotEnoughDiskSpaceForCompactionGetsDropped() 
throws Throwable
 +{
 +createLowGCGraceTable();
 +final ColumnFamilyStore cfs = getCurrentColumnFamilyStore();
 +for (int i = 0; i < 5; i++)
 +{
 +createPossiblyExpiredSSTable(cfs, false);
 +}
 +assertEquals(5, 
getCurrentColumnFamilyStore().getLiveSSTables().size());
 +cfs.forceMajorCompaction(false);
 +assertEquals(2, 
getCurrentColumnFamilyStore().getLiveSSTables().size());
 +dropTable("DROP TABLE %s");
 +}
 +
 +/*
 +Always return false for hasAvailableDiskSpace. i.e node has no more space
 +Create 2 expired SSTables and 1 long lived one. After compaction, there 
should only be 1 left,
 +as the 2 expired ones would have been compacted away.
 

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/17e602b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17e602b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17e602b7

Branch: refs/heads/trunk
Commit: 17e602b7d248c61634c31c93b7d244f35cfcefd3
Parents: 8e95534 a7c45be
Author: Benjamin Lerer 
Authored: Tue Dec 12 10:52:23 2017 +0100
Committer: Benjamin Lerer 
Committed: Tue Dec 12 10:52:23 2017 +0100

--
 CHANGES.txt |   2 +-
 NEWS.txt|  13 +
 bin/cassandra   |  19 +-
 conf/cassandra-env.ps1  | 914 ++-
 conf/cassandra-env.sh   |  12 +
 .../apache/cassandra/service/StartupChecks.java |  74 ++
 .../org/apache/cassandra/utils/HeapUtils.java   |  93 +-
 .../cassandra/utils/JVMStabilityInspector.java  |  24 +-
 .../utils/JVMStabilityInspectorTest.java|  28 +-
 9 files changed, 638 insertions(+), 541 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/17e602b7/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/17e602b7/NEWS.txt
--
diff --cc NEWS.txt
index 7bb9152,0c32278..259507e
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,103 -13,27 +13,116 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 +4.0
 +===
 +
 +New features
 +
 +   - An experimental option to compare all merkle trees together has been 
added - for example, in
 + a 3 node cluster with 2 replicas identical and 1 out-of-date, with this 
option enabled, the
 + out-of-date replica will only stream a single copy from up-to-date 
replica. Enable it by adding
 + "-os" to nodetool repair. See CASSANDRA-3200.
 +   - The currentTimestamp, currentDate, currentTime and currentTimeUUID 
functions have been added.
 + See CASSANDRA-13132
 +   - Support for arithmetic operations between `timestamp`/`date` and 
`duration` has been added.
 + See CASSANDRA-11936
 +   - Support for arithmetic operations on number has been added. See 
CASSANDRA-11935
 +   - Preview expected streaming required for a repair (nodetool repair 
--preview), and validate the
 + consistency of repaired data between nodes (nodetool repair --validate). 
See CASSANDRA-13257
 +   - Support for selecting Map values and Set elements has been added for 
SELECT queries. See CASSANDRA-7396
 +   - Change-Data-Capture has been modified to make CommitLogSegments available
 + immediately upon creation via hard-linking the files. This means that 
incomplete
 + segments will be available in cdc_raw rather than fully flushed. See 
documentation
 + and CASSANDRA-12148 for more detail.
 +   - The initial build of materialized views can be parallelized. The number 
of concurrent builder
 + threads is specified by the property 
`cassandra.yaml:concurrent_materialized_view_builders`.
 + This property can be modified at runtime through both JMX and the new 
`setconcurrentviewbuilders`
 + and `getconcurrentviewbuilders` nodetool commands. See CASSANDRA-12245 
for more details.
 +   - There is now a binary full query log based on Chronicle Queue that can 
be controlled using
 + nodetool enablefullquerylog, disablefullquerylog, and resetfullquerylog. 
The log 
 + contains all queries invoked, approximate time they were invoked, any 
parameters necessary
 + to bind wildcard values, and all query options. A human readable version 
of the log can be
 + dumped or tailed using the new bin/fqltool utility. The full query log 
is designed to be safe
 + to use in production and limits utilization of heap memory and disk 
space with limits
 + you can specify when enabling the log.
 + See nodetool and fqltool help text for more information.
 +   - SSTableDump now supports the -l option to output each partition as it's 
own json object
 + See CASSANDRA-13848 for more detail
 +
 +Upgrading
 +-
 +- Cassandra 4.0 removed support for COMPACT STORAGE tables. All Compact 
Tables
 +  have to be migrated using `ALTER ... DROP COMPACT STORAGE` statement in 
3.0/3.11.
 +  Cassandra starting 4.0 will not start if flags indicate that the table 
is non-CQL.
 +  Syntax for creating compact tables is also deprecated.
 +- Support for legacy auth tables in the system_auth keyspace (users,
 +  permissions, credentials) and the migration code has been 

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[marcuse]

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/1cb05092
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1cb05092
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1cb05092

Branch: refs/heads/trunk
Commit: 1cb050922c7cc181e7c4e90fa2a52c23a87d5fc0
Parents: 7815014 817f3c2
Author: Marcus Eriksson 
Authored: Mon Dec 11 09:04:46 2017 +0100
Committer: Marcus Eriksson 
Committed: Mon Dec 11 09:04:46 2017 +0100

--
 CHANGES.txt |  2 ++
 .../cassandra/db/compaction/CompactionManager.java  |  1 +
 .../org/apache/cassandra/db/compaction/Scrubber.java|  4 +++-
 .../io/sstable/IndexSummaryRedistribution.java  | 12 
 4 files changed, 14 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cb05092/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cb05092/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index e5c8269,638e74c..c57b37a
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -1094,14 -1095,15 +1094,15 @@@ public class CompactionManager implemen
  
  int nowInSec = FBUtilities.nowInSeconds();
  try (SSTableRewriter writer = SSTableRewriter.construct(cfs, txn, 
false, sstable.maxDataAge);
 - ISSTableScanner scanner = cleanupStrategy.getScanner(sstable, 
null);
 + ISSTableScanner scanner = cleanupStrategy.getScanner(sstable);
   CompactionController controller = new CompactionController(cfs, 
txn.originals(), getDefaultGcBefore(cfs, nowInSec));
+  Refs refs = 
Refs.ref(Collections.singleton(sstable));
   CompactionIterator ci = new 
CompactionIterator(OperationType.CLEANUP, Collections.singletonList(scanner), 
controller, nowInSec, UUIDGen.getTimeUUID(), metrics))
  {
 -writer.switchWriter(createWriter(cfs, compactionFileLocation, 
expectedBloomFilterSize, sstable.getSSTableMetadata().repairedAt, sstable, 
txn));
 +StatsMetadata metadata = sstable.getSSTableMetadata();
 +writer.switchWriter(createWriter(cfs, compactionFileLocation, 
expectedBloomFilterSize, metadata.repairedAt, metadata.pendingRepair, sstable, 
txn));
  long lastBytesScanned = 0;
  
 -
  while (ci.hasNext())
  {
  if (ci.isStopRequested())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cb05092/src/java/org/apache/cassandra/db/compaction/Scrubber.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1cb05092/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
--
diff --cc 
src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
index 47c3fca,73626d3..24de918
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryRedistribution.java
@@@ -39,9 -40,9 +39,10 @@@ import org.apache.cassandra.db.compacti
  import org.apache.cassandra.db.compaction.OperationType;
  import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
  import org.apache.cassandra.io.sstable.format.SSTableReader;
 +import org.apache.cassandra.schema.TableId;
  import org.apache.cassandra.utils.FBUtilities;
  import org.apache.cassandra.utils.Pair;
+ import org.apache.cassandra.utils.concurrent.Refs;
  
  import static 
org.apache.cassandra.io.sstable.Downsampling.BASE_SAMPLING_LEVEL;
  
@@@ -112,13 -125,16 +113,16 @@@ public class IndexSummaryRedistributio
  
  logger.trace("Index summaries for compacting SSTables are using {} MB 
of space",
   (memoryPoolBytes - remainingBytes) / 1024.0 / 1024.0);
- List newSSTables = 
adjustSamplingLevels(sstablesByHotness, transactions, totalReadsPerSec, 
remainingBytes);
- 
- for (LifecycleTransaction txn : transactions.values())
- txn.finish();
+ List newSSTables;
+ try (Refs refs = Refs.ref(sstablesByHotness))
+ {
+ newSSTables = adjustSamplingLevels(sstablesByHotness, 
transactions, totalReadsPerSec, remainingBytes);
  
+ for (LifecycleTransaction txn : transactions.values())
+ txn.finish();
+ }
  

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[marcuse]

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/9717cd67
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9717cd67
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9717cd67

Branch: refs/heads/trunk
Commit: 9717cd67bd327f527bd97775057d356b674f50ec
Parents: 65f7216 5a09faf
Author: Marcus Eriksson 
Authored: Tue Sep 5 10:41:24 2017 +0200
Committer: Marcus Eriksson 
Committed: Tue Sep 5 10:41:50 2017 +0200

--
 CHANGES.txt |   1 +
 .../io/sstable/format/SSTableReader.java|   8 +-
 .../sstable/IndexSummaryRedistributionTest.java | 143 +++
 3 files changed, 148 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9717cd67/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9717cd67/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9717cd67/test/unit/org/apache/cassandra/io/sstable/IndexSummaryRedistributionTest.java
--
diff --cc 
test/unit/org/apache/cassandra/io/sstable/IndexSummaryRedistributionTest.java
index 000,31a57e1..07a2212
mode 00,100644..100644
--- 
a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryRedistributionTest.java
+++ 
b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryRedistributionTest.java
@@@ -1,0 -1,142 +1,143 @@@
+ /*
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */
+ 
+ package org.apache.cassandra.io.sstable;
+ 
+ import java.io.IOException;
+ import java.nio.ByteBuffer;
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.concurrent.ExecutionException;
+ import java.util.concurrent.Future;
+ 
+ import org.junit.BeforeClass;
+ import org.junit.Test;
+ 
+ import org.apache.cassandra.SchemaLoader;
+ import org.apache.cassandra.db.ColumnFamilyStore;
+ import org.apache.cassandra.db.Keyspace;
+ import org.apache.cassandra.db.RowUpdateBuilder;
+ import org.apache.cassandra.exceptions.ConfigurationException;
+ import org.apache.cassandra.io.sstable.format.SSTableReader;
+ import org.apache.cassandra.metrics.RestorableMeter;
+ import org.apache.cassandra.metrics.StorageMetrics;
+ import org.apache.cassandra.schema.CachingParams;
+ import org.apache.cassandra.schema.KeyspaceParams;
++import org.apache.cassandra.schema.MigrationManager;
+ 
+ import static org.junit.Assert.assertEquals;
+ 
+ public class IndexSummaryRedistributionTest
+ {
+ private static final String KEYSPACE1 = "IndexSummaryRedistributionTest";
+ private static final String CF_STANDARD = "Standard";
+ 
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ SchemaLoader.prepareServer();
+ SchemaLoader.createKeyspace(KEYSPACE1,
+ KeyspaceParams.simple(1),
+ SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARD)
+ .minIndexInterval(8)
+ .maxIndexInterval(256)
+ 
.caching(CachingParams.CACHE_NOTHING));
+ }
+ 
+ @Test
+ public void testMetricsLoadAfterRedistribution() throws IOException
+ {
+ String ksname = KEYSPACE1;
+ String cfname = CF_STANDARD;
+ Keyspace keyspace = Keyspace.open(ksname);
+ ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfname);
+ int numSSTables = 1;
+ int numRows = 1024 * 10;
+ long load = StorageMetrics.load.getCount();
+ StorageMetrics.load.dec(load); // reset the load metric
+ createSSTables(ksname, cfname, numSSTables, 

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[marcuse]

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/c8d15f04
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c8d15f04
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c8d15f04

Branch: refs/heads/trunk
Commit: c8d15f04f1efd37668e2ccbc681730ae6b2199da
Parents: e5f3bb6 37d6730
Author: Marcus Eriksson 
Authored: Mon Sep 4 15:04:18 2017 +0200
Committer: Marcus Eriksson 
Committed: Mon Sep 4 15:04:18 2017 +0200

--
 CHANGES.txt |   1 +
 .../db/compaction/CompactionManager.java|   4 +-
 .../db/compaction/CompactionExecutorTest.java   | 109 +++
 3 files changed, 112 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8d15f04/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c8d15f04/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aleksey]

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/3e4d000c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e4d000c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e4d000c

Branch: refs/heads/trunk
Commit: 3e4d000c9e3ffa2df88c32d78c866e0598898dd4
Parents: 76efcc6 7ad1945
Author: Aleksey Yeschenko 
Authored: Wed Aug 30 17:32:09 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Wed Aug 30 17:37:41 2017 +0100

--
 CHANGES.txt |   1 +
 .../cql3/statements/SelectStatement.java|  16 +-
 .../db/AbstractReadCommandBuilder.java  |   2 +-
 .../cassandra/db/PartitionRangeReadCommand.java | 112 +++---
 .../org/apache/cassandra/db/ReadCommand.java| 131 +---
 .../db/SinglePartitionReadCommand.java  | 148 ++-
 .../cassandra/index/SecondaryIndexManager.java  |   8 +-
 .../internal/composites/CompositesSearcher.java |   3 +-
 .../index/internal/keys/KeysSearcher.java   |   3 +-
 .../cassandra/service/AbstractReadExecutor.java |   4 +-
 .../service/pager/PartitionRangeQueryPager.java |   8 +-
 test/unit/org/apache/cassandra/Util.java|  25 +---
 .../apache/cassandra/db/SecondaryIndexTest.java |  10 +-
 .../db/SinglePartitionSliceCommandTest.java |  29 ++--
 .../cassandra/index/sasi/SASIIndexTest.java |  43 +++---
 .../cassandra/io/sstable/SSTableReaderTest.java |   2 +-
 .../cassandra/service/ReadExecutorTest.java |   2 +-
 17 files changed, 338 insertions(+), 209 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e4d000c/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e4d000c/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 77eebcf,85efafb..84fef5e
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -569,18 -552,10 +569,10 @@@ public class SelectStatement implement
  if (keyBounds == null)
  return ReadQuery.EMPTY;
  
- PartitionRangeReadCommand command = new 
PartitionRangeReadCommand(table,
-   
nowInSec,
-   
columnFilter,
-   
rowFilter,
-   
limit,
-   new 
DataRange(keyBounds, clusteringIndexFilter),
-   
Optional.empty());
- // If there's a secondary index that the command can use, have it 
validate
- // the request parameters. Note that as a side effect, if a viable 
Index is
- // identified by the CFS's index manager, it will be cached in the 
command
- // and serialized during distribution to replicas in order to avoid 
performing
- // further lookups.
+ PartitionRangeReadCommand command =
 -PartitionRangeReadCommand.create(false, cfm, nowInSec, 
queriedColumns, rowFilter, limit, new DataRange(keyBounds, 
clusteringIndexFilter));
++PartitionRangeReadCommand.create(table, nowInSec, columnFilter, 
rowFilter, limit, new DataRange(keyBounds, clusteringIndexFilter));
+ 
+ // If there's a secondary index that the command can use, have it 
validate the request parameters.
  command.maybeValidateIndex();
  
  return command;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e4d000c/src/java/org/apache/cassandra/db/AbstractReadCommandBuilder.java
--
diff --cc src/java/org/apache/cassandra/db/AbstractReadCommandBuilder.java
index 8ced1c7,1c69813..481e906
--- a/src/java/org/apache/cassandra/db/AbstractReadCommandBuilder.java
+++ b/src/java/org/apache/cassandra/db/AbstractReadCommandBuilder.java
@@@ -336,10 -336,10 +336,10 @@@ public abstract class AbstractReadComma
  else
  bounds = new ExcludingBounds<>(start, end);
  
- return new PartitionRangeReadCommand(cfs.metadata(), 
nowInSeconds, makeColumnFilter(), filter, makeLimits(), new DataRange(bounds, 
makeFilter()), Optional.empty());
 -return PartitionRangeReadCommand.create(false, 

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aleksey]

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/7bea74b7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bea74b7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bea74b7

Branch: refs/heads/trunk
Commit: 7bea74b76b61e8baacd36b7bc315b7c0eba2e204
Parents: 6bea7de 26fedcd
Author: Aleksey Yeschenko 
Authored: Sat Aug 26 01:26:04 2017 +0100
Committer: Aleksey Yeschenko 
Committed: Sat Aug 26 01:26:04 2017 +0100

--
 src/java/org/apache/cassandra/batchlog/BatchlogManagerMBean.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jasobrown]

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/4803742e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4803742e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4803742e

Branch: refs/heads/trunk
Commit: 4803742eca5349994e2fb7118008c9b30b9dac4e
Parents: 6e42dd2 b726f26
Author: Jason Brown 
Authored: Mon Aug 21 15:39:06 2017 -0700
Committer: Jason Brown 
Committed: Mon Aug 21 15:39:40 2017 -0700

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/transport/Message.java | 6 +-
 src/java/org/apache/cassandra/transport/Server.java  | 9 +
 3 files changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4803742e/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4803742e/src/java/org/apache/cassandra/transport/Server.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/c0020629
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0020629
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0020629

Branch: refs/heads/trunk
Commit: c00206297be451077034daf318eb8912825e135a
Parents: cad9416 303dba6
Author: Benjamin Lerer 
Authored: Tue Aug 8 17:13:18 2017 +0200
Committer: Benjamin Lerer 
Committed: Tue Aug 8 17:13:30 2017 +0200

--
 CHANGES.txt |   1 +
 .../cassandra/config/DatabaseDescriptor.java|  26 ++-
 .../org/apache/cassandra/db/Directories.java|   3 +-
 .../org/apache/cassandra/io/util/FileUtils.java | 181 +--
 4 files changed, 191 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0020629/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0020629/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0020629/src/java/org/apache/cassandra/db/Directories.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0020629/src/java/org/apache/cassandra/io/util/FileUtils.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/4ef86457
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4ef86457
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4ef86457

Branch: refs/heads/trunk
Commit: 4ef86457b5ed3fd82c48011997d6c8b25af6fdc6
Parents: f48a319 bd89f56
Author: Benjamin Lerer 
Authored: Fri Jul 14 11:43:42 2017 +0200
Committer: Benjamin Lerer 
Committed: Fri Jul 14 11:43:53 2017 +0200

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/service/StorageService.java| 12 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ef86457/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4ef86457/src/java/org/apache/cassandra/service/StorageService.java
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/10b397e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10b397e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10b397e2

Branch: refs/heads/trunk
Commit: 10b397e2a9c90e0fe3a229659952a56a03795a22
Parents: 9fdec0a b5df3b4
Author: Benjamin Lerer 
Authored: Fri Jul 7 13:40:48 2017 +0200
Committer: Benjamin Lerer 
Committed: Fri Jul 7 13:42:19 2017 +0200

--
 CHANGES.txt |  3 +-
 .../org/apache/cassandra/cql3/UserTypes.java| 27 +---
 .../apache/cassandra/db/marshal/TupleType.java  | 45 -
 .../apache/cassandra/db/marshal/UserType.java   | 51 +--
 .../cassandra/serializers/TupleSerializer.java  | 64 +++
 .../serializers/UserTypeSerializer.java | 67 
 .../validation/entities/CollectionsTest.java| 36 +++
 .../cql3/validation/entities/TupleTypeTest.java | 10 ++-
 .../cql3/validation/entities/UserTypesTest.java | 15 -
 9 files changed, 239 insertions(+), 79 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b397e2/CHANGES.txt
--
diff --cc CHANGES.txt
index 4f2d2a1,679d55b..569a807
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -96,10 -1,11 +96,11 @@@
  3.11.1
   * Properly evict pstmts from prepared statements cache (CASSANDRA-13641)
  Merged from 3.0:
 - * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 - * Fix secondary index queries on COMPACT tables (CASSANDRA-13627)
 - * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
 +  * Allow different NUMACTL_ARGS to be passed in (CASSANDRA-13557)
 +  * Fix secondary index queries on COMPACT tables (CASSANDRA-13627) 
 +  * Nodetool listsnapshots output is missing a newline, if there are no 
snapshots (CASSANDRA-13568)
- 
+ Merged from 2.2:
 - * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
++  * Fix nested Tuples/UDTs validation (CASSANDRA-13646)
  
  3.11.0
   * Allow native function calls in CQLSSTableWriter (CASSANDRA-12606)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b397e2/src/java/org/apache/cassandra/cql3/UserTypes.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b397e2/src/java/org/apache/cassandra/db/marshal/TupleType.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b397e2/src/java/org/apache/cassandra/db/marshal/UserType.java
--
diff --cc src/java/org/apache/cassandra/db/marshal/UserType.java
index f139edd,febd91c..6149e94
--- a/src/java/org/apache/cassandra/db/marshal/UserType.java
+++ b/src/java/org/apache/cassandra/db/marshal/UserType.java
@@@ -426,8 -404,9 +403,14 @@@ public class UserType extends TupleTyp
  return sb.toString();
  }
  
 +public String toCQLString()
 +{
 +return String.format("%s.%s", ColumnIdentifier.maybeQuote(keyspace), 
ColumnIdentifier.maybeQuote(getNameAsString()));
 +}
++
+ @Override
+ public TypeSerializer getSerializer()
+ {
+ return serializer;
+ }
  }

http://git-wip-us.apache.org/repos/asf/cassandra/blob/10b397e2/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java
--
diff --cc 
test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java
index dad5d68,22e6e66..6f67609
--- 
a/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java
+++ 
b/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java
@@@ -1107,786 -1037,38 +1107,822 @@@ public class CollectionsTest extends CQ
  }
  
  @Test
 +public void testMapOperation() throws Throwable
 +{
 +createTable("CREATE TABLE %s (k int, c int, l text, " +
 +"m map, " +
 +"fm frozen>, " +
 +"sm map STATIC, " +
 +"fsm frozen> STATIC, " +
 +"o int, PRIMARY KEY (k, c))");
 +
 +execute("INSERT INTO %s(k, c, l, m, fm, sm, fsm, o) VALUES (0, 0, 
'foobar', ?, ?, ?, ?, 42)",
 +map("22", "value22", "333", "value333"),
 +map("1", "fvalue1", "22", "fvalue22", "333", "fvalue333"),
 +map("22", "svalue22", "333", "svalue333"),
 +map("1", "fsvalue1", "22", "fsvalue22", "333", 

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jjirsa]

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/de009a39
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de009a39
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de009a39

Branch: refs/heads/trunk
Commit: de009a39334b7cee4854c530b9852c555449b75a
Parents: cdb0167 903da08
Author: Jeff Jirsa 
Authored: Wed Jun 21 17:01:55 2017 -0700
Committer: Jeff Jirsa 
Committed: Wed Jun 21 17:01:55 2017 -0700

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[mck]

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/afd68abe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/afd68abe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/afd68abe

Branch: refs/heads/trunk
Commit: afd68abe60742c6deb6357ba4605268dfb3d06ea
Parents: 3e8f3c5 6220108
Author: mck 
Authored: Tue Jun 13 14:15:57 2017 +1000
Committer: mck 
Committed: Tue Jun 13 14:19:58 2017 +1000

--
 CHANGES.txt|  1 +
 .../cassandra/auth/CassandraRoleManager.java   |  4 
 .../apache/cassandra/service/StorageService.java   | 17 +++--
 3 files changed, 16 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd68abe/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd68abe/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
--
diff --cc src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 0591760,777ed05..433290e
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@@ -39,7 -39,9 +39,8 @@@ import org.apache.cassandra.cql3.statem
  import org.apache.cassandra.db.ConsistencyLevel;
  import org.apache.cassandra.db.marshal.UTF8Type;
  import org.apache.cassandra.exceptions.*;
 -import org.apache.cassandra.net.MessagingService;
  import org.apache.cassandra.service.QueryState;
+ import org.apache.cassandra.service.StorageService;
  import org.apache.cassandra.transport.messages.ResultMessage;
  import org.apache.cassandra.utils.ByteBufferUtil;
  import org.mindrot.jbcrypt.BCrypt;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/afd68abe/src/java/org/apache/cassandra/service/StorageService.java
--
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 8914440,b4878c7..a7d4e9d
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -1032,13 -1083,16 +1034,16 @@@ public class StorageService extends Not
  
  private void doAuthSetup()
  {
- maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
+ if (!authSetupCalled.getAndSet(true))
+ {
+ maybeAddOrUpdateKeyspace(AuthKeyspace.metadata());
  
- DatabaseDescriptor.getRoleManager().setup();
- DatabaseDescriptor.getAuthenticator().setup();
- DatabaseDescriptor.getAuthorizer().setup();
- Schema.instance.registerListener(new AuthSchemaChangeListener());
- authSetupComplete = true;
+ DatabaseDescriptor.getRoleManager().setup();
+ DatabaseDescriptor.getAuthenticator().setup();
+ DatabaseDescriptor.getAuthorizer().setup();
 -MigrationManager.instance.register(new AuthMigrationListener());
++Schema.instance.registerListener(new AuthSchemaChangeListener());
+ authSetupComplete = true;
+ }
  }
  
  public boolean isAuthSetupComplete()


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[stefania]

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/106691b2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/106691b2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/106691b2

Branch: refs/heads/trunk
Commit: 106691b2ff479582fa5b44a01f077d04ff39bf50
Parents: 3d2f065 92e3042
Author: Stefania Alborghetti 
Authored: Tue Jun 6 08:53:47 2017 +0800
Committer: Stefania Alborghetti 
Committed: Tue Jun 6 08:53:47 2017 +0800

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/106691b2/CHANGES.txt
--


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/ea57a4db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea57a4db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea57a4db

Branch: refs/heads/trunk
Commit: ea57a4dbe8b3c312465cd2a0fe315d5f04f8ce92
Parents: 7b149ce 54ff619
Author: Benjamin Lerer 
Authored: Wed May 31 14:48:48 2017 +0200
Committer: Benjamin Lerer 
Committed: Wed May 31 14:52:30 2017 +0200

--
 CHANGES.txt|   1 +
 build.xml  |   2 +-
 lib/futures-2.1.6-py2.py3-none-any.zip | Bin 16571 -> 1090481 bytes
 lib/jna-4.3.0.jar  | Bin 945524 -> 0 bytes
 lib/licenses/jna-4.3.0.txt | 202 
 lib/licenses/jna-4.4.0.txt | 202 
 6 files changed, 204 insertions(+), 203 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea57a4db/CHANGES.txt
--
diff --cc CHANGES.txt
index d81d2c5,26a8018..0bda3a6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -163,6 -93,8 +163,7 @@@ Merged from 3.0
   * Nodetool upgradesstables/scrub/compact ignores system tables 
(CASSANDRA-13410)
   * Fix schema version calculation for rolling upgrades (CASSANDRA-13441)
  Merged from 2.2:
 - * upgrade JNA version to 4.4.0 (CASSANDRA-13072)
 - * nodetool upgradesstables should upgrade system tables (CASSANDRA-13119)
++ * Upgrade JNA to version 4.4.0 (CASSANDRA-13072)
   * Avoid starting gossiper in RemoveTest (CASSANDRA-13407)
   * Fix weightedSize() for row-cache reported by JMX and NodeTool 
(CASSANDRA-13393)
   * Fix JVM metric names (CASSANDRA-13103)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea57a4db/build.xml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea57a4db/lib/futures-2.1.6-py2.py3-none-any.zip
--
diff --cc lib/futures-2.1.6-py2.py3-none-any.zip
index 50bd78b,50bd78b..4c27243
Binary files differ


-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aweisberg]

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/931e3a4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/931e3a4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/931e3a4d

Branch: refs/heads/trunk
Commit: 931e3a4d3b4fb0cf7d57baa7a52f9009c39ad50b
Parents: 2f9de24 d56c64a
Author: Ariel Weisberg 
Authored: Wed May 3 18:15:07 2017 -0400
Committer: Ariel Weisberg 
Committed: Wed May 3 18:15:07 2017 -0400

--

--



-
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[spod]

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/8b3a60b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b3a60b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b3a60b9

Branch: refs/heads/trunk
Commit: 8b3a60b9a7dbefeecc06bace617279612ec7092d
Parents: abbb2a7 ca034ea
Author: Stefan Podkowinski 
Authored: Wed Apr 26 19:47:28 2017 +0200
Committer: Stefan Podkowinski 
Committed: Wed Apr 26 19:47:28 2017 +0200

--
 redhat/cassandra | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[spod]

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/abbb2a71
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abbb2a71
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abbb2a71

Branch: refs/heads/trunk
Commit: abbb2a712d49165e0f30d9a3adfdccdc946d25be
Parents: a45b2a8 a483147
Author: Stefan Podkowinski 
Authored: Wed Apr 26 19:35:42 2017 +0200
Committer: Stefan Podkowinski 
Committed: Wed Apr 26 19:35:42 2017 +0200

--
 redhat/cassandra | 1 +
 1 file changed, 1 insertion(+)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[marcuse]

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/a45b2a8c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a45b2a8c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a45b2a8c

Branch: refs/heads/trunk
Commit: a45b2a8c6719eb637425b6dcb23a67d81a821ee0
Parents: 2160a3a 6679b08
Author: Marcus Eriksson 
Authored: Wed Apr 26 09:43:07 2017 +0200
Committer: Marcus Eriksson 
Committed: Wed Apr 26 09:43:07 2017 +0200

--
 test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[ifesdjeen]

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/90e50789
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90e50789
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90e50789

Branch: refs/heads/trunk
Commit: 90e50789680c8d386a57884a0d58ee62e5f4e73d
Parents: 37f5005 638df6f
Author: Alex Petrov 
Authored: Thu Apr 20 11:48:25 2017 +0200
Committer: Alex Petrov 
Committed: Thu Apr 20 11:48:25 2017 +0200

--
 CHANGES.txt| 1 +
 test/unit/org/apache/cassandra/service/RemoveTest.java | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e50789/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/90e50789/test/unit/org/apache/cassandra/service/RemoveTest.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[snazy]

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/333ebd67
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/333ebd67
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/333ebd67

Branch: refs/heads/trunk
Commit: 333ebd67a0ee7497f0c2f62372befbd01515a3c2
Parents: 7fa1577 c38e618
Author: Robert Stupp 
Authored: Sun Apr 9 10:59:18 2017 +0200
Committer: Robert Stupp 
Committed: Sun Apr 9 10:59:18 2017 +0200

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/333ebd67/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/333ebd67/src/java/org/apache/cassandra/cache/OHCProvider.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[spod]

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/39bca481
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/39bca481
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/39bca481

Branch: refs/heads/trunk
Commit: 39bca48134e6ccc9f60ae0b0846bd9c47b672080
Parents: c824165 05a0658
Author: Stefan Podkowinski 
Authored: Mon Apr 3 20:02:11 2017 +0200
Committer: Stefan Podkowinski 
Committed: Mon Apr 3 20:02:30 2017 +0200

--
 CHANGES.txt |  1 +
 .../cassandra/service/CassandraDaemon.java  |  6 +--
 .../metrics/CassandraMetricsRegistryTest.java   | 47 +---
 3 files changed, 45 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bca481/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/39bca481/src/java/org/apache/cassandra/service/CassandraDaemon.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[marcuse]

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/ccef21fe
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ccef21fe
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ccef21fe

Branch: refs/heads/trunk
Commit: ccef21feff63a19825c938d573ce5ab3ed0bed68
Parents: cc26c83 8862759
Author: Marcus Eriksson 
Authored: Mon Apr 3 08:34:20 2017 +0200
Committer: Marcus Eriksson 
Committed: Mon Apr 3 08:34:20 2017 +0200

--
 .../org/apache/cassandra/db/compaction/CompactionsCQLTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jkni]

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/8b74ae4b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b74ae4b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b74ae4b

Branch: refs/heads/trunk
Commit: 8b74ae4b6490e1991603e9365b690da6f6900c10
Parents: f5e0a7c ec9ce3d
Author: Joel Knighton 
Authored: Wed Mar 22 13:28:14 2017 -0500
Committer: Joel Knighton 
Committed: Wed Mar 22 13:29:09 2017 -0500

--
 CHANGES.txt |   1 +
 .../gms/GossipDigestAckVerbHandler.java |  27 +++--
 src/java/org/apache/cassandra/gms/Gossiper.java |  66 +++
 .../apache/cassandra/schema/MigrationTask.java  |  12 +-
 .../cassandra/service/StorageService.java   |  17 ++-
 test/conf/cassandra-seeds.yaml  |  43 +++
 .../apache/cassandra/gms/ShadowRoundTest.java   | 116 +++
 .../apache/cassandra/net/MatcherResponse.java   |  24 ++--
 8 files changed, 253 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b74ae4b/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b74ae4b/src/java/org/apache/cassandra/gms/Gossiper.java
--
diff --cc src/java/org/apache/cassandra/gms/Gossiper.java
index 50710eb,177d7dc..e5992af
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@@ -1337,12 -1352,23 +1346,24 @@@ public class Gossiper implements IFailu
  }
  
  /**
-  *  Do a single 'shadow' round of gossip, where we do not modify any state
-  *  Used when preparing to join the ring:
-  *  * when replacing a node, to get and assume its tokens
-  *  * when joining, to check that the local host id matches any 
previous id for the endpoint address
+  * Do a single 'shadow' round of gossip by retrieving endpoint states 
that will be stored exclusively in the
+  * map return value, instead of endpointStateMap.
+  *
++ * Used when preparing to join the ring:
+  * 
+  * when replacing a node, to get and assume its tokens
+  * when joining, to check that the local host id matches any 
previous id for the endpoint address
+  * 
+  *
+  * Method is synchronized, as we use an in-progress flag to indicate that 
shadow round must be cleared
+  * again by calling {@link Gossiper#maybeFinishShadowRound(InetAddress, 
boolean, Map)}. This will update
+  * {@link Gossiper#endpointShadowStateMap} with received values, in order 
to return an immutable copy to the
+  * caller of {@link Gossiper#doShadowRound()}. Therefor only a single 
shadow round execution is permitted at
+  * the same time.
+  *
+  * @return endpoint states gathered during shadow round or empty map
   */
- public void doShadowRound()
+ public synchronized Map doShadowRound()
  {
  buildSeedsList();
  // it may be that the local address is the only entry in the seed

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b74ae4b/src/java/org/apache/cassandra/schema/MigrationTask.java
--
diff --cc src/java/org/apache/cassandra/schema/MigrationTask.java
index a785e17,000..73e396d
mode 100644,00..100644
--- a/src/java/org/apache/cassandra/schema/MigrationTask.java
+++ b/src/java/org/apache/cassandra/schema/MigrationTask.java
@@@ -1,113 -1,0 +1,113 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.cassandra.schema;
 +
 +import java.net.InetAddress;
 +import java.util.Collection;
 +import java.util.EnumSet;
 +import java.util.Set;
 +import java.util.concurrent.ConcurrentLinkedQueue;
 +import java.util.concurrent.CountDownLatch;
 +

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[spod]

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/dd532664
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd532664
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd532664

Branch: refs/heads/trunk
Commit: dd5326646626bdba1739686d1f0e4a024a43186f
Parents: 567f906 5484bd1
Author: Stefan Podkowinski 
Authored: Mon Mar 20 19:54:33 2017 +0100
Committer: Stefan Podkowinski 
Committed: Mon Mar 20 19:54:33 2017 +0100

--
 CHANGES.txt  |  1 +
 .../cassandra/db/compaction/CompactionManager.java   | 11 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd532664/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd532664/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jasobrown]

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/01f8e770
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01f8e770
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01f8e770

Branch: refs/heads/trunk
Commit: 01f8e770d92853ac4ced0f7b664f9b80b9b0db24
Parents: 480feb0 8fcf837
Author: Jason Brown 
Authored: Thu Mar 16 13:27:37 2017 -0700
Committer: Jason Brown 
Committed: Thu Mar 16 13:30:50 2017 -0700

--
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/01f8e770/CHANGES.txt
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jjirsa]

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/dd5251c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd5251c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd5251c4

Branch: refs/heads/trunk
Commit: dd5251c46073d75c09e47f645b1d0ebc3a135411
Parents: 0c5faef a2399d4
Author: Jeff Jirsa 
Authored: Sun Mar 12 21:57:37 2017 -0700
Committer: Jeff Jirsa 
Committed: Sun Mar 12 21:58:36 2017 -0700

--
 CHANGES.txt |  1 +
 .../apache/cassandra/db/commitlog/CommitLogReader.java  | 12 
 2 files changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd5251c4/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd5251c4/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
--
diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
index 1da0cee,d1cb8d6..9eec477
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
@@@ -253,6 -265,18 +253,18 @@@ public class CommitLogReade
  int serializedSize;
  try
  {
+ // We rely on reading serialized size == 0 
(LEGACY_END_OF_SEGMENT_MARKER) to identify the end
+ // of a segment, which happens naturally due to the 0 padding 
of the empty segment on creation.
+ // However, it's possible with 2.1 era commitlogs that the 
last mutation ended less than 4 bytes
+ // from the end of the file, which means that we'll be unable 
to read an a full int and instead
+ // read an EOF here
+ if(end - reader.getFilePointer() < 4)
+ {
 -logger.trace("Not enough bytes left for another mutation 
in this CommitLog segment, continuing");
++logger.trace("Not enough bytes left for another mutation 
in this CommitLog section, continuing");
+ statusTracker.requestTermination();
+ return;
+ }
+ 
  // any of the reads may hit EOF
  serializedSize = reader.readInt();
  if (serializedSize == LEGACY_END_OF_SEGMENT_MARKER)

[10/10] cassandra git commit: Merge branch cassandra-3.11 into trunk

[blerer]

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/753d004c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/753d004c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/753d004c

Branch: refs/heads/trunk
Commit: 753d004cda7ac4ed636b5e7f0b712ba0e987d368
Parents: 9e8e891 7b3415d
Author: Benjamin Lerer 
Authored: Fri Mar 10 10:14:13 2017 +0100
Committer: Benjamin Lerer 
Committed: Fri Mar 10 10:15:07 2017 +0100

--
 CHANGES.txt |   1 +
 .../apache/cassandra/cql3/UpdateParameters.java |  24 -
 .../org/apache/cassandra/db/rows/BTreeRow.java  |  43 ++--
 src/java/org/apache/cassandra/db/rows/Row.java  |   6 ++
 .../org/apache/cassandra/utils/btree/BTree.java |  20 
 .../validation/entities/CollectionsTest.java| 100 +++
 .../apache/cassandra/db/rows/RowBuilder.java|   7 ++
 7 files changed, 192 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/src/java/org/apache/cassandra/cql3/UpdateParameters.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/src/java/org/apache/cassandra/db/rows/BTreeRow.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/src/java/org/apache/cassandra/db/rows/Row.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/test/unit/org/apache/cassandra/cql3/validation/entities/CollectionsTest.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/753d004c/test/unit/org/apache/cassandra/db/rows/RowBuilder.java
--
diff --cc test/unit/org/apache/cassandra/db/rows/RowBuilder.java
index 5eed774,ede2ccd..21522a5
--- a/test/unit/org/apache/cassandra/db/rows/RowBuilder.java
+++ b/test/unit/org/apache/cassandra/db/rows/RowBuilder.java
@@@ -37,8 -38,14 +38,14 @@@ public class RowBuilder implements Row.
  public Clustering clustering = null;
  public LivenessInfo livenessInfo = null;
  public Row.Deletion deletionTime = null;
 -public List> complexDeletions = new 
LinkedList<>();
 +public List> complexDeletions = new 
LinkedList<>();
  
+ @Override
+ public Builder copy()
+ {
+ throw new UnsupportedOperationException();
+ }
+ 
  public void addCell(Cell cell)
  {
  cells.add(cell);

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aleksey]

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/66e2c1b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66e2c1b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66e2c1b9

Branch: refs/heads/trunk
Commit: 66e2c1b90c4f6c03e950034b676a131ebdb33228
Parents: f3cd28d 2b62cb9
Author: Aleksey Yeschenko 
Authored: Wed Mar 8 00:22:42 2017 +
Committer: Aleksey Yeschenko 
Committed: Wed Mar 8 00:22:42 2017 +

--
 CHANGES.txt | 1 +
 .../cql3/statements/PermissionsManagementStatement.java | 5 +
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e2c1b9/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/66e2c1b9/src/java/org/apache/cassandra/cql3/statements/PermissionsManagementStatement.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aleksey]

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/78d648fb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/78d648fb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/78d648fb

Branch: refs/heads/trunk
Commit: 78d648fb47191c739c9dcd952386d561905e16d4
Parents: f3cd28d a7f6bf8
Author: Aleksey Yeschenko 
Authored: Wed Mar 8 00:11:02 2017 +
Committer: Aleksey Yeschenko 
Committed: Wed Mar 8 00:11:02 2017 +

--
 CHANGES.txt | 1 +
 .../cql3/statements/PermissionsManagementStatement.java | 5 +
 2 files changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/78d648fb/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/78d648fb/src/java/org/apache/cassandra/cql3/statements/PermissionsManagementStatement.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jasobrown]

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/1b552658
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b552658
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b552658

Branch: refs/heads/trunk
Commit: 1b552658bdf132b3f8921f2fa22d8d3fdcf2a2b2
Parents: 979b19b 7f5dc69
Author: Jason Brown 
Authored: Sat Mar 4 15:39:28 2017 -0800
Committer: Jason Brown 
Committed: Sat Mar 4 15:39:59 2017 -0800

--
 test/unit/org/apache/cassandra/db/DirectoriesTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b552658/test/unit/org/apache/cassandra/db/DirectoriesTest.java
--
diff --cc test/unit/org/apache/cassandra/db/DirectoriesTest.java
index 904354a,7e800e6..ffd4d3e
--- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java
+++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java
@@@ -147,19 -149,19 +147,19 @@@ public class DirectoriesTes
  }
  
  @Test
- public void testStandardDirs()
+ public void testStandardDirs() throws IOException
  {
 -for (CFMetaData cfm : CFM)
 +for (TableMetadata cfm : CFM)
  {
  Directories directories = new Directories(cfm);
  assertEquals(cfDir(cfm), 
directories.getDirectoryForNewSSTables());
  
 -Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.cfName, 1, 
SSTableFormat.Type.BIG);
 +Descriptor desc = new Descriptor(cfDir(cfm), KS, cfm.name, 1, 
SSTableFormat.Type.BIG);
  File snapshotDir = new File(cfDir(cfm),  File.separator + 
Directories.SNAPSHOT_SUBDIR + File.separator + "42");
- assertEquals(snapshotDir, Directories.getSnapshotDirectory(desc, 
"42"));
+ assertEquals(snapshotDir.getCanonicalFile(), 
Directories.getSnapshotDirectory(desc, "42"));
  
  File backupsDir = new File(cfDir(cfm),  File.separator + 
Directories.BACKUPS_SUBDIR);
- assertEquals(backupsDir, Directories.getBackupsDirectory(desc));
+ assertEquals(backupsDir.getCanonicalFile(), 
Directories.getBackupsDirectory(desc));
  }
  }
  

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[mshuler]

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/64323466
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64323466
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64323466

Branch: refs/heads/trunk
Commit: 64323466402f33536ba0318f02e7829eafcbd711
Parents: b9b6392 a830cf5
Author: Michael Shuler 
Authored: Fri Mar 3 12:42:40 2017 -0600
Committer: Michael Shuler 
Committed: Fri Mar 3 12:42:40 2017 -0600

--
 debian/control| 2 +-
 redhat/cassandra.spec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/64323466/redhat/cassandra.spec
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[mshuler]

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/d74cc080
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d74cc080
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d74cc080

Branch: refs/heads/trunk
Commit: d74cc0802c976713415aa39838bcebe333753e12
Parents: 9ba3185 4599da2
Author: Michael Shuler 
Authored: Wed Mar 1 18:48:02 2017 -0600
Committer: Michael Shuler 
Committed: Wed Mar 1 18:48:02 2017 -0600

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[paulo]

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/f3252180
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3252180
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3252180

Branch: refs/heads/trunk
Commit: f3252180863d0a2e78d1bfb5437506033a57f931
Parents: 21b4cae e345d4e
Author: Paulo Motta 
Authored: Wed Mar 1 20:34:28 2017 -0300
Committer: Paulo Motta 
Committed: Wed Mar 1 20:34:28 2017 -0300

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aweisberg]

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/4bb5ada5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bb5ada5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bb5ada5

Branch: refs/heads/trunk
Commit: 4bb5ada5358cb4287f445d9d49145e76f2bf3a07
Parents: 895e6ce 760d6c3
Author: Ariel Weisberg 
Authored: Tue Feb 28 19:57:57 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 28 19:57:57 2017 -0500

--
 CHANGES.txt | 1 +
 build.xml   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb5ada5/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb5ada5/build.xml
--
diff --cc build.xml
index 8fde61b,dcaa780..e2bbe94
--- a/build.xml
+++ b/build.xml
@@@ -1057,8 -1198,8 +1059,8 @@@
   debug="true"
   debuglevel="${debuglevel}"
   destdir="${test.classes}"
-  includeantruntime="false"
+  includeantruntime="true"
 - source="${source.version}" 
 + source="${source.version}"
   target="${target.version}"
   encoding="utf-8">
   

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aweisberg]

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/895e6ce1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/895e6ce1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/895e6ce1

Branch: refs/heads/trunk
Commit: 895e6ce11c4467011df106631d0f818fb2298d73
Parents: d24f4c6 91c8d91
Author: Ariel Weisberg 
Authored: Tue Feb 28 18:01:31 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 28 18:02:48 2017 -0500

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/895e6ce1/CHANGES.txt
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[stefania]

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/6e17d65f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e17d65f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e17d65f

Branch: refs/heads/trunk
Commit: 6e17d65f26fc37257c62a49de575b3da5f447a6d
Parents: ac21013 0fe76da
Author: Stefania Alborghetti 
Authored: Thu Feb 23 09:05:26 2017 +
Committer: Stefania Alborghetti 
Committed: Thu Feb 23 09:05:26 2017 +

--

--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[yukim]

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/ac210130
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac210130
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac210130

Branch: refs/heads/trunk
Commit: ac2101305722c81542ff8572b0fa082794846a7f
Parents: fbf7e12 b887ae9
Author: Yuki Morishita 
Authored: Thu Feb 23 11:13:13 2017 +0900
Committer: Yuki Morishita 
Committed: Thu Feb 23 11:13:13 2017 +0900

--
 CHANGES.txt |  1 +
 .../LongLeveledCompactionStrategyTest.java  | 50 
 2 files changed, 31 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac210130/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac210130/test/long/org/apache/cassandra/db/compaction/LongLeveledCompactionStrategyTest.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[paulo]

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/cc51b4db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc51b4db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cc51b4db

Branch: refs/heads/trunk
Commit: cc51b4db09d774dc04792e41db393c14d9cac8e5
Parents: 77eec6d b3490c0
Author: Paulo Motta 
Authored: Wed Feb 22 17:21:09 2017 -0300
Committer: Paulo Motta 
Committed: Wed Feb 22 17:21:09 2017 -0300

--
 CHANGES.txt| 1 +
 pylib/cqlshlib/copyutil.py | 7 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cc51b4db/CHANGES.txt
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aweisberg]

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/bda97326
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bda97326
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bda97326

Branch: refs/heads/trunk
Commit: bda973264d157485253742d2364c6c6467eea0b1
Parents: f97db26 c382a90
Author: Ariel Weisberg 
Authored: Tue Feb 21 12:17:31 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 21 12:17:31 2017 -0500

--
 CHANGES.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bda97326/CHANGES.txt
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[samt]

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/eaa59486
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eaa59486
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eaa59486

Branch: refs/heads/trunk
Commit: eaa594865699c7e8e8097a26a744c815981e009d
Parents: 1f7a1dd 87e8c6b
Author: Sam Tunnicliffe 
Authored: Mon Feb 20 12:10:41 2017 +
Committer: Sam Tunnicliffe 
Committed: Mon Feb 20 12:10:41 2017 +

--
 CHANGES.txt |  1 +
 .../cassandra/service/QueryPagerTest.java   | 76 +++-
 2 files changed, 76 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/eaa59486/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/eaa59486/test/unit/org/apache/cassandra/service/QueryPagerTest.java
--
diff --cc test/unit/org/apache/cassandra/service/QueryPagerTest.java
index d0b7704,2ec074b..56bf59c
--- a/test/unit/org/apache/cassandra/service/QueryPagerTest.java
+++ b/test/unit/org/apache/cassandra/service/QueryPagerTest.java
@@@ -27,9 -27,11 +27,12 @@@ import org.junit.Test
  import org.junit.runner.RunWith;
  
  import org.apache.cassandra.*;
 -import org.apache.cassandra.config.CFMetaData;
 -import org.apache.cassandra.config.ColumnDefinition;
 +import org.apache.cassandra.cql3.statements.CreateTableStatement;
++import org.apache.cassandra.schema.ColumnMetadata;
 +import org.apache.cassandra.schema.TableMetadata;
+ import org.apache.cassandra.cql3.ColumnIdentifier;
  import org.apache.cassandra.db.*;
+ import org.apache.cassandra.db.rows.Cell;
  import org.apache.cassandra.db.rows.Row;
  import org.apache.cassandra.db.rows.RowIterator;
  import org.apache.cassandra.db.filter.*;
@@@ -64,14 -66,20 +68,21 @@@ public class QueryPagerTes
  SchemaLoader.createKeyspace(KEYSPACE1,
  KeyspaceParams.simple(1),
  SchemaLoader.standardCFMD(KEYSPACE1, 
CF_STANDARD));
 +
  SchemaLoader.createKeyspace(KEYSPACE_CQL,
  KeyspaceParams.simple(1),
 -CFMetaData.compile("CREATE TABLE " + 
CF_CQL + " ("
 - + "k text,"
 - + "c text,"
 - + "v text,"
 - + "PRIMARY KEY (k, c))", 
KEYSPACE_CQL),
 -CFMetaData.compile("CREATE TABLE " + 
CF_CQL_WITH_STATIC + " ("
 - + "pk text, "
 - + "ck int, "
 - + "st int static, "
 - + "v1 int, "
 - + "v2 int, "
 - + "PRIMARY KEY(pk, 
ck))", KEYSPACE_CQL));
 +CreateTableStatement.parse("CREATE TABLE 
" + CF_CQL + " ("
 +   + "k text,"
 +   + "c text,"
 +   + "v text,"
-+ "PRIMARY KEY 
(k, c))", KEYSPACE_CQL));
++   + "PRIMARY KEY 
(k, c))", KEYSPACE_CQL),
++CreateTableStatement.parse("CREATE TABLE 
" + CF_CQL_WITH_STATIC + " ("
++   + "pk text, "
++   + "ck int, "
++   + "st int 
static, "
++   + "v1 int, "
++   + "v2 int, "
++   + "PRIMARY 
KEY(pk, ck))", KEYSPACE_CQL));
  addData();
  }
  
@@@ -441,4 -449,67 +452,67 @@@
  assertRow(partitions.get(0), "k0", "c" + i);
  }
  }
+ 
+ @Test
+ public void pagingReversedQueriesWithStaticColumnsTest() throws Exception
+ {
+ // There was a bug in paging for reverse queries when the schema 
includes static columns in
+ // 2.1 & 2.2. 

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jasobrown]

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/c718bfff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c718bfff
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c718bfff

Branch: refs/heads/trunk
Commit: c718bfff9a27e23ec1b31fcb81f3b65d134936d1
Parents: aea8bbf 3f89d24
Author: Jason Brown 
Authored: Fri Feb 17 13:38:17 2017 -0800
Committer: Jason Brown 
Committed: Fri Feb 17 13:39:05 2017 -0800

--
 CHANGES.txt |  1 +
 .../cassandra/net/OutboundTcpConnection.java| 22 
 2 files changed, 19 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c718bfff/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c718bfff/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 69480df,a0ed270..feff527
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -439,10 -438,10 +439,8 @@@ public class OutboundTcpConnection exte
  int maxTargetVersion = handshakeVersion(in);
  if (maxTargetVersion == NO_VERSION)
  {
 -// no version is returned, so disconnect an try again: we 
will either get
 -// a different target version (targetVersion < 
MessagingService.VERSION_12)
 -// or if the same version the handshake will finally 
succeed
 +// no version is returned, so disconnect an try again
  logger.trace("Target max version is {}; no version 
information yet, will retry", maxTargetVersion);
- if 
(DatabaseDescriptor.getSeeds().contains(poolReference.endPoint()))
- logger.warn("Seed gossip version is {}; will not 
connect with that version", maxTargetVersion);
  disconnect();
  continue;
  }

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aweisberg]

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/48bfc8e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/48bfc8e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/48bfc8e8

Branch: refs/heads/trunk
Commit: 48bfc8e8dcd926ea547211fd959cebba8c0e027b
Parents: 3f3db2d 23a1dee
Author: Ariel Weisberg 
Authored: Tue Feb 14 15:14:15 2017 -0500
Committer: Ariel Weisberg 
Committed: Tue Feb 14 15:14:15 2017 -0500

--
 conf/cassandra.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/48bfc8e8/conf/cassandra.yaml
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[aweisberg]

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/edcbef3e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edcbef3e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edcbef3e

Branch: refs/heads/trunk
Commit: edcbef3e343778b4d5affe019f64c89da2a13aa2
Parents: ffc82b1 702ec08
Author: Ariel Weisberg 
Authored: Mon Feb 13 13:33:11 2017 -0500
Committer: Ariel Weisberg 
Committed: Mon Feb 13 13:34:31 2017 -0500

--
 CHANGES.txt |  1 +
 conf/cassandra.yaml | 27 +
 .../org/apache/cassandra/config/Config.java |  3 +-
 .../cassandra/config/DatabaseDescriptor.java| 16 
 .../cassandra/net/OutboundTcpConnection.java|  4 +-
 .../cassandra/utils/CoalescingStrategies.java   | 32 
 .../utils/CoalescingStrategiesTest.java | 40 
 7 files changed, 114 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/CHANGES.txt
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/conf/cassandra.yaml
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/src/java/org/apache/cassandra/config/Config.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/edcbef3e/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
--
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 574e9e7,ea64ef4..69480df
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -82,9 -83,8 +82,11 @@@ public class OutboundTcpConnection exte
  private static final String BUFFER_SIZE_PROPERTY = PREFIX + 
"otc_buffer_size";
  private static final int BUFFER_SIZE = 
Integer.getInteger(BUFFER_SIZE_PROPERTY, 1024 * 64);
  
 +//Size of 3 elements added to every message
 +private static final int PROTOCOL_MAGIC_ID_TIMESTAMP_SIZE = 12;
 +
+ public static final int MAX_COALESCED_MESSAGES = 128;
+ 
  private static CoalescingStrategy newCoalescingStrategy(String 
displayName)
  {
  return 
CoalescingStrategies.newCoalescingStrategy(DatabaseDescriptor.getOtcCoalescingStrategy(),

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jjirsa]

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/1eaef3f9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eaef3f9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eaef3f9

Branch: refs/heads/trunk
Commit: 1eaef3f9edb1043319e7a06f6c77afb3c41ecd42
Parents: e1dda71 ed45d5e
Author: Jeff Jirsa 
Authored: Sat Feb 11 23:30:05 2017 -0800
Committer: Jeff Jirsa 
Committed: Sat Feb 11 23:30:31 2017 -0800

--
 CHANGES.txt |  3 +-
 .../DecayingEstimatedHistogramReservoir.java|  3 +-
 ...DecayingEstimatedHistogramReservoirTest.java | 31 
 3 files changed, 35 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eaef3f9/CHANGES.txt
--
diff --cc CHANGES.txt
index 6c1b9b6,5be6cef..7c38295
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -49,13 -18,12 +49,14 @@@ Merged from 3.0
   * Provide user workaround when system_schema.columns does not contain entries
 for a table that's in system_schema.tables (CASSANDRA-13180)
  Merged from 2.2:
-   * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
+  * Fix negative mean latency metric (CASSANDRA-12876)
+  * Use only one file pointer when creating commitlog segments 
(CASSANDRA-12539)
  Merged from 2.1:
   * Fix Thread Leak in OutboundTcpConnection (CASSANDRA-13204)
 + * Upgrade netty version to fix memory leak with client encryption 
(CASSANDRA-13114)
   * Coalescing strategy can enter infinite loop (CASSANDRA-13159)
  
 +
  3.10
   * Fix secondary index queries regression (CASSANDRA-13013)
   * Add duration type to the protocol V5 (CASSANDRA-12850)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eaef3f9/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
--

[10/10] cassandra git commit: Merge branch 'cassandra-3.11' into trunk

[jake]

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/d1694437
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1694437
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1694437

Branch: refs/heads/trunk
Commit: d16944372c5d929bf3e1434f0e2e4d33e2cd9d07
Parents: d0937cc d8dfeb2
Author: T Jake Luciani 
Authored: Fri Feb 3 15:20:26 2017 -0500
Committer: T Jake Luciani 
Committed: Fri Feb 3 15:20:26 2017 -0500

--
 CHANGES.txt | 21 ++--
 .../apache/cassandra/db/ColumnFamilyStore.java  |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1694437/CHANGES.txt
--
diff --cc CHANGES.txt
index 90392b8,d0134e5..2076c8f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -226,9 -195,11 +226,10 @@@ Merged from 3.0
   * Correct log message for statistics of offheap memtable flush 
(CASSANDRA-12776)
   * Explicitly set locale for string validation 
(CASSANDRA-12541,CASSANDRA-12542,CASSANDRA-12543,CASSANDRA-12545)
  Merged from 2.2:
-  * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981) 
+  * Fix speculative retry bugs (CASSANDRA-13009)
+  * Fix handling of nulls and unsets in IN conditions (CASSANDRA-12981)
   * Fix race causing infinite loop if Thrift server is stopped before it 
starts listening (CASSANDRA-12856)
   * CompactionTasks now correctly drops sstables out of compaction when not 
enough disk space is available (CASSANDRA-12979)
 - * Remove support for non-JavaScript UDFs (CASSANDRA-12883)
   * Fix DynamicEndpointSnitch noop in multi-datacenter situations 
(CASSANDRA-13074)
   * cqlsh copy-from: encode column names to avoid primary key parsing errors 
(CASSANDRA-12909)
   * Temporarily fix bug that creates commit log when running offline tools 
(CASSANDRA-8616)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1694437/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
--
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 4aa2d3e,1ff956e..039dc33
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -407,14 -394,14 +407,14 @@@ public class ColumnFamilyStore implemen
  this.keyspace = keyspace;
  this.metadata = metadata;
  name = columnFamilyName;
 -minCompactionThreshold = new 
DefaultValue<>(metadata.params.compaction.minCompactionThreshold());
 -maxCompactionThreshold = new 
DefaultValue<>(metadata.params.compaction.maxCompactionThreshold());
 -crcCheckChance = new DefaultValue<>(metadata.params.crcCheckChance);
 +minCompactionThreshold = new 
DefaultValue<>(metadata.get().params.compaction.minCompactionThreshold());
 +maxCompactionThreshold = new 
DefaultValue<>(metadata.get().params.compaction.maxCompactionThreshold());
 +crcCheckChance = new 
DefaultValue<>(metadata.get().params.crcCheckChance);
  indexManager = new SecondaryIndexManager(this);
 -viewManager = keyspace.viewManager.forTable(metadata);
 +viewManager = keyspace.viewManager.forTable(metadata.id);
  metric = new TableMetrics(this);
  fileIndexGenerator.set(generation);
- sampleLatencyNanos = DatabaseDescriptor.getReadRpcTimeout() / 2;
+ sampleLatencyNanos = 
TimeUnit.MILLISECONDS.toNanos(DatabaseDescriptor.getReadRpcTimeout() / 2);
  
  logger.info("Initializing {}.{}", keyspace.getName(), name);