List:Commits« Previous MessageNext Message »
From:Craig L Russell Date:November 15 2010 4:51pm
Subject:bzr push into clusterj branch (Craig.Russell:345 to 347)
View as plain text  
  347 Craig L Russell	2010-11-15
      Adapt to new implementation of StoreManager.insert

    modified:
      clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java
  346 Craig L Russell	2010-11-15
      Update to java6

    modified:
      clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java
  345 Craig L Russell	2010-11-15
      Bump version number to 7.1.10-SNAPSHOT

    modified:
      clusterj-api/pom.xml
      clusterj-bindings/pom.xml
      clusterj-core/pom.xml
      clusterj-jdbc/pom.xml
      clusterj-jpatest/pom.xml
      clusterj-openjpa/pom.xml
      clusterj-test/pom.xml
      clusterj-tie/pom.xml
      pom.xml
=== modified file 'clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java'
--- a/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java	2010-06-14 19:57:50 +0000
+++ b/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/AbstractResultSetInternalMethods.java	2010-11-15 16:49:18 +0000
@@ -26,10 +26,13 @@ import java.sql.Array;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.Date;
+import java.sql.NClob;
 import java.sql.Ref;
 import java.sql.ResultSetMetaData;
+import java.sql.RowId;
 import java.sql.SQLException;
 import java.sql.SQLWarning;
+import java.sql.SQLXML;
 import java.sql.Statement;
 import java.sql.Time;
 import java.sql.Timestamp;
@@ -56,12 +59,10 @@ public abstract class AbstractResultSetI
 
     public void buildIndexMapping() throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
-
     }
 
     public void clearNextResult() {
         throw new RuntimeException(local.message("ERR_Should_Not_Occur")); 
-
     }
 
     public ResultSetInternalMethods copy() throws SQLException {
@@ -326,6 +327,10 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur"));
     }
 
+    public int getHoldability() throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur"));
+    }
+
     public int getInt(int columnIndex) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur"));
     }
@@ -346,6 +351,22 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur"));
     }
 
+    public Reader getNCharacterStream(int columnIndex) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur"));
+    }
+
+    public Reader getNCharacterStream(String columnName) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur"));
+    }
+
+    public String getNString(int columnIndex) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public String getNString(String columnName) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public Object getObject(int columnIndex) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur"));
     }
@@ -376,6 +397,14 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur"));
     }
 
+    public RowId getRowId(int columnIndex) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur"));
+    }
+
+    public RowId getRowId(String columnLabel) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur"));
+    }
+
     public short getShort(int columnIndex) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -384,6 +413,22 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public SQLXML getSQLXML(String columnLabel) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public SQLXML getSQLXML(int columnIndex) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public NClob getNClob(String columnLabel) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public NClob getNClob(int columnIndex) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public Statement getStatement() throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -466,6 +511,10 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public boolean isClosed() throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public boolean isFirst() throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -474,6 +523,10 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public boolean last() throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -522,6 +575,10 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateArray(int columnIndex, Array x) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -540,6 +597,26 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public void updateAsciiStream(int columnIndex, InputStream x, long length)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateAsciiStream(String columnName, InputStream x, long length)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateAsciiStream(int columnIndex, InputStream x)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateAsciiStream(String columnName, InputStream x)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateBigDecimal(int columnIndex, BigDecimal x)
             throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
@@ -560,6 +637,27 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+
+    public void updateBinaryStream(int columnIndex, InputStream x, long length)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateBinaryStream(String columnName, InputStream x, long length)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateBinaryStream(int columnIndex, InputStream x)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateBinaryStream(String columnName, InputStream x)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateBlob(int columnIndex, Blob x) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -568,6 +666,22 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public void updateBlob(int columnIndex, InputStream istream) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateBlob(String columnName, InputStream istream) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateBlob(int columnIndex, InputStream istream, long length) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateBlob(String columnName, InputStream istream, long length) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateBoolean(int columnIndex, boolean x) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -592,13 +706,33 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public void updateCharacterStream(int columnIndex, Reader x)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateCharacterStream(String columnName, Reader x)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateCharacterStream(int columnIndex, Reader x, int length)
             throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
-    public void updateCharacterStream(String columnName, Reader reader,
-            int length) throws SQLException {
+    public void updateCharacterStream(String columnName, Reader reader, int length)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateCharacterStream(int columnIndex, Reader x, long length)
+            throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateCharacterStream(String columnName, Reader reader, long length)
+            throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
@@ -610,6 +744,22 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public void updateClob(String columnName, Reader reader) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateClob(int columnIndex, Reader reader) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateClob(String columnName, Reader reader, long length) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateDate(int columnIndex, Date x) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -650,6 +800,54 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNCharacterStream(String columnName, Reader reader) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNCharacterStream(String columnName, Reader reader, long length) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNClob(int columnIndex, NClob nclob) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNClob(String columnName, NClob nclob) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNClob(int columnIndex, Reader reader) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNClob(String columnName, Reader reader) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNClob(String columnName, Reader reader, long length) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNString(int columnIndex, String string) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateNString(String columnName, String string) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateNull(int columnIndex) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -688,6 +886,14 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public void updateRowId(int columnIndex, RowId x) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateRowId(String columnLabel, RowId x) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateShort(int columnIndex, short x) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
@@ -696,6 +902,14 @@ public abstract class AbstractResultSetI
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }
 
+    public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
+    public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
+        throw new SQLException(local.message("ERR_Should_Not_Occur")); 
+    }
+
     public void updateString(int columnIndex, String x) throws SQLException {
         throw new SQLException(local.message("ERR_Should_Not_Occur")); 
     }

=== modified file 'clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java'
--- a/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java	2010-06-14 19:57:50 +0000
+++ b/clusterj-jdbc/src/main/java/com/mysql/clusterj/jdbc/DomainTypeHandlerImpl.java	2010-11-15 16:50:15 +0000
@@ -18,6 +18,7 @@
 
 package com.mysql.clusterj.jdbc;
 
+import com.mysql.clusterj.ClusterJFatalInternalException;
 import com.mysql.clusterj.ClusterJUserException;
 
 import com.mysql.clusterj.core.metadata.AbstractDomainTypeHandlerImpl;
@@ -124,6 +125,9 @@ public class DomainTypeHandlerImpl<T> ex
                     numberOfFields++, column);
             fieldNameToNumber.put(domainFieldHandler.getName(), domainFieldHandler.getFieldNumber());
             persistentFieldHandlers.add(domainFieldHandler);
+            if (!column.isPrimaryKey()) {
+                nonPKFieldHandlers.add(domainFieldHandler);
+            }
         }
         // Check that all index columnNames have corresponding fields
         // indexes without fields will be unusable for query
@@ -155,4 +159,8 @@ public class DomainTypeHandlerImpl<T> ex
         // ignore this for now
     }
 
+    public void objectSetKeys(Object arg0, Object arg1) {
+        throw new ClusterJFatalInternalException("Not implemented.");
+    }
+
 }


Attachment: [text/bzr-bundle] bzr/craig.russell@oracle.com-20101115165015-kn2n7v39svsm78bw.bundle
Thread
bzr push into clusterj branch (Craig.Russell:345 to 347)Craig L Russell15 Nov