Fix pig tests. Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-7570
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/93999406 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93999406 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/93999406 Branch: refs/heads/trunk Commit: 939994064bad12f6687ac1031b92e44a8f30bc11 Parents: a932b62 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Aug 7 11:54:34 2014 -0500 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Aug 8 17:45:25 2014 +0200 ---------------------------------------------------------------------- .../cassandra/pig/CqlTableDataTypeTest.java | 73 +++++++++++-- .../org/apache/cassandra/pig/CqlTableTest.java | 106 ++++++++++++++----- .../org/apache/cassandra/pig/PigTestBase.java | 3 + .../cassandra/pig/ThriftColumnFamilyTest.java | 41 +++++-- 4 files changed, 176 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/93999406/test/pig/org/apache/cassandra/pig/CqlTableDataTypeTest.java ---------------------------------------------------------------------- diff --git a/test/pig/org/apache/cassandra/pig/CqlTableDataTypeTest.java b/test/pig/org/apache/cassandra/pig/CqlTableDataTypeTest.java index 2020b0a..bbd5a87 100644 --- a/test/pig/org/apache/cassandra/pig/CqlTableDataTypeTest.java +++ b/test/pig/org/apache/cassandra/pig/CqlTableDataTypeTest.java @@ -217,10 +217,19 @@ public class CqlTableDataTypeTest extends PigTestBase } @Test - public void testCqlStorageRegularType() + public void testCqlNativeStorageRegularType() throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException { - pig.registerQuery("rows = LOAD 'cql://cql3ks/cqltable?" + defaultParameters + "' USING CqlStorage();"); + //input_cql=select * from cqltable where token(key) > ? and token(key) <= ? + cqlTableTest("rows = LOAD 'cql://cql3ks/cqltable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20cqltable%20where%20token(key)%20%3E%20%3F%20and%20token(key)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + + //input_cql=select * from countertable where token(key) > ? and token(key) <= ? + counterTableTest("cc_rows = LOAD 'cql://cql3ks/countertable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20countertable%20where%20token(key)%20%3E%20%3F%20and%20token(key)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + } + + private void cqlTableTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); Iterator<Tuple> it = pig.openIterator("rows"); //{key: int, //col_ascii: chararray, @@ -257,21 +266,38 @@ public class CqlTableDataTypeTest extends PigTestBase Assert.assertEquals(t.get(14), "varchar"); Assert.assertEquals(t.get(15), 123); } - - pig.registerQuery("cc_rows = LOAD 'cql://cql3ks/countertable?" + defaultParameters + "' USING CqlStorage();"); - it = pig.openIterator("cc_rows"); + else + { + Assert.fail("Failed to get data for query " + initialQuery); + } + } + + private void counterTableTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); + Iterator<Tuple> it = pig.openIterator("cc_rows"); if (it.hasNext()) { Tuple t = it.next(); Assert.assertEquals(t.get(0), 1); Assert.assertEquals(t.get(1), 3L); } + else + { + Assert.fail("Failed to get data for query " + initialQuery); + } } @Test - public void testCqlStorageSetType() + public void testCqlNativeStorageSetType() throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException { - pig.registerQuery("set_rows = LOAD 'cql://cql3ks/settable?" + defaultParameters + "' USING CqlStorage();"); + //input_cql=select * from settable where token(key) > ? and token(key) <= ? + settableTest("set_rows = LOAD 'cql://cql3ks/settable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20settable%20where%20token(key)%20%3E%20%3F%20and%20token(key)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + } + + private void settableTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); Iterator<Tuple> it = pig.openIterator("set_rows"); if (it.hasNext()) { Tuple t = it.next(); @@ -322,13 +348,23 @@ public class CqlTableDataTypeTest extends PigTestBase Assert.assertEquals(innerTuple.get(0), 123); Assert.assertEquals(innerTuple.get(1), 124); } + else + { + Assert.fail("Failed to get data for query " + initialQuery); + } } @Test - public void testCqlStorageListType() + public void testCqlNativeStorageListType() throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException { - pig.registerQuery("list_rows = LOAD 'cql://cql3ks/listtable?" + defaultParameters + "' USING CqlStorage();"); + //input_cql=select * from listtable where token(key) > ? and token(key) <= ? + listtableTest("list_rows = LOAD 'cql://cql3ks/listtable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20listtable%20where%20token(key)%20%3E%20%3F%20and%20token(key)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + } + + private void listtableTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); Iterator<Tuple> it = pig.openIterator("list_rows"); if (it.hasNext()) { Tuple t = it.next(); @@ -379,13 +415,23 @@ public class CqlTableDataTypeTest extends PigTestBase Assert.assertEquals(innerTuple.get(1), 123); Assert.assertEquals(innerTuple.get(0), 124); } + else + { + Assert.fail("Failed to get data for query " + initialQuery); + } } @Test - public void testCqlStorageMapType() + public void testCqlNativeStorageMapType() throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException { - pig.registerQuery("map_rows = LOAD 'cql://cql3ks/maptable?" + defaultParameters + "' USING CqlStorage();"); + //input_cql=select * from maptable where token(key) > ? and token(key) <= ? + maptableTest("map_rows = LOAD 'cql://cql3ks/maptable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20maptable%20where%20token(key)%20%3E%20%3F%20and%20token(key)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + } + + private void maptableTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); Iterator<Tuple> it = pig.openIterator("map_rows"); if (it.hasNext()) { Tuple t = it.next(); @@ -436,5 +482,10 @@ public class CqlTableDataTypeTest extends PigTestBase Assert.assertEquals(innerTuple.get(0), 123); Assert.assertEquals(innerTuple.get(1), 124); } + else + { + Assert.fail("Failed to get data for query " + initialQuery); + } } + } http://git-wip-us.apache.org/repos/asf/cassandra/blob/93999406/test/pig/org/apache/cassandra/pig/CqlTableTest.java ---------------------------------------------------------------------- diff --git a/test/pig/org/apache/cassandra/pig/CqlTableTest.java b/test/pig/org/apache/cassandra/pig/CqlTableTest.java index 15d49f2..4ca043d 100644 --- a/test/pig/org/apache/cassandra/pig/CqlTableTest.java +++ b/test/pig/org/apache/cassandra/pig/CqlTableTest.java @@ -90,10 +90,36 @@ public class CqlTableTest extends PigTestBase } @Test - public void testCqlStorageSchema() + public void testCqlNativeStorageSchema() throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException { - pig.registerQuery("rows = LOAD 'cql://cql3ks/cqltable?" + defaultParameters + "' USING CqlStorage();"); + //input_cql=select * from cqltable where token(key1) > ? and token(key1) <= ? + cqlTableSchemaTest("rows = LOAD 'cql://cql3ks/cqltable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20cqltable%20where%20token(key1)%20%3E%20%3F%20and%20token(key1)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + + //input_cql=select * from compactcqltable where token(key1) > ? and token(key1) <= ? + compactCqlTableSchemaTest("rows = LOAD 'cql://cql3ks/compactcqltable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20compactcqltable%20where%20token(key1)%20%3E%20%3F%20and%20token(key1)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + } + + private void compactCqlTableSchemaTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); + Iterator<Tuple> it = pig.openIterator("rows"); + if (it.hasNext()) { + Tuple t = it.next(); + Assert.assertEquals(t.get(0).toString(), "key1"); + Assert.assertEquals(t.get(1), 100); + Assert.assertEquals(t.get(2), 10.1f); + Assert.assertEquals(3, t.size()); + } + else + { + Assert.fail("Failed to get data for query " + initialQuery); + } + } + + private void cqlTableSchemaTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); Iterator<Tuple> it = pig.openIterator("rows"); if (it.hasNext()) { Tuple t = it.next(); @@ -103,26 +129,27 @@ public class CqlTableTest extends PigTestBase Assert.assertEquals(t.get(3), 10.1f); Assert.assertEquals(4, t.size()); } - - pig.registerQuery("rows = LOAD 'cql://cql3ks/compactcqltable?" + defaultParameters + "' USING CqlStorage();"); - it = pig.openIterator("rows"); - if (it.hasNext()) { - Tuple t = it.next(); - Assert.assertEquals(t.get(0).toString(), "key1"); - Assert.assertEquals(t.get(1), 100); - Assert.assertEquals(t.get(2), 10.1f); - Assert.assertEquals(3, t.size()); + else + { + Assert.fail("Failed to get data for query " + initialQuery); } } @Test - public void testCqlStorageSingleKeyTable() + public void testCqlNativeStorageSingleKeyTable() + throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException + { + //input_cql=select * from moredata where token(x) > ? and token(x) <= ? + SingleKeyTableTest("moretestvalues= LOAD 'cql://cql3ks/moredata?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20moredata%20where%20token(x)%20%3E%20%3F%20and%20token(x)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + } + + private void SingleKeyTableTest(String initialQuery) throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException { pig.setBatchOn(); - pig.registerQuery("moretestvalues= LOAD 'cql://cql3ks/moredata?" + defaultParameters + "' USING CqlStorage();"); + pig.registerQuery(initialQuery); pig.registerQuery("insertformat= FOREACH moretestvalues GENERATE TOTUPLE(TOTUPLE('a',x)),TOTUPLE(y);"); - pig.registerQuery("STORE insertformat INTO 'cql://cql3ks/test?" + defaultParameters + "&output_query=UPDATE+cql3ks.test+set+b+%3D+%3F' USING CqlStorage();"); + pig.registerQuery("STORE insertformat INTO 'cql://cql3ks/test?" + defaultParameters + nativeParameters + "&output_query=UPDATE+cql3ks.test+set+b+%3D+%3F' USING CqlNativeStorage();"); pig.executeBatch(); //(5,5) //(6,6) @@ -130,22 +157,30 @@ public class CqlTableTest extends PigTestBase //(2,2) //(3,3) //(1,1) - pig.registerQuery("result= LOAD 'cql://cql3ks/test?" + defaultParameters + "' USING CqlStorage();"); + //input_cql=select * from test where token(a) > ? and token(a) <= ? + pig.registerQuery("result= LOAD 'cql://cql3ks/test?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20test%20where%20token(a)%20%3E%20%3F%20and%20token(a)%20%3C%3D%20%3F' USING CqlNativeStorage();"); Iterator<Tuple> it = pig.openIterator("result"); - if (it.hasNext()) { + while (it.hasNext()) { Tuple t = it.next(); Assert.assertEquals(t.get(0), t.get(1)); } } @Test - public void testCqlStorageCompositeKeyTable() + public void testCqlNativeStorageCompositeKeyTable() + throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException + { + //input_cql=select * from compmore where token(id) > ? and token(id) <= ? + CompositeKeyTableTest("moredata= LOAD 'cql://cql3ks/compmore?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20compmore%20where%20token(id)%20%3E%20%3F%20and%20token(id)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + } + + private void CompositeKeyTableTest(String initialQuery) throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException { pig.setBatchOn(); - pig.registerQuery("moredata= LOAD 'cql://cql3ks/compmore?" + defaultParameters + "' USING CqlStorage();"); + pig.registerQuery(initialQuery); pig.registerQuery("insertformat = FOREACH moredata GENERATE TOTUPLE (TOTUPLE('a',x),TOTUPLE('b',y), TOTUPLE('c',z)),TOTUPLE(data);"); - pig.registerQuery("STORE insertformat INTO 'cql://cql3ks/compotable?" + defaultParameters + "&output_query=UPDATE%20cql3ks.compotable%20SET%20d%20%3D%20%3F' USING CqlStorage();"); + pig.registerQuery("STORE insertformat INTO 'cql://cql3ks/compotable?" + defaultParameters + nativeParameters + "&output_query=UPDATE%20cql3ks.compotable%20SET%20d%20%3D%20%3F' USING CqlNativeStorage();"); pig.executeBatch(); //(5,6,Fix,nomatch) @@ -157,7 +192,8 @@ public class CqlTableTest extends PigTestBase //(6,5,Sive,nomatch) //(4,4,Four,match) //(9,10,Ninen,nomatch) - pig.registerQuery("result= LOAD 'cql://cql3ks/compotable?" + defaultParameters + "' USING CqlStorage();"); + //input_cql=select * from compotable where token(a) > ? and token(a) <= ? + pig.registerQuery("result= LOAD 'cql://cql3ks/compotable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20compotable%20where%20token(a)%20%3E%20%3F%20and%20token(a)%20%3C%3D%20%3F' USING CqlNativeStorage();"); Iterator<Tuple> it = pig.openIterator("result"); int count = 0; while (it.hasNext()) { @@ -168,22 +204,30 @@ public class CqlTableTest extends PigTestBase } @Test - public void testCqlStorageCollectionColumnTable() + public void testCqlNativeStorageCollectionColumnTable() + throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException + { + //input_cql=select * from collectiontable where token(m) > ? and token(m) <= ? + CollectionColumnTableTest("collectiontable= LOAD 'cql://cql3ks/collectiontable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20collectiontable%20where%20token(m)%20%3E%20%3F%20and%20token(m)%20%3C%3D%20%3F' USING CqlNativeStorage();"); + } + + private void CollectionColumnTableTest(String initialQuery) throws AuthenticationException, AuthorizationException, InvalidRequestException, UnavailableException, TimedOutException, TException, NotFoundException, SchemaDisagreementException, IOException { pig.setBatchOn(); - pig.registerQuery("collectiontable= LOAD 'cql://cql3ks/collectiontable?" + defaultParameters + "' USING CqlStorage();"); + pig.registerQuery(initialQuery); pig.registerQuery("recs= FOREACH collectiontable GENERATE TOTUPLE(TOTUPLE('m', m) ), TOTUPLE(TOTUPLE('map', TOTUPLE('m', 'mm'), TOTUPLE('n', 'nn')));"); - pig.registerQuery("STORE recs INTO 'cql://cql3ks/collectiontable?" + defaultParameters + "&output_query=update+cql3ks.collectiontable+set+n+%3D+%3F' USING CqlStorage();"); + pig.registerQuery("STORE recs INTO 'cql://cql3ks/collectiontable?" + defaultParameters + nativeParameters + "&output_query=update+cql3ks.collectiontable+set+n+%3D+%3F' USING CqlNativeStorage();"); pig.executeBatch(); //(book2,((m,mm),(n,nn))) //(book3,((m,mm),(n,nn))) //(book4,((m,mm),(n,nn))) //(book1,((m,mm),(n,nn))) - pig.registerQuery("result= LOAD 'cql://cql3ks/collectiontable?" + defaultParameters + "' USING CqlStorage();"); + //input_cql=select * from collectiontable where token(m) > ? and token(m) <= ? + pig.registerQuery("result= LOAD 'cql://cql3ks/collectiontable?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20collectiontable%20where%20token(m)%20%3E%20%3F%20and%20token(m)%20%3C%3D%20%3F' USING CqlNativeStorage();"); Iterator<Tuple> it = pig.openIterator("result"); - while (it.hasNext()) { + if (it.hasNext()) { Tuple t = it.next(); Tuple t1 = (Tuple) t.get(1); Assert.assertEquals(t1.size(), 2); @@ -194,6 +238,10 @@ public class CqlTableTest extends PigTestBase Assert.assertEquals(element2.get(0), "n"); Assert.assertEquals(element2.get(1), "nn"); } + else + { + Assert.fail("Can't fetch any data"); + } } @Test @@ -236,6 +284,10 @@ public class CqlTableTest extends PigTestBase } Assert.assertEquals(3, columns.size()); } + else + { + Assert.fail("Can't fetch any data"); + } //results: (key1,(column1,100),(column2,10.1)) pig.registerQuery("compact_rows = LOAD 'cassandra://cql3ks/compactcqltable?" + defaultParameters + "' USING CassandraStorage();"); @@ -253,5 +305,9 @@ public class CqlTableTest extends PigTestBase Assert.assertEquals(column.get(0), "column2"); Assert.assertEquals(column.get(1), 10.1f); } + else + { + Assert.fail("Can't fetch any data"); + } } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/93999406/test/pig/org/apache/cassandra/pig/PigTestBase.java ---------------------------------------------------------------------- diff --git a/test/pig/org/apache/cassandra/pig/PigTestBase.java b/test/pig/org/apache/cassandra/pig/PigTestBase.java index 83dc63b..002fbba 100644 --- a/test/pig/org/apache/cassandra/pig/PigTestBase.java +++ b/test/pig/org/apache/cassandra/pig/PigTestBase.java @@ -66,6 +66,9 @@ public class PigTestBase extends SchemaLoader protected static MiniCluster cluster; protected static PigServer pig; protected static String defaultParameters= "init_address=localhost&rpc_port=9170&partitioner=org.apache.cassandra.dht.ByteOrderedPartitioner"; + protected static String nativeParameters = "&core_conns=2&max_conns=10&min_simult_reqs=3&max_simult_reqs=10&native_timeout=10000000" + + "&native_read_timeout=10000000&send_buff_size=4096&receive_buff_size=4096&solinger=3" + + "&tcp_nodelay=true&reuse_address=true&keep_alive=true&native_port=9052"; static { http://git-wip-us.apache.org/repos/asf/cassandra/blob/93999406/test/pig/org/apache/cassandra/pig/ThriftColumnFamilyTest.java ---------------------------------------------------------------------- diff --git a/test/pig/org/apache/cassandra/pig/ThriftColumnFamilyTest.java b/test/pig/org/apache/cassandra/pig/ThriftColumnFamilyTest.java index 60344d2..8903297 100644 --- a/test/pig/org/apache/cassandra/pig/ThriftColumnFamilyTest.java +++ b/test/pig/org/apache/cassandra/pig/ThriftColumnFamilyTest.java @@ -200,10 +200,24 @@ public class ThriftColumnFamilyTest extends PigTestBase } @Test - public void testCqlStorage() throws IOException, ClassNotFoundException, TException, TimedOutException, NotFoundException, InvalidRequestException, NoSuchFieldException, UnavailableException, IllegalAccessException, InstantiationException, AuthenticationException, AuthorizationException + public void testCqlNativeStorage() throws IOException, ClassNotFoundException, TException, TimedOutException, NotFoundException, InvalidRequestException, NoSuchFieldException, UnavailableException, IllegalAccessException, InstantiationException, AuthenticationException, AuthorizationException { //regular thrift column families - pig.registerQuery("data = load 'cql://thriftKs/SomeApp?" + defaultParameters + "' using CqlStorage();"); + //input_cql=select * from "SomeApp" where token(key) > ? and token(key) <= ? + cqlStorageTest("data = load 'cql://thriftKs/SomeApp?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20%22SomeApp%22%20where%20token(key)%20%3E%20%3F%20and%20token(key)%20%3C%3D%20%3F' using CqlNativeStorage();"); + + //Test counter colun family + //input_cql=select * from "CC" where token(key) > ? and token(key) <= ? + cqlStorageCounterTableTest("cc_data = load 'cql://thriftKs/CC?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20%22CC%22%20where%20token(key)%20%3E%20%3F%20and%20token(key)%20%3C%3D%20%3F' using CqlNativeStorage();"); + + //Test composite column family + //input_cql=select * from "Compo" where token(key) > ? and token(key) <= ? + cqlStorageCompositeTableTest("compo_data = load 'cql://thriftKs/Compo?" + defaultParameters + nativeParameters + "&input_cql=select%20*%20from%20%22Compo%22%20where%20token(key)%20%3E%20%3F%20and%20token(key)%20%3C%3D%20%3F' using CqlNativeStorage();"); + } + + private void cqlStorageTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); //(bar,3.141592653589793,1335890877,User Bar,35.0,9,15000,like) //(baz,1.61803399,1335890877,User Baz,95.3,3,512000,dislike) @@ -256,16 +270,18 @@ public class ThriftColumnFamilyTest extends PigTestBase } } Assert.assertEquals(count, 4); + } - //Test counter colun family - pig.registerQuery("cc_data = load 'cql://thriftKs/CC?" + defaultParameters + "' using CqlStorage();"); + private void cqlStorageCounterTableTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); //(chuck,fist,1) //(chuck,kick,3) // {key: chararray,column1: chararray,value: long} - it = pig.openIterator("cc_data"); - count = 0; + Iterator<Tuple> it = pig.openIterator("cc_data"); + int count = 0; while (it.hasNext()) { count ++; Tuple t = it.next(); @@ -275,9 +291,11 @@ public class ThriftColumnFamilyTest extends PigTestBase Assert.assertEquals(t.get(2), 3L); } Assert.assertEquals(count, 2); + } - //Test composite column family - pig.registerQuery("compo_data = load 'cql://thriftKs/Compo?" + defaultParameters + "' using CqlStorage();"); + private void cqlStorageCompositeTableTest(String initialQuery) throws IOException + { + pig.registerQuery(initialQuery); //(kick,bruce,bruce,watch it, mate) //(kick,bruce,lee,oww) @@ -285,8 +303,8 @@ public class ThriftColumnFamilyTest extends PigTestBase //(punch,bruce,lee,ouch) //{key: chararray,column1: chararray,column2: chararray,value: chararray} - it = pig.openIterator("compo_data"); - count = 0; + Iterator<Tuple> it = pig.openIterator("compo_data"); + int count = 0; while (it.hasNext()) { count ++; Tuple t = it.next(); @@ -583,7 +601,8 @@ public class ThriftColumnFamilyTest extends PigTestBase } } - @Test + /** This test case fails due to antlr lib conflicts, Cassandra2.1 uses 3.2, Hive1.2 uses 3.4 */ + //@Test public void testCassandraStorageCompositeColumnCF() throws IOException, ClassNotFoundException, TException, TimedOutException, NotFoundException, InvalidRequestException, NoSuchFieldException, UnavailableException, IllegalAccessException, InstantiationException, AuthenticationException, AuthorizationException { //Test CompositeType
