bzr commit into NDB/Bindings:trunk branch (monty:453)

[Monty Taylor]

#At https://bazaar.launchpad.net/~ndb-bindings/ndb-bindings/trunk

  453 Monty Taylor	2008-10-01 [merge]
      Merged in from Craig.
added:
  java/src/
  java/src/java/
  java/test/
  java/test/java/
renamed:
  java/com => java/src/java/com
  java/testsuite => java/test/java/testsuite
modified:
  Makefile.am
  java/Makefile.am
  java/build.xml
  java/test/java/testsuite/ndbj/SelectCountTest.java
  m4/javaversion.m4

=== modified file 'Makefile.am'
--- a/Makefile.am	2008-08-04 21:11:07 +0000
+++ b/Makefile.am	2008-10-01 22:08:28 +0000
@@ -46,7 +46,7 @@ distuninstallcheck_listfiles=find . -typ
 
 distclean-local:
 	rm -fr autom4te.cache
-	@if test -f trs.java.sav ; then mv trs.java.sav
java/com/mysql/cluster/ndbj/ThrowingResultSetJDBC4.java ; fi
+	@if test -f trs.java.sav ; then mv trs.java.sav
java/src/java/com/mysql/cluster/ndbj/ThrowingResultSetJDBC4.java ; fi
 
 dist-hook:
 	-bzr log > $(top_builddir)/ChangeLog	

=== modified file 'java/Makefile.am'
--- a/java/Makefile.am	2008-08-19 06:54:27 +0000
+++ b/java/Makefile.am	2008-10-01 18:49:08 +0000
@@ -8,7 +8,7 @@ libmgmj_la_LIBADD = ${top_builddir}/mgmp
 
 package_namespace=com/mysql/cluster
 # automake 1.9 neglects to define this
-builddir=$(top_builddir)/java/build
+builddir=$(top_builddir)/java/generated/java
 package_builddir=$(builddir)/$(package_namespace)
 package_srcdir=$(srcdir)/$(package_namespace)
 NDBAPI_SWIG_SRC = ${srcdir}/ndbj.i $(SWIG_NDB_SOURCES) ${srcdir}/swig/*

=== modified file 'java/build.xml'
--- a/java/build.xml	2008-07-24 21:09:04 +0000
+++ b/java/build.xml	2008-10-01 19:45:22 +0000
@@ -21,7 +21,8 @@
 	<!-- compile -->
 	<target name="compile">
 		<mkdir dir="build"/>
-		<javac srcdir=".:build" destdir="build" debug="true"
+		<javac srcdir="generated/java:src/java:test/java" 
+                    destdir="build" debug="true"
 			classpathref="project.cp">
 			<include name="com/mysql/**/*.java"/>
 			<include name="testsuite/**/*.java"/>
@@ -92,7 +93,7 @@
 		<javadoc packagenames="com.mysql.cluster.*"
 			destdir="javadoc" windowtitle="NDB/J API"
 			classpathref="project.cp">
-			<fileset dir="." defaultexcludes="true">
+			<fileset dir="src/java" defaultexcludes="true">
 				<include name="com/**/*.java"/>
 				<exclude name="**/NdbBaseOperationEqualsImpl.java"/>
 				<exclude name="**/NdbBaseOperationResultsImpl.java"/>

=== added directory 'java/src'
=== added directory 'java/src/java'
=== renamed directory 'java/com' => 'java/src/java/com'
=== added directory 'java/test'
=== added directory 'java/test/java'
=== renamed directory 'java/testsuite' => 'java/test/java/testsuite'
=== modified file 'java/test/java/testsuite/ndbj/SelectCountTest.java'
--- a/java/testsuite/ndbj/SelectCountTest.java	2008-06-30 13:29:41 +0000
+++ b/java/test/java/testsuite/ndbj/SelectCountTest.java	2008-10-01 01:17:37 +0000
@@ -35,7 +35,9 @@ public class SelectCountTest extends Bas
     private static final String col1 = "id";
     private static final String col2 = "name";
     private static final String theTableName = "t_select_count";
+    // SELECT_COUNT must be a multiple of BATCH_SIZE
     private static final int SELECT_COUNT = 12000;
+    private static final int BATCH_SIZE = 1000;
 
     public SelectCountTest(String arg0) {
         super(arg0);
@@ -54,16 +56,18 @@ public class SelectCountTest extends Bas
     public void testCount() throws NdbApiException {
         long count;
 
-        // insert many rows
-        trans = ndb.startTransaction();
-        for (int i=0; i < SELECT_COUNT; i++) {
-            NdbOperation op = trans.getInsertOperation(theTableName);
-            op.equalInt(col1,i);
-            String input = "jim" + i;
-            op.setString(col2,input);
+        // insert SELECT_COUNT rows, BATCH_SIZE at a time
+        for (int total=0; total < SELECT_COUNT; total+=BATCH_SIZE) {
+            trans = ndb.startTransaction();
+            for (int i=0; i < BATCH_SIZE; i++) {
+                NdbOperation op = trans.getInsertOperation(theTableName);
+                op.equalInt(col1, total + i);
+                String input = "jim" + (total + i);
+                op.setString(col2, input);
+            }
+            trans.execute(ExecType.Commit, AbortOption.AbortOnError, true);
+            trans.close();
         }
-        trans.execute(ExecType.Commit, AbortOption.AbortOnError, true);
-        trans.close();
 
         // check that the correct number of rows were inserted
         count = ndb.selectCount(theTableName);

=== modified file 'm4/javaversion.m4'
--- a/m4/javaversion.m4	2008-04-11 00:41:55 +0000
+++ b/m4/javaversion.m4	2008-10-01 22:08:28 +0000
@@ -45,10 +45,10 @@ AC_DEFUN([SWAP_JDBC_RESULTSET],[
 
     if test ! -f trs.java.sav ; then 
       # Want to make sure we only do this once
-      cp java/com/mysql/cluster/ndbj/ThrowingResultSetJDBC4.java trs.java.sav
+      cp java/src/java/com/mysql/cluster/ndbj/ThrowingResultSetJDBC4.java trs.java.sav
     fi
 
-    cat << \EOF > java/com/mysql/cluster/ndbj/ThrowingResultSetJDBC4.java
+    cat << \EOF >
java/src/java/com/mysql/cluster/ndbj/ThrowingResultSetJDBC4.java
 /* This is a generated file to work around jre5/jre6 issues. If this file 
    is here, the build thinks you are using java5. If you aren't please 
    report a bug */
@@ -64,7 +64,7 @@ public class ThrowingResultSetJDBC4 {
 EOF
   else 
     if test -f trs.java.sav ; then 
-      mv trs.java.sav java/com/mysql/cluster/ndbj/ThrowingResultSetJDBC4.java
+      mv trs.java.sav java/src/java/com/mysql/cluster/ndbj/ThrowingResultSetJDBC4.java
     fi 
   fi 
 ])