#At https://bazaar.launchpad.net/~ndb-bindings/ndb-bindings/trunk
406 Monty Taylor 2008-06-10
REMOVED NdbFactory. Added static factory methods to NdbClusterConnection instead.
removed:
java/com/mysql/cluster/ndbj/NdbFactory.java
modified:
java/Makefile.am
java/com/mysql/cluster/ndbj/Ndb.java
java/com/mysql/cluster/ndbj/NdbBaseOperationResultsImpl.java
java/com/mysql/cluster/ndbj/NdbClusterConnection.java
java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java
java/com/mysql/cluster/ndbj/NdbTransaction.java
java/com/mysql/cluster/ndbj/examples/CRUDandScan.java
java/com/mysql/cluster/ndbj/examples/DeleteUsingPrimaryKey.java
java/com/mysql/cluster/ndbj/examples/ExamplesConfigurator.java
java/com/mysql/cluster/ndbj/examples/HelloWorldInsert.java
java/com/mysql/cluster/ndbj/examples/InsertUsingPrimaryKey.java
java/com/mysql/cluster/ndbj/examples/JoinUsingScanAndIndexScan.java
java/com/mysql/cluster/ndbj/examples/PrimaryKeyBatchOps.java
java/com/mysql/cluster/ndbj/examples/PrimaryKeyOpBlob.java
java/com/mysql/cluster/ndbj/examples/ReadRowsUsingTableScan.java
java/com/mysql/cluster/ndbj/examples/ReadUsingOrderedIndexOnPK.java
java/com/mysql/cluster/ndbj/examples/ReadUsingPrimaryKey.java
java/com/mysql/cluster/ndbj/examples/RetryTransaction.java
java/com/mysql/cluster/ndbj/examples/TestAsync.java
java/com/mysql/cluster/ndbj/examples/TestEvent.java
java/com/mysql/cluster/ndbj/examples/UpdateUsingPrimaryKey.java
java/swig/NdbClusterConnection.i
java/testsuite/BaseNdbjTestCase.java
java/testsuite/TestCallback.java
=== modified file 'java/Makefile.am'
--- a/java/Makefile.am 2008-06-10 12:37:51 +0000
+++ b/java/Makefile.am 2008-06-10 16:11:08 +0000
@@ -192,7 +192,6 @@ NDBAPI_JAVA_SRC = $(package_srcdir)/ndbj
${package_srcdir}/ndbj/NdbEventOperation.java \
${package_srcdir}/ndbj/NdbEventOperationResults.java \
${package_srcdir}/ndbj/NdbEventOperationResultsImpl.java \
- ${package_srcdir}/ndbj/NdbFactory.java \
${package_srcdir}/ndbj/NdbIndexOperation.java \
${package_srcdir}/ndbj/NdbIndexScanOperation.java \
${package_srcdir}/ndbj/NdbOperation.java \
@@ -271,7 +270,6 @@ NDBAPI_JAVA_CLASSES = $(package_builddir
${package_builddir}/ndbj/NdbEventOperation.class \
${package_builddir}/ndbj/NdbEventOperationResults.class \
${package_builddir}/ndbj/NdbEventOperationResultsImpl.class \
- ${package_builddir}/ndbj/NdbFactory.class \
${package_builddir}/ndbj/NdbIndexOperation.class \
${package_builddir}/ndbj/NdbIndexScanOperation.class \
${package_builddir}/ndbj/NdbOperation.class \
=== modified file 'java/com/mysql/cluster/ndbj/Ndb.java'
--- a/java/com/mysql/cluster/ndbj/Ndb.java 2007-12-20 02:25:04 +0000
+++ b/java/com/mysql/cluster/ndbj/Ndb.java 2008-06-10 16:11:08 +0000
@@ -20,7 +20,7 @@ import javax.transaction.TransactionMana
* NdbClusterConnection conn=null;<br>
* Ndb ndb=null;<br>
* try {<br>
- * conn = NdbFactory.createNdbClusterConnection("ndb-connectstring");<br>
+ * conn = NdbClusterConnection.create("ndb-connectstring");<br>
* ndb = conn.createNdb("database",12); // Max num of concurrent transactions is set to 12 <br>
* }<br>
* catch (NdbApiException e) {<br>
=== modified file 'java/com/mysql/cluster/ndbj/NdbBaseOperationResultsImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbBaseOperationResultsImpl.java 2007-12-26 22:53:00 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBaseOperationResultsImpl.java 2008-06-10 16:11:08 +0000
@@ -46,9 +46,9 @@ public abstract class NdbBaseOperationRe
resultSet.put(theColumn.getName(),attr);
}
public NdbResultSet resultData() {
- // TODO Auto-generated method stub
- return NdbFactory.createNdbResultSet((NdbOperation)this, resultSet);
+ return new NdbResultSetImpl((NdbOperation)this, resultSet);
}
+
public void getBlob(long columnId) throws NdbApiException {
Long id = new Long(columnId-1);
=== modified file 'java/com/mysql/cluster/ndbj/NdbClusterConnection.java'
--- a/java/com/mysql/cluster/ndbj/NdbClusterConnection.java 2008-05-23 18:41:10 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbClusterConnection.java 2008-06-10 16:11:08 +0000
@@ -46,7 +46,7 @@ package com.mysql.cluster.ndbj;
* <code>
* NdbClusterConnection conn=null;<br>
* try {<br>
- * conn = NdbFactory.createNdbClusterConnection("ndb-connectstring");<br>
+ * conn = NdbClusterConnection.create("ndb-connectstring");<br>
* // use the NdbClusterConnectionImpl object <br>
* }<br>
* catch (NdbApiPermanentException e) {<br>
@@ -116,9 +116,72 @@ package com.mysql.cluster.ndbj;
* @see Ndb
* @see NdbTransaction
*/
-public interface NdbClusterConnection
+public abstract class NdbClusterConnection
{
-
+ static boolean is_initted = false;
+
+ static {
+
+ if (!is_initted) {
+ try {
+ System.loadLibrary("ndbj");
+ } catch (UnsatisfiedLinkError e) {
+ throw new RuntimeException("Native code library failed to load. \n" + e);
+ }
+ ndbj.ndb_init();
+ is_initted = true;
+ }
+ }
+
+
+ /**
+ * One of the first methods typically called in a NDB/J application.
+ * <br>It is a factory method used to create the top-level NdbClusterConnection object.
+ * <br>Example Usage:
+ * <code>
+ * <br>NdbClusterConnection conn=null;
+ * <br>try {
+ * <br>conn = NdbClusterConnection.create("ndb-connectstring");
+ * <br>// use the NdbClusterConnection object
+ * <br>}
+ * <br>catch (NdbClusterConnectionPermanentException e) {
+ * <br>// Serious problem. Retrying connecting will not work.
+ * <br>}
+ * </code>
+ * @param connectString the "--connectstring" used to connect to the cluster's management server (ndb_mgmd)
+ * @return a NdbClusterConnection object
+ * @throws NdbApiException if a null string is passed in, or a connection object could not be created successfully.
+ */
+ static public NdbClusterConnection create(String connectString)
+ throws NdbApiException
+ {
+ return new NdbClusterConnectionImpl(connectString);
+ }
+
+ /**
+ * One of the first methods typically called in a NDB/J application.
+ * <br>It is a factory method used to create the top-level NdbClusterConnection object.
+ * <br>This form, without an argument, lets the connect string default to localhost.
+ * <br>Example Usage:
+ * <code>
+ * <br>NdbClusterConnection conn=null;
+ * <br>try {
+ * <br>conn = NdbClusterConnection.create();
+ * <br>// use the NdbClusterConnection object
+ * <br>}
+ * <br>catch (NdbClusterConnectionPermanentException e) {
+ * <br>// Serious problem. Retrying connecting will not work.
+ * <br>}
+ * </code>
+ * @return a NdbClusterConnection object
+ * @throws NdbApiException if a null string is passed in, or a connection object could not be created successfully.
+ */
+ static public NdbClusterConnection create()
+ throws NdbApiException
+ {
+ return new NdbClusterConnectionImpl(null);
+
+ }
/**
* Connect to a cluster management server (ndb_mgmd)
=== removed file 'java/com/mysql/cluster/ndbj/NdbFactory.java'
--- a/java/com/mysql/cluster/ndbj/NdbFactory.java 2008-06-10 15:51:22 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbFactory.java 1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-package com.mysql.cluster.ndbj;
-
-/**
- * NdbFactory is a class with a public static factory method for creating
- * an NdbClusterConnection object. NdbFactory also ensures that the JNI
- * library is loaded and initialized.
- *
- */
-public class NdbFactory
-{
-
- static boolean is_initted = false;
-
- static {
-
- if (!is_initted) {
- try {
- System.loadLibrary("ndbj");
- } catch (UnsatisfiedLinkError e) {
- throw new RuntimeException("Native code library failed to load. \n" + e);
- }
- ndbj.ndb_init();
- is_initted = true;
- }
- }
-
-
- /**
- * One of the first methods typically called in a NDB/J application.
- * <br>It is a factory method used to create the top-level NdbClusterConnection object.
- * <br>Example Usage:
- * <code>
- * <br>NdbClusterConnection conn=null;
- * <br>try {
- * <br>conn = NdbFactory.createNdbClusterConnection("ndb-connectstring");
- * <br>// use the NdbClusterConnection object
- * <br>}
- * <br>catch (NdbClusterConnectionPermanentException e) {
- * <br>// Serious problem. Retrying connecting will not work.
- * <br>}
- * </code>
- * @param connectString the "--connectstring" used to connect to the cluster's management server (ndb_mgmd)
- * @return a NdbClusterConnectionImpl object
- * @throws NdbApiException if a null string is passed in, or a connection object could not be created successfully.
- */
- static public NdbClusterConnection createNdbClusterConnection(String connectString)
- throws NdbApiException
- {
- return new NdbClusterConnectionImpl(connectString);
- }
-
- /**
- * One of the first methods typically called in a NDB/J application.
- * <br>It is a factory method used to create the top-level NdbClusterConnection object.
- * <br>This form, without an argument, lets the connect string default to localhost.
- * <br>Example Usage:
- * <code>
- * <br>NdbClusterConnection conn=null;
- * <br>try {
- * <br>conn = NdbFactory.createNdbClusterConnection();
- * <br>// use the NdbClusterConnection object
- * <br>}
- * <br>catch (NdbClusterConnectionPermanentException e) {
- * <br>// Serious problem. Retrying connecting will not work.
- * <br>}
- * </code>
- * @return a NdbClusterConnectionImpl object
- * @throws NdbApiException if a null string is passed in, or a connection object could not be created successfully.
- */
- static public NdbClusterConnection createNdbClusterConnection()
- throws NdbApiException
- {
- return new NdbClusterConnectionImpl(null);
-
- }
-
-}
-
-
=== modified file 'java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java'
--- a/java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java 2008-06-02 12:11:56 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java 2008-06-10 16:11:08 +0000
@@ -1,6 +1,5 @@
package com.mysql.cluster.ndbj;
-import java.sql.Timestamp;
import java.util.Calendar;
import java.math.BigInteger;
=== modified file 'java/com/mysql/cluster/ndbj/NdbTransaction.java'
--- a/java/com/mysql/cluster/ndbj/NdbTransaction.java 2008-05-21 03:38:38 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbTransaction.java 2008-06-10 16:11:08 +0000
@@ -40,7 +40,7 @@ import javax.transaction.Transaction;
* Ndb ndb=null;<br>
* NdbTransaction trans=null;<br>
* try {<br>
- * conn = NdbFactory.createNdbClusterConnection("ndb-connectstring");<br>
+ * conn = NdbClusterConnection.create("ndb-connectstring");<br>
* ndb = conn.createNdb("database",12);// Max num of concurrent transactions is set to 12 <br>
* trans = ndb.startTransaction();<br>
* // use the transaction
=== modified file 'java/com/mysql/cluster/ndbj/examples/CRUDandScan.java'
--- a/java/com/mysql/cluster/ndbj/examples/CRUDandScan.java 2008-06-10 12:37:51 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/CRUDandScan.java 2008-06-10 16:11:08 +0000
@@ -6,7 +6,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbIndexScanOperation;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbResultSet;
@@ -110,7 +109,7 @@ public class CRUDandScan {
/**
* Connect to the management server using a NdbClusterConnectionImpl object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/DeleteUsingPrimaryKey.java'
--- a/java/com/mysql/cluster/ndbj/examples/DeleteUsingPrimaryKey.java 2008-05-22 17:05:11 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/DeleteUsingPrimaryKey.java 2008-06-10 16:11:08 +0000
@@ -4,7 +4,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbTransaction;
@@ -95,7 +94,7 @@ public class DeleteUsingPrimaryKey {
/**
* Connect to the management server using a NdbClusterConnectionImpl object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/ExamplesConfigurator.java'
--- a/java/com/mysql/cluster/ndbj/examples/ExamplesConfigurator.java 2007-12-27 01:47:40 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/ExamplesConfigurator.java 2008-06-10 16:11:08 +0000
@@ -20,7 +20,6 @@ import java.util.Properties;
import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbTransaction;
public class ExamplesConfigurator
@@ -203,7 +202,7 @@ public class ExamplesConfigurator
try {
- conn = NdbFactory.createNdbClusterConnection(CONNECTSTRING);
+ conn = NdbClusterConnection.create(CONNECTSTRING);
conn.connect(5,3,true);
conn.waitUntilReady(30,0);
/**
=== modified file 'java/com/mysql/cluster/ndbj/examples/HelloWorldInsert.java'
--- a/java/com/mysql/cluster/ndbj/examples/HelloWorldInsert.java 2008-05-22 17:05:11 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/HelloWorldInsert.java 2008-06-10 16:11:08 +0000
@@ -1,12 +1,6 @@
package com.mysql.cluster.ndbj.examples;
import com.mysql.cluster.ndbj.*;
-//import com.mysql.cluster.ndbapi.Ndb;
-//import com.mysql.cluster.ndbapi.NdbClusterConnection;
-//import com.mysql.cluster.ndbapi.NdbFactory;
-//import com.mysql.cluster.ndbapi.NdbOperation;
-//import com.mysql.cluster.ndbapi.NdbTransaction;
-
import java.sql.*;
import com.mysql.cluster.ndbj.AbortOption;
@@ -72,7 +66,7 @@ public class HelloWorldInsert {
/**
* Connect to the management server using a NdbClusterConnectionImpl object
*/
- conn = NdbFactory.createNdbClusterConnection();
+ conn = NdbClusterConnection.create();
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/InsertUsingPrimaryKey.java'
--- a/java/com/mysql/cluster/ndbj/examples/InsertUsingPrimaryKey.java 2008-05-22 17:05:11 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/InsertUsingPrimaryKey.java 2008-06-10 16:11:08 +0000
@@ -4,7 +4,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbTransaction;
@@ -93,7 +92,7 @@ public class InsertUsingPrimaryKey {
/**
* Connect to the management server using a NdbClusterConnectionImpl object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/JoinUsingScanAndIndexScan.java'
--- a/java/com/mysql/cluster/ndbj/examples/JoinUsingScanAndIndexScan.java 2008-06-10 12:37:51 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/JoinUsingScanAndIndexScan.java 2008-06-10 16:11:08 +0000
@@ -6,7 +6,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbIndexScanOperation;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbResultSet;
@@ -101,7 +100,7 @@ public class JoinUsingScanAndIndexScan {
/**
* Connect to the management server using a NdbClusterConnectionImpl object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/PrimaryKeyBatchOps.java'
--- a/java/com/mysql/cluster/ndbj/examples/PrimaryKeyBatchOps.java 2008-05-22 17:05:11 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/PrimaryKeyBatchOps.java 2008-06-10 16:11:08 +0000
@@ -7,7 +7,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbResultSet;
import com.mysql.cluster.ndbj.NdbTransaction;
@@ -103,7 +102,7 @@ public class PrimaryKeyBatchOps {
/**
* Connect to the management server using a NdbClusterConnectionImpl object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/PrimaryKeyOpBlob.java'
--- a/java/com/mysql/cluster/ndbj/examples/PrimaryKeyOpBlob.java 2008-05-22 17:05:11 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/PrimaryKeyOpBlob.java 2008-06-10 16:11:08 +0000
@@ -5,7 +5,6 @@ import com.mysql.cluster.ndbj.NdbApiExce
import com.mysql.cluster.ndbj.NdbBlob;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbResultSet;
import com.mysql.cluster.ndbj.NdbTransaction;
@@ -78,7 +77,7 @@ public class PrimaryKeyOpBlob {
/**
* Connect to the management server using a NdbClusterConnectionRef object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/ReadRowsUsingTableScan.java'
--- a/java/com/mysql/cluster/ndbj/examples/ReadRowsUsingTableScan.java 2008-06-10 12:37:51 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/ReadRowsUsingTableScan.java 2008-06-10 16:11:08 +0000
@@ -4,7 +4,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbResultSet;
import com.mysql.cluster.ndbj.NdbScanOperation;
@@ -85,7 +84,7 @@ public class ReadRowsUsingTableScan {
/**
* Connect to the management server using a NdbClusterConnectionRef object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/ReadUsingOrderedIndexOnPK.java'
--- a/java/com/mysql/cluster/ndbj/examples/ReadUsingOrderedIndexOnPK.java 2008-06-10 12:37:51 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/ReadUsingOrderedIndexOnPK.java 2008-06-10 16:11:08 +0000
@@ -4,7 +4,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbIndexScanOperation;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbResultSet;
@@ -70,7 +69,7 @@ public class ReadUsingOrderedIndexOnPK {
/**
* Connect to the management server using a NdbClusterConnectionRef object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/ReadUsingPrimaryKey.java'
--- a/java/com/mysql/cluster/ndbj/examples/ReadUsingPrimaryKey.java 2008-05-22 17:05:11 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/ReadUsingPrimaryKey.java 2008-06-10 16:11:08 +0000
@@ -4,7 +4,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbResultSet;
import com.mysql.cluster.ndbj.NdbTransaction;
@@ -66,7 +65,7 @@ public class ReadUsingPrimaryKey {
/**
* Connect to the management server using a NdbClusterConnectionRef object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/RetryTransaction.java'
--- a/java/com/mysql/cluster/ndbj/examples/RetryTransaction.java 2008-05-22 17:05:11 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/RetryTransaction.java 2008-06-10 16:11:08 +0000
@@ -5,7 +5,6 @@ import com.mysql.cluster.ndbj.NdbApiExce
import com.mysql.cluster.ndbj.NdbApiTemporaryException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbTransaction;
@@ -63,7 +62,7 @@ public class RetryTransaction implements
/**
* Connect to the management server using a NdbClusterConnectionRef object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/com/mysql/cluster/ndbj/examples/TestAsync.java'
--- a/java/com/mysql/cluster/ndbj/examples/TestAsync.java 2008-06-10 12:37:51 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/TestAsync.java 2008-06-10 16:11:08 +0000
@@ -75,7 +75,7 @@ public class TestAsync {
System.out.println("connecting to cluster");
try {
- NdbClusterConnection connection = NdbFactory.createNdbClusterConnection();
+ NdbClusterConnection connection = NdbClusterConnection.create();
try {
if (connection.connect(5,3,true)==-1) {
=== modified file 'java/com/mysql/cluster/ndbj/examples/TestEvent.java'
--- a/java/com/mysql/cluster/ndbj/examples/TestEvent.java 2007-12-27 01:47:40 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/TestEvent.java 2008-06-10 16:11:08 +0000
@@ -28,7 +28,7 @@ public class TestEvent {
System.out.println("connecting to cluster");
try {
- NdbClusterConnection connection = NdbFactory.createNdbClusterConnection(connectString);
+ NdbClusterConnection connection = NdbClusterConnection.create(connectString);
try {
if (connection.connect(5,3,true)==-1) {
=== modified file 'java/com/mysql/cluster/ndbj/examples/UpdateUsingPrimaryKey.java'
--- a/java/com/mysql/cluster/ndbj/examples/UpdateUsingPrimaryKey.java 2008-05-22 17:05:11 +0000
+++ b/java/com/mysql/cluster/ndbj/examples/UpdateUsingPrimaryKey.java 2008-06-10 16:11:08 +0000
@@ -4,7 +4,6 @@ import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbApiPermanentException;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbOperation;
import com.mysql.cluster.ndbj.NdbTransaction;
@@ -66,7 +65,7 @@ public class UpdateUsingPrimaryKey {
/**
* Connect to the management server using a NdbClusterConnectionRef object
*/
- conn = NdbFactory.createNdbClusterConnection(ExamplesConfigurator.CONNECTSTRING);
+ conn = NdbClusterConnection.create(ExamplesConfigurator.CONNECTSTRING);
/**
* If you cannot connect immediately to the management server, retry connecting to the up to 5 times,
=== modified file 'java/swig/NdbClusterConnection.i'
--- a/java/swig/NdbClusterConnection.i 2008-04-19 18:53:30 +0000
+++ b/java/swig/NdbClusterConnection.i 2008-06-10 16:11:08 +0000
@@ -21,7 +21,7 @@
%rename Ndb_cluster_connection NdbClusterConnectionImpl;
-%typemap(javainterfaces) Ndb_cluster_connection "NdbClusterConnection";
+%typemap(javabase) Ndb_cluster_connection "NdbClusterConnection";
%javamethodmodifiers Ndb_cluster_connection::deleteAllNdbObjects "protected";
=== modified file 'java/testsuite/BaseNdbjTestCase.java'
--- a/java/testsuite/BaseNdbjTestCase.java 2008-06-02 12:14:10 +0000
+++ b/java/testsuite/BaseNdbjTestCase.java 2008-06-10 16:11:08 +0000
@@ -7,12 +7,9 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.Properties;
-import com.mysql.cluster.ndbj.NdbApiException;
import com.mysql.cluster.ndbj.NdbClusterConnection;
import com.mysql.cluster.ndbj.NdbDictionary;
-import com.mysql.cluster.ndbj.NdbFactory;
import com.mysql.cluster.ndbj.NdbTransaction;
-import com.mysql.cluster.ndbj.ndbj;
public class BaseNdbjTestCase extends testsuite.BaseTestCase {
@@ -141,7 +138,7 @@ public class BaseNdbjTestCase extends te
//System.out.println("Connecting to cluster...");
if (ndbConn==null) {
- ndbConn = NdbFactory.createNdbClusterConnection(NDB_MGMD_CONNECTSTRING);
+ ndbConn = NdbClusterConnection.create(NDB_MGMD_CONNECTSTRING);
ndbConn.connect(5,3,true);
=== modified file 'java/testsuite/TestCallback.java'
--- a/java/testsuite/TestCallback.java 2008-05-20 18:16:40 +0000
+++ b/java/testsuite/TestCallback.java 2008-06-10 16:11:08 +0000
@@ -3,7 +3,6 @@ package testsuite;
import com.mysql.cluster.ndbj.BaseCallback;
import com.mysql.cluster.ndbj.Ndb;
import com.mysql.cluster.ndbj.NdbError;
-import com.mysql.cluster.ndbj.NdbImpl;
import com.mysql.cluster.ndbj.NdbResultSet;
import com.mysql.cluster.ndbj.NdbTransaction;
import com.mysql.cluster.ndbj.NdbTransactionImpl;
| Thread |
|---|
| • bzr commit into NDB/Bindings:trunk branch (monty:406) | Monty Taylor | 10 Jun |
