cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [2/3] cassandra git commit: Force config client mode in CQLSSTableWriter
Date Fri, 19 Dec 2014 05:10:16 GMT
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_lerer@hotmail.com>
Authored: Thu Dec 18 23:08:51 2014 -0600
Committer: Yuki Morishita <yukim@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;


Mime
View raw message