You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/12/19 06:10:15 UTC
[1/3] cassandra git commit: Force config client mode in
CQLSSTableWriter
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 81d5d6e20 -> a7edaa521
refs/heads/trunk 507b6c029 -> 2f072f4d8
Force config client mode in CQLSSTableWriter
Patch by Benjamin Lerer; reviewed by yukim for CASSANDRA-8281
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7edaa52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7edaa52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7edaa52
Branch: refs/heads/cassandra-2.1
Commit: a7edaa5210268962230ad4d45793cf556957ef7a
Parents: 81d5d6e
Author: blerer <b_...@hotmail.com>
Authored: Thu Dec 18 23:08:51 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 18 23:08:51 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7edaa52/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4586137..bdfa397 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,6 +36,7 @@
* Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
* Improve JBOD disk utilization (CASSANDRA-7386)
* Log failed host when preparing incremental repair (CASSANDRA-8228)
+ * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
Merged from 2.0:
* Fix MOVED_NODE topology event never being emitted when a node
moves its token (CASSANDRA-8373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7edaa52/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
index f302599..a42c480 100644
--- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
@@ -76,6 +76,12 @@ import org.apache.cassandra.utils.Pair;
*/
public class CQLSSTableWriter implements Closeable
{
+ static
+ {
+ // The CQLSSTableWriter must always be used in client mode.
+ Config.setClientMode(true);
+ }
+
private final AbstractSSTableSimpleWriter writer;
private final UpdateStatement insert;
private final List<ColumnSpecification> boundNames;
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@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/2f072f4d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2f072f4d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2f072f4d
Branch: refs/heads/trunk
Commit: 2f072f4d8be0d591a66b0e0c5a9f55a9ecc42088
Parents: 507b6c0 a7edaa5
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Dec 18 23:09:53 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 18 23:09:53 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f072f4d/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2f072f4d/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
----------------------------------------------------------------------
[2/3] cassandra git commit: Force config client mode in
CQLSSTableWriter
Posted by yu...@apache.org.
Force config client mode in CQLSSTableWriter
Patch by Benjamin Lerer; reviewed by yukim for CASSANDRA-8281
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a7edaa52
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a7edaa52
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a7edaa52
Branch: refs/heads/trunk
Commit: a7edaa5210268962230ad4d45793cf556957ef7a
Parents: 81d5d6e
Author: blerer <b_...@hotmail.com>
Authored: Thu Dec 18 23:08:51 2014 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Thu Dec 18 23:08:51 2014 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java | 6 ++++++
2 files changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7edaa52/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4586137..bdfa397 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -36,6 +36,7 @@
* Fix incremental repair not remove parent session on remote (CASSANDRA-8291)
* Improve JBOD disk utilization (CASSANDRA-7386)
* Log failed host when preparing incremental repair (CASSANDRA-8228)
+ * Force config client mode in CQLSSTableWriter (CASSANDRA-8281)
Merged from 2.0:
* Fix MOVED_NODE topology event never being emitted when a node
moves its token (CASSANDRA-8373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a7edaa52/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
index f302599..a42c480 100644
--- a/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/CQLSSTableWriter.java
@@ -76,6 +76,12 @@ import org.apache.cassandra.utils.Pair;
*/
public class CQLSSTableWriter implements Closeable
{
+ static
+ {
+ // The CQLSSTableWriter must always be used in client mode.
+ Config.setClientMode(true);
+ }
+
private final AbstractSSTableSimpleWriter writer;
private final UpdateStatement insert;
private final List<ColumnSpecification> boundNames;