You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2014/05/14 19:01:47 UTC
[1/6] git commit: Close java driver Cluster in CQLRR.close patch by Mariusz Kryński; reviewed by jbellis for CASSANDRA-7228
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 820f0eb60 -> 541a20dbb
refs/heads/cassandra-2.1 1927d5ec7 -> 8a5365ebd
refs/heads/trunk b5671f08b -> 091db6482
Close java driver Cluster in CQLRR.close
patch by Mariusz Kryński; reviewed by jbellis for CASSANDRA-7228
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/541a20db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/541a20db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/541a20db
Branch: refs/heads/cassandra-2.0
Commit: 541a20dbb2ef258705c0632cddc3361ea533995c
Parents: 820f0eb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 14 09:55:55 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 14 09:55:55 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/541a20db/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 58cebbd..9a43040 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.9
+ * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
* Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
* Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/541a20db/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 62fa1c9..ff4f1e6 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,6 +133,8 @@ public class CqlRecordReader extends RecordReader<Long, Row>
{
if (session != null)
session.close();
+ if (cluster != null)
+ cluster.close();
}
public Long getCurrentKey()
[3/6] git commit: Close java driver Cluster in CQLRR.close patch by Mariusz Kryński; reviewed by jbellis for CASSANDRA-7228
Posted by jb...@apache.org.
Close java driver Cluster in CQLRR.close
patch by Mariusz Kryński; reviewed by jbellis for CASSANDRA-7228
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/541a20db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/541a20db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/541a20db
Branch: refs/heads/trunk
Commit: 541a20dbb2ef258705c0632cddc3361ea533995c
Parents: 820f0eb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 14 09:55:55 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 14 09:55:55 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/541a20db/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 58cebbd..9a43040 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.9
+ * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
* Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
* Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/541a20db/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 62fa1c9..ff4f1e6 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,6 +133,8 @@ public class CqlRecordReader extends RecordReader<Long, Row>
{
if (session != null)
session.close();
+ if (cluster != null)
+ cluster.close();
}
public Long getCurrentKey()
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by jb...@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/091db648
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/091db648
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/091db648
Branch: refs/heads/trunk
Commit: 091db6482b6b3fbadaa8d8a7ff8471f9ae035e53
Parents: b5671f0 8a5365e
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 14 10:01:40 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 14 10:01:40 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/091db648/CHANGES.txt
----------------------------------------------------------------------
[4/6] git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a5365eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a5365eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a5365eb
Branch: refs/heads/trunk
Commit: 8a5365ebd5c8118e5fb846aef1b89d630236b878
Parents: 1927d5e 541a20d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 14 09:56:57 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 14 10:01:31 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5365eb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 504064c,9a43040..5fd5a8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,9 +1,26 @@@
-2.0.9
+2.1.0-rc1
+ * Add PowerShell Windows launch scripts (CASSANDRA-7001)
+ * Make commitlog archive+restore more robust (CASSANDRA-6974)
+ * Fix marking commitlogsegments clean (CASSANDRA-6959)
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+ * Fix repair hang when given CF does not exist (CASSANDRA-7189)
+ * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
+Merged from 2.0:
+ * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
+ * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
+ * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
+ * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * Correctly delete scheduled range xfers (CASSANDRA-7143)
+ * Make batchlog replica selection rack-aware (CASSANDRA-6551)
+ * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
+ * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
* fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
* Fix disabling autocompaction (CASSANDRA-7187)
* Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5365eb/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------
[2/6] git commit: Close java driver Cluster in CQLRR.close patch by Mariusz Kryński; reviewed by jbellis for CASSANDRA-7228
Posted by jb...@apache.org.
Close java driver Cluster in CQLRR.close
patch by Mariusz Kryński; reviewed by jbellis for CASSANDRA-7228
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/541a20db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/541a20db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/541a20db
Branch: refs/heads/cassandra-2.1
Commit: 541a20dbb2ef258705c0632cddc3361ea533995c
Parents: 820f0eb
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 14 09:55:55 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 14 09:55:55 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/541a20db/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 58cebbd..9a43040 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.9
+ * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
* Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
* Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
* Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/541a20db/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 62fa1c9..ff4f1e6 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,6 +133,8 @@ public class CqlRecordReader extends RecordReader<Long, Row>
{
if (session != null)
session.close();
+ if (cluster != null)
+ cluster.close();
}
public Long getCurrentKey()
[5/6] git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8a5365eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a5365eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8a5365eb
Branch: refs/heads/cassandra-2.1
Commit: 8a5365ebd5c8118e5fb846aef1b89d630236b878
Parents: 1927d5e 541a20d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed May 14 09:56:57 2014 -0700
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed May 14 10:01:31 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5365eb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 504064c,9a43040..5fd5a8b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,9 +1,26 @@@
-2.0.9
+2.1.0-rc1
+ * Add PowerShell Windows launch scripts (CASSANDRA-7001)
+ * Make commitlog archive+restore more robust (CASSANDRA-6974)
+ * Fix marking commitlogsegments clean (CASSANDRA-6959)
+ * Add snapshot "manifest" describing files included (CASSANDRA-6326)
+ * Parallel streaming for sstableloader (CASSANDRA-3668)
+ * Fix bugs in supercolumns handling (CASSANDRA-7138)
+ * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
+ * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
+ * Upgrade NBHM lib (CASSANDRA-7128)
+ * Optimize netty server (CASSANDRA-6861)
+ * Fix repair hang when given CF does not exist (CASSANDRA-7189)
+ * Allow c* to be shutdown in an embedded mode (CASSANDRA-5635)
+Merged from 2.0:
+ * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228)
- * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133)
+ * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
+ * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
+ * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * Correctly delete scheduled range xfers (CASSANDRA-7143)
+ * Make batchlog replica selection rack-aware (CASSANDRA-6551)
+ * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
+ * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
+ * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
* fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
* Fix disabling autocompaction (CASSANDRA-7187)
* Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a5365eb/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------