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

2015-12-04 Thread tylerhobbs 
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/4a566139
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a566139
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a566139

Branch: refs/heads/trunk
Commit: 4a566139d1763453c01ad297ab98ec633e7befd1
Parents: 1c41a9a f0d45ea
Author: Tyler Hobbs 
Authored: Fri Dec 4 11:43:44 2015 -0600
Committer: Tyler Hobbs 
Committed: Fri Dec 4 11:43:44 2015 -0600

--
 CHANGES.txt |   2 +
 .../apache/cassandra/db/rows/AbstractCell.java  |   5 +-
 .../apache/cassandra/db/rows/AbstractRow.java   |   6 +-
 .../apache/cassandra/db/view/TemporalRow.java   |   6 +-
 src/java/org/apache/cassandra/db/view/View.java |  15 +-
 .../apache/cassandra/db/view/ViewManager.java   |   4 +
 .../apache/cassandra/service/StorageProxy.java  |  14 +-
 .../apache/cassandra/cql3/ViewSchemaTest.java   | 762 +++
 .../org/apache/cassandra/cql3/ViewTest.java | 707 +
 9 files changed, 838 insertions(+), 683 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a566139/CHANGES.txt
--
diff --cc CHANGES.txt
index 6c46183,7c7e301..532a77a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,7 +1,22 @@@
 +3.2
 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes 
(CASSANDRA-8639)
 + * 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:
+  * Handle single-column deletions correction in materialized views
+when the column is part of the view primary key (CASSANDRA-10796)
   * Fix issue with datadir migration on upgrade (CASSANDRA-10788)
   * Fix bug with range tombstones on reverse queries and test coverage for
 AbstractBTreePartition (CASSANDRA-10059)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a566139/src/java/org/apache/cassandra/db/view/View.java
--

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

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

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

Branch: refs/heads/trunk
Commit: f55df0b85ed0b404a287ec72763967f2d305427e
Parents: 2cc34df ca32e05
Author: Robert Stupp 
Authored: Tue Dec 1 10:41:07 2015 +0100
Committer: Robert Stupp 
Committed: Tue Dec 1 10:41:07 2015 +0100

--
 bin/cqlsh.py | 11 ---
 pylib/cqlshlib/helptopics.py | 25 -
 2 files changed, 32 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f55df0b8/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index 6b87d9f,7435f00..1a44d0d
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -71,6 -71,7 +71,7 @@@ except ImportError
  CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
  
  CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 
'..')
 -CASSANDRA_CQL_HTML_FALLBACK = 
'https://cassandra.apache.org/doc/cql3/CQL-3.0.html'
++CASSANDRA_CQL_HTML_FALLBACK = 
'https://cassandra.apache.org/doc/cql3/CQL-3.2.html'
  
  # default location of local CQL.html
  if os.path.exists(CASSANDRA_PATH + '/doc/cql3/CQL.html'):

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

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

Branch: refs/heads/trunk
Commit: d00d091c6329c4c3d3b157e2dc3e4eb5ff1ac0d1
Parents: f5e6f4e 17e13e5
Author: Benjamin Lerer 
Authored: Fri Nov 27 13:19:15 2015 +0100
Committer: Benjamin Lerer 
Committed: Fri Nov 27 13:19:21 2015 +0100

--
 CHANGES.txt  | 1 +
 .../apache/cassandra/io/sstable/format/big/BigTableWriter.java   | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d00d091c/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java
--

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

2015-11-27 Thread snazy 
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/306d882f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/306d882f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/306d882f

Branch: refs/heads/trunk
Commit: 306d882fe3d997a5ddc2b21ed60ca24c5e71c7bc
Parents: 33e7bba 918bc01
Author: Robert Stupp 
Authored: Fri Nov 27 15:26:13 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 15:26:13 2015 +0100

--
 CHANGES.txt  |1 +
 bin/cqlsh.py |   62 ++-
 build.xml|7 +-
 conf/cqlshrc.sample  |   17 +
 debian/rules |3 +-
 pylib/cqlshlib/helptopics.py | 1078 -
 6 files changed, 188 insertions(+), 980 deletions(-)
--


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

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

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

2015-11-27 Thread snazy 
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/b3ff1324
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3ff1324
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3ff1324

Branch: refs/heads/trunk
Commit: b3ff1324382e62936f8362d6956ae408e56a5438
Parents: 20eedd0 c29279c
Author: Robert Stupp 
Authored: Fri Nov 27 09:21:49 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 09:21:49 2015 +0100

