[2/2] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2017-01-06 Thread paulo 
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 29a855e1bab113b9f748edc050cd615429669253
Parents: 84b9b9a 5c0aacb
Author: Paulo Motta 
Authored: Fri Jan 6 09:53:09 2017 -0200
Committer: Paulo Motta 
Committed: Fri Jan 6 09:53:09 2017 -0200

--
 conf/jvm.options | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/29a855e1/conf/jvm.options
--

[2/2] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-12-19 Thread blerer 
Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: aa124a1da7b7bb493b5de2d70bfb63aebee24e95
Parents: 57c0eee 5d48b0d
Author: Benjamin Lerer 
Authored: Mon Dec 19 15:59:58 2016 +0100
Committer: Benjamin Lerer 
Committed: Mon Dec 19 16:00:11 2016 +0100

--
 CHANGES.txt |  1 +
 .../restrictions/StatementRestrictions.java |  7 ---
 .../cassandra/cql3/selection/Selection.java | 14 --
 .../cql3/statements/ModificationStatement.java  |  2 +-
 .../cql3/statements/SelectStatement.java|  1 -
 .../cql3/statements/UpdateStatement.java|  2 -
 .../validation/entities/CollectionsTest.java| 51 +---
 7 files changed, 46 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/CHANGES.txt
--
diff --cc CHANGES.txt
index 1b1c1f1,d4da5c4..618446d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,5 +1,15 @@@
 +4.0
 + * Thrift removal (CASSANDRA-5)
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
+  * Allow IN restrictions on column families with collections (CASSANDRA-12654)
   * Move to FastThreadLocalThread and FastThreadLocal (CASSANDRA-13034)
   * nodetool stopdaemon errors out (CASSANDRA-13030)
   * Log message size in trace message in OutboundTcpConnection 
(CASSANDRA-13028)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/src/java/org/apache/cassandra/cql3/restrictions/StatementRestrictions.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
--

http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa124a1d/src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
--

[2/2] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-12-12 Thread blerer 
Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: 31501cc8b1f2b66dce4abc59891984ba790896b0
Parents: a8acb2a 3b84de4
Author: Benjamin Lerer 
Authored: Mon Dec 12 14:09:46 2016 +0100
Committer: Benjamin Lerer 
Committed: Mon Dec 12 14:10:13 2016 +0100

--
 CHANGES.txt |   3 +-
 doc/source/operating/metrics.rst|  25 
 .../cql3/statements/BatchStatement.java |  35 --
 src/java/org/apache/cassandra/db/IMutation.java |  16 +++
 .../apache/cassandra/metrics/BatchMetrics.java  |  38 ++
 .../metrics/CASClientRequestMetrics.java|   5 -
 .../metrics/CASClientWriteRequestMetrics.java   |  52 
 .../metrics/ClientWriteRequestMetrics.java  |  47 
 .../apache/cassandra/service/StorageProxy.java  |  16 ++-
 .../cassandra/metrics/BatchMetricsTest.java | 119 +++
 10 files changed, 336 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/31501cc8/CHANGES.txt
--
diff --cc CHANGES.txt
index 18e0833,dfb849d..fa2bf93
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
 +4.0
 + * Remove pre-3.0 compatibility code for 4.0 (CASSANDRA-12716)
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
 +
  3.12
-  * add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
+  * Add mutation size and batch metrics (CASSANDRA-12649)
+  * Add method to get size of endpoints to TokenMetadata (CASSANDRA-12999)
   * Fix primary index calculation for SASI (CASSANDRA-12910)
   * Expose time spent waiting in thread pool queue (CASSANDRA-8398)
   * Conditionally update index built status to avoid unnecessary flushes 
(CASSANDRA-12969)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/31501cc8/src/java/org/apache/cassandra/service/StorageProxy.java
--

[2/2] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-11-25 Thread blerer 
Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: adadd7761cb940de6db1931b1abd78f1e9f7f687
Parents: af922ca 8884302
Author: Benjamin Lerer 
Authored: Fri Nov 25 09:52:30 2016 +0100
Committer: Benjamin Lerer 
Committed: Fri Nov 25 09:52:37 2016 +0100

--
 pylib/cqlshlib/cql3handling.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-11-24 Thread blerer 
Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: af922ca6caf3d21ce4d95168d841a0b4744ef1dc
Parents: 5af71cf 5de016f
Author: Benjamin Lerer 
Authored: Thu Nov 24 17:52:38 2016 +0100
Committer: Benjamin Lerer 
Committed: Thu Nov 24 17:52:48 2016 +0100

--
 src/java/org/apache/cassandra/db/rows/AbstractRow.java | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--

[2/2] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-10-25 Thread blerer 
Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: 2505733020759528d1592fd5ee3e3390b7227354
Parents: 4c728d2 b98a406
Author: Benjamin Lerer 
Authored: Tue Oct 25 17:15:49 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Oct 25 17:16:00 2016 +0200

--
 CHANGES.txt |  1 +
 .../cql3/restrictions/TokenFilter.java  | 21 
 .../SelectOrderedPartitionerTest.java   | 50 
 3 files changed, 63 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/25057330/CHANGES.txt
