Merge pull request #2 from ghatwala/master

Modified test.sh,build.xml,classpath as per latest merged changes.
ppc64le · Jun 14, 2017 · cdc4e26 · cdc4e26
2 parents a91c60c + 28eabcc
commit cdc4e26
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 16 deletions.
diff --git a/.classpath b/.classpath
@@ -4,9 +4,7 @@
 	<classpathentry kind="src" path="cassandra/src/java"/>
 	<classpathentry kind="src" path="cassandra/interface/thrift/gen-java"/>
 	<classpathentry kind="src" path="cassandra/src/gen-java"/>
-	<classpathentry kind="src" path="capisim/src"/>
 	<classpathentry kind="src" path="cassandra/test/unit"/>
-	<classpathentry kind="src" path="conf"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="cassandra/build/lib/jars/ant-1.9.4.jar"/>

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@
 	$ ant
 	```
 
-## how to run YCSB
+## how to run cassandra using - "capiblock.jar"
 
 1. run the following script. you can find the detail steps in this shell.
 

diff --git a/build.xml b/build.xml
@@ -7,7 +7,8 @@
 	<property name="cassandra.build.dir.lib" value="${cassandra}/build/lib" />
 
 	<property name="capiblock.lib" value="lib/capiblock.jar" />
-
+
+	<property name="capi.rowcache.dir" value="dist" />
 	<property name="capi.rowcache.jar" value="dist/capi-rowcache.jar" />
 	<property name="capi.rowcache.build.dir" value="bin" />
 
@@ -17,6 +18,7 @@
 
 	<target name="clean">
 		<delete dir="${capi.rowcache.build.dir}" />
+		<delete dir="${capi.rowcache.dir}" />
 	</target>
 
 	<target name="cleanall" depends="clean">

diff --git a/test.sh b/test.sh
@@ -2,25 +2,17 @@
 
 set -x
 
-CAPI=capisim
 CASSANDRA=cassandra
 
 # setup
-cp $CAPI/capiblock.jar $CASSANDRA/lib/
-cp dist/*.jar $CASSANDRA/lib/
-cp conf/* $CASSANDRA/conf/
-if [ -f $CASSANDRA/lib/jna-4.0.0.jar ]; then mv $CASSANDRA/lib/jna-4.0.0.jar $CASSANDRA/lib/jna-4.0.0.jar.bak; fi
-cp lib/jna*.jar $CASSANDRA/lib/
+cp lib/capiblock.jar $CASSANDRA/lib/
 
 # kill if Cassandra daemon exists
 ps aux | grep java | grep CassandraDaemon | awk '{print $2}' | xargs kill 2> /dev/null
 
 # clear cassandra data
 rm -rf $CASSANDRA/data/
 
-# clear capisim file
-rm /tmp/test.txt
-
 # start Cassandra
 rm -rf $CASSANDRA/logs
 if [ `whoami` = "root" ]; then
@@ -55,6 +47,3 @@ create table usertable (
 exit
 EOF
 
-cd YCSB
-bin/ycsb load cassandra2-cql -P workloads/workloadc -p operationcount=1000000000 -p recordcount=10000 -p fieldcount=10 -p fieldlength=100 -p requestdistribution=uniform -p hosts=localhost -threads 1 -s
-bin/ycsb run cassandra2-cql -P workloads/workloadc -p maxexecutiontime=180 -p operationcount=1000000000 -p recordcount=10000 -p fieldcount=10 -p fieldlength=100 -p requestdistribution=uniform -p hosts=localhost -threads 1 -s
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ @@
     	$ ant
     	```
-    ## how to run YCSB
+    ## how to run cassandra using - "capiblock.jar"
 . run the following script. you can find the detail steps in this shell.
@@ Expand Down @@