You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/05/17 02:34:25 UTC
[9/9] ignite git commit: Merge branches 'ignite-1.6' and
'ignite-3144' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-3144
Merge branches 'ignite-1.6' and 'ignite-3144' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-3144
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a44073c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a44073c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a44073c
Branch: refs/heads/ignite-3144
Commit: 5a44073c923e84c41e0db6dc80a126755b780f51
Parents: 418b8e8 1dc1d85
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue May 17 09:33:33 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 17 09:33:33 2016 +0700
----------------------------------------------------------------------
.../cache/CacheWeakQueryIteratorsHolder.java | 169 ++++++-
.../processors/cache/GridCacheAdapter.java | 13 +-
.../processors/cache/GridCacheSwapManager.java | 12 +-
.../processors/cache/IgniteCacheProxy.java | 39 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 16 +-
.../processors/cache/query/CacheQuery.java | 10 +-
.../cache/query/CacheQueryFuture.java | 13 +-
.../query/GridCacheDistributedQueryManager.java | 100 +++-
.../cache/query/GridCacheLocalQueryManager.java | 34 +-
.../cache/query/GridCacheQueryAdapter.java | 175 +++++--
.../cache/query/GridCacheQueryErrorFuture.java | 12 +-
.../query/GridCacheQueryFutureAdapter.java | 10 +-
.../cache/query/GridCacheQueryManager.java | 502 +++++++++++++-----
.../datastructures/GridCacheSetImpl.java | 9 +-
.../service/GridServiceProcessor.java | 49 +-
.../CacheLateAffinityAssignmentTest.java | 2 +-
...achePartitionedPreloadLifecycleSelfTest.java | 102 +---
...CacheReplicatedPreloadLifecycleSelfTest.java | 132 +----
.../IgniteCacheExpiryPolicyTestSuite.java | 3 +
.../transactions/TxDeadlockDetectionTest.java | 12 +-
.../ConfigVariationsTestSuiteBuilder.java | 4 +-
...IgniteCacheConfigVariationsAbstractTest.java | 2 +-
.../IgniteConfigVariationsAbstractTest.java | 27 +-
modules/indexing/pom.xml | 7 +
.../CacheAbstractQueryMetricsSelfTest.java | 4 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 34 +-
.../IgniteCacheConfigVariationsQueryTest.java | 505 +++++++++++++++++++
...gniteCacheConfigVariationQueryTestSuite.java | 41 ++
modules/mesos/pom.xml | 43 +-
.../apache/ignite/mesos/ClusterProperties.java | 94 ++--
.../apache/ignite/mesos/IgniteFramework.java | 15 +-
.../ignite/mesos/resource/IgniteProvider.java | 198 +++-----
.../ignite/mesos/resource/ResourceProvider.java | 78 ++-
modules/platforms/cpp/DEVNOTES.txt | 10 +
modules/platforms/cpp/Makefile.am | 5 +-
modules/platforms/cpp/Makefile.amrel | 5 +-
modules/platforms/cpp/examples/README.txt | 1 +
modules/platforms/cpp/odbc/README.txt | 7 +-
.../cpp/odbc/install/install_amd64.cmd | 35 +-
.../platforms/cpp/odbc/install/install_x86.cmd | 17 +-
.../IgniteCacheRandomOperationBenchmark.java | 4 +-
41 files changed, 1761 insertions(+), 789 deletions(-)
----------------------------------------------------------------------