At http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3
------------------------------------------------------------
revno: 234
revision-id: mtaylor@stripped
parent: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: telco-6.3
timestamp: Wed 2007-11-21 10:09:56 -0800
message:
Merged in devel automake workaround and doc cleanups.
modified:
configure.in configure.in-20070228020914-u2pk759xg7thauwf-13
java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java
ndbapitemporaryexcep-20070428054022-qvbhak1i97y86t1c-5
java/com/mysql/cluster/ndbj/NdbBaseOperation.java
ndbbaseoperation.jav-20070517181935-98huwjarzuh25b30-5
java/com/mysql/cluster/ndbj/NdbBaseOperationEquals.java
ndbbaseoperationequa-20070517181935-98huwjarzuh25b30-6
java/com/mysql/cluster/ndbj/NdbBlob.java ndbblob.java-20070517181935-98huwjarzuh25b30-7
java/com/mysql/cluster/ndbj/NdbClusterConnection.java
ndbclusterconnection-20070517181935-98huwjarzuh25b30-9
java/com/mysql/cluster/ndbj/NdbEventOperation.java
ndbeventoperation.ja-20070625182612-zsu6r68jih70efaq-1
java/com/mysql/cluster/ndbj/NdbFactory.java
ndbfactory.java-20070517181935-98huwjarzuh25b30-13
java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java
ndbindexscanoperatio-20070517181935-98huwjarzuh25b30-17
java/com/mysql/cluster/ndbj/NdbOperation.java
ndboperation.java-20070517181935-98huwjarzuh25b30-19
java/com/mysql/cluster/ndbj/NdbOperationResults.java
ndboperationresults.-20070930023920-gzlkrx1c10i1d6bl-1
java/com/mysql/cluster/ndbj/NdbResultSet.java
ndbresultset.java-20070517181935-98huwjarzuh25b30-21
java/com/mysql/cluster/ndbj/NdbResultSetImpl.java
ndbresultsetimpl.jav-20070517181935-98huwjarzuh25b30-22
java/com/mysql/cluster/ndbj/NdbScanOperation.java
ndbscanoperation.jav-20070517181935-98huwjarzuh25b30-25
java/com/mysql/cluster/ndbj/NdbTransaction.java
ndbtransaction.java-20070517181935-98huwjarzuh25b30-27
------------------------------------------------------------
revno: 192.1.25.1.55
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Wed 2007-11-21 10:06:02 -0800
message:
Added a work aroud for a broken automake1.9.
modified:
configure.in configure.in-20070228020914-u2pk759xg7thauwf-13
------------------------------------------------------------
revno: 192.1.25.1.54
revision-id: mtaylor@stripped
parent: mtaylor@stripped
committer: Monty Taylor <mtaylor@stripped>
branch nick: devel
timestamp: Mon 2007-11-19 18:32:41 -0800
message:
Cleaned up old javadoc references to Ref classes.
modified:
java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java
ndbapitemporaryexcep-20070428054022-qvbhak1i97y86t1c-5
java/com/mysql/cluster/ndbj/NdbBaseOperation.java
ndbbaseoperation.jav-20070517181935-98huwjarzuh25b30-5
java/com/mysql/cluster/ndbj/NdbBaseOperationEquals.java
ndbbaseoperationequa-20070517181935-98huwjarzuh25b30-6
java/com/mysql/cluster/ndbj/NdbBlob.java
ndbblob.java-20070517181935-98huwjarzuh25b30-7
java/com/mysql/cluster/ndbj/NdbClusterConnection.java
ndbclusterconnection-20070517181935-98huwjarzuh25b30-9
java/com/mysql/cluster/ndbj/NdbEventOperation.java
ndbeventoperation.ja-20070625182612-zsu6r68jih70efaq-1
java/com/mysql/cluster/ndbj/NdbFactory.java
ndbfactory.java-20070517181935-98huwjarzuh25b30-13
java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java
ndbindexscanoperatio-20070517181935-98huwjarzuh25b30-17
java/com/mysql/cluster/ndbj/NdbOperation.java
ndboperation.java-20070517181935-98huwjarzuh25b30-19
java/com/mysql/cluster/ndbj/NdbOperationResults.java
ndboperationresults.-20070930023920-gzlkrx1c10i1d6bl-1
java/com/mysql/cluster/ndbj/NdbResultSet.java
ndbresultset.java-20070517181935-98huwjarzuh25b30-21
java/com/mysql/cluster/ndbj/NdbResultSetImpl.java
ndbresultsetimpl.jav-20070517181935-98huwjarzuh25b30-22
java/com/mysql/cluster/ndbj/NdbScanOperation.java
ndbscanoperation.jav-20070517181935-98huwjarzuh25b30-25
java/com/mysql/cluster/ndbj/NdbTransaction.java
ndbtransaction.java-20070517181935-98huwjarzuh25b30-27
=== modified file 'configure.in'
--- a/configure.in 2007-11-20 02:15:08 +0000
+++ b/configure.in 2007-11-21 18:09:56 +0000
@@ -3,6 +3,11 @@
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER(config.h)
+AS_IF([`echo $am__api_version | cut -f2 -d.` -lt 10],[
+builddir=`pwd`
+AC_SUBST(builddir)])
+
+
AC_ARG_WITH([debug],
[AS_HELP_STRING([--with-debug],
[Build a debugging version])],
=== modified file 'java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java'
--- a/java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java 2007-10-23 05:12:33 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbApiTemporaryException.java 2007-11-20 02:32:41 +0000
@@ -15,7 +15,7 @@
* while (finished == false && numRetries-- > 0) {<br>
* try {<br>
* // Set up Transaction and create operations<br>
- * trans.execute(NdbTransactionRef.ExecType.Commit,
NdbTransactionRef.AbortOption.AbortOnError, true);<br>
+ * trans.execute(NdbTransaction.ExecType.Commit,
NdbTransaction.AbortOption.AbortOnError, true);<br>
* finished = true;<br> // transaction succeded, exit loop
* } <br>
* catch (NdbApiTemporaryException e) {<br>
@@ -26,8 +26,7 @@
* }<br>
* }<br>
* </code>
- * @see NdbTransactionRef
- * @author jdowling
+ * @see NdbTransaction
*/
public class NdbApiTemporaryException extends NdbApiException {
=== modified file 'java/com/mysql/cluster/ndbj/NdbBaseOperation.java'
--- a/java/com/mysql/cluster/ndbj/NdbBaseOperation.java 2007-11-04 21:32:20 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBaseOperation.java 2007-11-20 02:32:41 +0000
@@ -7,10 +7,10 @@
* The NdbBaseOperation interface defines get<> operations supported by
* the four different types of Operations:
* <ul>
- * <li> Primary key operations (NdbOperationRef interface )
- * <li> Scan operations (NdbScanOperationRef interface)
- * <li> Index scan operations (NdbIndexScanOperationRef)
- * <li> Unique Index (unique key) Operations (NdbIndexOperationRef interface)
+ * <li> Primary key operations (NdbOperation interface )
+ * <li> Scan operations (NdbScanOperation interface)
+ * <li> Index scan operations (NdbIndexScanOperation)
+ * <li> Unique Index (unique key) Operations (NdbIndexOperation interface)
* </ul>
* <p>The get<> operations can be understood in SQL language as being
"SELECT"-style
* operations. They indicate that this operation would like to SELECT (or get)
@@ -22,7 +22,7 @@
* differently by NDB.
* <p>The resultData method is used to return the NdbResultSet (similar to <a
href="http://java.sun.com/j2se/1.5.0/docs/api/java/sql/ResultSet.html">ResultSet</a>
from JDBC).
* <p>Examples:
- * For a primary key operation (NdbOperationRef), the following SQL:
+ * For a primary key operation (NdbOperation), the following SQL:
* <br><code>
* SELECT myInt, myString, myBlob FROM my_table where pkValue='X';
* </code>
@@ -30,8 +30,8 @@
* becomes:
* <br>
* <code>
- * <br>NdbOperationRef op = trans.getNdbOperation("my_table");
- * <br>op.readTuple(NdbOperationRef.LockMode.LM_CommittedRead);
+ * <br>NdbOperation op = trans.getNdbOperation("my_table");
+ * <br>op.readTuple(NdbOperation.LockMode.LM_CommittedRead);
* <br>op.equals("pkValue","X");
* <br>op.getValue("myInt");
* <br>op.getValue("myString");
@@ -39,7 +39,7 @@
* <br>NdbResultSet rs = op.resultData();
* </code>
* <p>
- * For a scan operation (NdbScanOperationRef), the following SQL:
+ * For a scan operation (NdbScanOperation), the following SQL:
* <br><code>
* SELECT myValue,myBlob FROM my_table;
* </code>
@@ -47,14 +47,14 @@
* becomes:
* <br>
* <code>
- * <br>NdbScanOperationRef op = trans.getNdbScanOperation("my_table");
- * <br>op.readTuples(NdbOperationRef.LockMode.LM_CommittedRead,0,0);
+ * <br>NdbScanOperation op = trans.getNdbScanOperation("my_table");
+ * <br>op.readTuples(NdbOperation.LockMode.LM_CommittedRead,0,0);
* <br>op.getValue("myValue");
* <br>op.getValue("myBlob");
* <br>NdbResultSet rs = op.resultData();
* </code>
* <p>
- * For an index scan operation (NdbIndexScanOperationRef), the following SQL:
+ * For an index scan operation (NdbIndexScanOperation), the following SQL:
* <br><code>
* SELECT myValue,myBlob FROM my_table where ;
* </code>
@@ -62,14 +62,14 @@
* becomes:
* <br>
* <code>
- * <br>NdbIndexScanOperationRef op =
trans.getNdbScanOperation("my_table","my_index_name");
- * <br>op.readTuples(NdbOperationRef.LockMode.LM_CommittedRead,0,0);
+ * <br>NdbIndexScanOperation op =
trans.getNdbScanOperation("my_table","my_index_name");
+ * <br>op.readTuples(NdbOperation.LockMode.LM_CommittedRead,0,0);
* <br>op.getValue("myValue");
* <br>op.getValue("myBlob");
* <br>NdbResultSet rs = op.resultData();
* </code>
* <p>
- * For an operation on a unique index (NdbIndexOperationRef), the following SQL:
+ * For an operation on a unique index (NdbIndexOperation), the following SQL:
* <br><code>
* SELECT timeOfDay,myUniqueFloat FROM my_table where uniqueKeyCol=200;
* </code>
@@ -77,8 +77,8 @@
* becomes:
* <br>
* <code>
- * <br>NdbIndexOperationRef op = trans.getNdbScanOperation("my_table");
- * <br>op.readTuple(NdbOperationRef.LockMode.LM_CommittedRead);
+ * <br>NdbIndexOperation op = trans.getNdbScanOperation("my_table");
+ * <br>op.readTuple(NdbOperation.LockMode.LM_CommittedRead);
* <br>op.equals("uniqueKeyCol",200);
* <br>op.getValue("timeOfDay");
* <br>op.getValue("myUniqueFloat");
@@ -102,11 +102,11 @@
* </td></tr><tr><td>TIMESTAMP
</td><td>java.sql.Timestamp
* </td></tr><tr><td>TIMESTAMP </td><td>java.sql.Date
* </td></tr></table>
- * @see NdbOperationRef
+ * @see NdbOperation
* @see NdbScanOpertion
- * @see NdbIndexScanOperationRef
- * @see NdbIndexOperationRef
- * @see NdbBlobRef
+ * @see NdbIndexScanOperation
+ * @see NdbIndexOperation
+ * @see NdbBlob
* @see NdbResultSet
* @author jdowling
*/
@@ -118,12 +118,12 @@
* The getBlob operation specifies that the operation will select a blob, identified
* by a column id.
* <code>
- * <br>NdbOperationRef op = trans.getNdbOperation("someTable");
+ * <br>NdbOperation op = trans.getNdbOperation("someTable");
* <br>op.equals("pkValue","X");
* <br>op.getBlob(3); //column with offset '3' (4th column in the table)
* <br>NdbResultSet rs = op.resultData();
- * <br>NdbBlobRef b = rs.getBlob(3);
- * <br>trans.execute(NdbTransactionRef.ExecType.NoCommit,
NdbTransactionRef.AbortOption.AbortOnError, 1);
+ * <br>NdbBlob b = rs.getBlob(3);
+ * <br>trans.execute(NdbTransaction.ExecType.NoCommit,
NdbTransaction.AbortOption.AbortOnError, 1);
* </code>
*
* @param columnId integer position (offset) of column number in schema definition
(columnId starts from position '1' for the first column in a schema)
@@ -137,12 +137,12 @@
* The getBlob operation specifies that the operation will select a blob for reading,
* identified by a columnName.
* <code>
- * <br>NdbOperationRef op = trans.getNdbOperation("someTable");
+ * <br>NdbOperation op = trans.getNdbOperation("someTable");
* <br>op.equals("pkValue","X");
* <br>op.getBlob("id"); //column with name 'id'
* <br>NdbResultSet rs = op.resultData();
- * <br>NdbBlobRef b = rs.getBlob("id");
- * <br>trans.execute(NdbTransactionRef.ExecType.NoCommit,
NdbTransactionRef.AbortOption.AbortOnError, 1);
+ * <br>NdbBlob b = rs.getBlob("id");
+ * <br>trans.execute(NdbTransaction.ExecType.NoCommit,
NdbTransaction.AbortOption.AbortOnError, 1);
* </code>
*
* @param columnName Name of the Column
@@ -173,12 +173,12 @@
throws NdbApiException;
*/
/**
- * Creates a blob handle NdbBlobRef.
+ * Creates a blob handle NdbBlob.
* <br>A second call with same argument returns the previously created handle.
* The handle is linked to the operation and is maintained automatically.
*
* @param columnId integer position (offset) of column number in schema definition
(columnId starts from position '1' for the first column in a schema)
- * @return NdbBlobRef object
+ * @return NdbBlob object
* @throws NdbApiException if there was a problem in the cluster when selecting this
column.
* @note getting a blob handle on a non-existing column yields a seg fault,
* see bug report http://bugs.mysql.com/bug.php?id=21036
@@ -194,7 +194,7 @@
* Gets a BlobHandle object using the String name for the Blob column in
* the the table. The BlobHandle object can be used to read/write the Blob.
* @param columnName name of the Column in the Schema
- * @return NdbBlobRef object
+ * @return NdbBlob object
* @throws NdbApiException if there was a problem in the cluster when selecting this
column.
*/
public abstract NdbBlob getBlobHandle(String columnName)
=== modified file 'java/com/mysql/cluster/ndbj/NdbBaseOperationEquals.java'
--- a/java/com/mysql/cluster/ndbj/NdbBaseOperationEquals.java 2007-10-23 00:04:00 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBaseOperationEquals.java 2007-11-20 02:32:41 +0000
@@ -6,7 +6,7 @@
/**
* NdbBaseOperationEquals defines equality methods, known in SQL as "where equals".
- * NdbBaseOperationEquals is implemented by NdbOperationRef (Primary key operations), and
NdbIndexScanOperationRef (Ordered Index) interfaces.
+ * NdbBaseOperationEquals is implemented by NdbOperation (Primary key operations), and
NdbIndexScanOperation (Ordered Index) interfaces.
* <br>An equality operation is a match on a primary key or an index.
* <p>In the following trivial SQL example, the column value in table my_table
* can be a primary key or an index defined on the table.
@@ -16,9 +16,8 @@
* SELECT * FROM my_table where value='X';
* </code>
*
- * @see NdbOperationRef
- * @see NdbIndexScanOperationRef
- * @author jdowling
+ * @see NdbOperation
+ * @see NdbIndexScanOperation
*/
public interface NdbBaseOperationEquals extends NdbBaseOperation {
=== modified file 'java/com/mysql/cluster/ndbj/NdbBlob.java'
--- a/java/com/mysql/cluster/ndbj/NdbBlob.java 2007-10-05 03:52:23 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbBlob.java 2007-11-20 02:32:41 +0000
@@ -110,7 +110,7 @@
/**
* Gets the current state of the Blob as an enum (IDLE, PREPARED, ACTIVE, CLOSED,
INVALID)
* @return Returns the state.
- * @see NdbBlobRef.State
+ * @see NdbBlob.State
*/
public abstract State getState() throws NdbApiException;
=== modified file 'java/com/mysql/cluster/ndbj/NdbClusterConnection.java'
--- a/java/com/mysql/cluster/ndbj/NdbClusterConnection.java 2007-10-23 23:47:41 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbClusterConnection.java 2007-11-20 02:32:41 +0000
@@ -5,7 +5,7 @@
* This class represents a connection to a cluster of data nodes.
* A NdbClusterConnectionImpl object is used to bind to
* a cluster. It is needed to create Ndb objects, that in turn can be used to
- * create a NdbTransactionRef and operation objects.
+ * create a NdbTransaction and operation objects.
* <p>
* The close() method must be called on a NdbClusterConnectionImpl object
* when it is no longer needed, to free underlying resources.
@@ -25,7 +25,7 @@
* <code>
* NdbClusterConnectionImpl connRef=null;<br>
* try {<br>
- * connRef =
NdbFactoryRef.createNdbClusterConnection("ndb-connectstring");<br>
+ * connRef =
NdbFactory.createNdbClusterConnection("ndb-connectstring");<br>
* // use the NdbClusterConnectionImpl object
* }<br>
* catch (NdbClusterConnectionPermanentException e) {<br>
=== modified file 'java/com/mysql/cluster/ndbj/NdbEventOperation.java'
--- a/java/com/mysql/cluster/ndbj/NdbEventOperation.java 2007-10-28 00:05:03 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbEventOperation.java 2007-11-20 02:32:41 +0000
@@ -41,7 +41,7 @@
/**
* @return
- * @see com.mysql.cluster.ndbj.NdbEventOperationRef#getState()
+ * @see com.mysql.cluster.ndbj.NdbEventOperation#getState()
*/
public abstract State getState();
=== modified file 'java/com/mysql/cluster/ndbj/NdbFactory.java'
--- a/java/com/mysql/cluster/ndbj/NdbFactory.java 2007-11-01 15:07:47 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbFactory.java 2007-11-20 02:32:41 +0000
@@ -4,9 +4,9 @@
/**
- * NdbFactoryRef is a class with a public static factory method for creating
+ * NdbFactory is a class with a public static factory method for creating
* a NdbClusterConnectionImpl object.
- * <br>NdbFactoryRef is also used to instantiate all NdbRef-accessing objects that
+ * <br>NdbFactory is also used to instantiate all Ndb-accessing objects that
* are part of the pubic NDB/J API, that is, can be used by client apps.
*
*/
@@ -31,7 +31,7 @@
* <code>
* <br>NdbClusterConnectionImpl conn=null;
* <br>try {
- * <br>conn =
NdbFactoryRef.createNdbClusterConnection("ndb-connectstring");
+ * <br>conn =
NdbFactory.createNdbClusterConnection("ndb-connectstring");
* <br>// use the NdbClusterConnectionImpl object
* <br>}
* <br>catch (NdbClusterConnectionPermanentException e) {
=== modified file 'java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java'
--- a/java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java 2007-10-23 01:41:19 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbIndexScanOperation.java 2007-11-20 02:32:41 +0000
@@ -45,10 +45,10 @@
/**
* BoundType is used to specify bounds for an Index Scan using a
- * NdbIndexScanOperationRef object. More than one bound may be specified on the
- * NdbIndexScanOperationRef object. However, there is an restriction on using
+ * NdbIndexScanOperation object. More than one bound may be specified on the
+ * NdbIndexScanOperation object. However, there is an restriction on using
* strict bounds (BoundLT and BoundGT). Strict bounds can only be used if it
- * is the last bound that is specified on an NdbIndexScanOperationRef object.
+ * is the last bound that is specified on an NdbIndexScanOperation object.
* Non-strict bounds can be specified at any bound position (from first to
* last bound). <br>
* Another restriction on setbound is that when using a multi-part key with
@@ -63,7 +63,7 @@
* non-strict bound (greater than or equal to) BoundEQ is a non-strict bound
* (equal to)
*
- * In C++ NDB-API, these BoundTypes are defined in NdbIndexScanOperationRef.hpp
+ * In C++ NDB-API, these BoundTypes are defined in NdbIndexScanOperation.hpp
*/
public enum BoundType {
/**
@@ -122,7 +122,7 @@
* @param multi_range
* @return
* @throws NdbApiException
- * @see
com.mysql.cluster.ndbj.NdbIndexScanOperationRef#readTuples(com.mysql.cluster.ndbj.NdbOperationRef.LockMode,
long, long, boolean, boolean, boolean, boolean, boolean)
+ * @see
com.mysql.cluster.ndbj.NdbIndexScanOperation#readTuples(com.mysql.cluster.ndbj.NdbOperation.LockMode,
long, long, boolean, boolean, boolean, boolean, boolean)
*/
public void readTuples(LockMode lock_mode, long batch, long parallel,
boolean order_by, boolean order_desc, boolean read_range_no,
@@ -139,7 +139,7 @@
* @param keyinfo
* @return
* @throws NdbApiException
- * @see
com.mysql.cluster.ndbj.NdbIndexScanOperationRef#readTuples(com.mysql.cluster.ndbj.NdbOperationRef.LockMode,
long, long, boolean, boolean, boolean, boolean)
+ * @see
com.mysql.cluster.ndbj.NdbIndexScanOperation#readTuples(com.mysql.cluster.ndbj.NdbOperation.LockMode,
long, long, boolean, boolean, boolean, boolean)
*/
public abstract void readTuples(LockMode lock_mode, long batch, long parallel,
boolean order_by, boolean order_desc, boolean read_range_no, boolean keyinfo)
@@ -154,7 +154,7 @@
* @param read_range_no
* @return
* @throws NdbApiException
- * @see
com.mysql.cluster.ndbj.NdbIndexScanOperationRef#readTuples(com.mysql.cluster.ndbj.NdbOperationRef.LockMode,
long, long, boolean, boolean, boolean)
+ * @see
com.mysql.cluster.ndbj.NdbIndexScanOperation#readTuples(com.mysql.cluster.ndbj.NdbOperation.LockMode,
long, long, boolean, boolean, boolean)
*/
public abstract void readTuples(LockMode lock_mode, long batch, long parallel, boolean
order_by,
boolean order_desc, boolean read_range_no)
@@ -168,7 +168,7 @@
* @param order_desc
* @return
* @throws NdbApiException
- * @see
com.mysql.cluster.ndbj.NdbIndexScanOperationRef#readTuples(com.mysql.cluster.ndbj.NdbOperationRef.LockMode,
long, long, boolean, boolean)
+ * @see
com.mysql.cluster.ndbj.NdbIndexScanOperation#readTuples(com.mysql.cluster.ndbj.NdbOperation.LockMode,
long, long, boolean, boolean)
*/
public abstract void readTuples(LockMode lock_mode, long batch, long parallel,
boolean order_by, boolean order_desc)
@@ -181,7 +181,7 @@
* @param order_by
* @return
* @throws NdbApiException
- * @see
com.mysql.cluster.ndbj.NdbIndexScanOperationRef#readTuples(com.mysql.cluster.ndbj.NdbOperationRef.LockMode,
long, long, boolean)
+ * @see
com.mysql.cluster.ndbj.NdbIndexScanOperation#readTuples(com.mysql.cluster.ndbj.NdbOperation.LockMode,
long, long, boolean)
*/
public abstract void readTuples(LockMode lock_mode, long batch, long parallel, boolean
order_by)
throws NdbApiException;
@@ -347,8 +347,8 @@
* @param anInputDateTime
* @return
* @throws NdbApiException
- * @see com.mysql.cluster.ndbj.NdbIndexScanOperationRef#setBound(long,
- * com.mysql.cluster.ndbj.NdbIndexScanOperationRef.BoundType,
+ * @see com.mysql.cluster.ndbj.NdbIndexScanOperation#setBound(long,
+ * com.mysql.cluster.ndbj.NdbIndexScanOperation.BoundType,
* java.util.Calendar)
*/
public void setBoundDatetime(String atAttrName, BoundType type, Calendar
anInputDateTime)
@@ -360,8 +360,8 @@
* @param val
* @return
* @throws NdbApiException
- * @see com.mysql.cluster.ndbj.NdbIndexScanOperationRef#setBound(long,
- * com.mysql.cluster.ndbj.NdbIndexScanOperationRef.BoundType, double)
+ * @see com.mysql.cluster.ndbj.NdbIndexScanOperation#setBound(long,
+ * com.mysql.cluster.ndbj.NdbIndexScanOperation.BoundType, double)
*/
public void setBoundDouble(String atAttrName, BoundType type, double val)
throws NdbApiException;
@@ -372,8 +372,8 @@
* @param val
* @return
* @throws NdbApiException
- * @see com.mysql.cluster.ndbj.NdbIndexScanOperationRef#setBound(long,
- * com.mysql.cluster.ndbj.NdbIndexScanOperationRef.BoundType, float)
+ * @see com.mysql.cluster.ndbj.NdbIndexScanOperation#setBound(long,
+ * com.mysql.cluster.ndbj.NdbIndexScanOperation.BoundType, float)
*/
public void setBoundFloat(String atAttrName, BoundType type, float val)
throws NdbApiException;
@@ -383,8 +383,8 @@
* @param anInputDateTime
* @return
* @throws NdbApiException
- * @see com.mysql.cluster.ndbj.NdbIndexScanOperationRef#setBound(long,
- * com.mysql.cluster.ndbj.NdbIndexScanOperationRef.BoundType,
+ * @see com.mysql.cluster.ndbj.NdbIndexScanOperation#setBound(long,
+ * com.mysql.cluster.ndbj.NdbIndexScanOperation.BoundType,
* java.util.Calendar)
*/
public void setBoundDatetime(long anAttrId, BoundType type, Calendar anInputDateTime)
@@ -396,8 +396,8 @@
* @param val
* @return
* @throws NdbApiException
- * @see com.mysql.cluster.ndbj.NdbIndexScanOperationRef#setBound(long,
- * com.mysql.cluster.ndbj.NdbIndexScanOperationRef.BoundType, double)
+ * @see com.mysql.cluster.ndbj.NdbIndexScanOperation#setBound(long,
+ * com.mysql.cluster.ndbj.NdbIndexScanOperation.BoundType, double)
*/
public void setBoundDouble(long anAttrId, BoundType type, double val)
throws NdbApiException;
@@ -408,8 +408,8 @@
* @param val
* @return
* @throws NdbApiException
- * @see com.mysql.cluster.ndbj.NdbIndexScanOperationRef#setBound(long,
- * com.mysql.cluster.ndbj.NdbIndexScanOperationRef.BoundType, float)
+ * @see com.mysql.cluster.ndbj.NdbIndexScanOperation#setBound(long,
+ * com.mysql.cluster.ndbj.NdbIndexScanOperation.BoundType, float)
*/
public void setBoundFloat(long anAttrId, BoundType type, float val)
throws NdbApiException;
=== modified file 'java/com/mysql/cluster/ndbj/NdbOperation.java'
--- a/java/com/mysql/cluster/ndbj/NdbOperation.java 2007-10-23 01:41:19 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbOperation.java 2007-11-20 02:32:41 +0000
@@ -2,10 +2,10 @@
/**
- * A NdbOperationRef object represents an operation using a primary key to access a row
in a table.
+ * A NdbOperation object represents an operation using a primary key to access a row in a
table.
* <br>The main way to use it is to follow the following steps:
* <ol>
- * <li>create a NdbOperationRef object using startTransaction method on a NdbRef
object
+ * <li>create a NdbOperation object using startTransaction method on a Ndb object
* <li>decide on the type of operation to perfom on the operation (readTuple(),
insertTuple(), updateTuple(), deleteTuple())
* <li>define the search criteria for a row by setting the primary key using the
equal() method.
* For example, if you are reading a tuple with a single column as a primary key,
you execute the equal() method once on that column,
@@ -19,7 +19,7 @@
* operation.equal("b",VAL2);
* }.
* <li>For any rows found after you called the equal() method(s), you can get/set
the value of columns in those rows. These are known as <b>attribute
actions</b>.
- * <li>Commit the operation by calling the exec() method on the NdbTransactionRef
object.
+ * <li>Commit the operation by calling the exec() method on the NdbTransaction
object.
* <li>Retrieve any results using a NdbResultSet.
* </ol>
* <p>
@@ -30,12 +30,12 @@
* <p>
* <code>
* <br>trans = ndb.startTransaction();
- * <br>NdbOperationRef op = trans.getNdbOperation(tableName);
- * <br>op.readTuple(NdbOperationRef.LockMode.LM_Exclusive);
+ * <br>NdbOperation op = trans.getNdbOperation(tableName);
+ * <br>op.readTuple(NdbOperation.LockMode.LM_Exclusive);
* <br>op.equal("id",PK_VAL);
* <br>op.getValue("val");
* <br>NdbResultSet rs = op.resultData();
- *
<br>trans.execute(NdbTransactionRef.ExecType.Commit,NdbTransactionRef.AbortOption.AbortOnError,1
);
+ *
<br>trans.execute(NdbTransaction.ExecType.Commit,NdbTransaction.AbortOption.AbortOnError,1
);
* <br>while(rs.next())
* <br> String val = rs.getString(columnName);
* </code>
=== modified file 'java/com/mysql/cluster/ndbj/NdbOperationResults.java'
--- a/java/com/mysql/cluster/ndbj/NdbOperationResults.java 2007-10-05 03:52:23 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbOperationResults.java 2007-11-20 02:32:41 +0000
@@ -17,11 +17,11 @@
* would like to retrieve from the NdbResultSet.
* <br> The columnName is used to specify the column, where 1 is the first column
in the table.
* <code>
- * <br>NdbOperationRef op = trans.getNdbOperation("someTable");
+ * <br>NdbOperation op = trans.getNdbOperation("someTable");
* <br>op.equals("pkValue","X");
* <br>op.getValue("myInt");
* <br>NdbResultSet rs = op.resultData();
- * trans.execute(NdbTransactionRef.ExecType.NoCommit,
NdbTransactionRef.AbortOption.AbortOnError, 1);
+ * trans.execute(NdbTransaction.ExecType.NoCommit,
NdbTransaction.AbortOption.AbortOnError, 1);
*
* if (rs.next()) {
* int res = rs.getInt();
=== modified file 'java/com/mysql/cluster/ndbj/NdbResultSet.java'
--- a/java/com/mysql/cluster/ndbj/NdbResultSet.java 2007-10-11 07:35:31 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbResultSet.java 2007-11-20 02:32:41 +0000
@@ -1,8 +1,3 @@
-/*
- * Copyright (c) Jim Dowling,
- * All Rights Reserved.
- */
-
package com.mysql.cluster.ndbj;
@@ -167,7 +162,7 @@
/**
* Updates the next row in the NdbResultSet.
- * @return a NdbOperationRef object
+ * @return a NdbOperation object
* @throws NdbApiException if a problem occurred when attempting to update the row.
*/
public abstract NdbOperation updateRow() throws NdbApiException;
=== modified file 'java/com/mysql/cluster/ndbj/NdbResultSetImpl.java'
--- a/java/com/mysql/cluster/ndbj/NdbResultSetImpl.java 2007-10-19 10:13:10 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbResultSetImpl.java 2007-11-20 02:32:41 +0000
@@ -236,7 +236,7 @@
throw new NdbApiException("NdbResultSet.next() "
+ "- op == null");
}
- // nextResult on NdbIndexScanOperationRef and NdbScanOperationRef return:
+ // nextResult on NdbIndexScanOperation and NdbScanOperation return:
// -1: Indicates that an error has occurred.
// 0: Another tuple has been received.
// 1: There are no more tuples to scan.
=== modified file 'java/com/mysql/cluster/ndbj/NdbScanOperation.java'
--- a/java/com/mysql/cluster/ndbj/NdbScanOperation.java 2007-10-23 01:41:19 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbScanOperation.java 2007-11-20 02:32:41 +0000
@@ -6,9 +6,9 @@
/**
* The NdbBaseScan interface defines common methods providded by
- * both NdbScanOperationRef and NdbIndexScanOperationRef objects.
+ * both NdbScanOperation and NdbIndexScanOperation objects.
* <p>A scan operation reads many rows in a table; whereas a primary key operation
- * (provided by NdbOperationRef objects) read a single row in a table.
+ * (provided by NdbOperation objects) read a single row in a table.
* <p>Scans are executed in parallel over the nodes in a cluster,
* and is therefore an expensive operation to perform. Use sparingly.
* <br>Call the close method on the scan object to finish a scan when it is no
longer needed.
@@ -47,7 +47,7 @@
/**
* SF_TupScan is 0x10000
* <p>
- * In C++ NDB-API, these Scan Types are defined in NdbScanOperationRef.hpp
+ * In C++ NDB-API, these Scan Types are defined in NdbScanOperation.hpp
*/
TUPLE_SCAN(1 << 16),
/**
@@ -119,7 +119,7 @@
/**
* This method is used by the NdbResultSet to fetch the next tuple in a scan
transaction.
* Following each call to nextResult(), the NdbResultSet objects
- * populated using NdbOperationRef.getValue() are updated
+ * populated using NdbOperation.getValue() are updated
* with values from the scanned tuple.
*
* @param fetchAllowed
@@ -163,7 +163,7 @@
* This method is used to update the current tuple using the transaction object
* passed as a parameter.
* @param updateTrans
- * @return NdbOperationRef object or null if no operation is updated
+ * @return NdbOperation object or null if no operation is updated
* @throws NdbApiException if there is an internal problem in the cluster.
*/
public abstract NdbOperation updateCurrentTuple(NdbTransactionImpl updateTrans)
@@ -216,10 +216,10 @@
public abstract void restart() throws NdbApiException;
/**
- * Creates a new NdbScanFilterRef that can be applied to
+ * Creates a new NdbScanFilter that can be applied to
* filter the results returned from the scan operation.
- * Note: call getValue() methods on the NdbScanOperationRef object
- * before you call begin on a NdbScanFilterRef object.
+ * Note: call getValue() methods on the NdbScanOperation object
+ * before you call begin on a NdbScanFilter object.
*
* @return
* @throws NdbApiException
=== modified file 'java/com/mysql/cluster/ndbj/NdbTransaction.java'
--- a/java/com/mysql/cluster/ndbj/NdbTransaction.java 2007-10-31 15:04:37 +0000
+++ b/java/com/mysql/cluster/ndbj/NdbTransaction.java 2007-11-20 02:32:41 +0000
@@ -3,20 +3,20 @@
import java.math.BigInteger;
/**
- * An NdbTransactionRef object represents a transaction that can be used
+ * An NdbTransaction object represents a transaction that can be used
* to execute a batch of operations in the database.
- * <p>The NdbTransactionRef object must be closed independent of its outcome,
+ * <p>The NdbTransaction object must be closed independent of its outcome,
* i.e. even if there is an error. This can be done by calling the method
- * close on the NdbTransactionRef object or by calling the method closeTransaction
- * on the NdbRef object used to create the transaction.
+ * close on the NdbTransaction object or by calling the method closeTransaction
+ * on the Ndb object used to create the transaction.
* <p>
- * A transaction (represented by an NdbTransactionRef object) belongs to
- * an NdbRef object and is created calling the startTransaction method on a NdbRef
object.<br>
- * A transaction consists of a number of operations (represented by NdbOperationRef,
NdbScanOperationRef, NdbIndexOperationRef, and NdbIndexScanOperationRef objects),
+ * A transaction (represented by an NdbTransaction object) belongs to
+ * an Ndb object and is created calling the startTransaction method on a Ndb
object.<br>
+ * A transaction consists of a number of operations (represented by NdbOperation,
NdbScanOperation, NdbIndexOperation, and NdbIndexScanOperation objects),
* which can be executed in the cluster. Each operation accesses exactly one table.
- * <p>After getting the NdbTransactionRef object, the first step is to get
(allocate) an operation given the table name using one of the
+ * <p>After getting the NdbTransaction object, the first step is to get (allocate)
an operation given the table name using one of the
* methods getNdbOperation, getNdbScanOperation, getNdbIndexOperation, or
getNdbIndexScanOperation.
- * Then the operation is defined. Several operations can be defined on the same
NdbTransactionRef object,
+ * Then the operation is defined. Several operations can be defined on the same
NdbTransaction object,
* they will in that case be executed in parallel. When all operations are defined, the
execute method
* sends them to the NDB kernel for execution.
*
@@ -27,10 +27,10 @@
* <br>Sample Code:<br>
* <code>
* NdbClusterConnectionImpl conn=null;<br>
- * NdbRef ndb=null;<br>
- * NdbTransactionRef trans=null;<br>
+ * Ndb ndb=null;<br>
+ * NdbTransaction trans=null;<br>
* try {<br>
- * conn =
NdbFactoryRef.createNdbClusterConnection("ndb-connectstring");<br>
+ * conn = NdbFactory.createNdbClusterConnection("ndb-connectstring");<br>
* ndb = conn.createNdb("database");<br>
* ndb.init(12); // Max num of concurrent transactions is set to 12 <br>
* trans = ndb.startTransaction();<br>
@@ -114,8 +114,8 @@
* before the call to execute. All allocated operations should be properly defined
before calling execute.
* A call to the execute method uses one out of three types of execution: Commit,
NoCommit, or Rollback.
* If an operation in the transaction fails, it is aborted if abortOption is set
- * to NdbTransactionRef.AbortOption.AbortOnError , and the transaction continues
excution after the failed
- * operation if abortOption is NdbTransactionRef.AbortOption.AO_ignoreError.
+ * to NdbTransaction.AbortOption.AbortOnError , and the transaction continues excution
after the failed
+ * operation if abortOption is NdbTransaction.AbortOption.AO_ignoreError.
* <p>If forceSend is set to 0, the transaction is placed in a send buffer for up
to a maximum of 10 milliseconds,
* after which it is flushed to the cluster. This can help improve system performance in
high load, through increased
* batching of transactions. If forceSend is set to 1, the transaction is flushed
@@ -148,9 +148,9 @@
public int execute(ExecType execType) throws NdbApiException;
/**
- * Creates a NdbOperationRef (primary key operation) and adds it to the transaction.
+ * Creates a NdbOperation (primary key operation) and adds it to the transaction.
* @param tableName name of the schema
- * @return a NdbOperationRef object
+ * @return a NdbOperation object
* <br> is thrown if the cluster could not create an IndexScanOperation (e.g.,
there are no Operation records available due to too heavy load on the cluster)
* @throws NdbApiException if tableName is null or empty, the object has been closed, or
the Operation object could not be created
* @throws IllegalStateException if the close method has already been called on the
object.
@@ -159,10 +159,10 @@
throws NdbApiException;
/**
- * Creates a NdbIndexOperationRef (operation on a unique index) and adds it to the
transaction
+ * Creates a NdbIndexOperation (operation on a unique index) and adds it to the
transaction
* @param indexName the String name for the index (use "show create table TABLE_NAME\G"
to find the index name)
* @param tableName name of the schema
- * @return a NdbIndexOperationRef object
+ * @return a NdbIndexOperation object
* <br> is thrown if the cluster could not create an IndexScanOperation (e.g.,
there are no Operation records available due to too heavy load on the cluster)
* @throws NdbApiException if tableNameis null, the object has been closed, or the
Operation object could not be created
* @throws IllegalStateException if the close method has already been called on the
object.
@@ -172,11 +172,11 @@
public NdbIndexOperation getNdbIndexOperation(NdbIndex theIndex) throws NdbApiException;
/**
- * Creates a NdbIndexScanOperationRef (operation on an index) and adds it to the
transaction.
+ * Creates a NdbIndexScanOperation (operation on an index) and adds it to the
transaction.
* @param indexName the String name for the index (use "show create table TABLE_NAME\G"
to find the index name)
* @param tableName name of the schema
- * @return a NdbIndexScanOperationRef object
- * @throws NdbApiException if the indexName or tableName was null or a
NdbIndexScanOperationRef object could not be created
+ * @return a NdbIndexScanOperation object
+ * @throws NdbApiException if the indexName or tableName was null or a
NdbIndexScanOperation object could not be created
* <br> is thrown if the cluster could not create an IndexScanOperation (e.g.,
there are no Operation records available due to too heavy load on the cluster)
* @throws NdbApiException if tableName or indexName is null or empty, the object has
been closed, or the Operation object could not be created
* @throws IllegalStateException if the close method has already been called on the
object.
@@ -187,14 +187,14 @@
NdbIndex theIndex) throws NdbApiException;
/**
- * Creates a NdbScanOperationRef and adds it to the transaction. A NdbScanOperationRef
can be
+ * Creates a NdbScanOperation and adds it to the transaction. A NdbScanOperation can be
* used to perform a table scan, where all of the rows in a table are
selected/updated/deleted.
*
- * <br>Call the close() method on the NdbTransactionRef object when you have
finished using
+ * <br>Call the close() method on the NdbTransaction object when you have finished
using
* it to free JNI resourcs.
* @param tableName name of the schema
- * @return NdbScanOperationRef object
- * @throws NdbApiException if the tableName was null or a NdbScanOperationRef object
could not be created
+ * @return NdbScanOperation object
+ * @throws NdbApiException if the tableName was null or a NdbScanOperation object could
not be created
* @throws IllegalStateException if the close method has already been called on the
object.
*/
public NdbScanOperation getNdbScanOperation(String tableName)
@@ -220,9 +220,9 @@
throws NdbApiException;
/**
- * closes the NdbTransactionRef object. The object can no longer be used after the
close()
- * method has been invoked. You have to create a new NdbTransactionRef object using
- * a NdbRef.startTransaction() method.
+ * closes the NdbTransaction object. The object can no longer be used after the close()
+ * method has been invoked. You have to create a new NdbTransaction object using
+ * a Ndb.startTransaction() method.
*/
public void close();
@@ -253,15 +253,15 @@
* @param execType
* @param cb
* @param abortOption
- * @see NdbTransactionRef#executeAsynchPrepare(ExecTypeRef,
+ * @see NdbTransaction#executeAsynchPrepare(ExecType,
* BaseCallback,
- * AbortOptionRef)
+ * AbortOption)
*/
public void executeAsynchPrepare(ExecType execType, BaseCallback cb, AbortOption
abortOption);
/**
* @param execType
* @param cb
- * @see NdbTransactionRef#executeAsynchPrepare(ExecTypeRef,
+ * @see NdbTransaction#executeAsynchPrepare(ExecType,
* BaseCallback)
*/
public void executeAsynchPrepare(ExecType execType, BaseCallback cb);
| Thread |
|---|
| • Rev 234: Merged in devel automake workaround and doc cleanups. in http://bazaar.launchpad.net/~ndb-connectors/ndb-connectors/telco-6.3 | Monty Taylor | 21 Nov |
