You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/08/14 10:30:17 UTC
[07/50] ignite git commit: WIP.
WIP.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b88846c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b88846c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b88846c
Branch: refs/heads/ignite-5991-6019
Commit: 0b88846c8a9cc5abebee630d1aac9df9fb109cee
Parents: 9f88f51
Author: devozerov <vo...@gridgain.com>
Authored: Thu Aug 10 14:36:40 2017 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu Aug 10 14:36:40 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/examples/datagrid/TestExample.java | 12 +++++++++---
.../processors/query/h2/IgniteH2Indexing.java | 14 ++++++++++----
.../processors/query/h2/twostep/MapQueryResult.java | 6 +++++-
3 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b88846c/examples/src/main/java/org/apache/ignite/examples/datagrid/TestExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/TestExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/TestExample.java
index 1ec5589..c0b921e 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/TestExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/TestExample.java
@@ -14,15 +14,18 @@ public class TestExample {
public static final String CACHE_NAME = "cache";
public static void main(String[] args) {
- try (Ignite srv = Ignition.start()) {
+ try (Ignite srv = Ignition.start(new IgniteConfiguration().setLocalHost("127.0.0.1"))) {
IgniteCache<Long, Person> srvCache = srv.createCache(
new CacheConfiguration<Long, Person>().setName(CACHE_NAME).setIndexedTypes(Long.class, Person.class));
for (long i = 0; i < 10_000; i++)
srvCache.put(i, new Person(i, "First" + i, "Last" + i));
- try (Ignite cli=
- Ignition.start(new IgniteConfiguration().setIgniteInstanceName("client").setClientMode(true))) {
+ System.out.println("PUT FINISHED");
+
+ try (Ignite cli = Ignition.start(new IgniteConfiguration().setIgniteInstanceName("client").setLocalHost("127.0.0.1").setClientMode(true))) {
+ System.out.println("CLIENT STARTED");
+
IgniteCache<Long, Person> cliCache = cli.cache(CACHE_NAME);
SqlFieldsQuery qry = new SqlFieldsQuery("SELECT firstName FROM Person WHERE 1=1");
@@ -37,6 +40,9 @@ public class TestExample {
System.out.println("DONE: " + cnt);
}
+ catch (Exception e) {
+ System.out.println(e);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b88846c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index 661bf3e..e0e3e95 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@ -139,10 +139,10 @@ import org.apache.ignite.spi.indexing.IndexingQueryFilter;
import org.h2.api.ErrorCode;
import org.h2.api.JavaObjectSerializer;
import org.h2.command.CommandContainer;
-import org.h2.command.CommandInterface;
import org.h2.command.Prepared;
import org.h2.command.dml.Insert;
import org.h2.command.dml.Select;
+import org.h2.engine.Session;
import org.h2.engine.SysProperties;
import org.h2.index.Index;
import org.h2.jdbc.JdbcPreparedStatement;
@@ -925,10 +925,14 @@ public class IgniteH2Indexing implements GridQueryIndexing {
});
}
+ Session ses = H2Utils.session(conn);
+
if (timeoutMillis > 0)
- H2Utils.session(conn).setQueryTimeout(timeoutMillis);
+ ses.setQueryTimeout(timeoutMillis);
try {
+ ses.setLazyQueryExecution(true);
+
return stmt.executeQuery();
}
catch (SQLException e) {
@@ -940,7 +944,9 @@ public class IgniteH2Indexing implements GridQueryIndexing {
}
finally {
if (timeoutMillis > 0)
- H2Utils.session(conn).setQueryTimeout(0);
+ ses.setQueryTimeout(0);
+
+ ses.setLazyQueryExecution(false);
}
}
@@ -977,7 +983,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
Select select = U.field(cmd, "prepared");
- select.query(0, new MapQueryStreamingResultTarget());
+ select.query(0, new MapQueryStreamingResultTarget(1, false));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b88846c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryResult.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryResult.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryResult.java
index 4799e03..199c454 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryResult.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/MapQueryResult.java
@@ -26,6 +26,7 @@ import org.apache.ignite.internal.processors.query.h2.opt.GridH2ValueCacheObject
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.h2.jdbc.JdbcResultSet;
+import org.h2.result.LazyResult;
import org.h2.result.ResultInterface;
import org.h2.value.Value;
import org.jetbrains.annotations.Nullable;
@@ -120,7 +121,10 @@ class MapQueryResult implements AutoCloseable {
throw new IllegalStateException(e); // Must not happen.
}
- rowCnt = res.getRowCount();
+ if (res instanceof LazyResult)
+ System.out.println("LAZY! LAZY! LAZY! LAZY! LAZY! LAZY! LAZY! LAZY! ");
+
+ rowCnt = (res instanceof LazyResult) ? 10_000 : res.getRowCount();
cols = res.getVisibleColumnCount();
}
else {