Merge remote-tracking branch 'origin/ignite-950' into ignite-950
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7512412f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7512412f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7512412f Branch: refs/heads/ignite-950 Commit: 7512412fab6299c956db09293344ff44d42b0fb0 Parents: 08f8fa7 43c2138 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Jul 8 15:22:48 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Jul 8 15:22:48 2015 -0700 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 20 ++++ .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 8 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 38 +++++++ .../IgniteSpiDiscoverySelfTestSuite.java | 3 + .../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 +++++++++++++++++++ 15 files changed, 525 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
