You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/02/02 15:17:34 UTC
[42/43] incubator-ignite git commit: # ignite-26 merge from sprint-1
# ignite-26 merge from sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f24882d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f24882d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f24882d
Branch: refs/heads/ignite-26
Commit: 2f24882da0145de1a4e839a5535fe3f9051c77e6
Parents: addef7e ff7ee6d
Author: sboikov <sb...@gridgain.com>
Authored: Mon Feb 2 17:15:24 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Feb 2 17:15:24 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/2f24882d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index c0577b4,bfb199c..3d52051
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -3135,13 -3102,8 +3133,8 @@@ public class IgniteKernal extends Clust
}
/** {@inheritDoc} */
- @Override public GridInteropProcessor interop() {
- return ctx.interop();
- }
-
- /** {@inheritDoc} */
@Override public <K> Map<ClusterNode, Collection<K>> mapKeysToNodes(String cacheName,
- @Nullable Collection<? extends K> keys) throws IgniteCheckedException {
+ @Nullable Collection<? extends K> keys) {
if (F.isEmpty(keys))
return Collections.emptyMap();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f24882d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f24882d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
index 467567f,f83c476..98c9ad3
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheStoreManager.java
@@@ -186,13 -179,10 +185,10 @@@ public class GridCacheStoreManager<K, V
boolean convertPortable = !cctx.config().isKeepPortableInStore();
if (cctx.config().isPortableEnabled()) {
- if (store instanceof GridInteropAware)
- ((GridInteropAware)store).configure(cctx.cache().name(), convertPortable);
- else
- this.convertPortable = convertPortable;
+ this.convertPortable = convertPortable;
}
else if (convertPortable)
- U.warn(log, "GridCacheConfiguration.isKeepPortableInStore() configuration property will " +
+ U.warn(log, "CacheConfiguration.isKeepPortableInStore() configuration property will " +
"be ignored because portable mode is not enabled for cache: " + cctx.namex());
}
@@@ -252,7 -256,8 +262,8 @@@
* @return Loaded value, possibly <tt>null</tt>.
* @throws IgniteCheckedException If data loading failed.
*/
+ @SuppressWarnings("unchecked")
- @Nullable private Object loadFromStore(@Nullable IgniteTx tx,
+ @Nullable private Object loadFromStore(@Nullable IgniteTxEx tx,
K key,
boolean convert)
throws IgniteCheckedException {
@@@ -524,7 -531,8 +537,8 @@@
* @return {@code true} If there is a persistent storage.
* @throws IgniteCheckedException If storage failed.
*/
+ @SuppressWarnings("unchecked")
- public boolean putToStore(@Nullable IgniteTx tx, K key, V val, GridCacheVersion ver)
+ public boolean putToStore(@Nullable IgniteTxEx tx, K key, V val, GridCacheVersion ver)
throws IgniteCheckedException {
if (store != null) {
// Never persist internal keys.
@@@ -634,7 -642,8 +648,8 @@@
* @return {@code True} if there is a persistent storage.
* @throws IgniteCheckedException If storage failed.
*/
+ @SuppressWarnings("unchecked")
- public boolean removeFromStore(@Nullable IgniteTx tx, K key) throws IgniteCheckedException {
+ public boolean removeFromStore(@Nullable IgniteTxEx tx, K key) throws IgniteCheckedException {
if (store != null) {
// Never remove internal key from store as it is never persisted.
if (key instanceof GridCacheInternal)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f24882d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheWriteBehindStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f24882d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f24882d/modules/core/src/main/java/org/apache/ignite/internal/processors/streamer/IgniteStreamerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f24882d/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------