--
diff --cc CHANGES.txt
index f9e3e34,dea2003..0c966b8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,5 +1,14 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +Merged from 3.0:
 + * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 +
  3.10
+  * Use non-token restrictions for bounds when token restrictions are 
overridden (CASSANDRA-12419)
   * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
   * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
   * Avoid potential AttributeError in cqlsh due to no table metadata 
(CASSANDRA-12815)

[2/2] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-10-20 Thread blerer 
Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: 65405b9ed578a6d33f4e71411625a3a655392e31
Parents: 0695307 af1afef
Author: Benjamin Lerer 
Authored: Thu Oct 20 17:24:32 2016 +0200
Committer: Benjamin Lerer 
Committed: Thu Oct 20 17:24:32 2016 +0200

--
 CHANGES.txt|   1 +
 build.xml  |   2 +-
 lib/commons-codec-1.2.jar  | Bin 30085 -> 0 bytes
 lib/commons-codec-1.9.jar  | Bin 0 -> 263965 bytes
 lib/licenses/commons-codec-1.2.txt | 202 
 lib/licenses/commons-codec-1.9.txt | 202 
 6 files changed, 204 insertions(+), 203 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/65405b9e/CHANGES.txt
--
diff --cc CHANGES.txt
index 94d13d5,26bc68b..94a1a4e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,13 -1,7 +1,14 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
  3.10
+  * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
 - * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
   * Add duration data type (CASSANDRA-11873)
 + * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
   * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
   * Improve sum aggregate functions (CASSANDRA-12417)
   * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)

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

[2/2] cassandra git commit: Merge branch 'cassandra-3.X' into trunk

2016-10-18 Thread marcuse 
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 42e0fc5ee221950875d93b4cd007d4f5bcaa4244
Parents: a4705c2 9fc14bc
Author: Marcus Eriksson 
Authored: Tue Oct 18 14:01:05 2016 +0200
Committer: Marcus Eriksson 
Committed: Tue Oct 18 14:01:05 2016 +0200

--
 CHANGES.txt |  1 +
 doc/source/operating/compaction.rst |  6 +++-
 pylib/cqlshlib/cql3handling.py  |  1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  |  5 +++
 .../cassandra/db/ColumnFamilyStoreMBean.java|  5 +++
 .../compaction/CompactionStrategyManager.java   | 17 ++
 .../compaction/LeveledCompactionStrategy.java   | 34 +++-
 .../db/compaction/LeveledManifest.java  | 21 
 .../writers/MajorLeveledCompactionWriter.java   |  4 ++-
 .../cassandra/tools/StandaloneScrubber.java |  4 +--
 .../tools/nodetool/stats/TableStatsHolder.java  |  2 +-
 .../LongLeveledCompactionStrategyTest.java  |  2 +-
 .../unit/org/apache/cassandra/SchemaLoader.java |  1 +
 .../validation/miscellaneous/OverflowTest.java  |  2 +-
 .../db/compaction/CompactionsCQLTest.java   |  2 +-
 15 files changed, 91 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42e0fc5e/CHANGES.txt
--
diff --cc CHANGES.txt
index 8f112ed,20a64e1..eed6ee8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter 
(CASSANDRA-12422)
 +
  3.10
+  * Make the fanout size for LeveledCompactionStrategy to be configurable 
(CASSANDRA-11550)
   * Fix timeout in ReplicationAwareTokenAllocatorTest (CASSANDRA-12784)
   * Improve sum aggregate functions (CASSANDRA-12417)
   * Make cassandra.yaml docs for batch_size_*_threshold_in_kb reflect changes 
in CASSANDRA-10876 (CASSANDRA-12761)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/42e0fc5e/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
--

[2/2] cassandra git commit: Merge branch cassandra-3.X into trunk

2016-10-11 Thread blerer 
Merge branch cassandra-3.X into trunk


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

Branch: refs/heads/trunk
Commit: dffe270778c2d942708b42de03839327f17725d7
Parents: 9f16749 8309543
Author: Benjamin Lerer 
Authored: Tue Oct 11 10:51:59 2016 +0200
Committer: Benjamin Lerer 
Committed: Tue Oct 11 10:57:26 2016 +0200

--
 CHANGES.txt |  1 +
 src/antlr/Cql.g | 17 +++
 src/antlr/Parser.g  | 48 +---
 .../apache/cassandra/cql3/CqlParserTest.java| 15 +++---
 .../validation/operations/AggregationTest.java  |  4 +-
 5 files changed, 61 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dffe2707/CHANGES.txt
--
diff --cc CHANGES.txt
index 6977168,2f517e0..1310795
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +4.0
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace 
(CASSANDRA-12681)
 +
 +
  3.10
+  * Exit query parsing upon first error (CASSANDRA-12598)
   * Fix cassandra-stress to use single seed in UUID generation 
(CASSANDRA-12729)
   * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450)
   * Config class uses boxed types but DD exposes primitive types 
(CASSANDRA-12199)