Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
build.xml
src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe598e77
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe598e77
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe598e77
Branch: refs/heads/cassandra-2.0
Commit: fe598e77e6e06a6408ea8e8b1fa80b25977e572d
Parents: 3a29c74 4e35969
Author: Brandon Williams <[email protected]>
Authored: Mon Oct 14 14:17:05 2013 -0500
Committer: Brandon Williams <[email protected]>
Committed: Mon Oct 14 14:17:05 2013 -0500
----------------------------------------------------------------------
build.xml | 8 +
.../hadoop/pig/AbstractCassandraStorage.java | 4 +-
.../cassandra/hadoop/pig/CassandraStorage.java | 25 +-
.../apache/cassandra/hadoop/pig/CqlStorage.java | 25 +-
test/conf/log4j-junit.properties | 3 +
.../org/apache/cassandra/pig/CqlTableTest.java | 236 ++++++
.../org/apache/cassandra/pig/PigTestBase.java | 167 ++++
.../cassandra/pig/ThriftColumnFamilyTest.java | 809 +++++++++++++++++++
test/unit/org/apache/pig/test/MiniCluster.java | 78 ++
.../org/apache/pig/test/MiniGenericCluster.java | 122 +++
10 files changed, 1470 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe598e77/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 4be1d10,37109c8..5e7f269
--- a/build.xml
+++ b/build.xml
@@@ -364,7 -370,9 +364,8 @@@
<exclusion groupId="commons-lang" artifactId="commons-lang"/>
</dependency>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-core"
version="1.0.3"/>
+ <dependency groupId="org.apache.hadoop"
artifactId="hadoop-minicluster" version="1.0.3"/>
<dependency groupId="org.apache.pig" artifactId="pig"
version="0.10.0"/>
- <dependency groupId="net.sf.jopt-simple" artifactId="jopt-simple"
version="3.2"/>
<dependency groupId="net.java.dev.jna" artifactId="jna"
version="3.2.7"/>
<dependency groupId="net.sourceforge.cobertura"
artifactId="cobertura" version="${cobertura.version}"/>
@@@ -404,7 -418,9 +405,8 @@@
<dependency groupId="commons-logging" artifactId="commons-logging"/>
<dependency groupId="org.apache.rat" artifactId="apache-rat"/>
<dependency groupId="org.apache.hadoop" artifactId="hadoop-core"/>
+ <dependency groupId="org.apache.hadoop"
artifactId="hadoop-minicluster"/>
<dependency groupId="org.apache.pig" artifactId="pig"/>
- <dependency groupId="net.sf.jopt-simple" artifactId="jopt-simple"/>
<dependency groupId="net.java.dev.jna" artifactId="jna"/>
</artifact:pom>
@@@ -1120,9 -1163,11 +1123,14 @@@
</testmacro>
</target>
+ <target name="test-all"
+ depends="test,long-test,test-compression,test-clientutil-jar"
+ description="Run all tests" />
+ <target name="pig-test" depends="build-test" description="Excute Pig tests">
+ <testmacro suitename="unit" inputdir="${test.unit.src}"
+ timeout="1200000" filter="**/pig/*Test.java">
+ </testmacro>
+ </target>
<!-- instruments the classes to later create code coverage reports -->
<target name="cobertura-instrument" depends="build,build-test">
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe598e77/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe598e77/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index 5357709,0512a37..4708359
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -792,11 -818,11 +810,12 @@@ public class CassandraStorage extends A
catch (Exception e)
{
throw new IOException("Expected
'cassandra://[username:password@]<keyspace>/<columnfamily>" +
-
"[?slice_start=<start>&slice_end=<end>[&reversed=true][&limit=1]" +
-
"[&allow_deletes=true][&widerows=true][&use_secondary=true]" +
-
"[&comparator=<comparator>][&split_size=<size>][&partitioner=<partitioner>]]':
" + e.getMessage());
+
"[?slice_start=<start>&slice_end=<end>[&reversed=true][&limit=1]" +
+
"[&allow_deletes=true][&widerows=true][&use_secondary=true]" +
+
"[&comparator=<comparator>][&split_size=<size>][&partitioner=<partitioner>]" +
+ "[&init_address=<host>][&rpc_port=<port>]]': " +
e.getMessage());
}
}
+
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe598e77/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
