You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2018/06/13 23:37:21 UTC

[03/10] cassandra git commit: Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will."

Revert "CqlRecordReader unnecessarily quotes the keyspace when connecting, when the java driver will."

This reverts commit 1b0b113facb2d8ad125b9baa0127ffe5abe8a16e.

See https://issues.apache.org/jira/browse/CASSANDRA-10751?focusedCommentId=16511413&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16511413


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1143bc11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1143bc11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1143bc11

Branch: refs/heads/cassandra-3.11
Commit: 1143bc113dc456675a2f3a89c93fba8ce117ac3f
Parents: fc7a69b
Author: Mick Semb Wever <mc...@apache.org>
Authored: Thu Jun 14 07:48:27 2018 +1000
Committer: Mick Semb Wever <mc...@apache.org>
Committed: Thu Jun 14 07:48:27 2018 +1000

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 -
 src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9faf499..7b1089e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,5 @@
 2.2.13
  * Incorrect counting of pending messages in OutboundTcpConnection (CASSANDRA-11551)
- * CqlRecordReader no longer quotes the keyspace when connecting, as the java driver will (CASSANDRA-10751)
  * Fix compaction failure caused by reading un-flushed data (CASSANDRA-12743)
  * Use Bounds instead of Range for sstables in anticompaction (CASSANDRA-14411)
  * Fix JSON queries with IN restrictions and ORDER BY clause (CASSANDRA-14286)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1143bc11/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 18b2f50..b3e440d 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -133,7 +133,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
         }
 
         if (cluster != null)
-            session = cluster.connect(keyspace);
+            session = cluster.connect(quote(keyspace));
 
         if (session == null)
           throw new RuntimeException("Can't create connection session");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org