=== modified file 'TODO' --- a/TODO 2008-02-15 14:12:07 +0000 +++ b/TODO 2008-03-04 12:22:02 +0000 @@ -78,3 +78,18 @@ is passed in to an Operation. Then on transaction execute, you have Transaction call the NdbOperationsProcessor for each resultSet it has, and have it return a list of unprocessed ResultSets. + + Look at AbortOption and ExecType bollocks. + + Figure out Ndb("")->NdbOperation("db.table"), why doesn't it work? How + should it work. Do we want to add a NdbOperation(schema="", table="")? + If not, how do we do multi-schema transactions. + + Do we need to use DeleteLocalRef in ndb_throw_exception()? + + Check use of ThrowNew(clazz,"Invalid exception class specified"); Do we need + a new jstring? + + Find errors in ndb_exception.i + + === modified file 'acinclude.m4' --- a/acinclude.m4 2008-01-23 20:28:19 +0000 +++ b/acinclude.m4 2008-03-03 15:31:11 +0000 @@ -96,7 +96,7 @@ AC_ARG_WITH([java], [AS_HELP_STRING([--with-java], - [BULD NDB/J @<:@default=yes@:>@])], + [BUILD NDB/J @<:@default=yes@:>@])], [with_java=$withval], [with_java=java]) @@ -130,7 +130,7 @@ AC_ARG_WITH([csharp], [AS_HELP_STRING([--with-csharp], - [BULD NDB/.NET @<:@default=yes@:>@])], + [BUILD NDB/.NET @<:@default=yes@:>@])], [with_csharp=$withval], [with_csharp=yes]) @@ -146,7 +146,7 @@ AC_ARG_WITH([perl], [AS_HELP_STRING([--with-perl], - [BULD NDB/Perl @<:@default=yes@:>@])], + [BUILD NDB/Perl @<:@default=yes@:>@])], [with_perl=$withval], [with_perl=yes]) @@ -171,7 +171,7 @@ AC_ARG_WITH([ruby], [AS_HELP_STRING([--with-ruby], - [BULD NDB/Ruby @<:@default=yes@:>@])], + [BUILD NDB/Ruby @<:@default=yes@:>@])], [with_ruby=$withval], [with_ruby=ruby]) === modified file 'configure.in' --- a/configure.in 2008-02-16 17:04:54 +0000 +++ b/configure.in 2008-03-04 12:35:43 +0000 @@ -1,4 +1,4 @@ -AC_INIT([ndb-bindings], [0.60]) +AC_INIT([ndb-bindings], [0.6.2]) AC_CONFIG_AUX_DIR([.]) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_CONFIG_HEADER(config.h) === modified file 'debian/changelog' --- a/debian/changelog 2008-02-18 11:32:36 +0000 +++ b/debian/changelog 2008-03-04 12:24:26 +0000 @@ -1,3 +1,10 @@ +ndb-bindings (0.6.1-1) unreleased; urgency=low + + * Fixed some typos and added some comments. + * Merged build.xml patch from Jess. + + -- Monty Taylor Tue, 04 Mar 2008 13:24:20 +0100 + ndb-bindings (0.6.0-2) unreleased; urgency=low * Changed the libtool dependency. === modified file 'interface/ndbapi/NdbClusterConnection.i' --- a/interface/ndbapi/NdbClusterConnection.i 2008-02-20 21:39:51 +0000 +++ b/interface/ndbapi/NdbClusterConnection.i 2008-03-01 04:27:22 +0000 @@ -17,13 +17,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -// Need to do this here so it doesn't get overridden -#if defined(SWIGJAVA) - %rename Ndb_cluster_connection NdbClusterConnectionImpl; -#else - %rename Ndb_cluster_connection NdbClusterConnection; -#endif - class Ndb_cluster_connection { === modified file 'interface/ndbapi/ndbglobals.i' --- a/interface/ndbapi/ndbglobals.i 2008-02-16 17:04:54 +0000 +++ b/interface/ndbapi/ndbglobals.i 2008-03-01 04:27:22 +0000 @@ -21,12 +21,14 @@ %include "config.h" %{ + #include #include #include -#include +#include +/* These get included in mysql.h. Not sure they should... */ #undef PACKAGE #undef PACKAGE_NAME #undef PACKAGE_STRING @@ -36,10 +38,8 @@ #include "config.h" -//#include - - - long long getMicroTime() + + long long getMicroTime() { struct timeval tTime; gettimeofday(&tTime, 0); @@ -48,29 +48,27 @@ } - -typedef int voidint; +/* voidint is a way to mark a method that returns int for SWIG + to tell it we want the wrapped function to return void, but + we don't want to discard the return value out of hand because + we need it at the wrapping layer to find errors */ +typedef int voidint; typedef Uint32 NdbTimestamp; -typedef NdbDictionary::Object NdbDictObject; -typedef NdbDictionary::Table NdbDictTable; -typedef NdbDictionary::Column NdbDictColumn; -typedef NdbDictionary::Index NdbDictIndex; -typedef NdbDictionary::Dictionary NdbDictDictionary; -typedef NdbDictionary::Event NdbDictEvent; -typedef struct st_byte { - char * theString; - int theLength; -} BYTES; + +typedef struct st_byte { + char * theString; + int theLength; +} BYTES; class NdbDateTime { - public: + public: unsigned int year, month, day, hour, minute, second; NdbDateTime(); }; -NdbDateTime::NdbDateTime() { +NdbDateTime::NdbDateTime() { year=0; month=0; day=0; @@ -79,21 +77,21 @@ second=0; } +/* We don't just typedef these right in the first place + because there because that would mean NdbDictionary::Dictionary + would get renamed to NdbDictionary at the C level, which + wouldn't work out so well. */ + +typedef NdbDictionary::Object NdbDictObject; +typedef NdbDictionary::Table NdbDictTable; +typedef NdbDictionary::Column NdbDictColumn; +typedef NdbDictionary::Index NdbDictIndex; +typedef NdbDictionary::Dictionary NdbDictDictionary; +typedef NdbDictionary::Event NdbDictEvent; + + %} -long long getMicroTime(); -/* -typedef char my_bool; -enum enum_mysql_timestamp_type -{ - MYSQL_TIMESTAMP_NONE= -2, MYSQL_TIMESTAMP_ERROR= -1, - MYSQL_TIMESTAMP_DATE= 0, MYSQL_TIMESTAMP_DATETIME= 1, MYSQL_TIMESTAMP_TIME= 2 -}; -*/ - - -// TODO: This is a little stupid. -// Why don't we just typedef these right in the first place %rename(NdbObject) NdbDictObject; %rename(NdbTable) NdbDictTable; %rename(NdbColumn) NdbDictColumn; @@ -101,6 +99,11 @@ %rename(NdbDictionary) NdbDictDictionary; %rename(NdbEvent) NdbDictEvent; +/* Do this here so we can override it in the Java interface */ +%rename(Ndb_cluster_connection) NdbClusterConnection; + +long long getMicroTime(); + enum AbortOption { CommitIfFailFree = 0, === modified file 'java/build.xml' --- a/java/build.xml 2008-02-12 23:22:11 +0000 +++ b/java/build.xml 2008-03-02 03:13:35 +0000 @@ -1,5 +1,5 @@ === modified file 'java/swig/NdbClusterConnection.i' --- a/java/swig/NdbClusterConnection.i 2008-02-16 17:04:54 +0000 +++ b/java/swig/NdbClusterConnection.i 2008-03-01 04:27:22 +0000 @@ -17,6 +17,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +%rename Ndb_cluster_connection NdbClusterConnectionImpl; %typemap(javainterfaces) Ndb_cluster_connection "NdbClusterConnection"; === modified file 'java/testsuite/ndbj/NdbTest.java' --- a/java/testsuite/ndbj/NdbTest.java 2008-02-12 04:07:47 +0000 +++ b/java/testsuite/ndbj/NdbTest.java 2008-03-02 03:13:35 +0000 @@ -17,18 +17,18 @@ public class NdbTest extends BaseNdbjTestCase { - static final String PRIMARYKEYINDEXNAME = "PRIMARY"; + static final String PRIMARYKEYINDEXNAME = "PRIMARY"; - static final String TABLE1 = "table1"; - static final String TABLE2 = "table2"; - static final String TABLE3 = "table3"; - static final String key1 = "k1"; - static final String key2 = "k2"; - static final String data1 = "d1"; - static final String data2 = "d2"; - static final String data3 = "d3"; - static final String data4 = "d4"; - static final String data5 = "d5"; + static final String TABLE1 = "table1"; + static final String TABLE2 = "table2"; + static final String TABLE3 = "table3"; + static final String key1 = "k1"; + static final String key2 = "k2"; + static final String data1 = "d1"; + static final String data2 = "d2"; + static final String data3 = "d3"; + static final String data4 = "d4"; + static final String data5 = "d5"; static final String data6 = "d6"; static final String data7 = "d7"; @@ -36,33 +36,34 @@ static final String rowTable2 = "james"; static final String rowTable3 = "maeve"; - static final int TEST_BLOB_SIZE = 8*1024; - - public static void main(String[] args) { - junit.textui.TestRunner.run(NdbTest.class); - } - - public NdbTest(String arg0) { - super(arg0); - } - - @Override - public void setUp() throws Exception { - super.setUp(); - createTable(TABLE1, - "( k1 VARCHAR(30) NOT NULL, d1 VARCHAR(20), " - + "d2 INTEGER, primary key (k1) ) engine=ndbcluster;"); - - createTable(TABLE2, - "( k1 VARCHAR(256) NOT NULL, k2 INTEGER NOT NULL, d1 VARCHAR(256)," - +" d2 INTEGER, primary key (k1, k2) ) engine=ndbcluster;"); - - createTable(TABLE3, - "( k1 VARCHAR(256) NOT NULL, d1 TIMESTAMP, d2 CHAR(1)," - +" d3 VARBINARY(100), d4 BLOB, d5 TEXT, d6 BIGINT," - + "d7 BLOB, PRIMARY KEY (k1)) engine=ndbcluster;"); - - } + static final int TEST_BLOB_SIZE = 8*1024; + + public static void main(String[] args) { + junit.textui.TestRunner.run(NdbTest.class); + } + + public NdbTest(String arg0) { + super(arg0); + } + + @Override + public void setUp() throws Exception { + super.setUp(); + createTable(TABLE1, + "( k1 VARCHAR(30) NOT NULL, d1 VARCHAR(20), " + + " d2 INTEGER, primary key (k1) ) engine=ndbcluster;"); + + createTable(TABLE2, + "( k1 VARCHAR(256) NOT NULL, k2 INTEGER NOT NULL, " + + " d1 VARCHAR(256)," + + " d2 INTEGER, primary key (k1, k2) ) engine=ndbcluster;"); + + createTable(TABLE3, + "( k1 VARCHAR(256) NOT NULL, d1 TIMESTAMP, d2 CHAR(1)," + + " d3 VARBINARY(100), d4 BLOB, d5 TEXT, d6 BIGINT," + + " d7 BLOB, PRIMARY KEY (k1)) engine=ndbcluster;"); + + } private static void printTable1( NdbResultSet rs ) throws NdbApiException { === modified file 'signfile.sh' --- a/signfile.sh 2008-01-11 23:16:59 +0000 +++ b/signfile.sh 2008-03-04 12:35:43 +0000 @@ -1,3 +1,3 @@ #!/bin/sh -gpg --armor --sign --detach-sig $1 +gpg -u mtaylor@mysql.com --armor --sign --detach-sig $1