natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1.0' into cassandra-2.1

This commit is contained in:
Brandon Williams 2014-08-12 20:51:48 -05:00
parent b896f4ddf1 397c0b7c09
commit 42f2f80574
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
View File

@ -548,7 +548,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
String partitionKeyList = makeColumnList(partitionKeys);
return String.format("SELECT %s FROM %s.%s WHERE token(%s)>? AND token(%s)<=?" + getAdditionalWhereClauses(),
selectColumnList, keyspace, cfName, partitionKeyList, partitionKeyList);
selectColumnList, quote(keyspace), quote(cfName), partitionKeyList, partitionKeyList);
}
private String getAdditionalWhereClauses()

33
test/pig/org/apache/cassandra/pig/CqlRecordReaderTest.java
View File

@ -44,7 +44,7 @@ import org.apache.thrift.transport.TTransportException;
public class CqlRecordReaderTest extends PigTestBase
{
private static String[] statements = {
"CREATE KEYSPACE cql3ks WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 1}",
"CREATE KEYSPACE cql3ks WITH replication = {'class': 'SimpleStrategy', 'replication_factor' : 1};",
"USE cql3ks;",
"CREATE TABLE cqltable (" +
@ -56,6 +56,16 @@ public class CqlRecordReaderTest extends PigTestBase
"data text," +
"primary key((pk1,pk2,pk3),ck1,ck2));",
"INSERT INTO cqltable(pk1, pk2, pk3, ck1, ck2, data) VALUES (11, 12, 13, 14, 15, 'value1');",
"CREATE TABLE \"MixedCaseCqlTable\" (" +
"pk1 int," +
"\"PK2\" int," +
"pk3 int," +
"\"CK1\" int," +
"ck2 int," +
"data text," +
"primary key((pk1,\"PK2\",pk3),\"CK1\",ck2));",
"INSERT INTO \"MixedCaseCqlTable\"(pk1, \"PK2\", pk3, \"CK1\", ck2, data) VALUES (11, 12, 13, 14, 15, 'value1');",
};
@BeforeClass
@ -88,6 +98,27 @@ public class CqlRecordReaderTest extends PigTestBase
}
}
@Test
public void defaultMixedCaseCqlQueryTest() throws Exception
{
String initialQuery = "rows = LOAD 'cql://cql3ks/MixedCaseCqlTable?" + defaultParameters + nativeParameters + "' USING CqlNativeStorage();";
pig.registerQuery(initialQuery);
Iterator<Tuple> it = pig.openIterator("rows");
if (it.hasNext()) {
Tuple t = it.next();
Assert.assertEquals(t.get(0), 11);
Assert.assertEquals(t.get(1), 12);
Assert.assertEquals(t.get(2), 13);
Assert.assertEquals(t.get(3), 14);
Assert.assertEquals(t.get(4), 15);
Assert.assertEquals(t.get(5), "value1");
}
else
{
Assert.fail("Failed to get data for query " + initialQuery);
}
}
@Test
public void selectColumnsTest() throws Exception
{