bzr commit into mysql-5.1-telco-7.1 branch (martin.zaun:4048)

[Martin Zaun]

#At file:///Users/mz/mysql/ndb-7.1/ based on revid:magnus.blaudd@stripped

 4048 Martin Zaun	2011-01-11 [merge]
      crund - merge from ndb-7.1-opt64 to ndb-7.1

    added:
      storage/ndb/test/crund/scripts/mytwscxx.sh
      storage/ndb/test/crund/scripts/mytwsjava.sh
    renamed:
      storage/ndb/test/crund/scripts/mytest.sh => storage/ndb/test/crund/scripts/mycrundjava.sh
      storage/ndb/test/crund/scripts/mytestcxx.sh => storage/ndb/test/crund/scripts/mycrundcxx.sh
      storage/ndb/test/crund/scripts/mytests.sh => storage/ndb/test/crund/scripts/mycrund.sh
    modified:
      storage/ndb/test/crund/scripts/start_ndb.sh
      storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java
      storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp
      storage/ndb/test/crund/scripts/mycrundjava.sh
      storage/ndb/test/crund/scripts/mycrund.sh
=== renamed file 'storage/ndb/test/crund/scripts/mytests.sh' => 'storage/ndb/test/crund/scripts/mycrund.sh'
--- a/storage/ndb/test/crund/scripts/mytests.sh	2010-09-27 05:31:17 +0000
+++ b/storage/ndb/test/crund/scripts/mycrund.sh	2011-01-11 16:11:00 +0000
@@ -2,8 +2,10 @@
 
 #for f in run.ndbapi.opt run.ndbjtie.opt run.clusterj.opt run.mysql.opt run.openjpa.mysql.opt run.openjpa.clusterj.opt ; do
 #for f in run.ndbapi.opt run.ndbjtie.opt run.clusterj.opt run.mysql.opt ; do
-for f in run.ndbapi.opt ; do
+#for f in run.ndbjtie.opt ; do
+#for f in run.ndbapi.opt ; do
+for f in run.clusterj.opt ; do
   echo testing $f
-  ./mytest.sh ant $f
+  ./mycrundjava.sh $f
   mv -v results/xxx  results/xxx_$f
 done

=== renamed file 'storage/ndb/test/crund/scripts/mytestcxx.sh' => 'storage/ndb/test/crund/scripts/mycrundcxx.sh'
=== renamed file 'storage/ndb/test/crund/scripts/mytest.sh' => 'storage/ndb/test/crund/scripts/mycrundjava.sh'
--- a/storage/ndb/test/crund/scripts/mytest.sh	2010-09-27 05:31:17 +0000
+++ b/storage/ndb/test/crund/scripts/mycrundjava.sh	2011-01-11 16:11:00 +0000
@@ -1,5 +1,5 @@
 #!/bin/bash
-# usage: <ant|make> <run.ndbapi|...|run.driver>
+# usage: <run.ndbapi.opt|...>
 
 touch out.txt
 echo "" >> out.txt 2>&1
@@ -13,9 +13,10 @@ iostat 5 > iostat5.txt 2>&1 &
 #vmstat 5 > vmstat5.txt 2>&1 &
 pid=$!
 echo "" >> out.txt 2>&1
-( cd .. ; $1 $2 ) >> out.txt 2>&1
+( cd .. ; ant $1 ) >> out.txt 2>&1
 mkdir -p results/xxx
 mv -v [a-z]*.txt results/xxx
