IGNITE-5829 on 2.1.5

examples/pom.xml

@@ -28,7 +28,7 @@
     </parent>
 
     <artifactId>ignite-examples</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
 
     <dependencies>
         <dependency>

modules/aop/pom.xml

@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-aop</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

modules/apache-license-gen/pom.xml

@@ -31,7 +31,7 @@
 
     <groupId>org.apache.ignite</groupId>
     <artifactId>ignite-apache-license-gen</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <build>

modules/aws/pom.xml

@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-aws</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

modules/benchmarks/pom.xml

@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-benchmarks</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

modules/camel/pom.xml

@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-camel</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

modules/cassandra/pom.xml

@@ -32,7 +32,7 @@
 
     <artifactId>ignite-cassandra</artifactId>
     <packaging>pom</packaging>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencyManagement>

modules/cassandra/serializers/pom.xml

@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.ignite</groupId>
         <artifactId>ignite-cassandra</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
     <artifactId>ignite-cassandra-serializers</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

modules/cassandra/store/pom.xml

@@ -26,12 +26,12 @@
     <parent>
         <groupId>org.apache.ignite</groupId>
         <artifactId>ignite-cassandra</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
     <artifactId>ignite-cassandra-store</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <properties>

modules/cassandra/store/src/test/java/org/apache/ignite/tests/utils/TestTransaction.java

@@ -140,4 +140,14 @@ public class TestTransaction implements Transaction {
     @Override public IgniteFuture<Void> rollbackAsync() throws IgniteException {
         return null;
     }
+
+    /** {@inheritDoc} */
+    @Override public void suspend() throws IgniteException{
+        // No-op.
+    }
+
+    /** {@inheritDoc} */
+    @Override public void resume() throws IgniteException {
+        // No-op.
+    }
 }

modules/clients/pom.xml

@@ -31,7 +31,7 @@
     </parent>
 
     <artifactId>ignite-clients</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <url>http://ignite.apache.org</url>
 
     <dependencies>

modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java

@@ -304,4 +304,40 @@ public void testTxAllowedRollback() throws Exception {
             conn.rollback();
         }
     }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testSqlHints() throws Exception {
+        try (final Connection conn = DriverManager.getConnection(CFG_URL_PREFIX + "enforceJoinOrder=true@"
+            + configURL())) {
+            assertTrue(((JdbcConnection)conn).isEnforceJoinOrder());
+            assertFalse(((JdbcConnection)conn).isDistributedJoins());
+            assertFalse(((JdbcConnection)conn).isCollocatedQuery());
+            assertFalse(((JdbcConnection)conn).isLazy());
+        }
+
+        try (final Connection conn = DriverManager.getConnection(CFG_URL_PREFIX + "distributedJoins=true@"
+            + configURL())) {
+            assertFalse(((JdbcConnection)conn).isEnforceJoinOrder());
+            assertTrue(((JdbcConnection)conn).isDistributedJoins());
+            assertFalse(((JdbcConnection)conn).isCollocatedQuery());
+            assertFalse(((JdbcConnection)conn).isLazy());
+        }
+
+        try (final Connection conn = DriverManager.getConnection(CFG_URL_PREFIX + "collocated=true@"
+            + configURL())) {
+            assertFalse(((JdbcConnection)conn).isEnforceJoinOrder());
+            assertFalse(((JdbcConnection)conn).isDistributedJoins());
+            assertTrue(((JdbcConnection)conn).isCollocatedQuery());
+            assertFalse(((JdbcConnection)conn).isLazy());
+        }
+
+        try (final Connection conn = DriverManager.getConnection(CFG_URL_PREFIX + "lazy=true@" + configURL())) {
+            assertFalse(((JdbcConnection)conn).isEnforceJoinOrder());
+            assertFalse(((JdbcConnection)conn).isDistributedJoins());
+            assertFalse(((JdbcConnection)conn).isCollocatedQuery());
+            assertTrue(((JdbcConnection)conn).isLazy());
+        }
+    }
 }

modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDeleteStatementSelfTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.jdbc2;
 
+import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -46,4 +47,25 @@ public void testExecuteUpdate() throws SQLException {
         assertFalse(jcache(0).containsKey("p2"));
         assertTrue(jcache(0).containsKeys(new HashSet<Object>(Arrays.asList("p1", "p3"))));
     }
+
+    /**
+     *
+     */
+    public void testBatch() throws SQLException {
+        PreparedStatement ps = conn.prepareStatement("delete from Person where firstName = ?");
+
+        ps.setString(1, "John");
+
+        ps.addBatch();
+
+        ps.setString(1, "Harry");
+
+        ps.addBatch();
+
+        int[] res = ps.executeBatch();
+
+        assertFalse(jcache(0).containsKey("p1"));
+        assertTrue(jcache(0).containsKeys(new HashSet<Object>(Arrays.asList("p2", "p3"))));
+        assertTrue(Arrays.equals(new int[] {1, 0}, res));
+    }
 }

modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcInsertStatementSelfTest.java

@@ -17,6 +17,7 @@
 
 package org.apache.ignite.internal.jdbc2;
 
+import java.sql.BatchUpdateException;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -26,6 +27,7 @@
 import java.util.concurrent.Callable;
 import org.apache.ignite.cache.CachePeekMode;
 import org.apache.ignite.internal.processors.query.IgniteSQLException;
