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:09:56 UTC
[8/8] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-5075' into ignite-5075-pds
Merge remote-tracking branch 'remotes/origin/ignite-5075' into ignite-5075-pds
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b86104be
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b86104be
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b86104be
Branch: refs/heads/ignite-5075-pds
Commit: b86104be7f0c26bfda394d448b3276e2d5eef803
Parents: aaf9f45 7fc0168
Author: sboikov <sb...@gridgain.com>
Authored: Tue May 23 15:08:34 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue May 23 15:08:34 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 +-
.../configuration/CacheConfiguration.java | 4 +-
.../communication/GridIoMessageFactory.java | 2 +
.../cache/CacheGroupInfrastructure.java | 172 +++++++-------
.../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 ++++
32 files changed, 958 insertions(+), 398 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b86104be/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b86104be/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
index e717670,7c07d2d..34feeaf
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupInfrastructure.java
@@@ -20,8 -20,8 +20,9 @@@ package org.apache.ignite.internal.proc
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+ import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b86104be/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------