+mv -v ../log*.txt results/xxx
 cp -v ../*.properties results/xxx
 cp -v ../build.xml results/xxx
 cp -v ../config.ini results/xxx

=== added file 'storage/ndb/test/crund/scripts/mytwscxx.sh'
--- a/storage/ndb/test/crund/scripts/mytwscxx.sh	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/crund/scripts/mytwscxx.sh	2011-01-11 16:11:00 +0000
@@ -0,0 +1,24 @@
+#!/bin/bash
+# usage: no args/options
+
+touch out.txt
+echo "" >> out.txt 2>&1
+hwprefs -v cpu_count >> out.txt 2>&1
+echo "" >> out.txt 2>&1
+./restart_cluster.sh >> out.txt 2>&1
+echo "" >> out.txt 2>&1
+./load_shema.sh >> out.txt 2>&1
+iostat 5 > iostat5.txt 2>&1 &
+#vmstat 5 > vmstat5.txt 2>&1 &
+pid=$!
+echo "" >> out.txt 2>&1
+( cd ../tws/tws_cpp/ ; make run.driver ) >> out.txt 2>&1
+mkdir -p results/xxx
+mv -v [a-z]*.txt results/xxx
+mv -v ../tws/tws_cpp/log*.txt results/xxx
+cp -v ../tws/*.properties results/xxx
+cp -v ../config.ini results/xxx
+cp -v ../my.cnf results/xxx
+mv -v results/xxx  results/xxx_tws_cpp
+sleep 6
+kill -9 $pid

=== added file 'storage/ndb/test/crund/scripts/mytwsjava.sh'
--- a/storage/ndb/test/crund/scripts/mytwsjava.sh	1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/crund/scripts/mytwsjava.sh	2011-01-11 16:11:00 +0000
@@ -0,0 +1,26 @@
+#!/bin/bash
+# usage: no args/options
+
+touch out.txt
+echo "" >> out.txt 2>&1
+hwprefs -v cpu_count >> out.txt 2>&1
+echo "" >> out.txt 2>&1
+./restart_cluster.sh >> out.txt 2>&1
+echo "" >> out.txt 2>&1
+./load_shema.sh >> out.txt 2>&1
+iostat 5 > iostat5.txt 2>&1 &
+#vmstat 5 > vmstat5.txt 2>&1 &
+pid=$!
+echo "" >> out.txt 2>&1
+( cd ../tws/tws_java/ ; ant run ) >> out.txt 2>&1
+mkdir -p results/xxx
+mv -v [a-z]*.txt results/xxx
+mv -v ../tws/tws_java/log*.txt results/xxx
+cp -v ../tws/tws_java/nbproject/configs/*.properties results/xxx
+cp -v ../tws/tws_java/nbproject/private/*.properties results/xxx
+cp -v ../tws/*.properties results/xxx
+cp -v ../config.ini results/xxx
+cp -v ../my.cnf results/xxx
+mv -v results/xxx  results/xxx_tws_java
+sleep 6
+kill -9 $pid

=== modified file 'storage/ndb/test/crund/scripts/start_ndb.sh'
--- a/storage/ndb/test/crund/scripts/start_ndb.sh	2010-09-27 05:31:17 +0000
+++ b/storage/ndb/test/crund/scripts/start_ndb.sh	2011-01-11 16:11:00 +0000
@@ -19,6 +19,10 @@ echo
 echo start ndbd...
 ( cd "$mylogdir" ; "$MYSQL_LIBEXEC/ndbd" --initial )
 
+#echo
+#echo start ndbd...
+#( cd "$mylogdir" ; "$MYSQL_LIBEXEC/ndbd" --initial )
+
 # need some extra time
 for ((i=0; i<1; i++)) ; do echo "." ; sleep 1; done
 

=== modified file 'storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java'
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java	2010-10-19 22:56:45 +0000
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java	2011-01-11 16:10:36 +0000
@@ -478,6 +478,7 @@ public class JdbcLoad extends CrundDrive
                     });
             }
 
+            if (false) { // works but not implemented in other backends yet
             for (int i = 3, l = 1000; l <= maxBlobBytes; l *= 10, i++) {
                 final byte[] b = bytes[i];
                 assert l == b.length;
@@ -525,7 +526,9 @@ public class JdbcLoad extends CrundDrive
                         }
                     });
             }
-
+            }
+            
+            if (false) { // works but not implemented in other backends yet
             for (int i = 3, l = 1000; l <= maxTextChars; l *= 10, i++) {
                 final String s = strings[i];
                 assert l == s.length();
@@ -573,7 +576,8 @@ public class JdbcLoad extends CrundDrive
                         }
                     });
             }
-
+            }
+            
             ops.add(
                 new JdbcOp("setB0->A" + (batch ? "_batch" : ""),
                            "UPDATE b0 b0 SET b0.a_id = ? WHERE (b0.id = ?)") {

=== modified file 'storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp'
--- a/storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp	2010-10-08 11:17:35 +0000
+++ b/storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp	2011-01-11 16:10:36 +0000
@@ -941,7 +941,7 @@ CrundNdbApiOperations::navB0ToA(int coun
             if (op->getValue(model->attr_B0_a_id, (char*)&a_id) == NULL)
                 ABORT_NDB_ERROR(tx->getNdbError());
         }
-        executeOperations(); // start the scan; don't commit yet
+        executeOperations(); // execute the operation; don't commit yet
 
         // fetch the attributes from A
         {
@@ -1023,7 +1023,7 @@ CrundNdbApiOperations::navB0ToAalt(int c
         if (!batch)
             executeOperations();
     }
-    executeOperations(); // start the scan; don't commit yet
+    executeOperations(); // execute the operation; don't commit yet
 
     // allocate attributes holder
     CommonAB* const ab = new CommonAB[count_B];


Attachment: [text/bzr-bundle] bzr/[e-mail]