+import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.testframework.GridTestUtils;
 
 /**
@@ -174,4 +176,161 @@ public void testDuplicateKeys() {
 
         assertEquals(3, jcache(0).withKeepBinary().getAll(new HashSet<>(Arrays.asList("p1", "p2", "p3"))).size());
     }
+
+    /**
+     * @throws SQLException if failed.
+     */
+    public void testBatch() throws SQLException {
+        formBatch(1, 2);
+        formBatch(3, 4);
+
+        int[] res = prepStmt.executeBatch();
+
+        assertTrue(Arrays.equals(new int[] {2, 2}, res));
+    }
+
+    /**
+     * @throws SQLException if failed.
+     */
+    public void testSingleItemBatch() throws SQLException {
+        formBatch(1, 2);
+
+        int[] res = prepStmt.executeBatch();
+
+        assertTrue(Arrays.equals(new int[] {2}, res));
+    }
+
+    /**
+     * @throws SQLException if failed.
+     */
+    public void testSingleItemBatchError() throws SQLException {
+        formBatch(1, 2);
+
+        prepStmt.executeBatch();
+
+        formBatch(1, 2); // Duplicate key
+
+        BatchUpdateException reason = (BatchUpdateException)
+            GridTestUtils.assertThrows(log, new Callable<Object>() {
+                @Override public Object call() throws Exception {
+                    return prepStmt.executeBatch();
+                }
+            },
+            BatchUpdateException.class,
+            "Failed to INSERT some keys because they are already in cache");
+
+        // Check update counts in the exception.
+        assertTrue(F.isEmpty(reason.getUpdateCounts()));
+    }
+
+    /**
+     * @throws SQLException if failed.
+     */
+    public void testErrorAmidstBatch() throws SQLException {
+        formBatch(1, 2);
+        formBatch(3, 1); // Duplicate key
+
+        BatchUpdateException reason = (BatchUpdateException)
+            GridTestUtils.assertThrows(log, new Callable<Object>() {
+                @Override public Object call() throws Exception {
+                    return prepStmt.executeBatch();
+                }
+            },
+            BatchUpdateException.class,
+            "Failed to INSERT some keys because they are already in cache");
+
+        // Check update counts in the exception.
+        int[] counts = reason.getUpdateCounts();
+
+        assertNotNull(counts);
+
+        assertEquals(1, counts.length);
+        assertEquals(2, counts[0]);
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    public void testClearBatch() throws Exception {
+        GridTestUtils.assertThrows(log, new Callable<Object>() {
+            @Override public Object call() throws SQLException {
+                return prepStmt.executeBatch();
+            }
+        }, SQLException.class, "Batch is empty");
+
+        formBatch(1, 2);
+
+        prepStmt.clearBatch();
+
+        GridTestUtils.assertThrows(log, new Callable<Object>() {
+            @Override public Object call() throws SQLException {
+                return prepStmt.executeBatch();
+            }
+        }, SQLException.class, "Batch is empty");
+    }
+
+    /**
+     * Form batch on prepared statement.
+     *
+     * @param id1 id for first row.
+     * @param id2 id for second row.
+     * @throws SQLException if failed.
+     */
+    private void formBatch(int id1, int id2) throws SQLException {
+        int[] ids = new int[] { id1, id2 };
+
+        int arg = 0;
+        for (int id: ids) {
+            String key = "p" + id;
+
+            switch (id) {
+                case 1:
+                    prepStmt.setString(arg + 1, key);
+                    prepStmt.setInt(arg + 2, 1);
+                    prepStmt.setString(arg + 3, "John");
+                    prepStmt.setString(arg + 4, "White");
+                    prepStmt.setInt(arg + 5, 25);
+                    prepStmt.setBytes(arg + 6, getBytes("White"));
+
+                    break;
+
+                case 2:
+                    prepStmt.setString(arg + 1, key);
+                    prepStmt.setInt(arg + 2, 2);
+                    prepStmt.setString(arg + 3, "Joe");
+                    prepStmt.setString(arg + 4, "Black");
+                    prepStmt.setInt(arg + 5, 35);
+                    prepStmt.setBytes(arg + 6, getBytes("Black"));
+
+                    break;
+
+                case 3:
+                    prepStmt.setString(arg + 1, key);
+                    prepStmt.setInt(arg + 2, 3);
+                    prepStmt.setString(arg + 3, "Mike");
+                    prepStmt.setString(arg + 4, "Green");
+                    prepStmt.setInt(arg + 5, 40);
+                    prepStmt.setBytes(arg + 6, getBytes("Green"));
+
+                    break;
+
+                case 4:
+                    prepStmt.setString(arg + 1, key);
+                    prepStmt.setInt(arg + 2, 4);
+                    prepStmt.setString(arg + 3, "Leah");
+                    prepStmt.setString(arg + 4, "Grey");
+                    prepStmt.setInt(arg + 5, 22);
+                    prepStmt.setBytes(arg + 6, getBytes("Grey"));
+
+                    break;
+
+                default:
+                    assert false;
+            }
+
+            arg += 6;
+        }
+
+        prepStmt.addBatch();
+    }
 }