Merge branch 'sprint-1' into ignite-140
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75ecf4ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75ecf4ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75ecf4ab Branch: refs/heads/ignite-6 Commit: 75ecf4ab840ce834a731bba7aac7bcdb25822bc7 Parents: 9616b02 ff7ee6d Author: Artem SHutak <ashu...@gridgain.com> Authored: Mon Feb 2 18:00:35 2015 +0300 Committer: Artem SHutak <ashu...@gridgain.com> Committed: Mon Feb 2 18:00:35 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 22 -- .../ignite/internal/GridKernalContext.java | 8 - .../ignite/internal/GridKernalContextImpl.java | 12 -- .../org/apache/ignite/internal/IgniteEx.java | 8 - .../apache/ignite/internal/IgniteKernal.java | 7 - .../org/apache/ignite/internal/IgnitionEx.java | 1 - .../GridDeploymentPerLoaderStore.java | 20 +- .../GridDeploymentPerVersionStore.java | 4 +- .../processors/cache/GridCacheAdapter.java | 5 +- .../cache/GridCacheDeploymentManager.java | 161 +++++++------- .../cache/GridCachePreloaderAdapter.java | 2 +- .../processors/cache/GridCacheProcessor.java | 5 +- .../processors/cache/GridCacheStoreManager.java | 25 ++- .../processors/cache/GridCacheSwapManager.java | 3 +- .../cache/GridCacheWriteBehindStore.java | 21 +- .../preloader/GridDhtPartitionDemandPool.java | 2 +- .../processors/interop/GridInteropAware.java | 49 ----- .../interop/GridInteropProcessor.java | 82 ------- .../interop/GridInteropProcessorAdapter.java | 31 --- .../processors/interop/GridInteropTarget.java | 109 ---------- .../interop/os/GridOsInteropProcessor.java | 80 ------- .../internal/processors/interop/os/package.html | 23 -- .../internal/processors/interop/package.html | 23 -- .../plugin/IgnitePluginProcessor.java | 10 +- .../streamer/GridStreamProcessor.java | 5 +- .../processors/streamer/IgniteStreamerEx.java | 3 +- .../processors/streamer/IgniteStreamerImpl.java | 5 +- .../cache/GridCacheCommandHandlerSelfTest.java | 10 +- .../hadoop/GridHadoopCommandLineTest.java | 4 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 6 - modules/yardstick/README.md | 67 ++++++ .../config/benchmark-atomic-win.properties | 42 ++++ .../config/benchmark-atomic.properties | 48 +++++ .../config/benchmark-compute-win.properties | 45 ++++ .../config/benchmark-compute.properties | 51 +++++ .../config/benchmark-query-win.properties | 43 ++++ .../yardstick/config/benchmark-query.properties | 49 +++++ .../config/benchmark-tx-win.properties | 42 ++++ .../yardstick/config/benchmark-tx.properties | 48 +++++ .../yardstick/config/benchmark-win.properties | 50 +++++ modules/yardstick/config/benchmark.properties | 61 ++++++ modules/yardstick/config/ignite-base-config.xml | 118 ++++++++++ .../config/ignite-localhost-config.xml | 55 +++++ .../config/ignite-multicast-config.xml | 38 ++++ modules/yardstick/pom.xml | 185 ++++++++++++++++ .../yardstick/IgniteAbstractBenchmark.java | 130 +++++++++++ .../yardstick/IgniteBenchmarkArguments.java | 213 +++++++++++++++++++ .../org/apache/ignite/yardstick/IgniteNode.java | 191 +++++++++++++++++ .../cache/IgniteCacheAbstractBenchmark.java | 44 ++++ .../yardstick/cache/IgniteGetBenchmark.java | 41 ++++ .../yardstick/cache/IgnitePutBenchmark.java | 42 ++++ .../yardstick/cache/IgnitePutGetBenchmark.java | 47 ++++ .../cache/IgnitePutGetTxBenchmark.java | 52 +++++ .../yardstick/cache/IgnitePutTxBenchmark.java | 43 ++++ .../cache/IgniteSqlQueryBenchmark.java | 94 ++++++++ .../cache/IgniteSqlQueryJoinBenchmark.java | 118 ++++++++++ .../cache/IgniteSqlQueryPutBenchmark.java | 86 ++++++++ .../yardstick/cache/model/Organization.java | 110 ++++++++++ .../ignite/yardstick/cache/model/Person.java | 191 +++++++++++++++++ .../yardstick/cache/model/SampleValue.java | 62 ++++++ .../compute/IgniteAffinityCallBenchmark.java | 36 ++++ .../yardstick/compute/IgniteApplyBenchmark.java | 72 +++++++ .../compute/IgniteBroadcastBenchmark.java | 35 +++ .../compute/IgniteExecuteBenchmark.java | 35 +++ .../yardstick/compute/IgniteRunBenchmark.java | 71 +++++++ .../yardstick/compute/model/NoopCallable.java | 41 ++++ .../yardstick/compute/model/NoopTask.java | 97 +++++++++ pom.xml | 9 +- 68 files changed, 2948 insertions(+), 600 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/75ecf4ab/pom.xml ----------------------------------------------------------------------
