bzr push into mysql-5.1-telco-7.1 branch (Craig.Russell:4234 to 4235)

[Craig L Russell]

 4235 Craig L Russell	2011-06-02
      Minor cleanup in crund

    modified:
      storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjLoad.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/IA.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/IB0.java
      storage/ndb/test/crund/tws/schema.sql
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java
 4234 Craig L Russell	2011-06-02
      Add LIKE for binary and varbinary columns

    added:
      storage/ndb/clusterj/clusterj-test/src/main/java/testsuite/clusterj/QueryLikeByteArrayTypesTest.java
      storage/ndb/clusterj/clusterj-tie/src/test/java/testsuite/clusterj/tie/QueryLikeByteArrayTypesTest.java
    modified:
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/LikePredicateImpl.java
      storage/ndb/clusterj/clusterj-core/src/main/java/com/mysql/clusterj/core/query/PropertyImpl.java
      storage/ndb/clusterj/clusterj-test/Makefile.am
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanFilterImpl.java
      storage/ndb/clusterj/clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
=== modified file 'storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjLoad.java'
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjLoad.java	2011-01-31 09:07:01 +0000
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjLoad.java	2011-06-02 21:43:17 +0000
@@ -25,15 +25,12 @@ import com.mysql.clusterj.Query;
 import com.mysql.clusterj.Session;
 import com.mysql.clusterj.SessionFactory;
 import com.mysql.clusterj.query.QueryDomainType;
-import com.mysql.clusterj.query.Predicate;
 import com.mysql.clusterj.query.QueryBuilder;
+
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * A benchmark implementation against a ClusterJ database.
@@ -58,7 +55,6 @@ public class ClusterjLoad extends CrundD
         out.print("setting clusterj properties ...");
 
         final StringBuilder msg = new StringBuilder();
-        final String eol = System.getProperty("line.separator");
 
         // check required properties
         mgmdConnect
@@ -454,6 +450,7 @@ public class ClusterjLoad extends CrundD
                         b0.setId(i);
                         assert b0 != null;
                         b0.setAid(0);
+                        session.updatePersistent(b0);
                     }
                     commitTransaction();
                 }
@@ -617,7 +614,6 @@ public class ClusterjLoad extends CrundD
 
     // ----------------------------------------------------------------------
 
-    @SuppressWarnings("unchecked")
     static public void main(String[] args) {
         System.out.println("ClusterjLoad.main()");
         parseArguments(args);

=== modified file 'storage/ndb/test/crund/src/com/mysql/cluster/crund/IA.java'
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/IA.java	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/IA.java	2011-06-02 21:43:17 +0000
@@ -21,14 +21,12 @@
 package com.mysql.cluster.crund;
 
 import com.mysql.clusterj.annotation.PersistenceCapable;
-import com.mysql.clusterj.annotation.PrimaryKey;
 
 /**
  * An Entity test interface for use with ClusterJ.
  */
 @PersistenceCapable(table="a")
 public interface IA {
-    @PrimaryKey
     public int getId();
     public void setId(int id);
 

=== modified file 'storage/ndb/test/crund/src/com/mysql/cluster/crund/IB0.java'
--- a/storage/ndb/test/crund/src/com/mysql/cluster/crund/IB0.java	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/test/crund/src/com/mysql/cluster/crund/IB0.java	2011-06-02 21:43:17 +0000
@@ -20,11 +20,8 @@
 
 package com.mysql.cluster.crund;
 
-import com.mysql.clusterj.annotation.NotPersistent;
-import com.mysql.clusterj.annotation.PersistenceCapable;
-import com.mysql.clusterj.annotation.PrimaryKey;
 import com.mysql.clusterj.annotation.Column;
-import com.mysql.clusterj.annotation.Index;
+import com.mysql.clusterj.annotation.PersistenceCapable;
 
 /**
  * An Entity test interface for ClusterJ.
@@ -32,7 +29,6 @@ import com.mysql.clusterj.annotation.Ind
 @PersistenceCapable(table="b0")
 public interface IB0 {
 
-    @PrimaryKey
     public int getId();
     public void setId(int id);
 
@@ -68,7 +64,6 @@ public interface IB0 {
     public void setCvarchar_def(String cvarchar_def);
 
     @Column(name="a_id") // or change name of attr
-    @Index(name="I_B0_FK")
     public int getAid();
     public void setAid(int aid);
 }

=== modified file 'storage/ndb/test/crund/tws/schema.sql'
--- a/storage/ndb/test/crund/tws/schema.sql	2011-02-02 09:52:33 +0000
+++ b/storage/ndb/test/crund/tws/schema.sql	2011-06-02 21:43:17 +0000
@@ -44,4 +44,4 @@ CREATE  TABLE IF NOT EXISTS testdb.mytab
 --        UNIQUE INDEX c2_UNIQUE (c2 ASC),
 --        UNIQUE INDEX c7_UNIQUE (c7 ASC),
 --        UNIQUE INDEX c8_UNIQUE (c8 ASC)
-);
+) ENGINE=NDB;

=== modified file 'storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java'
--- a/storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java	2011-01-31 09:07:01 +0000
+++ b/storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java	2011-06-02 21:43:17 +0000
@@ -46,6 +46,10 @@ public class TwsDriver extends Driver {
     protected TwsLoad clusterjLoad;
     protected TwsLoad ndbjtieLoad;
 
+    static {
+        System.setProperty("java.util.logging.config.file", "run.properties");
+    }
+
     static public void main(String[] args) throws Exception {
         parseArguments(args);
         TwsDriver main = new TwsDriver();


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