brianfrankcoopergh-59 Cassandra 1.0.6 (akkumar)

jaricftw · Jan 17, 2012 · 7b4e438 · 7b4e438
1 parent ad97f1c
commit 7b4e438
Show file tree

Hide file tree

Showing 4 changed files with 685 additions and 51 deletions.
diff --git a/Makefile b/Makefile
@@ -10,6 +10,9 @@ CASSANDRA_7_DIR=db/cassandra-0.7/lib
 CASSANDRA_7_FILE=apache-cassandra-0.7.9-bin.tar.gz
 CASSANDRA_8_DIR=db/cassandra-0.8/lib
 CASSANDRA_8_FILE=apache-cassandra-0.8.7-bin.tar.gz
+CASSANDRA_1X_VERSION=1.0.6
+CASSANDRA_1X_DIR=db/cassandra-$(CASSANDRA_1X_VERSION)/lib
+CASSANDRA_1X_FILE=apache-cassandra-$(CASSANDRA_1X_VERSION)-bin.tar.gz
 HBASE_DIR=db/hbase/lib
 HBASE_VERSION=0.90.5
 HBASE_FILE=hbase-$(HBASE_VERSION).tar.gz
@@ -35,6 +38,7 @@ download-database-deps:  $(CASSANDRA_5_DIR)/$(CASSANDRA_5_FILE) \
 			 $(CASSANDRA_6_DIR)/$(CASSANDRA_6_FILE) \
 			 $(CASSANDRA_7_DIR)/$(CASSANDRA_7_FILE) \
 			 $(CASSANDRA_8_DIR)/$(CASSANDRA_8_FILE) \
+			 $(CASSANDRA_1X_DIR)/$(CASSANDRA_1X_FILE) \
 			 $(HBASE_DIR)/$(HBASE_FILE)             \
 			 $(INFINISPAN_DIR)/$(INFINISPAN_FILE)   \
 			 $(MONGODB_DIR)/$(MONGODB_FILE)   \
@@ -63,6 +67,11 @@ $(CASSANDRA_8_DIR)/$(CASSANDRA_8_FILE) :
 		 -O $(CASSANDRA_8_DIR)/$(CASSANDRA_8_FILE)
 	tar -C $(CASSANDRA_8_DIR) -zxf $(CASSANDRA_8_DIR)/$(CASSANDRA_8_FILE)
 
+$(CASSANDRA_1X_DIR)/$(CASSANDRA_1X_FILE) :
+	wget http://archive.apache.org/dist/cassandra/$(CASSANDRA_1X_VERSION)/$(CASSANDRA_1X_FILE)\
+		 -O $(CASSANDRA_1X_DIR)/$(CASSANDRA_1X_FILE)
+	tar -C $(CASSANDRA_1X_DIR) -zxf $(CASSANDRA_1X_DIR)/$(CASSANDRA_1X_FILE)
+
 $(HBASE_DIR)/$(HBASE_FILE) :
 	wget http://archive.apache.org/dist/hbase/hbase-$(HBASE_VERSION)/$(HBASE_FILE)\
 		 -O $(HBASE_DIR)/$(HBASE_FILE)

diff --git a/build.xml b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
    <project name="ycsb" default="compile" basedir=".">
-   
+
     <property name="src.dir"     value="src"/>
     <property name="lib.dir"     value="lib"/>
     <property name="doc.dir"     value="doc"/>
@@ -26,56 +26,61 @@
     </target>
 
     <target name="dbcompile-cassandra-0.5" depends="compile">
-    	<property name="db.dir" value="db/cassandra-0.5"/>
-        <antcall target="dbcompile"/>
+      <property name="db.dir" value="db/cassandra-0.5"/>
+      <antcall target="dbcompile"/>
     </target>
-    	
-   	<target name="dbcompile-cassandra-0.6" depends="compile">
-		<property name="db.dir" value="db/cassandra-0.6"/>
-		<antcall target="dbcompile"/>
-	</target>
-   	
-   	<target name="dbcompile-cassandra-0.7" depends="compile">
-		<property name="db.dir" value="db/cassandra-0.7"/>
-		<antcall target="dbcompile"/>
-	</target>   	
+
+  <target name="dbcompile-cassandra-0.6" depends="compile">
+    <property name="db.dir" value="db/cassandra-0.6"/>
+    <antcall target="dbcompile"/>
+  </target>
+
+  <target name="dbcompile-cassandra-0.7" depends="compile">
+    <property name="db.dir" value="db/cassandra-0.7"/>
+    <antcall target="dbcompile"/>
+  </target>
 
         <target name="dbcompile-cassandra-0.8" depends="compile">
                 <property name="db.dir" value="db/cassandra-0.8"/>
                 <antcall target="dbcompile"/>
         </target>
