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/05/21 02:02:59 UTC
[3/6] git commit: Quote ks/cf names better.
Quote ks/cf names better.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-7093
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/786396ea
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/786396ea
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/786396ea
Branch: refs/heads/trunk
Commit: 786396eaf031a1ffa11a2aa247edfcf7bc457936
Parents: 0356ee7
Author: Brandon Williams <br...@apache.org>
Authored: Tue May 20 19:01:50 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue May 20 19:01:50 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/786396ea/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 a6514e3..8b0ba83 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -89,8 +89,8 @@ public class CqlRecordReader extends RecordReader<Long, Row>
totalRowCount = (this.split.getLength() < Long.MAX_VALUE)
? (int) this.split.getLength()
: ConfigHelper.getInputSplitSize(conf);
- cfName = ConfigHelper.getInputColumnFamily(conf);
- keyspace = ConfigHelper.getInputKeyspace(conf);
+ cfName = quote(ConfigHelper.getInputColumnFamily(conf));
+ keyspace = quote(ConfigHelper.getInputKeyspace(conf));
cqlQuery = CqlConfigHelper.getInputCql(conf);
partitioner = ConfigHelper.getInputPartitioner(context.getConfiguration());
try
@@ -123,7 +123,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
}
if (cluster != null)
- session = cluster.connect(quote(keyspace));
+ session = cluster.connect(keyspace);
rowIterator = new RowIterator();
logger.debug("created {}", rowIterator);
}