Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/700398fc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/700398fc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/700398fc Branch: refs/heads/ignite-gg-11810 Commit: 700398fc1ce5b0c958c406174297efa14b4975e6 Parents: 203f28f e7e0d87 Author: sboikov <sboi...@gridgain.com> Authored: Tue Jan 17 11:48:38 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jan 17 11:48:38 2017 +0300 ---------------------------------------------------------------------- .../store/jdbc/dialect/BasicJdbcDialect.java | 31 +++++++----- .../org/apache/ignite/internal/IgnitionEx.java | 3 +- .../GridClientConnectionManagerAdapter.java | 7 ++- .../impl/connection/GridClientTopology.java | 53 ++++++++++++++++---- .../cache/DynamicCacheChangeRequest.java | 8 +-- .../processors/cache/GridCacheProcessor.java | 9 ++-- .../ignite/spi/discovery/tcp/ServerImpl.java | 1 - .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +++++++++++++++++- .../cache/GridCacheAbstractMetricsSelfTest.java | 8 ++- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 3 ++ ...LocalCacheOffHeapAndSwapMetricsSelfTest.java | 10 ++++ .../testsuites/IgniteCacheTestSuite5.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../query/h2/database/H2TreeIndex.java | 2 +- .../query/h2/opt/GridH2TreeIndex.java | 26 ++++++---- .../query/h2/opt/GridH2TableSelfTest.java | 8 ++- 16 files changed, 173 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/700398fc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/700398fc/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java ----------------------------------------------------------------------
