Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 04D3D1848E for ; Wed, 17 Jun 2015 17:34:25 +0000 (UTC) Received: (qmail 82572 invoked by uid 500); 17 Jun 2015 17:34:24 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 82541 invoked by uid 500); 17 Jun 2015 17:34:24 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 82532 invoked by uid 99); 17 Jun 2015 17:34:24 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 17:34:24 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 6E8FD1A5C2D for ; Wed, 17 Jun 2015 17:34:24 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id W3YPtDMylR9z for ; Wed, 17 Jun 2015 17:34:23 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 4E92A2763C for ; Wed, 17 Jun 2015 17:34:15 +0000 (UTC) Received: (qmail 82358 invoked by uid 99); 17 Jun 2015 17:34:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 17:34:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0BC3AE3C61; Wed, 17 Jun 2015 17:34:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 17 Jun 2015 17:34:22 -0000 Message-Id: <58aa39be7ef04826baef0b2c516c77e7@git.apache.org> In-Reply-To: <46575ae561944f8682fca16b66b8f360@git.apache.org> References: <46575ae561944f8682fca16b66b8f360@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/10] incubator-ignite git commit: ignite-484-1 - error messages ignite-484-1 - error messages Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e602ca01 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e602ca01 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e602ca01 Branch: refs/heads/ignite-484-1 Commit: e602ca01e48fd43f4cc33b729078c105d84601f6 Parents: efb4244 Author: S.Vladykin Authored: Wed Jun 17 20:15:45 2015 +0300 Committer: S.Vladykin Committed: Wed Jun 17 20:15:45 2015 +0300 ---------------------------------------------------------------------- .../query/h2/twostep/GridMapQueryExecutor.java | 4 +-- .../h2/twostep/GridReduceQueryExecutor.java | 31 ++++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e602ca01/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 2503a87..ba95d43 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 @@ -401,7 +401,7 @@ public class GridMapQueryExecutor { } } catch (IgniteCheckedException e) { - throw new CacheException(e); + throw new CacheException("Failed to unmarshall parameters.", e); } List caches = (List)F.concat(true, req.space(), req.extraSpaces()); @@ -422,7 +422,7 @@ public class GridMapQueryExecutor { GridCacheContext mainCctx = cacheContext(req.space()); if (mainCctx == null) - throw new CacheException("Cache was destroyed: " + req.space()); + throw new CacheException("Failed to find cache: " + req.space()); qr = new QueryResults(req.requestId(), qrys.size(), mainCctx); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e602ca01/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index b956167..32d1c95 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@ -338,7 +338,7 @@ public class GridReduceQueryExecutor { Set nodes = new HashSet<>(dataNodes(space, topVer)); if (F.isEmpty(nodes)) - throw new CacheException("No data nodes found for cache: " + space); + throw new CacheException("Failed to find data nodes for cache: " + space); if (!F.isEmpty(extraSpaces)) { for (String extraSpace : extraSpaces) { @@ -349,12 +349,12 @@ public class GridReduceQueryExecutor { if (cctx.isReplicated() && !extraCctx.isReplicated()) throw new CacheException("Queries running on replicated cache should not contain JOINs " + - "with partitioned tables."); + "with partitioned tables [rCache=" + cctx.name() + ", pCache=" + extraSpace + "]"); Collection extraNodes = dataNodes(extraSpace, topVer); if (F.isEmpty(extraNodes)) - throw new CacheException("No data nodes found for cache: " + extraSpace); + throw new CacheException("Failed to find data nodes for cache: " + extraSpace); if (cctx.isReplicated() && extraCctx.isReplicated()) { nodes.retainAll(extraNodes); @@ -363,8 +363,8 @@ public class GridReduceQueryExecutor { if (isPreloadingActive(cctx, extraSpaces)) return null; // Retry. else - throw new CacheException("Caches '" + cctx.name() + "' and '" + extraSpace + - "' have distinct set of data nodes."); + throw new CacheException("Caches have distinct sets of data nodes [cache1=" + cctx.name() + + ", cache2=" + extraSpace + "]"); } } else if (!cctx.isReplicated() && extraCctx.isReplicated()) { @@ -372,16 +372,16 @@ public class GridReduceQueryExecutor { if (isPreloadingActive(cctx, extraSpaces)) return null; // Retry. else - throw new CacheException("Caches '" + cctx.name() + "' and '" + extraSpace + - "' have distinct set of data nodes."); + throw new CacheException("Caches have distinct sets of data nodes [cache1=" + cctx.name() + + ", cache2=" + extraSpace + "]"); } else if (!cctx.isReplicated() && !extraCctx.isReplicated()) { if (extraNodes.size() != nodes.size() || !nodes.containsAll(extraNodes)) if (isPreloadingActive(cctx, extraSpaces)) return null; // Retry. else - throw new CacheException("Caches '" + cctx.name() + "' and '" + extraSpace + - "' have distinct set of data nodes."); + throw new CacheException("Caches have distinct sets of data nodes [cache1=" + cctx.name() + + ", cache2=" + extraSpace + "]"); } else throw new IllegalStateException(); @@ -586,7 +586,7 @@ public class GridReduceQueryExecutor { if (!extraCctx.isReplicated()) throw new CacheException("Queries running on replicated cache should not contain JOINs " + - "with partitioned tables."); + "with tables in partitioned caches [rCache=" + cctx.name() + ", pCache=" + extraSpace + "]"); Set extraOwners = replicatedUnstableDataNodes(extraCctx); @@ -628,7 +628,7 @@ public class GridReduceQueryExecutor { Set dataNodes = new HashSet<>(dataNodes(space, NONE)); if (dataNodes.isEmpty()) - throw new CacheException("No data nodes found for cache '" + space + "'"); + throw new CacheException("Failed to find data nodes for cache: " + space); // Find all the nodes owning all the partitions for replicated cache. for (int p = 0, parts = cctx.affinity().partitions(); p < parts; p++) { @@ -670,8 +670,8 @@ public class GridReduceQueryExecutor { int parts = extraCctx.affinity().partitions(); if (parts != partsCnt) - throw new CacheException("Number of partitions must be the same for correct collocation in " + - "caches " + cctx.name() + " and " + extraSpace + "."); + throw new CacheException("Number of partitions must be the same for correct collocation [cache1=" + + cctx.name() + ", parts1=" + partsCnt + ", cache2=" + extraSpace + ", parts2=" + parts + "]"); } } @@ -685,7 +685,7 @@ public class GridReduceQueryExecutor { if (!F.isEmpty(dataNodes(cctx.name(), NONE))) return null; // Retry. - throw new CacheException("No data nodes found for cache '" + cctx.name() + "' for partition " + p); + throw new CacheException("Failed to find data nodes [cache=" + cctx.name() + ", part=" + p + "]"); } partLocs[p] = new HashSet<>(owners); @@ -707,8 +707,7 @@ public class GridReduceQueryExecutor { if (!F.isEmpty(dataNodes(extraSpace, NONE))) return null; // Retry. - throw new CacheException("No data nodes found for cache '" + extraSpace + - "' for partition " + p); + throw new CacheException("Failed to find data nodes [cache=" + extraSpace + ", part=" + p + "]"); } if (partLocs[p] == null)