-
-   	<target name="dbcompile-hbase" depends="compile">
-		<property name="db.dir" value="db/hbase"/>
-		<antcall target="dbcompile"/>
-	</target>
-
-   	<target name="dbcompile-mongodb" depends="compile">
-		<property name="db.dir" value="db/mongodb"/>
-		<antcall target="dbcompile"/>
-	</target>
-
-   	<target name="dbcompile-voldemort" depends="compile">
-		<property name="db.dir" value="db/voldemort"/>
-		<antcall target="dbcompile"/>
-	</target>
-
-   	<target name="dbcompile-jdbc" depends="compile">
-   		<property name="db.dir" value="db/jdbc"/>
-   	    <antcall target="dbcompile"/>
-   	</target>
+
+    <target name="dbcompile-cassandra-1.0.6" depends="compile">
+            <property name="db.dir" value="db/cassandra-1.0.6"/>
+            <antcall target="dbcompile"/>
+    </target>
+
+  <target name="dbcompile-hbase" depends="compile">
+    <property name="db.dir" value="db/hbase"/>
+    <antcall target="dbcompile"/>
+  </target>
+
+  <target name="dbcompile-mongodb" depends="compile">
+    <property name="db.dir" value="db/mongodb"/>
+    <antcall target="dbcompile"/>
+  </target>
+
+  <target name="dbcompile-voldemort" depends="compile">
+    <property name="db.dir" value="db/voldemort"/>
+    <antcall target="dbcompile"/>
+  </target>
+
+     <target name="dbcompile-jdbc" depends="compile">
+       <property name="db.dir" value="db/jdbc"/>
+       <antcall target="dbcompile"/>
+     </target>
 
     <target name="dbcompile-redis" depends="compile">
         <property name="db.dir" value="db/redis"/>
         <antcall target="dbcompile"/>
     </target>
-	
-   	<target name="dbcompile-mapkeeper" depends="compile">
+
+     <target name="dbcompile-mapkeeper" depends="compile">
             <property name="db.dir" value="db/mapkeeper"/>
             <antcall target="dbcompile"/>
-   	</target>
+     </target>
 
- 	<target name="compile">
+   <target name="compile">
         <mkdir dir="${classes.dir}"/>
         <javac includeantruntime="false" srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath" deprecation="on">
           <compilerarg value="-Xlint:unchecked"/>
@@ -84,30 +89,30 @@
     </target>
 
     <target name="dbcompile">
-	    <path id="dbclasspath">
-	        <fileset dir="${db.dir}/lib" includes="**/*.jar"/>
-	        <fileset file="build/ycsb.jar"/>
-	    </path>
-		
-    	<mkdir dir="${classes.dir}"/>
-        <javac includeantruntime="false" srcdir="${db.dir}/src" destdir="${classes.dir}" classpathref="dbclasspath" deprecation="on">
+      <path id="dbclasspath">
+          <fileset dir="${db.dir}/lib" includes="**/*.jar"/>
+          <fileset file="build/ycsb.jar"/>
+      </path>
+
+      <mkdir dir="${classes.dir}"/>
+      <javac includeantruntime="false" srcdir="${db.dir}/src" destdir="${classes.dir}" classpathref="dbclasspath" deprecation="on">
           <compilerarg value="-Xlint:unchecked"/>
-        </javac>
-        <antcall target="makejar"/>
+      </javac>
+      <antcall target="makejar"/>
+    </target>
+
+    <target name ="makejar" description="Create a jar for the YCSB project">
+         <jar jarfile="build/ycsb.jar" includes="**/*.class" basedir="${classes.dir}"/>
     </target>
 
-   	<target name ="makejar" description="Create a jar for the YCSB project">
-		<jar jarfile="build/ycsb.jar" includes="**/*.class" basedir="${classes.dir}"/>
-	</target>
-
     <target name="clean">
        <delete includeemptydirs="true">
           <fileset dir="build" includes="**/*"/>
        </delete>
     </target>
 
    <target name="doc">
-      <javadoc destdir="${doc.dir}/javadoc" packagenames="com.yahoo.ycsb,com.yahoo.ycsb.workloads,com.yahoo.ycsb.db,com.yahoo.ycsb.generator,com.yahoo.ycsb.measurements"> 
+      <javadoc destdir="${doc.dir}/javadoc" packagenames="com.yahoo.ycsb,com.yahoo.ycsb.workloads,com.yahoo.ycsb.db,com.yahoo.ycsb.generator,com.yahoo.ycsb.measurements">
          <fileset dir="." defaultexcludes="yes">
            <include name="src/**"/>
            <include name="db/*/src/**"/>

diff --git a/changes b/changes
@@ -26,6 +26,7 @@
         * gh-57 voldemort - enable nio connector (akkumar)
         * gh-58 benchmarking with hbase 0.90.5 (akkumar)
         * gh-55 VMware vFabric GemFire (sbawaska)
+        * gh-59 Cassandra 1.0.6 (akkumar)
 
 0.1.3
 	* Voldemort binding (rsumbaly)