You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/07/23 22:05:19 UTC
[1/7] git commit: merge
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 f7e3b9a6b -> 90b3acadc
refs/heads/cassandra-2.1.0 cfedc0075 -> c7b7a2493
refs/heads/trunk 432cfeff1 -> 7cb78e12f
merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7e3b9a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7e3b9a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7e3b9a6
Branch: refs/heads/trunk
Commit: f7e3b9a6b310924b11e09a7cc37fc83a5eb2b948
Parents: b181261 f9fc846
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Jul 23 12:55:19 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Jul 23 12:56:00 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 7 +-
bin/cqlsh | 3 +-
build.xml | 2 +-
conf/cassandra-env.sh | 4 +-
debian/changelog | 6 +
doc/cql/CQL.textile | 2 +
doc/cql3/CQL.textile | 2 +-
examples/hadoop_cql3_word_count/README.txt | 6 +-
.../conf/log4j.properties | 2 +-
.../src/WordCountSetup.java | 5 +-
examples/hadoop_word_count/README.txt | 6 +-
.../hadoop_word_count/conf/log4j.properties | 2 +-
examples/hadoop_word_count/src/WordCount.java | 5 +-
.../src/WordCountCounters.java | 2 +
.../hadoop_word_count/src/WordCountSetup.java | 25 +-
pylib/cqlshlib/cql3handling.py | 5 +-
.../org/apache/cassandra/db/DefsTables.java | 2 +-
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 1 -
.../cassandra/hadoop/cql3/CqlInputFormat.java | 2 -
.../cassandra/hadoop/pig/CqlNativeStorage.java | 291 +++++++++++++++++++
.../apache/cassandra/hadoop/pig/CqlStorage.java | 11 +-
.../apache/cassandra/service/ClientState.java | 3 +-
.../org/apache/cassandra/tools/NodeTool.java | 4 +-
.../apache/cassandra/transport/DataType.java | 3 +-
test/conf/cassandra.yaml | 2 +
.../cassandra/pig/CqlTableDataTypeTest.java | 94 +++++-
.../org/apache/cassandra/pig/CqlTableTest.java | 101 ++++++-
.../org/apache/cassandra/pig/PigTestBase.java | 3 +
.../cassandra/pig/ThriftColumnFamilyTest.java | 53 +++-
29 files changed, 590 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7e3b9a6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a30de32,6914a84..4432b10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -6,11 -7,14 +7,15 @@@
* Optimise NativeCell comparisons (CASSANDRA-6755)
* Configurable client timeout for cqlsh (CASSANDRA-7516)
* Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
-Merged from 2.0:
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
- 2.1.0-final
+ 2.1.0-rc4
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
[7/7] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.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/7cb78e12
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7cb78e12
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7cb78e12
Branch: refs/heads/trunk
Commit: 7cb78e12ffe9a8939798aa848b851938368bd5a3
Parents: 432cfef 90b3aca
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 23 15:05:13 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 23 15:05:13 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7cb78e12/CHANGES.txt
----------------------------------------------------------------------
[4/7] git commit: update changes
Posted by br...@apache.org.
update changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7b7a249
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7b7a249
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7b7a249
Branch: refs/heads/cassandra-2.1.0
Commit: c7b7a249395df3faea1397704a56e3849f76871a
Parents: cfedc00
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 23 15:04:33 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 23 15:04:33 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b7a249/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5ba30cc..caef095 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,9 @@
+2.1.0-final
+ * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+
2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
[5/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90b3acad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90b3acad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90b3acad
Branch: refs/heads/trunk
Commit: 90b3acadccd25c8da307362bbb0dfa20714c2199
Parents: f7e3b9a c7b7a24
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 23 15:05:05 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 23 15:05:05 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90b3acad/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4432b10,caef095..adb4142
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,9 +1,25 @@@
+2.1.1
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+
+ 2.1.0-final
+ * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
[2/7] git commit: update changes
Posted by br...@apache.org.
update changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7b7a249
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7b7a249
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7b7a249
Branch: refs/heads/cassandra-2.1
Commit: c7b7a249395df3faea1397704a56e3849f76871a
Parents: cfedc00
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 23 15:04:33 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 23 15:04:33 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b7a249/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5ba30cc..caef095 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,9 @@
+2.1.0-final
+ * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+
2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
[6/7] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90b3acad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90b3acad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90b3acad
Branch: refs/heads/cassandra-2.1
Commit: 90b3acadccd25c8da307362bbb0dfa20714c2199
Parents: f7e3b9a c7b7a24
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 23 15:05:05 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 23 15:05:05 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/90b3acad/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4432b10,caef095..adb4142
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,9 +1,25 @@@
+2.1.1
+ * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
+ * Add listen_interface and rpc_interface options (CASSANDRA-7417)
+ * Fail to start if commit log replay detects a problem (CASSANDRA-7125)
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+ * Configurable client timeout for cqlsh (CASSANDRA-7516)
+ * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
+Merged from 2.0:
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * Fix native protocol drop user type notification (CASSANDRA-7571)
+ * Give read access to system.schema_usertypes to all authenticated users
+ (CASSANDRA-7578)
+ * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
+
+ 2.1.0-final
+ * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
[3/7] git commit: update changes
Posted by br...@apache.org.
update changes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7b7a249
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7b7a249
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7b7a249
Branch: refs/heads/trunk
Commit: c7b7a249395df3faea1397704a56e3849f76871a
Parents: cfedc00
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jul 23 15:04:33 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Wed Jul 23 15:04:33 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7b7a249/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5ba30cc..caef095 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,9 @@
+2.1.0-final
+ * Fix cqlsh display when zero rows are returned (CASSANDRA-7580)
+ * Get java version correctly when JAVA_TOOL_OPTIONS is set (CASSANDRA-7572)
+
2.1.0-rc4
+ * Fix word count hadoop example (CASSANDRA-7200)
* Updated memtable_cleanup_threshold and memtable_flush_writers defaults
(CASSANDRA-7551)
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)