Merge branch 'master' into ignite-648
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18d1b8e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18d1b8e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18d1b8e6 Branch: refs/heads/ignite-648 Commit: 18d1b8e6fe4a5be363e01b7bcbdea1c6f3bedb94 Parents: 80ea1a3 94a42a4 Author: ashutak <ashu...@gridgain.com> Authored: Wed Jul 8 15:07:02 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Wed Jul 8 15:07:02 2015 +0300 ---------------------------------------------------------------------- dev-tools/slurp.sh | 2 +- .../cache/query/GridCacheQueryAdapter.java | 35 +++- .../processors/query/GridQueryProcessor.java | 5 + .../ignite/spi/discovery/tcp/ServerImpl.java | 20 ++ .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- .../cache/CacheFutureExceptionSelfTest.java | 121 +++-------- ...acheAtomicReplicatedNodeRestartSelfTest.java | 8 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++++ .../IgniteSpiDiscoverySelfTestSuite.java | 3 + .../CacheAbstractQueryMetricsSelfTest.java | 157 +++++++++++++- .../cache/CacheLocalQueryMetricsSelfTest.java | 33 +++ ...titionedQueryMetricsDistributedSelfTest.java | 33 +++ ...chePartitionedQueryMetricsLocalSelfTest.java | 33 +++ .../CachePartitionedQueryMetricsSelfTest.java | 32 --- ...plicatedQueryMetricsDistributedSelfTest.java | 33 +++ ...acheReplicatedQueryMetricsLocalSelfTest.java | 33 +++ .../CacheReplicatedQueryMetricsSelfTest.java | 32 --- .../IgniteCacheQuerySelfTestSuite.java | 7 +- modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++ .../config/benchmark-put-indexed-val.properties | 64 ++++++ modules/yardstick/config/ignite-base-config.xml | 23 +++ .../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++ .../ignite/yardstick/cache/model/Person1.java | 55 +++++ .../ignite/yardstick/cache/model/Person2.java | 67 ++++++ .../ignite/yardstick/cache/model/Person8.java | 109 ++++++++++ scripts/git-patch-prop.sh | 2 +- 30 files changed, 1116 insertions(+), 177 deletions(-) ----------------------------------------------------------------------
