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 2017/05/23 12:06:38 UTC
[6/6] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-5075
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7fc01683
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7fc01683
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7fc01683
Branch: refs/heads/ignite-5075
Commit: 7fc01683a7e0995d41ad8d900767d6e48443d8b2
Parents: 19ed098 ca94cf3
Author: sboikov <sb...@gridgain.com>
Authored: Tue May 23 15:05:52 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue May 23 15:05:52 2017 +0300
----------------------------------------------------------------------
.../store/cassandra/CassandraCacheStore.java | 15 +-
.../ignite/tests/IgnitePersistentStoreTest.java | 62 ++++-
.../persistence/loadall_blob/ignite-config.xml | 90 +++++++
.../loadall_blob/persistence-settings.xml | 29 +++
.../store/jdbc/CacheAbstractJdbcStore.java | 6 +-
.../managers/communication/GridIoManager.java | 30 ++-
.../communication/GridIoMessageFactory.java | 2 +
.../platform/cache/PlatformCache.java | 28 ++-
.../cache/query/GridCacheTwoStepQuery.java | 84 ++-----
.../processors/cache/query/QueryTable.java | 164 +++++++++++++
.../processors/query/h2/IgniteH2Indexing.java | 84 +++----
.../query/h2/opt/GridH2IndexBase.java | 2 +-
.../processors/query/h2/opt/GridH2Table.java | 28 ++-
.../query/h2/sql/GridSqlQuerySplitter.java | 21 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 15 +-
.../h2/twostep/GridReduceQueryExecutor.java | 233 +++++++++----------
.../h2/twostep/msg/GridH2QueryRequest.java | 13 +-
.../twostep/msg/GridH2ValueMessageFactory.java | 4 +
.../core/include/ignite/cache/query/query_sql.h | 2 +
.../ignite/cache/query/query_sql_fields.h | 3 +
.../Cache/Query/CacheLinqTest.cs | 36 ++-
.../Cache/Query/CacheQueriesTest.cs | 60 ++++-
.../Cache/Query/SqlFieldsQuery.cs | 29 ++-
.../Apache.Ignite.Core/Cache/Query/SqlQuery.cs | 31 +++
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 3 +
.../Apache.Ignite.Linq/CacheExtensions.cs | 10 +
.../Impl/CacheFieldsQueryExecutor.cs | 42 ++--
.../Apache.Ignite.Linq/Impl/CacheQueryable.cs | 3 +-
.../dotnet/Apache.Ignite.Linq/QueryOptions.cs | 23 ++
.../spring/SpringTransactionManager.java | 13 ++
.../GridSpringTransactionManagerSelfTest.java | 45 ++++
31 files changed, 892 insertions(+), 318 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7fc01683/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7fc01683/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index 8286b45,75914ef..bba5fca
--- 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
@@@ -1163,10 -1143,11 +1143,11 @@@ public class GridReduceQueryExecutor
continue; // Skip unmapped partitions.
if (F.isEmpty(owners)) {
- if (!F.isEmpty(dataNodes(extraCctx.name(), NONE)))
+ if (!F.isEmpty(dataNodes(extraCctx.groupId(), NONE)))
return null; // Retry.
- throw new CacheException("Failed to find data nodes [cache=" + extraCctx.name() + ", part=" + p + "]");
+ throw new CacheException("Failed to find data nodes [cache=" + extraCctx.name() +
+ ", part=" + p + "]");
}
if (partLocs[p] == null)