List:Commits« Previous MessageNext Message »
From:Craig L Russell Date:October 4 2010 6:23pm
Subject:bzr push into clusterj branch (Craig.Russell:331 to 333)
View as plain text  
  333 Craig L Russell	2010-10-04
      Fix failure to set lock mode at transaction begin

    modified:
      clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java
      clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java
  332 Craig L Russell	2010-10-02
      Update version number to 7.1.9

    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
  331 Craig L Russell	2010-09-30
      Improve decode of String columns; allocate scratch buffers in ResultDataImpl and reuse for each column

    modified:
      clusterj-tie/src/main/java/com/mysql/clusterj/tie/OperationImpl.java
      clusterj-tie/src/main/java/com/mysql/clusterj/tie/ResultDataImpl.java
      clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanOperationImpl.java
      clusterj-tie/src/main/java/com/mysql/clusterj/tie/ScanResultDataImpl.java
      clusterj-tie/src/main/java/com/mysql/clusterj/tie/TableImpl.java
      clusterj-tie/src/main/java/com/mysql/clusterj/tie/Utility.java
=== modified file 'clusterj-api/pom.xml'
--- a/clusterj-api/pom.xml	2010-09-18 00:11:24 +0000
+++ b/clusterj-api/pom.xml	2010-10-02 17:22:03 +0000
@@ -22,7 +22,7 @@
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-api</artifactId>
   <packaging>bundle</packaging>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.9-SNAPSHOT</version>
   <name>ClusterJ API</name>
   <description>The API for ClusterJ</description>
   <build>

=== modified file 'clusterj-bindings/pom.xml'
--- a/clusterj-bindings/pom.xml	2010-09-18 00:11:24 +0000
+++ b/clusterj-bindings/pom.xml	2010-10-02 17:22:03 +0000
@@ -22,7 +22,7 @@
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-bindings</artifactId>
   <packaging>bundle</packaging>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.9-SNAPSHOT</version>
   <name>ClusterJ Bindings</name>
   <description>The ndb-bindings implementation of ClusterJ storage spi</description>
   <build>
@@ -113,13 +113,13 @@
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-api</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-core</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -149,7 +149,7 @@
     <dependency>
     	<groupId>com.mysql.clusterj</groupId>
     	<artifactId>clusterj-test</artifactId>
-        <version>7.1.8-SNAPSHOT</version>
+        <version>7.1.9-SNAPSHOT</version>
     	<scope>test</scope>
     </dependency>
   </dependencies>   

=== modified file 'clusterj-core/pom.xml'
--- a/clusterj-core/pom.xml	2010-09-18 00:11:24 +0000
+++ b/clusterj-core/pom.xml	2010-10-02 17:22:03 +0000
@@ -22,7 +22,7 @@
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-core</artifactId>
   <packaging>bundle</packaging>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.9-SNAPSHOT</version>
   <name>ClusterJ Core</name>
   <description>The core implementation of ClusterJ</description>
   <build>
@@ -89,7 +89,7 @@
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-api</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

