=== modified file 'java/testsuite/ndbj/ImmediatePollTimeoutTest.java' --- a/java/testsuite/ndbj/ImmediatePollTimeoutTest.java 2008-04-29 03:00:39 +0000 +++ b/java/testsuite/ndbj/ImmediatePollTimeoutTest.java 2008-04-29 03:40:11 +0000 @@ -49,7 +49,6 @@ if (!alreadySetUp) { // Create required tables - System.out.print("Creating tables..."); this.createTable(tablename, " (ATTR1 INT UNSIGNED auto_increment not null," + === modified file 'java/testsuite/ndbj/Latin1InsertReadTest.java' --- a/java/testsuite/ndbj/Latin1InsertReadTest.java 2007-12-27 02:37:27 +0000 +++ b/java/testsuite/ndbj/Latin1InsertReadTest.java 2008-04-29 03:40:11 +0000 @@ -59,7 +59,6 @@ else op.equalString(col1,col2Val); op.setString(col2, col2Val); - System.out.println("Inserted:" + col2Val); } trans.execute(ExecType.Commit, @@ -69,10 +68,6 @@ assertTrue(true); } catch (NdbApiTemporaryException e) { numRetries++; - System.out - .println("Temporary error. Retrying insert. Num Retries == " - + numRetries + " error msg:" + e.getMessage()); - System.out.println(e.getMessage()); } catch (NdbApiException e) { System.out.println("Caught NdbApiException in Insert:\t" + e.getMessage()); @@ -87,7 +82,6 @@ } try { - System.out.println("Reading the inserted rows"); trans = ndb.startTransaction(); NdbResultSet[] theResult = new NdbResultSet[NUM_INSERTS]; @@ -108,13 +102,11 @@ for (NdbResultSet r : theResult) { while (r.next()) { String val = r.getString(col2); - System.out.println("Read: " + val); if (val.compareTo(col2Val)!=0) assertFalse(true); } } - System.out.println("Finished reading"); assertTrue(true); } catch (NdbApiUserErrorPermanentException e) { System.out.println("User Permanent error. Retrying insert. Num Retries == " @@ -130,7 +122,7 @@ try { - System.out.println("Deleting the inserted rows"); + trans = ndb.startTransaction(); for (int i = 0; i < NUM_INSERTS; i++) { @@ -145,7 +137,6 @@ trans.execute(ExecType.Commit, AbortOption.AbortOnError, true); - System.out.println("Finished delete"); assertTrue(true); } catch (NdbApiUserErrorPermanentException e) { System.out === modified file 'java/testsuite/ndbj/NdbBlobTest.java' --- a/java/testsuite/ndbj/NdbBlobTest.java 2007-12-27 02:37:27 +0000 +++ b/java/testsuite/ndbj/NdbBlobTest.java 2008-04-29 03:40:11 +0000 @@ -93,8 +93,6 @@ trans.close(); } - System.out.println("Starting a transaction for table " + tablename); - NdbBlob blob = null; try { long t1 = System.currentTimeMillis(); @@ -117,30 +115,22 @@ blob = (NdbBlob)rs.getBlob(col2); if (id == 0) { assertEquals(blob.getNull(), true); - System.out.println("First entry was null"); continue; } - System.out.println("\nid=" + id); if (!blob.getNull()) { byte[] b = blob.getData(); // TODO: Fix BLOB getLength() int len = blob.getLength().intValue(); - System.out.println("Length=" + len); byte[] input = bData.getBytes(); for (int i = 0; i < len; i++) { - System.out.print((char) b[i]); assertEquals(b[i],input[i]); } - System.out.println(); - } else { - System.out.println("NULL blob"); + } + assertFalse(true); } - long t2 = System.currentTimeMillis(); - long tot = t2 - t1; - System.out.println("--END: " + tot); assertTrue(true); } @@ -168,24 +158,16 @@ trans.execute(ExecType.NoCommit, AbortOption.AbortOnError, true); - System.out.println("length of Blob : " + b.getLength()); // TODO: Fix BLOB getLength() int len = b.getLength().intValue(); byte[] buff = new byte[len]; b.readData(buff, len); - System.out.println("START---"); - for (int i = 0; i < len; i++) - System.out.print((char) buff[i]); - System.out.println("--END"); trans.execute(ExecType.Commit, AbortOption.AbortOnError, true); - long t2 = System.currentTimeMillis(); - long tot = t2 - t1; - System.out.println("--END: " + tot); assertTrue(true); } @@ -216,20 +198,14 @@ if (!blob.getNull()) { byte[] barr = blob.getData(); - System.out.println("TestBlob Known Length = " - + blob.getLength() + "\n START---"); // TODO: Fix BLOB getLength() - for (int i = 0; i < blob.getLength().intValue(); i++) - System.out.print((char) barr[i]); + /*for (int i = 0; i < blob.getLength().intValue(); i++) + System.out.print((char) barr[i]); */ } else { - System.out.println("Not expected NULLLLLLL"); assertTrue(false); } - long t2 = System.currentTimeMillis(); - long tot = t2 - t1; - System.out.println("--END: " + tot); assertTrue(true); } @@ -256,23 +232,19 @@ trans.execute(ExecType.NoCommit, AbortOption.AbortOnError, true); - System.out.println("Unknown length of Blob : " + bh.getLength()); // TODO: Fix BLOB getLength() int len = bh.getLength().intValue(); byte[] buff = new byte[len]; bh.readData(buff, len); - System.out.println("START---"); for (int i = 0; i < len; i++) System.out.print((char) buff[i]); - System.out.println("--END"); trans.execute(ExecType.Commit, AbortOption.AbortOnError, true); long t2 = System.currentTimeMillis(); long tot = t2 - t1; - System.out.println("--END: " + tot); assertTrue(true); } catch (NdbApiException e) { @@ -305,19 +277,13 @@ if (!bh.getNull()) { byte[] barr = bh.getData(); - System.out.println("TestBlob Known Length = " + bh.getLength() - + "\n START---"); - // TODO: Fix BLOB getLength() - for (int i = 0; i < bh.getLength().intValue(); i++) - System.out.print((char) barr[i]); + /*for (int i = 0; i < bh.getLength().intValue(); i++) + System.out.print((char) barr[i]);*/ } else { - System.out.println("Not expected NULLLLLLL"); + assertTrue(false); } - long t2 = System.currentTimeMillis(); - long tot = t2 - t1; - System.out.println("--END: " + tot); assertTrue(true); } catch (NdbApiException e) { System.out.println("Exception " + e.toString()); @@ -336,7 +302,6 @@ NdbOperation op = trans.getUpdateOperation(tablename); - System.out.println("Update Blob"); op.equalInt(col1, 2); @@ -374,7 +339,6 @@ NdbBlob bh = op.getBlobHandle(col2); - System.out.println("Insert/Delete Blob Test"); trans = ndb.startTransaction(); op = trans.getInsertOperation(tablename); @@ -428,7 +392,6 @@ while (rs.next()) { int id = rs.getInt(col1); - System.out.println("\nid=" + id); rs.deleteRow(); } @@ -437,7 +400,6 @@ long t2 = System.currentTimeMillis(); long tot = t2 - t1; - System.out.println("--END: " + tot); assertTrue(true); } === modified file 'java/testsuite/ndbj/NdbOperationIDTest.java' --- a/java/testsuite/ndbj/NdbOperationIDTest.java 2008-04-29 03:19:52 +0000 +++ b/java/testsuite/ndbj/NdbOperationIDTest.java 2008-04-29 03:40:11 +0000 @@ -309,7 +309,6 @@ AbortOption.AbortOnError, true); - System.out.println("Finished delete"); assertTrue(true); } catch (NdbApiException e) { === modified file 'java/testsuite/ndbj/NdbOperationTest.java' --- a/java/testsuite/ndbj/NdbOperationTest.java 2007-12-27 02:37:27 +0000 +++ b/java/testsuite/ndbj/NdbOperationTest.java 2008-04-29 03:40:11 +0000 @@ -77,10 +77,8 @@ try { - System.out.println("Starting a transaction for table " + tablename); trans = ndb.startTransaction(); - System.out.println("Getting an operation object from table:\t" +tablename); NdbOperation op = trans.getInsertOperation(tablename); op.equalInt(col1,int_val); @@ -114,13 +112,11 @@ op.setInt(col12, short_val); - System.out.println("Going to execute Insert: ("+int_val+", "+varcharlong_val + ", " + float_val + ", " + double_val + ", " + long_val + ")"); - + trans.execute(ExecType.Commit, AbortOption.AbortOnError, true); - System.out.println("Finished insert"); assertTrue(true); } catch (NdbApiException e) { @@ -134,12 +130,10 @@ } try { - System.out.println("Starting an read transaction"); trans = ndb.startTransaction(); trans.setOperationLockMode(LockMode.LM_Exclusive); - System.out.println("Getting an operation object from table:\t" +tablename); NdbOperation op = trans.getSelectOperation(tablename); op.equalInt(col1,int_val); @@ -158,8 +152,6 @@ rs = op.resultData(); - System.out.println("Going to execute Read: id="+int_val+", name=?"); - trans.execute(ExecType.Commit, AbortOption.AbortOnError, true); @@ -218,7 +210,6 @@ } - System.out.println("Finished reading"); } catch (SQLException e) { System.out.println("Caught NdbApiException in Read Tuple:\t" + e.getMessage()); @@ -276,7 +267,6 @@ AbortOption.AbortOnError, true); - System.out.println("Finished update"); assertTrue(true); } catch (NdbApiException e) { @@ -289,20 +279,16 @@ } try { - System.out.println("Starting an delete transaction"); trans = ndb.startTransaction(); - System.out.println("Getting an operation object from table:\t" +tablename); NdbOperation op = trans.getDeleteOperation(tablename); op.equalInt(col1,int_val); - System.out.println("Going to execute delete tuple, id="+int_val); trans.execute(ExecType.Commit, AbortOption.AbortOnError, true); - System.out.println("Finished delete"); assertTrue(true); } catch (NdbApiException e) { === modified file 'java/testsuite/ndbj/Utf8InsertReadTest.java' --- a/java/testsuite/ndbj/Utf8InsertReadTest.java 2007-12-27 02:37:27 +0000 +++ b/java/testsuite/ndbj/Utf8InsertReadTest.java 2008-04-29 03:40:11 +0000 @@ -80,7 +80,6 @@ } try { - System.out.println("Reading the inserted rows"); trans = ndb.startTransaction(); NdbResultSet[] theResults = new NdbResultSet[NUM_INSERTS]; @@ -97,13 +96,11 @@ for (NdbResultSet r : theResults) { while (r.next()) { String val = r.getString(col2); - System.out.println("Read: " + val); if (val.compareTo(col2Val)!=0) assertFalse(true); } } - System.out.println("Finished reading"); assertTrue(true); } catch (NdbApiUserErrorPermanentException e) { System.out.println("User Permanent error. Retrying insert. Num Retries == " @@ -119,7 +116,6 @@ try { - System.out.println("Deleting the inserted rows"); trans = ndb.startTransaction(); for (int i = 0; i < NUM_INSERTS; i++) { @@ -130,7 +126,6 @@ trans.execute(ExecType.Commit, AbortOption.AbortOnError, true); - System.out.println("Finished delete"); assertTrue(true); } catch (NdbApiUserErrorPermanentException e) { System.out