[Commits] Rev 3507: Cassandra SE in file:///data0/psergey/dev2/5.5-cassandra-r01/

Sergey Petrunya psergey at askmonty.org
Mon Sep 10 11:50:58 EEST 2012


At file:///data0/psergey/dev2/5.5-cassandra-r01/

------------------------------------------------------------
revno: 3507
revision-id: psergey at askmonty.org-20120910085058-dcjjidpg0sgdnseq
parent: psergey at askmonty.org-20120907113243-vn56s52q8fj157lr
committer: Sergey Petrunya <psergey at askmonty.org>
branch nick: 5.5-cassandra-r01
timestamp: Mon 2012-09-10 12:50:58 +0400
message:
  Cassandra SE
  - Make cassandra.test drop and re-crate the test keyspace.
=== modified file 'mysql-test/t/cassandra.test'
--- a/mysql-test/t/cassandra.test	2012-09-07 11:32:43 +0000
+++ b/mysql-test/t/cassandra.test	2012-09-10 08:50:58 +0000
@@ -30,11 +30,20 @@
   thrift_host='localhost' keyspace='no_such_keyspace';
 
 ############################################################################
-## Cassandra initialization:
+## Cassandra initialization
 ############################################################################
---disable_parsing
-
-./cqlsh --cql3
+
+# Step 1: remove the keyspace that could be left over from the previous test
+--remove_files_wildcard $MYSQLTEST_VARDIR cassandra_test_cleanup.cql
+--write_file $MYSQLTEST_VARDIR/cassandra_test_cleanup.cql
+drop keyspace mariadbtest2;
+EOF
+--error 0,1,2
+--system cqlsh -3 -f $MYSQLTEST_VARDIR/cassandra_test_cleanup.cql
+
+# Step 2: create new keyspace and test column families
+--remove_files_wildcard $MYSQLTEST_VARDIR cassandra_test_init.cql
+--write_file $MYSQLTEST_VARDIR/cassandra_test_init.cql
 
 CREATE KEYSPACE mariadbtest2
   WITH strategy_class = 'org.apache.cassandra.locator.SimpleStrategy'
@@ -55,14 +64,27 @@
 
 create columnfamily cf7 (rowkey int primary key, boolcol boolean);
 
-./cassandra-cli 
-
+create columnfamily cf8 (rowkey int primary key, countercol counter);
+
+EOF
+--error 0,1,2
+--system cqlsh -3 -f $MYSQLTEST_VARDIR/cassandra_test_init.cql
+
+
+# Step 3: Cassandra's CQL doesn't allow certain kinds of queries. Run them in
+# CLI
+--remove_files_wildcard $MYSQLTEST_VARDIR cassandra_test_init.cli
+--write_file $MYSQLTEST_VARDIR/cassandra_test_init.cli
+use mariadbtest2;
 CREATE COLUMN FAMILY cf10
   WITH comparator = UTF8Type
   AND key_validation_class=UTF8Type
   AND default_validation_class = UTF8Type;
-
---enable_parsing
+EOF
+
+--error 0,1,2
+--system cassandra-cli -f $MYSQLTEST_VARDIR/cassandra_test_init.cli
+
 ############################################################################
 ## Cassandra initialization ends
 ############################################################################



More information about the commits mailing list