[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-12-04 Thread jmckenzie 
Merge branch 'cassandra-3.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34be4d61
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34be4d61
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34be4d61

Branch: refs/heads/trunk
Commit: 34be4d61c914a214f9d1f929c6859c233c679bf5
Parents: 084590c eb0f56d
Author: Joshua McKenzie 
Authored: Fri Dec 4 13:40:47 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Dec 4 13:40:47 2015 -0500

--
 src/java/org/apache/cassandra/service/AbstractReadExecutor.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
--

[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-12-02 Thread yukim 
Merge branch 'cassandra-3.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/461fffc7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/461fffc7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/461fffc7

Branch: refs/heads/trunk
Commit: 461fffc764c1a2363b92ba3084fca8543440b0ae
Parents: b524020 62de5a3
Author: Yuki Morishita 
Authored: Wed Dec 2 13:52:08 2015 -0600
Committer: Yuki Morishita 
Committed: Wed Dec 2 13:52:08 2015 -0600

--
 CHANGES.txt  | 1 +
 src/java/org/apache/cassandra/streaming/StreamReader.java| 4 +---
 .../cassandra/streaming/compress/CompressedStreamReader.java | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/461fffc7/CHANGES.txt
--
diff --cc CHANGES.txt
index cc79512,ad4cd8b..a4c12a2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,6 +1,20 @@@
 +3.2
 + * Normalize all scripts (CASSANDRA-10679)
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.1
  Merged from 3.0:
+  * Fix NPE on stream read error (CASSANDRA-10771)
   * Normalize cqlsh DESC output (CASSANDRA-10431)
   * Rejects partition range deletions when columns are specified 
(CASSANDRA-10739)
   * Fix error when saving cached key for old format sstable (CASSANDRA-10778)

[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-11-30 Thread samt 
Merge branch 'cassandra-3.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a4afa79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a4afa79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a4afa79

Branch: refs/heads/trunk
Commit: 4a4afa79c43586fcbda93458d65b59cfab654ae0
Parents: 306d882 5de5d06
Author: Sam Tunnicliffe 
Authored: Mon Nov 30 12:28:38 2015 +
Committer: Sam Tunnicliffe 
Committed: Mon Nov 30 12:28:38 2015 +

--
 CHANGES.txt |  1 +
 .../org/apache/cassandra/config/CFMetaData.java | 14 +++--
 .../org/apache/cassandra/config/Schema.java |  8 +--
 .../apache/cassandra/cql3/QueryProcessor.java   |  4 +-
 .../cassandra/service/MigrationListener.java|  4 +-
 .../cassandra/service/MigrationManager.java |  4 +-
 .../org/apache/cassandra/transport/Server.java  |  2 +-
 .../validation/entities/SecondaryIndexTest.java | 62 +---
 .../index/internal/CassandraIndexTest.java  |  8 ---
 9 files changed, 62 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a4afa79/CHANGES.txt
--
diff --cc CHANGES.txt
index 6c5d7b9,57769db..c69cdf5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,18 -1,6 +1,19 @@@
 +3.2
 + * Make compression ratio much more accurate (CASSANDRA-10225)
 + * Optimize building of Clustering object when only one is created 
(CASSANDRA-10409)
 + * Make index building pluggable (CASSANDRA-10681)
 + * Add sstable flush observer (CASSANDRA-10678)
 + * Improve NTS endpoints calculation (CASSANDRA-10200)
 + * Improve performance of the folderSize function (CASSANDRA-10677)
 + * Add support for type casting in selection clause (CASSANDRA-10310)
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.1
  Merged from 3.0:
+  * Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
   * Fix SELECT statement with IN restrictions on partition key,
 ORDER BY and LIMIT (CASSANDRA-10729)
   * Improve stress performance over 1k threads (CASSANDRA-7217)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a4afa79/src/java/org/apache/cassandra/config/CFMetaData.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a4afa79/test/unit/org/apache/cassandra/index/internal/CassandraIndexTest.java
--

[6/6] cassandra git commit: Merge branch cassandra-3.1 into trunk

2015-11-24 Thread blerer 
Merge branch cassandra-3.1 into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a694a9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a694a9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a694a9f

Branch: refs/heads/trunk
Commit: 1a694a9fdd2ad7308b1baa660cca03987aff30da
Parents: ba14431 521cc54
Author: Benjamin Lerer 
Authored: Tue Nov 24 15:14:57 2015 +0100
Committer: Benjamin Lerer 
Committed: Tue Nov 24 15:15:05 2015 +0100

--
 bin/cqlsh.py | 57 ---
 1 file changed, 33 insertions(+), 24 deletions(-)
--

[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-11-20 Thread slebresne 
Merge branch 'cassandra-3.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bc42f326
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc42f326
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc42f326

Branch: refs/heads/trunk
Commit: bc42f3264f3486202873e88b73f268535fed130c
Parents: 8e3a47d 4b364ec
Author: Sylvain Lebresne 
Authored: Fri Nov 20 15:13:01 2015 +0100
Committer: Sylvain Lebresne 
Committed: Fri Nov 20 15:13:01 2015 +0100

--
 CHANGES.txt  |  1 +
 bin/cqlsh.py | 28 ++--
 2 files changed, 23 insertions(+), 6 deletions(-)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-11-17 Thread marcuse 
Merge branch 'cassandra-3.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6645062c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6645062c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6645062c

Branch: refs/heads/trunk
Commit: 6645062caaebfa7d77ae0c77db9e33cd1be44005
Parents: 0010fce 798a7a8
Author: Marcus Eriksson 
Authored: Tue Nov 17 10:15:58 2015 +0100
Committer: Marcus Eriksson 
Committed: Tue Nov 17 10:15:58 2015 +0100

--
 CHANGES.txt   |  2 ++
 .../cassandra/repair/messages/RepairOption.java   | 18 +++---
 .../cassandra/service/ActiveRepairService.java|  2 ++
 .../apache/cassandra/service/StorageService.java  |  9 +++--
 .../repair/messages/RepairOptionTest.java | 17 +++--
 5 files changed, 41 insertions(+), 7 deletions(-)
--


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

[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-11-13 Thread jmckenzie 
Merge branch 'cassandra-3.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34822301
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34822301
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34822301

Branch: refs/heads/trunk
Commit: 34822301c2b12253eda5465d46fe47f61655dba3
Parents: da4f7f1 88892af
Author: Joshua McKenzie 
Authored: Fri Nov 13 10:03:50 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Nov 13 10:03:50 2015 -0500

--
 src/java/org/apache/cassandra/db/lifecycle/LogFile.java   | 7 ---
 .../org/apache/cassandra/db/lifecycle/LogTransaction.java | 6 ++
 2 files changed, 6 insertions(+), 7 deletions(-)
--

[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk

2015-11-13 Thread samt 
Merge branch 'cassandra-3.1' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8ad0f0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8ad0f0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8ad0f0f

Branch: refs/heads/trunk
Commit: d8ad0f0f2a1ba459bfcd07aee972285bc4fd5cc1
Parents: 3482230 00c31a2
Author: Sam Tunnicliffe 
Authored: Fri Nov 13 17:53:11 2015 +
Committer: Sam Tunnicliffe 
Committed: Fri Nov 13 17:56:32 2015 +

--
 CHANGES.txt |  1 +
 .../cassandra/index/SecondaryIndexManager.java  |  7 -
 .../apache/cassandra/index/CustomIndexTest.java | 33 
 3 files changed, 40 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ad0f0f/CHANGES.txt
--
diff --cc CHANGES.txt
index 0af24a7,6aff321..6ee2beb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,6 +1,12 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.1
  Merged from 3.0:
+  * Notify indexers of partition delete during cleanup (CASSANDRA-10685)
   * Keep the file open in trySkipCache (CASSANDRA-10669)
   * Updated trigger example (CASSANDRA-10257)
  Merged from 2.2:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d8ad0f0f/test/unit/org/apache/cassandra/index/CustomIndexTest.java
--
diff --cc test/unit/org/apache/cassandra/index/CustomIndexTest.java
index b372c59,b305868..ad68613
--- a/test/unit/org/apache/cassandra/index/CustomIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/CustomIndexTest.java
@@@ -18,6 -19,7 +19,7 @@@ import org.apache.cassandra.cql3.statem
  import org.apache.cassandra.cql3.statements.SelectStatement;
  import org.apache.cassandra.db.ColumnFamilyStore;
  import org.apache.cassandra.db.ReadCommand;
 -import org.apache.cassandra.db.ReadOrderGroup;
++import org.apache.cassandra.db.ReadExecutionController;
  import org.apache.cassandra.db.marshal.AbstractType;
  import org.apache.cassandra.db.marshal.Int32Type;
  import org.apache.cassandra.db.marshal.UTF8Type;
@@@ -471,6 -475,35 +475,35 @@@ public class CustomIndexTest extends CQ
  assertEquals(1, index.reloads.get());
  }
  
+ @Test
+ public void notifyIndexersOfPartitionAndRowRemovalDuringCleanup() throws 
Throwable
+ {
+ createTable("CREATE TABLE %s (k int, c int, v int, PRIMARY KEY 
(k,c))");
+ createIndex(String.format("CREATE CUSTOM INDEX cleanup_index ON %%s() 
USING '%s'", StubIndex.class.getName()));
+ ColumnFamilyStore cfs = getCurrentColumnFamilyStore();
+ StubIndex index  = 
(StubIndex)cfs.indexManager.getIndexByName("cleanup_index");
+ 
+ execute("INSERT INTO %s (k, c, v) VALUES (?, ?, ?)", 0, 0, 0);
+ execute("INSERT INTO %s (k, c, v) VALUES (?, ?, ?)", 0, 1, 1);
+ execute("INSERT INTO %s (k, c, v) VALUES (?, ?, ?)", 0, 2, 2);
+ execute("INSERT INTO %s (k, c, v) VALUES (?, ?, ?)", 3, 3, 3);
+ assertEquals(4, index.rowsInserted.size());
+ assertEquals(0, index.partitionDeletions.size());
+ 
+ ReadCommand cmd = Util.cmd(cfs, 0).build();
 -try (ReadOrderGroup orderGroup = cmd.startOrderGroup();
 - UnfilteredPartitionIterator iterator = 
cmd.executeLocally(orderGroup))
++try (ReadExecutionController executionController = 
cmd.executionController();
++ UnfilteredPartitionIterator iterator = 
cmd.executeLocally(executionController))
+ {
+ assertTrue(iterator.hasNext());
+ cfs.indexManager.deletePartition(iterator.next(), 
FBUtilities.nowInSeconds());
+ }
+ 
+ assertEquals(1, index.partitionDeletions.size());
+ assertEquals(3, index.rowsDeleted.size());
+ for (int i = 0; i < 3; i++)
+ assertEquals(index.rowsDeleted.get(i).clustering(), 
index.rowsInserted.get(i).clustering());
+ }
+ 
  private void testCreateIndex(String indexName, String... 
targetColumnNames) throws Throwable
  {
  createIndex(String.format("CREATE CUSTOM INDEX %s ON %%s(%s) USING 
'%s'",