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

Branch: refs/heads/trunk
Commit: a1f0dcdcb757065ff7c98890e6f7bfd669cd3148
Parents: 640795d 2e675b5
Author: Paulo Motta 
Authored: Fri Jan 6 11:00:12 2017 -0200
Committer: Paulo Motta 
Committed: Fri Jan 6 11:00:12 2017 -0200

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


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

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

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

Branch: refs/heads/trunk
Commit: 7d266b9e79e0738df25e4f86b5bdccb030a02d88
Parents: 0f67b54 b1e23ab
Author: Paulo Motta 
Authored: Thu Dec 15 16:51:12 2016 -0200
Committer: Paulo Motta 
Committed: Thu Dec 15 16:51:12 2016 -0200

--
 CHANGES.txt |  1 +
 src/java/org/apache/cassandra/db/Keyspace.java  | 89 +++-
 src/java/org/apache/cassandra/db/Mutation.java  | 17 ++--
 .../db/commitlog/CommitLogReplayer.java | 10 +--
 src/java/org/apache/cassandra/hints/Hint.java   | 40 ++---
 .../apache/cassandra/hints/HintVerbHandler.java |  4 +-
 .../cassandra/service/paxos/PaxosState.java |  9 +-
 .../cassandra/streaming/StreamReceiveTask.java  |  6 +-
 8 files changed, 90 insertions(+), 86 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d266b9e/CHANGES.txt
--
diff --cc CHANGES.txt
index e0c5637,5f7cf93..fd888bc1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -133,8 -123,9 +133,9 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
 + * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Improve contention handling on failure to acquire MV lock for streaming 
and hints (CASSANDRA-12905)
   * Fix DELETE and UPDATE queries with empty IN restrictions (CASSANDRA-12829)
   * Mark MVs as built after successful bootstrap (CASSANDRA-12984)
   * Estimated TS drop-time histogram updated with Cell.NO_DELETION_TIME 
(CASSANDRA-13040)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7d266b9e/src/java/org/apache/cassandra/db/Mutation.java
--

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

Branch: refs/heads/trunk
Commit: a8acb2a1ba42426ec60d53a5564c6572cd37a6e9
Parents: c09ba58 8883554
Author: Benjamin Lerer 
Authored: Mon Dec 12 13:54:05 2016 +0100
Committer: Benjamin Lerer 
Committed: Mon Dec 12 13:56:07 2016 +0100

--
 CHANGES.txt |   1 +
 .../operations/InsertUpdateIfConditionTest.java | 125 +++
 2 files changed, 76 insertions(+), 50 deletions(-)
--


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

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

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

Branch: refs/heads/trunk
Commit: f782f148bdde962adf11d268db3435231dba5083
Parents: 58cf4c9 8b3de2f
Author: Benjamin Lerer 
Authored: Mon Nov 21 18:54:34 2016 +0100
Committer: Benjamin Lerer 
Committed: Mon Nov 21 18:54:34 2016 +0100

