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 2015/02/03 03:05:58 UTC

[44/44] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-82

Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-82


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/afeb022a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/afeb022a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/afeb022a

Branch: refs/heads/ignite-82
Commit: afeb022ae44ef2f2b5b815edc8f8645b8f68f666
Parents: 8176780 43e835b
Author: AKuznetsov <ak...@gridgain.com>
Authored: Tue Feb 3 09:05:02 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Tue Feb 3 09:05:02 2015 +0700

----------------------------------------------------------------------
 .gitignore                                      |   1 -
 config/fabric/default-config.xml                |   2 +-
 config/ignite-log4j.xml                         |  27 +--
 config/java.util.logging.properties             |   6 +-
 ipc/shmem/readme.txt                            |   2 +-
 .../spi/checkpoint/s3/S3CheckpointSpi.java      |   2 +-
 modules/clients/src/test/resources/log4j.xml    |   2 +-
 .../apache/ignite/IgniteBasicWarmupClosure.java |   2 +-
 .../apache/ignite/cache/CacheConfiguration.java |  24 +--
 .../org/apache/ignite/cache/CacheEntry.java     |   2 +-
 .../apache/ignite/cache/CacheProjection.java    |  10 +-
 .../cache/CacheWriteSynchronizationMode.java    |  10 +-
 .../configuration/IgniteConfiguration.java      |  24 +--
 .../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 +-
 .../ignite/internal/util/IgniteUtils.java       |   4 +-
 .../main/java/org/apache/ignite/package.html    |   2 +-
 modules/core/src/test/config/example-cache.xml  |   8 +-
 modules/core/src/test/config/ggfs-loopback.xml  |   8 +-
 .../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 +-
 84 files changed, 2995 insertions(+), 667 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afeb022a/pom.xml
----------------------------------------------------------------------