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 2015/08/18 18:46:07 UTC
[10/11] incubator-ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10606
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10606
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c232395d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c232395d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c232395d
Branch: refs/heads/ignite-gg-10606
Commit: c232395db35d4fe9cf296a384b96ea27998a389b
Parents: ddbbffb 09da9c2
Author: iveselovskiy <iv...@gridgain.com>
Authored: Tue Aug 18 19:44:53 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Tue Aug 18 19:44:53 2015 +0300
----------------------------------------------------------------------
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +-
.../configuration/IgniteConfiguration.java | 5 +-
.../GridDhtUnreservedPartitionException.java | 66 ++++++++
.../cache/query/GridCacheQueryAdapter.java | 56 ++++++-
.../cache/query/GridCacheQueryManager.java | 71 ++++++---
.../ignite/spi/discovery/tcp/ServerImpl.java | 83 ++++++++--
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 49 ++++--
.../tcp/internal/TcpDiscoveryNode.java | 18 +--
.../tcp/internal/TcpDiscoveryNodesRing.java | 23 +++
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 152 ++++++++++++++++++-
.../TcpDiscoverySpiFailureTimeoutSelfTest.java | 8 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 3 +
.../query/h2/twostep/GridMergeTable.java | 7 +-
.../query/h2/twostep/GridThreadLocalTable.java | 22 ++-
...CacheScanPartitionQueryFallbackSelfTest.java | 96 ++++++++++++
.../query/IgniteSqlSplitterSelfTest.java | 152 +++++++++++++++++++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../util/spring/IgniteSpringHelperImpl.java | 4 +-
19 files changed, 739 insertions(+), 84 deletions(-)
----------------------------------------------------------------------