--
 CHANGES.txt |   5 +
 doc/source/cql/changes.rst  |   4 +-
 doc/source/cql/definitions.rst  |   4 +-
 doc/source/cql/index.rst|   1 +
 doc/source/cql/operators.rst|  57 ++
 pylib/cqlshlib/cql3handling.py  |   2 +-
 src/antlr/Lexer.g   |   6 +-
 src/antlr/Parser.g  | 248 +--
 .../org/apache/cassandra/cql3/Constants.java|  58 +-
 src/java/org/apache/cassandra/cql3/Lists.java   |  85 ++-
 src/java/org/apache/cassandra/cql3/Maps.java| 122 ++-
 src/java/org/apache/cassandra/cql3/Sets.java|  95 ++-
 src/java/org/apache/cassandra/cql3/Tuples.java  | 147 +++-
 .../org/apache/cassandra/cql3/UserTypes.java| 115 ++-
 .../cassandra/cql3/functions/FunctionCall.java  |  37 +-
 .../cql3/functions/FunctionResolver.java|  91 ++-
 .../cassandra/cql3/functions/OperationFcts.java | 380 ++
 .../cql3/selection/CollectionFactory.java   |  91 +++
 .../cql3/selection/ForwardingFactory.java   |  90 +++
 .../cassandra/cql3/selection/ListSelector.java  | 104 +++
 .../cassandra/cql3/selection/MapSelector.java   | 195 +
 .../cql3/selection/ScalarFunctionSelector.java  |   9 -
 .../cassandra/cql3/selection/Selectable.java| 647 +++-
 .../cassandra/cql3/selection/Selector.java  |  11 -
 .../cassandra/cql3/selection/SetSelector.java   | 106 +++
 .../cassandra/cql3/selection/TupleSelector.java | 101 +++
 .../cql3/selection/UserTypeSelector.java| 177 +
 .../org/apache/cassandra/db/SystemKeyspace.java |   1 +
 .../cassandra/db/marshal/AbstractType.java  |  13 +-
 .../cassandra/db/marshal/BooleanType.java   |   2 +-
 .../apache/cassandra/db/marshal/ByteType.java   |  56 +-
 .../cassandra/db/marshal/CounterColumnType.java |  40 +-
 .../apache/cassandra/db/marshal/DateType.java   |   2 +-
 .../cassandra/db/marshal/DecimalType.java   |  76 +-
 .../apache/cassandra/db/marshal/DoubleType.java |  69 +-
 .../apache/cassandra/db/marshal/EmptyType.java  |   2 +-
 .../apache/cassandra/db/marshal/FloatType.java  |  61 +-
 .../apache/cassandra/db/marshal/Int32Type.java  |  48 +-
 .../cassandra/db/marshal/IntegerType.java   |  69 +-
 .../cassandra/db/marshal/LexicalUUIDType.java   |   2 +-
 .../apache/cassandra/db/marshal/LongType.java   |  52 +-
 .../apache/cassandra/db/marshal/NumberType.java | 223 ++
 .../cassandra/db/marshal/ReversedType.java  |   2 +-
 .../apache/cassandra/db/marshal/ShortType.java  |  51 +-
 .../cassandra/db/marshal/TimeUUIDType.java  |   2 +-
 .../cassandra/db/marshal/TimestampType.java |   2 +-
 .../apache/cassandra/db/marshal/TupleType.java  |   5 +
 .../apache/cassandra/db/marshal/UUIDType.java   |   2 +-
 .../apache/cassandra/db/marshal/UserType.java   |   5 +
 .../exceptions/OperationExecutionException.java |  57 ++
 .../cassandra/serializers/ByteSerializer.java   |   4 +-
 .../apache/cassandra/utils/ByteBufferUtil.java  |  17 +
 .../org/apache/cassandra/cql3/CQLTester.java|   4 +-
 .../cql3/functions/OperationFctsTest.java   | 744 +++
 .../selection/SelectionColumnMappingTest.java   |  94 +++
 .../cql3/selection/TermSelectionTest.java   | 386 +-
 .../cql3/validation/operations/SelectTest.java  |  10 +
 57 files changed, 4769 insertions(+), 320 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f782f148/CHANGES.txt
--
diff --cc CHANGES.txt
index fa9233a,1f1625c..6cd725c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,8 +1,15 @@@
 +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.12
+  * Add support for arithmetic operators (CASSANDRA-11935)
+ 
+ 3.11
+  * AnticompactionRequestSerializer serializedSize is incorrect 
(CASSANDRA-12934)
  
  3.10

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

2016-11-08 Thread mshuler 
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/0d813fe8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d813fe8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d813fe8

Branch: refs/heads/trunk
Commit: 0d813fe885b61dbe4e84a04e93a72e0ee798d7f5
Parents: 1eea75b 072b527
Author: Michael Shuler 
Authored: Tue Nov 8 12:43:05 2016 -0600
Committer: Michael Shuler 
Committed: Tue Nov 8 12:43:05 2016 -0600

--

--

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

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

Branch: refs/heads/trunk
Commit: 1eea75bcc4cc88365ea4ac1058a63ad93d139003
Parents: b6cb2ab 8ae3139
Author: Benjamin Lerer 
Authored: Tue Nov 8 18:22:53 2016 +0100
Committer: Benjamin Lerer 
Committed: Tue Nov 8 18:23:15 2016 +0100

--
 CHANGES.txt |  2 +
 test/unit/org/apache/cassandra/Util.java|  6 +-
 .../commitlog/CommitLogSegmentManagerTest.java  | 93 
 3 files changed, 60 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eea75bc/CHANGES.txt
--
diff --cc CHANGES.txt
index 0332f50,dd9088b..69a05c2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +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
+  * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
   * Fix cassandra-stress truncate option (CASSANDRA-12695)
   * Fix crossNode value when receiving messages (CASSANDRA-12791)
   * Don't load MX4J beans twice (CASSANDRA-12869)

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

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

Branch: refs/heads/trunk
Commit: 07bc404ff48a57144c267ac8abf2f6f537dc432c
Parents: be2b8cd 3003d21
Author: Michael Shuler 
Authored: Mon Oct 10 17:11:48 2016 -0500
Committer: Michael Shuler 
Committed: Mon Oct 10 17:11:48 2016 -0500

--

--

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

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

Branch: refs/heads/trunk
Commit: cf04fef918a82603da0409e7b16b5e48f37e85b4
Parents: 87cb1c6 6839a57
Author: Jeff Jirsa 
Authored: Mon Oct 3 13:04:21 2016 -0700
Committer: Jeff Jirsa 
Committed: Mon Oct 3 13:04:21 2016 -0700

--

--