=== modified file 'clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java'
--- a/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java	2010-09-22 00:09:11 +0000
+++ b/clusterj-core/src/main/java/com/mysql/clusterj/core/SessionImpl.java	2010-10-04 18:23:11 +0000
@@ -599,6 +599,7 @@ public class SessionImpl implements Sess
     protected void internalBegin() {
         try {
             clusterTransaction = db.startTransaction(joinTransactionId);
+            clusterTransaction.setLockMode(lockmode);
             // if a transaction has already begun, tell the cluster transaction about the key
             if (partitionKey != null) {
                 clusterTransaction.setPartitionKey(partitionKey);
@@ -1139,6 +1140,10 @@ public class SessionImpl implements Sess
         clusterTransaction.setCoordinatedTransactionId(coordinatedTransactionId);
     }
 
+    /** Set the lock mode for subsequent operations. The lock mode takes effect immediately
+     * and continues until set again.
+     * @param lockmode the lock mode
+     */
     public void setLockMode(LockMode lockmode) {
         this.lockmode = lockmode;
         if (clusterTransaction != null) {

=== modified file 'clusterj-jdbc/pom.xml'
--- a/clusterj-jdbc/pom.xml	2010-09-18 00:11:24 +0000
+++ b/clusterj-jdbc/pom.xml	2010-10-02 17:22:03 +0000
@@ -14,18 +14,18 @@
   	<dependency>
   		<groupId>com.mysql.clusterj</groupId>
   		<artifactId>clusterj-core</artifactId>
-  		<version>7.1.8-SNAPSHOT</version>
+  		<version>7.1.9-SNAPSHOT</version>
   	</dependency>
   	<dependency>
   		<groupId>com.mysql.clusterj</groupId>
   		<artifactId>clusterj-tie</artifactId>
-  		<version>7.1.8-SNAPSHOT</version>
+  		<version>7.1.9-SNAPSHOT</version>
   		<scope>test</scope>
   	</dependency>
     <dependency>
       <groupId>ndbjtie</groupId>
       <artifactId>ndbjtie</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   	<dependency>
@@ -42,7 +42,7 @@
     <dependency>
     	<groupId>com.mysql.clusterj</groupId>
     	<artifactId>clusterj-test</artifactId>
-        <version>7.1.8-SNAPSHOT</version>
+        <version>7.1.9-SNAPSHOT</version>
     	<scope>test</scope>
     </dependency>
   </dependencies>

=== modified file 'clusterj-jpatest/pom.xml'
--- a/clusterj-jpatest/pom.xml	2010-09-18 00:11:24 +0000
+++ b/clusterj-jpatest/pom.xml	2010-10-02 17:22:03 +0000
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.mysql.clusterj</groupId>
     <artifactId>clusterj-jpatest</artifactId>
-    <version>7.1.8-SNAPSHOT</version>
+    <version>7.1.9-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>ClusterJ JPA Integration Tests</name>
 

=== modified file 'clusterj-openjpa/pom.xml'
--- a/clusterj-openjpa/pom.xml	2010-09-18 00:11:24 +0000
+++ b/clusterj-openjpa/pom.xml	2010-10-02 17:22:03 +0000
@@ -25,7 +25,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-openjpa</artifactId>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.9-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>ClusterJ OpenJPA Integration</name>
 
@@ -122,24 +122,24 @@
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-jpatest</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-api</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-core</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-tie</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

=== modified file 'clusterj-test/pom.xml'
--- a/clusterj-test/pom.xml	2010-09-18 00:11:24 +0000
+++ b/clusterj-test/pom.xml	2010-10-02 17:22:03 +0000
@@ -22,7 +22,7 @@
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-test</artifactId>
   <packaging>jar</packaging>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.9-SNAPSHOT</version>
   <name>ClusterJ Test Suite</name>
   <build>
     <plugins>
@@ -91,13 +91,13 @@
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-api</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-core</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

=== modified file 'clusterj-tie/pom.xml'
--- a/clusterj-tie/pom.xml	2010-09-18 00:11:24 +0000
+++ b/clusterj-tie/pom.xml	2010-10-02 17:22:03 +0000
@@ -22,7 +22,7 @@
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-tie</artifactId>
   <packaging>bundle</packaging>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.9-SNAPSHOT</version>
   <name>ClusterJ Tie</name>
   <description>The ndbj-tie implementation of ClusterJ storage spi</description>
   <build>
@@ -123,13 +123,13 @@
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-api</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.mysql.clusterj</groupId>
       <artifactId>clusterj-core</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -153,13 +153,13 @@
     <dependency>
     	<groupId>com.mysql.clusterj</groupId>
     	<artifactId>clusterj-test</artifactId>
-        <version>7.1.8-SNAPSHOT</version>
+        <version>7.1.9-SNAPSHOT</version>
     	<scope>test</scope>
     </dependency>
     <dependency>
       <groupId>ndbjtie</groupId>
       <artifactId>ndbjtie</artifactId>
-      <version>7.1.8-SNAPSHOT</version>
+      <version>7.1.9-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>   

=== modified file 'clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java'
--- a/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java	2010-09-04 00:11:18 +0000
+++ b/clusterj-tie/src/main/java/com/mysql/clusterj/tie/ClusterTransactionImpl.java	2010-10-04 18:23:11 +0000
@@ -91,7 +91,7 @@ class ClusterTransactionImpl implements 
     /** Lock mode for index scan operations */
     private int indexScanLockMode = com.mysql.ndbjtie.ndbapi.NdbOperationConst.LockMode.LM_CommittedRead;
 
-    /** Lock mode for index scan operations */
+    /** Lock mode for table scan operations */
     private int tableScanLockMode = com.mysql.ndbjtie.ndbapi.NdbOperationConst.LockMode.LM_CommittedRead;
 
     /** Autocommit flag if we are in an autocommit transaction */
@@ -221,7 +221,7 @@ class ClusterTransactionImpl implements 
         handleError(ndbIndex, ndbDictionary);
         NdbIndexScanOperation ndbOperation = ndbTransaction.getNdbIndexScanOperation(ndbIndex);
         handleError(ndbOperation, ndbTransaction);
-        int lockMode = lookupLockMode;
+        int lockMode = indexScanLockMode;
         int scanFlags = 0;
         int parallel = 0;
         int batch = 0;
@@ -250,7 +250,7 @@ class ClusterTransactionImpl implements 
         handleError(ndbTable, ndbDictionary);
         NdbScanOperation ndbScanOperation = ndbTransaction.getNdbScanOperation(ndbTable);
         handleError(ndbScanOperation, ndbTransaction);
-        int lockMode = indexScanLockMode;
+        int lockMode = tableScanLockMode;
         int scanFlags = 0;
         int parallel = 0;
         int batch = 0;

=== modified file 'pom.xml'
--- a/pom.xml	2010-09-18 00:11:24 +0000
+++ b/pom.xml	2010-10-02 17:22:03 +0000
@@ -22,7 +22,7 @@
   <groupId>com.mysql.clusterj</groupId>
   <artifactId>clusterj-aggregate</artifactId>
   <packaging>pom</packaging>
-  <version>7.1.8-SNAPSHOT</version>
+  <version>7.1.9-SNAPSHOT</version>
   <name>ClusterJ Aggregate</name>
   <description>The aggregate maven project of ClusterJ</description>
   <modules>


Attachment: [text/bzr-bundle] bzr/craig.russell@oracle.com-20101004182311-inrptk3su5mhplgm.bundle
Thread
bzr push into clusterj branch (Craig.Russell:331 to 333)Craig L Russell4 Oct