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/15 08:52:13 UTC
[29/50] [abbrv] ignite git commit: ignite-split2 - retry
ignite-split2 - retry
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dad374fa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dad374fa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dad374fa
Branch: refs/heads/ignite-1232
Commit: dad374fac124f92c3477990e114bb0dc9b860d52
Parents: 5cf4edc
Author: S.Vladykin <sv...@gridgain.com>
Authored: Tue Dec 15 06:00:40 2015 +0300
Committer: S.Vladykin <sv...@gridgain.com>
Committed: Tue Dec 15 06:00:40 2015 +0300
----------------------------------------------------------------------
.../processors/query/h2/twostep/GridMapQueryExecutor.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/dad374fa/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
index 6e1aef7..ec54a27 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridMapQueryExecutor.java
@@ -55,6 +55,7 @@ import org.apache.ignite.internal.processors.cache.query.GridCacheQueryMarshalla
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
import org.apache.ignite.internal.processors.query.h2.opt.GridH2QueryContext;
+import org.apache.ignite.internal.processors.query.h2.opt.GridH2RetryException;
import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryCancelRequest;
import org.apache.ignite.internal.processors.query.h2.twostep.messages.GridQueryFailResponse;
@@ -66,6 +67,7 @@ import org.apache.ignite.internal.util.GridSpinBusyLock;
import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.T2;
+import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.plugin.extensions.communication.Message;
import org.h2.jdbc.JdbcResultSet;
@@ -589,6 +591,12 @@ public class GridMapQueryExecutor {
*/
private void sendError(ClusterNode node, long qryReqId, Throwable err) {
try {
+ if (X.hasCause(err, GridH2RetryException.class)) {
+ sendRetry(node, qryReqId);
+
+ return;
+ }
+
GridQueryFailResponse msg = new GridQueryFailResponse(qryReqId, err);
if (node.isLocal())