You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/02/29 08:24:04 UTC
ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1232
Repository: ignite
Updated Branches:
refs/heads/ignite-1232 e7b0cfeb7 -> 95ef93f60
Merge remote-tracking branch 'remotes/origin/master' into ignite-1232
Conflicts:
modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/95ef93f6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/95ef93f6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/95ef93f6
Branch: refs/heads/ignite-1232
Commit: 95ef93f6032d77af0df52297f78f8d39727e07ca
Parents: e7b0cfe
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 29 10:22:29 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 29 10:22:54 2016 +0300
----------------------------------------------------------------------
.../processors/query/h2/IgniteH2Indexing.java | 42 ++++++++++----------
.../cache/IgniteCacheJoinQueryTest.java | 5 +--
2 files changed, 23 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/95ef93f6/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 59df383..dee90b6 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
@@ -1106,31 +1106,33 @@ public class IgniteH2Indexing implements GridQueryIndexing {
boolean cachesCreated = false;
- while (true) {
- try {
- // Do not cache this statement because the whole two step query object will be cached later on.
- stmt = prepareStatement(c, sqlQry, false);
+ try {
+ while (true) {
+ try {
+ // Do not cache this statement because the whole two step query object will be cached later on.
+ stmt = prepareStatement(c, sqlQry, false);
- break;
- }
- catch (SQLException e) {
- if (!cachesCreated && e.getErrorCode() == ErrorCode.SCHEMA_NOT_FOUND_1) {
- try {
- ctx.cache().createMissingCaches();
- }
- catch (IgniteCheckedException e1) {
- throw new CacheException("Failed to create missing caches.", e);
- }
+ break;
+ }
+ catch (SQLException e) {
+ if (!cachesCreated && e.getErrorCode() == ErrorCode.SCHEMA_NOT_FOUND_1) {
+ try {
+ ctx.cache().createMissingCaches();
+ }
+ catch (IgniteCheckedException e1) {
+ throw new CacheException("Failed to create missing caches.", e);
+ }
- cachesCreated = true;
+ cachesCreated = true;
+ }
+ else
+ throw new CacheException("Failed to parse query: " + sqlQry, e);
}
- else
- throw new CacheException("Failed to parse query: " + sqlQry, e);
- }
- finally {
- GridH2QueryContext.clear(false);
}
}
+ finally {
+ GridH2QueryContext.clear(false);
+ }
try {
bindParameters(stmt, F.asList(qry.getArgs()));
http://git-wip-us.apache.org/repos/asf/ignite/blob/95ef93f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryTest.java
index abe9404..541d54c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryTest.java
@@ -23,9 +23,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.Callable;
import java.util.concurrent.ThreadLocalRandom;
-import javax.cache.CacheException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.cache.CacheKeyConfiguration;
@@ -41,7 +39,6 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@@ -154,7 +151,7 @@ public class IgniteCacheJoinQueryTest extends GridCommonAbstractTest {
checkPersonAccountsJoin(cache0, putData.personAccounts, affKey);
- checkOrganizationPersonsJoin(cache, putData.orgPersons);
+ checkOrganizationPersonsJoin(cache0, putData.orgPersons);
}
}
finally {