Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b87d6c33 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b87d6c33 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b87d6c33 Branch: refs/heads/ignite-6022-proto Commit: b87d6c331c5948d50d16cdd3ed3a23dfe23fbfc8 Parents: 2df2c1f Author: devozerov <[email protected]> Authored: Mon Dec 18 16:50:34 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Dec 18 16:50:34 2017 +0300 ---------------------------------------------------------------------- .../odbc/jdbc/JdbcRequestHandler.java | 2 +- .../query/h2/opt/JdbcBatchLoader.java | 29 +++++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b87d6c33/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java index 7e508a8..1bda70c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java @@ -465,7 +465,7 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler { } } - public static volatile boolean STREAMER = true; + public static volatile boolean STREAMER = false;//Boolean.getBoolean("IGNITE_JDBC_STREAMER"); /** * @param req Request. http://git-wip-us.apache.org/repos/asf/ignite/blob/b87d6c33/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/JdbcBatchLoader.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/JdbcBatchLoader.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/JdbcBatchLoader.java index f145f58..31d67f0 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/JdbcBatchLoader.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/JdbcBatchLoader.java @@ -44,7 +44,7 @@ public class JdbcBatchLoader { try { JdbcBatchLoader ldr = new JdbcBatchLoader(); - ldr.load(10_000_000, 10_000, 8, "127.0.0.1"); + ldr.load(10_000_000, 10_000, 1, "127.0.0.1"); } catch (Exception e) { log("Failed to load data into cloud"); @@ -64,6 +64,8 @@ public class JdbcBatchLoader { * @throws Exception If failed to load data to cloud. */ public void load(int total, int batch, int threads, String addr) throws Exception { + ExecutorService exec = Executors.newFixedThreadPool(threads); + log("Connecting to IGNITE..."); ComboPooledDataSource dataSrc = new ComboPooledDataSource(); @@ -76,28 +78,29 @@ public class JdbcBatchLoader { stmt.execute(SQL_CREATE); - U.closeQuiet(stmt); - } + int cnt = total / batch; - int cnt = total / batch; + CountDownLatch latch = new CountDownLatch(cnt); - CountDownLatch latch = new CountDownLatch(cnt); + log("Start loading of " + total + " records..."); - ExecutorService exec = Executors.newFixedThreadPool(threads); + long start = System.currentTimeMillis(); - log("Start loading of " + total + " records..."); + for (int i = 0; i < cnt; i++) + exec.execute(new Worker(dataSrc, i, batch, latch)); - long start = System.currentTimeMillis(); + latch.await(); - for (int i = 0; i < cnt; i++) - exec.execute(new Worker(dataSrc, i, batch, latch)); + stmt.execute("FLUSH"); - latch.await(); + U.closeQuiet(stmt); - log("Loading time: " + (System.currentTimeMillis() - start) / 1000 + "seconds"); - log("Loading finished!"); + log("Loading time: " + (System.currentTimeMillis() - start) / 1000 + "seconds"); + log("Loading finished!"); + } U.shutdownNow(JdbcBatchLoader.class, exec, null); + dataSrc.close(); }
