You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/03/31 16:42:01 UTC
svn commit: r760464 - in /incubator/cassandra/trunk: build.xml test/conf/
test/conf/storage-conf.xml
Author: jbellis
Date: Tue Mar 31 14:41:55 2009
New Revision: 760464
URL: http://svn.apache.org/viewvc?rev=760464&view=rev
Log:
create test dirs and separate test config xml. patch from johano. fixes #22
Added:
incubator/cassandra/trunk/test/conf/
incubator/cassandra/trunk/test/conf/storage-conf.xml
Modified:
incubator/cassandra/trunk/build.xml
Modified: incubator/cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/build.xml?rev=760464&r1=760463&r2=760464&view=diff
==============================================================================
--- incubator/cassandra/trunk/build.xml (original)
+++ incubator/cassandra/trunk/build.xml Tue Mar 31 14:41:55 2009
@@ -7,6 +7,7 @@
<property name="build.src" value="${basedir}/src"/>
<property name="build.lib" value="${basedir}/lib"/>
<property name="build.dir" value="${basedir}/build"/>
+ <property name="build.test.dir" value="${build.dir}/test"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="javadoc.dir" value="${build.dir}/javadoc"/>
<property name="test.dir" value="${basedir}/test"/>
@@ -106,10 +107,12 @@
<taskdef resource="testngtasks" classpath="lib/testng-5.8-jdk15.jar"/>
<target name="test" depends="build-test">
<echo message="running tests"/>
+ <mkdir dir="${build.test.dir}/commitlog"/>
+ <mkdir dir="${build.test.dir}/cassandra"/>
<testng outputDir="${build.dir}/test/output"
haltOnFailure="true"
verbose="2">
- <jvmarg value="-Dstorage-config=conf"/>
+ <jvmarg value="-Dstorage-config=test/conf"/>
<classpath>
<path refid="cassandra.classpath" />
<pathelement location="${test.classes}"/>
Added: incubator/cassandra/trunk/test/conf/storage-conf.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/conf/storage-conf.xml?rev=760464&view=auto
==============================================================================
--- incubator/cassandra/trunk/test/conf/storage-conf.xml (added)
+++ incubator/cassandra/trunk/test/conf/storage-conf.xml Tue Mar 31 14:41:55 2009
@@ -0,0 +1,49 @@
+<Storage>
+ <ClusterName>Test Cluster</ClusterName>
+ <!-- any IPartitioner may be used, including your own
+ as long as it is on the classpath. Out of the box,
+ Cassandra provides
+ org.apache.cassandra.dht.RandomPartitioner and
+ org.apache.cassandra.dht.OrderPreservingPartitioner.
+ Range queries require using OrderPreservingPartitioner or a subclass. -->
+ <Partitioner>org.apache.cassandra.dht.RandomPartitioner</Partitioner>
+ <RackAware>false</RackAware>
+ <MulticastChannel>230.0.0.1</MulticastChannel>
+ <ReplicationFactor>1</ReplicationFactor>
+ <ZookeeperAddress>127.0.0.1</ZookeeperAddress>
+ <RpcTimeoutInMillis>5000</RpcTimeoutInMillis>
+ <JobTrackerHost>tdsearch001.sf2p.facebook.com</JobTrackerHost>
+ <JobJarFileLocation>C:\Engagements\Cassandra-Nexus</JobJarFileLocation>
+ <StoragePort>7000</StoragePort>
+ <ControlPort>7001</ControlPort>
+ <ThriftPort>7001</ThriftPort>
+ <ColumnIndexSizeInKB>256</ColumnIndexSizeInKB>
+ <HttpPort>7002</HttpPort>
+ <MetadataDirectory>build/test/cassandra/system</MetadataDirectory>
+ <CommitLogDirectory>build/test/commitlog</CommitLogDirectory>
+ <CommitLogRotationThresholdInMB>128</CommitLogRotationThresholdInMB>
+ <GangliaServers>
+ <GangliaServer>127.0.0.1:12000</GangliaServer>
+ </GangliaServers>
+ <DataFileDirectories>
+ <DataFileDirectory>build/test/cassandra/data</DataFileDirectory>
+ </DataFileDirectories>
+ <CalloutLocation>build/test/cassandra/callouts</CalloutLocation>
+ <BootstrapFileDirectory>build/test/cassandra/bootstrap</BootstrapFileDirectory>
+ <StagingFileDirectory>build/test/cassandra/staging</StagingFileDirectory>
+ <CommitLogFastSync>false</CommitLogFastSync>
+ <Tables>
+ <Table Name = "Table1">
+ <ColumnFamily Index="Name" Name="Standard1"/>
+ <ColumnFamily Index="Name" Name="Standard2"/>
+ <ColumnFamily Index="Time" Name="StandardByTime1"/>
+ <ColumnFamily Index="Time" Name="StandardByTime2"/>
+ <ColumnFamily ColumnType="Super" Index="Name" Name="Super1"/>
+ <ColumnFamily ColumnType="Super" Index="Name" Name="Super2"/>
+ </Table>
+ </Tables>
+ <Seeds>
+ <!-- Add names of hosts that are deemed contact points -->
+ <Seed>127.0.0.1</Seed>
+ </Seeds>
+</Storage>