At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge
------------------------------------------------------------
revno: 156
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: ndbjmerge
timestamp: Thu 2007-09-13 18:52:17 -0700
message:
Cleaned up reference/impl issues.
Removed useless BaseCallback.
Removed cruft.
removed:
java/com/mysql/cluster/ndbj/BaseCallback.java
basecallback.java-20070703180415-vgaf7h8unl6b2jg2-1
modified:
java/build.xml build.xml-20070521233115-yg3ylf2k3vuzr27o-1
java/com/mysql/cluster/ndbj/NdbBaseOperationImpl.java
ndboperationimpl.jav-20070517181935-98huwjarzuh25b30-20
java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java
ndbindexscanoperatio-20070517181935-98huwjarzuh25b30-17
java/com/mysql/cluster/ndbj/NdbTransaction.java
ndbtransaction.java-20070517181935-98huwjarzuh25b30-27
java/com/mysql/cluster/ndbj/NdbTransactionImpl.java
ndbtransactionimpl.j-20070517181935-98huwjarzuh25b30-28
java/com/mysql/cluster/ndbj/examples/TestAsync.java
testasync.java-20070703002120-jsnz1ul38pp1h3w3-1
java/ndbj.i ndbj.i-20070913223244-5938mztpztyn9sry-1
swig/ndbglobals.i globals.i-20070228021421-qkr4cbpxymyqdrf3-7
=== removed file 'java/com/mysql/cluster/ndbj/BaseCallback.java'
--- a/java/com/mysql/cluster/ndbj/BaseCallback.java 2007-09-13 21:28:09 +0000
+++ b/java/com/mysql/cluster/ndbj/BaseCallback.java 1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-package com.mysql.cluster.ndbj;
-
-import com.mysql.cluster.errors.*;
-
-public class BaseCallback extends com.mysql.cluster.ndbj.BaseCallbackRef {
-
- private Ndb myNdb = null;
-
- public BaseCallback() {
- super();
- }
-
- public BaseCallback(Ndb theNdb) {
- super();
- this.myNdb = theNdb;
- }
-
- public final void callback(int res, com.mysql.cluster.ndbj.NdbTransactionRef trans) {
- // TODO: need to get a throws from the C++ basecallback
- NdbTransaction ndbjTrans = null;
- try {
- if (this.myNdb == null) {
- ndbjTrans = NdbFactory.createTransaction(trans);
- } else {
- ndbjTrans = NdbFactory.createTransaction(myNdb,trans);
- }
- } catch (NdbApiException e) {
- // TODO: What's a sensible thing to do here if we can't re-throw?
- ndbjTrans = null;
- }
- if (ndbjTrans != null)
- this.callback(res, ndbjTrans);
- }
-
- public void callback(int res, NdbTransaction trans) {
- System.out.println("In the NDB/J default callback. Transaction:" + trans);
- }
-}
=== modified file 'java/build.xml'
--- a/java/build.xml 2007-09-13 22:33:10 +0000
+++ b/java/build.xml 2007-09-14 01:52:17 +0000
@@ -28,14 +28,14 @@
<fileset dir="com/mysql/cluster/ndbj" includes="SWIG*" />
<fileset dir="com/mysql/cluster/ndbj" includes="*Ref*" />
<fileset dir="com/mysql/cluster/ndbj" includes="ndbj*" />
- <fileset dir="com/mysql/cluster/ndbj" includes="MYSQL_TIME.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="NdbColumn.java" />
+ <fileset dir="com/mysql/cluster/ndbj" includes="AbortOption.java" />
+ <fileset dir="com/mysql/cluster/ndbj" includes="BaseCallback.java" />
+ <fileset dir="com/mysql/cluster/ndbj" includes="ExecType.java" />
<fileset dir="com/mysql/cluster/ndbj" includes="NdbDictionary.java" />
<fileset dir="com/mysql/cluster/ndbj" includes="NdbEvent.java" />
<fileset dir="com/mysql/cluster/ndbj" includes="NdbIndex.java" />
<fileset dir="com/mysql/cluster/ndbj" includes="NdbObject.java" />
<fileset dir="com/mysql/cluster/ndbj" includes="NdbTable.java" />
- <fileset dir="com/mysql/cluster/ndbj" includes="enum_mysql_timestamp_type.java"
/>
</delete>
<delete dir="javadoc" />
</target>
=== modified file 'java/com/mysql/cluster/ndbj/NdbBaseOperationImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbBaseOperationImpl.java 2007-09-13 21:28:09 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBaseOperationImpl.java 2007-09-14 01:52:17 +0000
@@ -14,7 +14,7 @@
import java.sql.Timestamp;
-
+
class NdbBaseOperationImpl extends NdbBaseImpl implements NdbBaseOperation {
/*
@@ -352,10 +352,10 @@
resultSet.put(i.toString(), blob);
if (execOps == true) {
- NdbTransaction.AbortOption opt = (abortOnError == true) ?
NdbTransaction.AbortOption.AbortOnError
- : NdbTransaction.AbortOption.AO_IgnoreError;
+ AbortOption opt = (abortOnError == true) ? AbortOption.AbortOnError
+ : AbortOption.AO_IgnoreError;
- trans.execute(NdbTransaction.ExecType.NoCommit, opt, force );
+ trans.execute(ExecType.NoCommit, opt, force );
}
}
@@ -391,10 +391,10 @@
resultSet.put(columnName, blob);
if (execOps == true) {
- NdbTransaction.AbortOption opt = (abortOnError == true) ?
NdbTransaction.AbortOption.AbortOnError
- : NdbTransaction.AbortOption.AO_IgnoreError;
+ AbortOption opt = (abortOnError == true) ? AbortOption.AbortOnError
+ : AbortOption.AO_IgnoreError;
- trans.execute(NdbTransaction.ExecType.NoCommit, opt, force);
+ trans.execute(ExecType.NoCommit, opt, force);
}
}
=== modified file 'java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java'
--- a/java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java 2007-09-13 21:28:09 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java 2007-09-14 01:52:17 +0000
@@ -3,7 +3,6 @@
import java.util.Calendar;
import com.mysql.cluster.errors.NdbApiException;
-import com.mysql.cluster.ndbj.NdbBaseOperation.LockMode;
/**
* This interface describes operations that can be performed on an INDEX in a
=== modified file 'java/com/mysql/cluster/ndbj/NdbTransaction.java'
--- a/java/com/mysql/cluster/ndbj/NdbTransaction.java 2007-09-13 21:28:09 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbTransaction.java 2007-09-14 01:52:17 +0000
@@ -64,69 +64,7 @@
*/
public interface NdbTransaction extends NdbBase {
- /**
- * This type sets the transaction's execution type —
- * that is, whether it should execute, execute and commit, or abort.
- * It is used as a parameter to the execute method.
- * @see NdbTransactionImpl#execute(ExecTypeRef, AbortOptionRef, int)
- */
- public enum ExecType
- {
- /**
- * The operations in the transaction should be executed, but not committed to the
database.
- */
- NoCommit(1),
- /**
- * The operations in the transaction should be executed, and committed to the
database.
- */
- Commit(2),
- /**
- * The transaction should be rolled back.
- */
- Rollback(3);
- public int type;
- private ExecType(int type)
- {
- this.type=type;
- }
- public int getEnumValue() {
- return this.type;
- }
- };
-
-
- /**
- * This type is used to determine whether failed operations should force a
transaction to be aborted.
- * It is used as an argument to the execute method.
- * Options for how to handle the abort of a transaction:
- * <br>AbortOnError aborts the transaction if an
- * operation causes an error
- * <br> AO_IgnoreError does not abort the transaction (it continues
- * execution) if an operation causes an error
- * @see NdbTransactionImpl#execute(ExecTypeRef, AbortOptionRef, int)
- */
- public enum AbortOption
- {
- /**
- * A failed operation causes the transaction to abort.
- */
- AbortOnError(0),
- /**
- * Failed operations are ignored; the transaction continues to execute.
- */
- AO_IgnoreError(2);
- public int type;
-
- private AbortOption(int type)
- {
- this.type=type;
- }
- public int getEnumValue() {
- return this.type;
- }
-
- };
-
+
/**
* This type is used to determine the state of the transaction.
=== modified file 'java/com/mysql/cluster/ndbj/NdbTransactionImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbTransactionImpl.java 2007-09-13 22:24:21 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbTransactionImpl.java 2007-09-14 01:52:17 +0000
@@ -4,6 +4,7 @@
import java.math.BigInteger;
+import java.util.List;
import java.util.ArrayList;
@@ -36,13 +37,13 @@
* An IllegalStateException is thrown if you attempt to invoke methods on this
* class after the close method has been called on instances.
*
- * @see com.mysql.cluster.ndbj.NdbBase
- * @see com.mysql.cluster.ndbj.Ndb
- * @see com.mysql.cluster.ndbj.NdbClusterConnectionImpl
- * @see com.mysql.cluster.ndbj.NdbOperation
- * @see com.mysql.cluster.ndbj.NdbIndexOperation
- * @see com.mysql.cluster.ndbj.NdbScanOperation
- * @see com.mysql.cluster.ndbj.NdbIndexScanOperation
+ * @see NdbBase
+ * @see Ndb
+ * @see NdbClusterConnectionImpl
+ * @see NdbOperation
+ * @see NdbIndexOperation
+ * @see NdbScanOperation
+ * @see NdbIndexScanOperation
*/
class NdbTransactionImpl extends NdbBaseImpl implements NdbTransaction {
@@ -50,13 +51,13 @@
/**
* List of Blob object used by the Transaction
*/
- private ArrayList<NdbBlob> ndbBlobArray;
+ private List<NdbBlob> ndbBlobArray;
/**
* Pointer to the NdbRef JNI object
*/
- com.mysql.cluster.ndbj.NdbRef ndbRef;
- com.mysql.cluster.ndbj.NdbTransactionRef transRef;
+ NdbRef ndbRef;
+ NdbTransactionRef transRef;
ExecutionState transExecutionState;
@@ -76,8 +77,8 @@
* A long pointer to the native NdbRef object
* @throws NdbApiException
*/
- NdbTransactionImpl(com.mysql.cluster.ndbj.NdbRef ndbRef,
- com.mysql.cluster.ndbj.NdbTransactionRef transRef)
+ NdbTransactionImpl(NdbRef ndbRef,
+ NdbTransactionRef transRef)
throws NdbApiException {
super();
if (ndbRef == null) {
@@ -90,7 +91,7 @@
transExecutionState = NdbTransaction.ExecutionState.STARTED;
}
- NdbTransactionImpl(com.mysql.cluster.ndbj.NdbTransactionRef transRef)
+ NdbTransactionImpl(NdbTransactionRef transRef)
throws NdbApiException {
super();
this.ndbRef = null;
@@ -99,7 +100,7 @@
transExecutionState = NdbTransaction.ExecutionState.STARTED;
}
/**
- * The transaction stores a listt of Blob objects for the transactions
+ * The transaction stores a list of Blob objects for the transactions
*
* @param blob
*/
@@ -110,22 +111,19 @@
/*
* (non-Javadoc)
*
- * @see
com.mysql.cluster.ndbj.NdbTransaction#execute(com.mysql.cluster.ndbj.NdbTransactionImpl.ExecType,
- * com.mysql.cluster.ndbj.NdbTransactionImpl.AbortOption, int)
+ * @see NdbTransaction#execute(NdbTransactionImpl.ExecType,
+ * NdbTransactionImpl.AbortOption, int)
*/
public void execute(ExecType execType, AbortOption abortOption,
boolean force) throws NdbApiException {
isValid();
- transRef.execute(
- com.mysql.cluster.ndbj.ExecTypeRef.swigToEnum(execType.getEnumValue()),
- com.mysql.cluster.ndbj.AbortOptionRef.swigToEnum(abortOption.getEnumValue()),
- force);
+ transRef.execute(execType,abortOption, force);
- if (execType == NdbTransaction.ExecType.Commit) {
+ if (execType == ExecType.Commit) {
transExecutionState = NdbTransaction.ExecutionState.EXECUTED_COMMITTED;
}
- if (execType == NdbTransaction.ExecType.NoCommit) {
+ if (execType == ExecType.NoCommit) {
transExecutionState = NdbTransaction.ExecutionState.EXECUTED_NOT_COMMITTED;
}
}
@@ -133,14 +131,14 @@
/*
* (non-Javadoc)
*
- * @see com.mysql.cluster.ndbj.NdbTransaction#getNdbOperation(java.lang.String)
+ * @see NdbTransaction#getNdbOperation(java.lang.String)
*/
public NdbOperation getNdbOperation(String tableName)
throws NdbApiException {
isValid();
isStringNullOrEmpty(tableName);
- com.mysql.cluster.ndbj.NdbOperationRef opRef = transRef.getNdbOperation(tableName);
+ NdbOperationRef opRef = transRef.getNdbOperation(tableName);
return NdbFactory.createNdbOperation(this, opRef);
}
@@ -148,13 +146,13 @@
/*
* (non-Javadoc)
*
- * @see com.mysql.cluster.ndbj.NdbTransaction#getNdbIndexOperation(java.lang.String,
+ * @see NdbTransaction#getNdbIndexOperation(java.lang.String,
* java.lang.String)
*/
public NdbIndexOperation getNdbIndexOperation(Ndb myNdb, String indexName, String
tableName)
throws NdbApiException
{
- com.mysql.cluster.ndbj.NdbIndexOperationRef opRef =
transRef.getNdbIndexOperation(((NdbImpl)myNdb).ndbRef, indexName, tableName);
+ NdbIndexOperationRef opRef = transRef.getNdbIndexOperation(((NdbImpl)myNdb).ndbRef,
indexName, tableName);
return NdbFactory.createNdbIndexOperation(this,opRef);
}
@@ -166,20 +164,20 @@
if (ndbRef == null) {
throw new RuntimeException("null ndbRef");
}
- com.mysql.cluster.ndbj.NdbIndexOperationRef opRef =
transRef.getNdbIndexOperation(ndbRef, indexName, tableName);
+ NdbIndexOperationRef opRef = transRef.getNdbIndexOperation(ndbRef, indexName,
tableName);
return NdbFactory.createNdbIndexOperation(this,opRef);
}
/*
* (non-Javadoc)
*
- * @see com.mysql.cluster.ndbj.NdbTransaction#getNdbIndexScanOperation(java.lang.String,
+ * @see NdbTransaction#getNdbIndexScanOperation(java.lang.String,
* java.lang.String)
*/
public NdbIndexScanOperation getNdbIndexScanOperation(Ndb myNdb, String indexName,
String tableName)
throws NdbApiException
{
- com.mysql.cluster.ndbj.NdbIndexScanOperationRef opRef =
transRef.getNdbIndexScanOperation(((NdbImpl)myNdb).ndbRef, indexName, tableName);
+ NdbIndexScanOperationRef opRef =
transRef.getNdbIndexScanOperation(((NdbImpl)myNdb).ndbRef, indexName, tableName);
return NdbFactory.createNdbIndexScanOperation(this,tableName, indexName,opRef);
}
@@ -189,7 +187,7 @@
isStringNullOrEmpty(indexName);
isStringNullOrEmpty(tableName);
- com.mysql.cluster.ndbj.NdbIndexScanOperationRef opRef =
+ NdbIndexScanOperationRef opRef =
transRef.getNdbIndexScanOperation(ndbRef, indexName, tableName);
return NdbFactory.createNdbIndexScanOperation(this,tableName,indexName,opRef);
}
@@ -197,14 +195,14 @@
/*
* (non-Javadoc)
*
- * @see com.mysql.cluster.ndbj.NdbTransaction#getNdbScanOperation(java.lang.String)
+ * @see NdbTransaction#getNdbScanOperation(java.lang.String)
*/
public NdbScanOperation getNdbScanOperation(String tableName)
throws NdbApiException {
isValid();
isStringNullOrEmpty(tableName);
- com.mysql.cluster.ndbj.NdbScanOperationRef opRef =
+ NdbScanOperationRef opRef =
transRef.getNdbScanOperation(tableName);
return NdbFactory.createNdbScanOperation(this,tableName,opRef);
}
@@ -212,13 +210,13 @@
/*
* (non-Javadoc)
*
- * @see
com.mysql.cluster.ndbj.NdbTransaction#getNextCompletedOperation(com.mysql.cluster.ndbj.NdbOperation)
+ * @see NdbTransaction#getNextCompletedOperation(NdbOperation)
*/
public NdbOperation getNextCompletedOperation(NdbOperation op)
throws NdbApiException {
isValid();
- com.mysql.cluster.ndbj.NdbOperationRef nextOpRef
+ NdbOperationRef nextOpRef
= transRef.getNextCompletedOperation(op.getOpRef());
return new NdbOperationImpl(this,nextOpRef);
@@ -229,7 +227,7 @@
/*
* (non-Javadoc)
*
- * @see com.mysql.cluster.ndbj.NdbTransaction#close()
+ * @see NdbTransaction#close()
*/
public void close() {
transExecutionState = NdbTransaction.ExecutionState.CLOSED;
@@ -256,7 +254,7 @@
/*
* (non-Javadoc)
*
- * @see com.mysql.cluster.ndbj.NdbTransaction#isClosed()
+ * @see NdbTransaction#isClosed()
*/
public boolean isClosed() {
return (transExecutionState == NdbTransaction.ExecutionState.CLOSED);
@@ -265,7 +263,7 @@
/*
* (non-Javadoc)
*
- * @see com.mysql.cluster.ndbj.NdbTransaction#selectCount(java.lang.String)
+ * @see NdbTransaction#selectCount(java.lang.String)
*/
public BigInteger selectCount(String tableName) throws NdbApiException {
return transRef.selectCount(tableName);
@@ -274,14 +272,14 @@
/*
* (non-Javadoc)
*
- * @see com.mysql.cluster.ndbj.NdbTransaction#restart()
+ * @see NdbTransaction#restart()
*/
public int restart() throws NdbApiException {
return transRef.restart();
}
/* (non-Javadoc)
- * @see com.mysql.cluster.ndbj.NdbBaseImpl#getNdbErrorRef()
+ * @see NdbBaseImpl#getNdbErrorRef()
*/
@Override
protected NdbErrorRef getNdbErrorRef() {
@@ -304,7 +302,7 @@
/**
*
- * @see com.mysql.cluster.ndbj.NdbTransactionRef#delete()
+ * @see NdbTransactionRef#delete()
*/
public void delete() {
if(transRef!=null)
@@ -327,14 +325,14 @@
* @param abortOption
* @return
* @throws NdbApiException
- * @see
com.mysql.cluster.ndbj.NdbTransactionRef#execute(com.mysql.cluster.ndbj.ExecTypeRef,
- * com.mysql.cluster.ndbj.AbortOptionRef)
+ * @see NdbTransactionRef#execute(ExecTypeRef,
+ * AbortOptionRef)
*/
public void execute(ExecType execType, AbortOption abortOption)
throws NdbApiException {
transRef.execute(
- com.mysql.cluster.ndbj.ExecTypeRef.swigToEnum(execType.getEnumValue()),
- com.mysql.cluster.ndbj.AbortOptionRef.swigToEnum(abortOption.getEnumValue())
+ execType,
+ abortOption
);
}
@@ -342,11 +340,10 @@
* @param execType
* @return
* @throws NdbApiException
- * @see
com.mysql.cluster.ndbj.NdbTransactionRef#execute(com.mysql.cluster.ndbj.ExecTypeRef)
+ * @see NdbTransactionRef#execute(ExecTypeRef)
*/
public void execute(ExecType execType) throws NdbApiException {
- transRef.execute(
- com.mysql.cluster.ndbj.ExecTypeRef.swigToEnum(execType.getEnumValue()));
+ transRef.execute(execType);
}
@@ -354,66 +351,55 @@
* @param execType
* @param cb
* @param abortOption
- * @see
com.mysql.cluster.ndbj.NdbTransactionRef#executeAsynchPrepare(com.mysql.cluster.ndbj.ExecTypeRef,
- * com.mysql.cluster.ndbj.BaseCallbackRef,
- * com.mysql.cluster.ndbj.AbortOptionRef)
+ * @see NdbTransactionRef#executeAsynchPrepare(ExecTypeRef,
+ * BaseCallbackRef,
+ * AbortOptionRef)
*/
public void executeAsynchPrepare(ExecType execType, BaseCallbackRef cb,
AbortOption abortOption) {
- transRef.executeAsynchPrepare(
- com.mysql.cluster.ndbj.ExecTypeRef.swigToEnum(execType.getEnumValue()),
- cb,
- com.mysql.cluster.ndbj.AbortOptionRef.swigToEnum(abortOption.getEnumValue()));
-
+ transRef.executeAsynchPrepare(execType, cb, abortOption);
}
/**
* @param execType
* @param cb
- * @see
com.mysql.cluster.ndbj.NdbTransactionRef#executeAsynchPrepare(com.mysql.cluster.ndbj.ExecTypeRef,
- * com.mysql.cluster.ndbj.BaseCallbackRef)
+ * @see NdbTransactionRef#executeAsynchPrepare(ExecTypeRef,
+ * BaseCallbackRef)
*/
public void executeAsynchPrepare(ExecType execType, BaseCallbackRef cb) {
- transRef.executeAsynchPrepare(
- com.mysql.cluster.ndbj.ExecTypeRef.swigToEnum(execType.getEnumValue()),
- cb);
+ transRef.executeAsynchPrepare(execType, cb);
}
/**
* @param execType
* @param cb
* @param abortOption
- * @see
com.mysql.cluster.ndbj.NdbTransactionRef#executeAsynchPrepare(com.mysql.cluster.ndbj.ExecTypeRef,
- * com.mysql.cluster.ndbj.INdbCallable,
- * com.mysql.cluster.ndbj.AbortOptionRef)
+ * @see NdbTransactionRef#executeAsynchPrepare(ExecTypeRef,
+ * INdbCallable,
+ * AbortOptionRef)
*/
public void executeAsynchPrepare(ExecType execType,
INdbCallable cb,
AbortOption abortOption) {
- transRef.executeAsynchPrepare(
- com.mysql.cluster.ndbj.ExecTypeRef.swigToEnum(execType.getEnumValue()),
- cb,
- com.mysql.cluster.ndbj.AbortOptionRef.swigToEnum(abortOption.getEnumValue()));
+ transRef.executeAsynchPrepare(execType,cb,abortOption);
}
/**
* @param execType
* @param cb
- * @see
com.mysql.cluster.ndbj.NdbTransactionRef#executeAsynchPrepare(com.mysql.cluster.ndbj.ExecTypeRef,
- * com.mysql.cluster.ndbj.INdbCallable)
+ * @see NdbTransactionRef#executeAsynchPrepare(ExecTypeRef,
+ * INdbCallable)
*/
public void executeAsynchPrepare(ExecType execType,
- com.mysql.cluster.ndbj.INdbCallable cb) {
- transRef.executeAsynchPrepare(
- com.mysql.cluster.ndbj.ExecTypeRef.swigToEnum(execType.getEnumValue()),
- cb);
+ INdbCallable cb) {
+ transRef.executeAsynchPrepare(execType, cb);
}
/**
* @return
* @throws NdbApiException
- * @see com.mysql.cluster.ndbj.NdbTransactionRef#getNdbErrorLine()
+ * @see NdbTransactionRef#getNdbErrorLine()
*/
public int getNdbErrorLine() throws NdbApiException {
return transRef.getNdbErrorLine();
@@ -422,9 +408,9 @@
/**
* @return
* @throws NdbApiException
- * @see com.mysql.cluster.ndbj.NdbTransactionRef#getNdbErrorOperation()
+ * @see NdbTransactionRef#getNdbErrorOperation()
*/
- public com.mysql.cluster.ndbj.NdbOperationRef getNdbErrorOperation()
+ public NdbOperationRef getNdbErrorOperation()
throws NdbApiException {
return transRef.getNdbErrorOperation();
}
=== modified file 'java/com/mysql/cluster/ndbj/examples/TestAsync.java'
--- a/java/com/mysql/cluster/ndbj/examples/TestAsync.java 2007-07-05 17:18:08 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/TestAsync.java 2007-09-14 01:52:17 +0000
@@ -191,8 +191,7 @@
*******************/
System.out.println("Testing NDBAPI speed");
- long foo = 0;
-
+
beginTime = new Date(System.currentTimeMillis());
for(int x=0;x<num_iter;x++){
@@ -215,7 +214,7 @@
myTrans.execute(NdbTransaction.ExecType.Commit);
- foo=rs.getInt("ATTR2");
+ rs.getInt("ATTR2");
myTrans.close();
}
endTime = new Date(System.currentTimeMillis());
@@ -250,6 +249,7 @@
TestBaseCallback cb = new TestBaseCallback(myNdb,rs);
myTrans.executeAsynchPrepare(NdbTransaction.ExecType.Commit, cb );
+ cbs.add(cb);
// foo=myRecAttr.int32_value();
// myNdb.closeTransaction(myTrans);
=== modified file 'java/ndbj.i'
--- a/java/ndbj.i 2007-09-13 22:33:10 +0000
+++ b/java/ndbj.i 2007-09-14 01:52:17 +0000
@@ -20,9 +20,9 @@
%module(directors="1") ndbj
-%rename AbortOption AbortOptionRef;
-%rename BaseCallback BaseCallbackRef;
-%rename ExecType ExecTypeRef;
+ //%rename AbortOption AbortOptionRef;
+//%rename BaseCallback BaseCallbackRef;
+//%rename ExecType ExecTypeRef;
%rename NdbBlob NdbBlobRef;
%rename NdbClusterConnection NdbClusterConnectionRef;
%rename NdbColumn NdbColumnRef;
=== modified file 'swig/ndbglobals.i'
--- a/swig/ndbglobals.i 2007-08-01 16:44:14 +0000
+++ b/swig/ndbglobals.i 2007-09-14 01:52:17 +0000
@@ -56,6 +56,7 @@
} BYTES;
%}
+/*
typedef char my_bool;
enum enum_mysql_timestamp_type
{
@@ -70,7 +71,7 @@
my_bool neg;
enum enum_mysql_timestamp_type time_type;
} MYSQL_TIME;
-
+*/
// TODO: This is a little stupid.
// Why don't we just typedef these right in the first place
%rename(NdbObject) NdbDictObject;
| Thread |
|---|
| • Rev 156: Cleaned up reference/impl issues. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/ndbjmerge | Monty Taylor | 14 Sep |
