Merge branch 'master' into ignite-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e942cae9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e942cae9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e942cae9 Branch: refs/heads/ignite-gg-10760 Commit: e942cae9e628150094d24805c268212dd094f3ab Parents: 25c9f60 c311c3c Author: vozerov-gridgain <voze...@gridgain.com> Authored: Thu Sep 17 10:45:59 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Thu Sep 17 10:45:59 2015 +0300 ---------------------------------------------------------------------- .../configuration/NearCacheConfiguration.java | 18 +- .../distributed/dht/GridDhtLocalPartition.java | 26 +- .../query/GridCacheDistributedQueryFuture.java | 27 +- .../cache/query/GridCacheLocalQueryFuture.java | 5 + .../cache/query/GridCacheQueryAdapter.java | 170 ++++++++----- .../query/GridCacheQueryFutureAdapter.java | 11 +- .../cache/query/GridCacheQueryManager.java | 30 ++- .../distributed/CacheAffEarlySelfTest.java | 245 +++++++++++++++++++ .../GridCacheSwapScanQueryAbstractSelfTest.java | 118 ++++----- .../processors/igfs/IgfsAbstractSelfTest.java | 5 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 244 +++++------------- .../ignite/visor/commands/VisorConsole.scala | 31 ++- .../yardstick/IgniteBenchmarkArguments.java | 24 +- .../org/apache/ignite/yardstick/IgniteNode.java | 12 +- 14 files changed, 610 insertions(+), 356 deletions(-) ----------------------------------------------------------------------