--
 CHANGES.txt  | 1 +
 doc/cql3/CQL.textile | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3ff1324/doc/cql3/CQL.textile
--

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

2015-11-27 Thread snazy 
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/0401f579
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0401f579
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0401f579

Branch: refs/heads/trunk
Commit: 0401f5797a729fedb3580328d8416e03047884c8
Parents: 10054f3 55bf08a
Author: Robert Stupp 
Authored: Fri Nov 27 11:42:45 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 27 11:42:45 2015 +0100

--
 .../cassandra/hadoop/cql3/CqlRecordWriter.java  | 160 +++
 1 file changed, 92 insertions(+), 68 deletions(-)
--

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

2015-11-23 Thread snazy 
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/945a4192
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/945a4192
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/945a4192

Branch: refs/heads/trunk
Commit: 945a4192d4b99bc3033a4d1deb686ebdcbc09d3b
Parents: 76c4841 23a84f0
Author: Robert Stupp 
Authored: Mon Nov 23 16:48:59 2015 +0100
Committer: Robert Stupp 
Committed: Mon Nov 23 16:48:59 2015 +0100

--
 CHANGES.txt |  1 +
 .../cql3/functions/JavaBasedUDFunction.java | 15 +
 .../cql3/functions/UDFByteCodeVerifier.java | 21 ++-
 .../cassandra/cql3/functions/UDFunction.java|  6 ++
 .../cql3/validation/entities/UFTest.java| 42 -
 .../validation/entities/UFVerifierTest.java | 62 +++-
 6 files changed, 128 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/945a4192/CHANGES.txt
--
diff --cc CHANGES.txt
index 8b50fc7,1a46cb3..a6646f9
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,14 -1,6 +1,15 @@@
 +3.2
 + * 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:
+  * Unable to create a function with argument of type Inet (CASSANDRA-10741)
   * Fix backward incompatibiliy in CqlInputFormat (CASSANDRA-10717)
   * Correctly preserve deletion info on updated rows when notifying indexers
 of single-row deletions (CASSANDRA-10694)

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

2015-11-20 Thread snazy 
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/76c4841b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76c4841b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76c4841b

Branch: refs/heads/trunk
Commit: 76c4841b34ce232e79b97a197d8198384d814fc3
Parents: 4016160 32a682a
Author: Robert Stupp 
Authored: Fri Nov 20 17:24:57 2015 +0100
Committer: Robert Stupp 
Committed: Fri Nov 20 17:24:57 2015 +0100

--
 build.xml   | 180 +-
 ide/idea-iml-file.xml   |  68 
 ide/idea/inspectionProfiles/Project_Default.xml |  38 +-
 ide/idea/misc.xml   |   4 +
 ide/idea/vcs.xml|   6 +
 ide/idea/workspace.xml  | 359 +++
 6 files changed, 447 insertions(+), 208 deletions(-)
--


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

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

2015-11-19 Thread snazy 
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/c4a54978
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4a54978
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4a54978

Branch: refs/heads/trunk
Commit: c4a54978cad8448802608e34a85f485acc94f88f
Parents: 8c511cc d1103f5
Author: Robert Stupp 
Authored: Thu Nov 19 10:42:24 2015 +0100
Committer: Robert Stupp 
Committed: Thu Nov 19 10:42:24 2015 +0100

--
 conf/cassandra.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

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

Branch: refs/heads/trunk
Commit: 0781bccc92ad0204425c9515564bdacee0942439
Parents: 7fcf14f 6688911
Author: blerer 
Authored: Thu Nov 12 21:14:45 2015 +0100
Committer: blerer 
Committed: Thu Nov 12 21:14:59 2015 +0100

--
 CHANGES.txt|  1 +
 .../cassandra/db/marshal/SimpleDateType.java   |  2 +-
 .../cql3/validation/operations/AlterTest.java  | 17 +
 3 files changed, 19 insertions(+), 1 deletion(-)
--


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

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

2015-11-10 Thread aleksey 
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/3820e89d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3820e89d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3820e89d

Branch: refs/heads/trunk
Commit: 3820e89d9e4a630f1e7a651926f9fe1124dfa2cb
Parents: ce6296b 11b073e
Author: Aleksey Yeschenko 
Authored: Tue Nov 10 16:33:26 2015 +
Committer: Aleksey Yeschenko 
Committed: Tue Nov 10 16:33:26 2015 +

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


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