downgrade thrift to 0.6.1

build-common.xml

@@ -161,7 +161,7 @@
     <pathelement location="${hadoop.mapreduce.jar}"/>
     <pathelement location="${hadoop.mapreduce.tools.jar}"/>
     <pathelement location="${build.dir.hive}/classes"/>
-    <fileset dir="${build.dir.hive}" includes="*/*.jar" excludes="*/*cassandra*.jar"/>
+    <fileset dir="${build.dir.hive}" includes="*/*.jar"/>
     <fileset dir="${hive.root}/lib" includes="*.jar"/>
     <fileset dir="${build.ivy.lib.dir}/default" includes="*.jar" excludes="*hadoop*.jar"
              erroronmissingdir="false"/>

cassandra-handler/build.xml

@@ -16,8 +16,6 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-
-
 <project xmlns:ivy="antlib:org.apache.ivy.ant" name="cassandra-handler" default="jar">
 
   <property name="src.dir"  location="${basedir}/src/java"/>
@@ -27,18 +25,12 @@
   <property name="cassandra.resource.dir" location="conf" />
   <property name="cassandra-handler.test.results.dir" location="${basedir}/src/test/results"/>
 
-
-  <property name="build.ivy.lib.dir" location="${basedir}/../build/ivy/cassandralib"/>
-  <property name="build.ivy.lib.dir2" location="${basedir}/../build/ivy/lib"/>
-
-
   <import file="../build-common.xml"/>
 
   <path id="test.classpath">
     <fileset dir="${hive.root}" includes="testlibs/*.jar"/>
     <pathelement location="${build.dir.hive}/builtins/hive-builtins-${version}.jar" />
     <pathelement location="${build.dir.hive}/ql/test/classes" />
-    <pathelement location="${build.classes}" /> 
     <pathelement location="${test.build.classes}" /> 
     <pathelement location="" />
     <pathelement location="${hadoop.conf.dir}"/>
@@ -55,9 +47,9 @@
     <pathelement location="${common.jar}"/>
     <pathelement location="${basedir}/conf"/><!--put yaml on cp -->
     <fileset dir="${hive.root}" includes="testlibs/*.jar"/>
-    <fileset dir="${hadoop.root}/lib" includes="*.jar" excludes="*thrift*.jar"/>
+    <fileset dir="${hadoop.root}/lib" includes="*.jar"/>
     <fileset dir="${hadoop.root}/lib/jsp-2.1" includes="*.jar"/>
-    <fileset dir="${build.ivy.lib.dir2}/default" includes="*.jar" excludes="*thrift*.jar"/>
+    <fileset dir="${build.ivy.lib.dir}/default" includes="*.jar"/>
 
     <path refid="classpath"/>
   </path>
@@ -83,7 +75,7 @@
     <echo message="${cassandra-all-jars}:${cassandra-thrift-jars}:${test.build.classes}/:${basedir}/conf/:${build.classes}/:${hive.root}/lib/" file="${test.log.dir}/cassandra-handler/cassandra-artifacts.txt" append="false"/>
 
     <taskdef name="qtestgen" classname="org.apache.hadoop.hive.ant.QTestGenTask"
-             classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir2}/default/velocity-${velocity.version}.jar:${build.ivy.lib.dir2}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir2}/default/commons-lang-${commons-lang.version}.jar">
+             classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/velocity-${velocity.version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar">
     </taskdef>
 
     <qtestgen outputDirectory="${test.build.src}/org/apache/hadoop/hive/cli"

cassandra-handler/src/test/org/apache/hadoop/hive/cassandra/CassandraTestSetup.java

@@ -1,17 +1,18 @@
 package org.apache.hadoop.hive.cassandra;
 
-import java.net.URL;
-
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 
 import org.apache.cassandra.contrib.utils.service.CassandraServiceDataCleaner;
 import org.apache.cassandra.contrib.utils.service.CassandraServiceFactory;
-import org.apache.cassandra.contrib.utils.service.CassandraThriftClassLoader;
+import org.apache.cassandra.hadoop.ColumnFamilyInputFormat;
+import org.apache.cassandra.thrift.Cassandra;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hive.cassandra.serde.AbstractColumnSerDe;
 import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.mapred.JobConf;
 
 public class CassandraTestSetup extends TestSetup {
 
@@ -32,20 +33,20 @@ void preTest(HiveConf conf, String logDir) throws Exception {
       cassandra = csf.getEmbeddedCassandraService();
     }
 
-    String auxJars = conf.getAuxJars();
-    for (URL url : csf.urls) {
-      String u = url.toExternalForm();
-      if (u.endsWith(".jar")) {
-        if(auxJars == null || auxJars.isEmpty()) {
-          auxJars = u;
-        } else {
-          auxJars += ","+u;
-        }
-      }
-    }
 
+    String auxJars = conf.getAuxJars();
+    auxJars = ((auxJars == null) ? "" : (auxJars + ",")) + "file://"
+        + new JobConf(conf, Cassandra.Client.class).getJar();
+    auxJars += ",file://" + new JobConf(conf, ColumnFamilyInputFormat.class).getJar();
+    auxJars += ",file://" + new JobConf(conf, AbstractColumnSerDe.class).getJar();
+    auxJars += ",file://" + new JobConf(conf, org.apache.thrift.transport.TSocket.class).getJar();
+    auxJars += ",file://"
+        + new JobConf(conf, com.google.common.collect.AbstractIterator.class).getJar();
+    auxJars += ",file://" + new JobConf(conf, org.apache.commons.lang.ArrayUtils.class).getJar();
+    auxJars += ",file://"
+        + new JobConf(conf, org.apache.thrift.meta_data.FieldValueMetaData.class).getJar();
+    auxJars += ",file://" + new JobConf(conf, org.cliffc.high_scale_lib.NonBlockingHashMap.class).getJar();
     conf.setAuxJars(auxJars);
-    conf.setClassLoader(new CassandraThriftClassLoader(csf.urls));
   }
 
   @Override

ivy/libraries.properties

@@ -46,8 +46,8 @@ jdom.version=1.1
 jline.version=0.9.94
 json.version=20090211
 junit.version=4.10
-libfb303.version=0.7.0
-libthrift.version=0.7.0
+libfb303.version=0.6.1
+libthrift.version=0.6.1
 log4j.version=1.2.16
 maven-ant-tasks.version=2.1.0
 mockito-all.version=1.8.2