ignite-4535 : Removing CacheMemoryMode - done. (cherry picked from commit 6b7472c)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4ea0316e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4ea0316e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4ea0316e Branch: refs/heads/ignite-3477-master Commit: 4ea0316e7a2e04389e57efbfbbeaad77fa5bcb45 Parents: 7a49fa5 Author: Ilya Lantukh <[email protected]> Authored: Tue Mar 21 16:48:51 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Thu Mar 30 16:20:13 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheMemoryMode.java | 63 ------------- .../configuration/CacheConfiguration.java | 23 ----- .../configuration/CollectionConfiguration.java | 14 --- modules/yardstick/README.txt | 2 - .../config/benchmark-atomic-win.properties | 8 +- .../config/benchmark-atomic.properties | 12 +-- .../config/benchmark-client-mode.properties | 9 -- .../config/benchmark-multicast.properties | 9 -- .../config/benchmark-query-win.properties | 5 +- .../yardstick/config/benchmark-query.properties | 3 - .../config/benchmark-tx-win.properties | 6 +- .../yardstick/config/benchmark-tx.properties | 4 - modules/yardstick/config/benchmark.properties | 11 +-- modules/yardstick/config/ignite-base-config.xml | 63 ------------- .../config/ignite-base-load-config.xml | 63 ------------- .../config/ignite-cache-load-config.xml | 5 -- .../config/ignite-failover-base-config.xml | 41 --------- .../ignite-int-max-values-offheap-config.xml | 89 ------------------- .../ignite-int-max-values-swap-config.xml | 93 -------------------- .../test-max-int-values-offheap.properties | 62 ------------- .../config/test-max-int-values-swap.properties | 61 ------------- .../yardstick/IgniteBenchmarkArguments.java | 29 ------ .../cache/IgniteGetOffHeapBenchmark.java | 32 ------- .../cache/IgniteGetOffHeapValuesBenchmark.java | 32 ------- .../cache/IgnitePutGetOffHeapBenchmark.java | 32 ------- .../IgnitePutGetOffHeapValuesBenchmark.java | 32 ------- .../cache/IgnitePutGetTxOffHeapBenchmark.java | 32 ------- .../IgnitePutGetTxOffHeapValuesBenchmark.java | 32 ------- .../cache/IgnitePutOffHeapBenchmark.java | 32 ------- .../cache/IgnitePutOffHeapValuesBenchmark.java | 32 ------- .../IgnitePutRandomValueSizeBenchmark.java | 2 +- .../cache/IgnitePutTxOffHeapBenchmark.java | 32 ------- .../IgnitePutTxOffHeapValuesBenchmark.java | 32 ------- .../IgniteSqlQueryJoinOffHeapBenchmark.java | 32 ------- .../cache/IgniteSqlQueryOffHeapBenchmark.java | 32 ------- .../IgniteSqlQueryPutOffHeapBenchmark.java | 32 ------- ...IgniteAtomicOffHeapInvokeRetryBenchmark.java | 31 ------- .../IgniteAtomicOffHeapRetriesBenchmark.java | 31 ------- ...ransactionalOffHeapInvokeRetryBenchmark.java | 33 ------- ...ransactionalOffHeapWriteInvokeBenchmark.java | 37 -------- ...eTransactionalOffHeapWriteReadBenchmark.java | 32 ------- .../IgniteCacheRandomOperationBenchmark.java | 1 - 42 files changed, 8 insertions(+), 1250 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java deleted file mode 100644 index 5c840cd..0000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheMemoryMode.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache; - -import org.apache.ignite.cache.eviction.EvictionPolicy; - -/** - * Defines set of memory modes. Memory modes help control whether cache entries are - * stored on heap memory, offheap memory, or in swap space. - */ -@Deprecated public enum CacheMemoryMode { - /** - * Entries will be stored on-heap first. The onheap tiered storage works as follows: - * <nl> - * <li>Entries are cached on heap memory first.</li> - * <li> - * If offheap memory is enabled and eviction policy evicts an entry from heap memory, entry will - * be moved to offheap memory. If offheap memory is disabled, then entry is simply discarded. - * </li> - * <li> - * If swap space is enabled and offheap memory fills up, then entry will be evicted into swap space. - * If swap space is disabled, then entry will be discarded. If swap is enabled and offheap memory - * is disabled, then entry will be evicted directly from heap memory into swap. - * </li> - * </nl> - * <p> - * <b>Note</b> that heap memory evictions are handled by configured {@link EvictionPolicy} - * implementation. By default, no eviction policy is enabled, so entries never leave heap - * memory space unless explicitly removed. - */ - ONHEAP_TIERED, - - /** - * Works the same as {@link #ONHEAP_TIERED}, except that entries never end up in heap memory and get - * stored in offheap memory right away. Entries get cached in offheap memory first and then - * get evicted to swap, if one is configured. - */ - OFFHEAP_TIERED, - - /** - * Entry keys will be stored on heap memory, and values will be stored in offheap memory. Note - * that in this mode entries can be evicted only to swap. The evictions will happen according - * to configured {@link EvictionPolicy}. - * <p/> - * Size returned by {@link CachePeekMode#OFFHEAP} is always zero, for this mode. - */ - OFFHEAP_VALUES, -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 418c7fb..476b983 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -46,7 +46,6 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryProcessor; import org.apache.ignite.cache.CacheInterceptor; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.CacheRebalanceMode; import org.apache.ignite.cache.CacheTypeMetadata; @@ -1669,28 +1668,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { } /** - * Gets memory mode for cache. Memory mode helps control whether value is stored in on-heap memory, - * off-heap memory, or swap space. Refer to {@link CacheMemoryMode} for more info. - * - * @return Memory mode. - */ - @Deprecated public CacheMemoryMode getMemoryMode() { - return null; - } - - /** - * Sets memory mode for cache. - * - * @param memMode Memory mode. - * @return {@code this} for chaining. - */ - @Deprecated public CacheConfiguration<K, V> setMemoryMode(CacheMemoryMode memMode) { - //this.memMode = memMode; - - return this; - } - - /** * Gets cache interceptor. * * @return Cache interceptor. http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java index e92b8a7..2d3af8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CollectionConfiguration.java @@ -19,7 +19,6 @@ package org.apache.ignite.configuration; import java.io.Serializable; import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.util.typedef.internal.S; @@ -98,19 +97,6 @@ public class CollectionConfiguration implements Serializable { } /** - * @return Cache memory mode. - */ - @Deprecated public CacheMemoryMode getMemoryMode() { - return null; - } - - /** - * @param memoryMode Memory mode. - */ - @Deprecated public void setMemoryMode(CacheMemoryMode memoryMode) { - } - - /** * @return Predicate specifying on which nodes the cache should be started. */ public IgnitePredicate<ClusterNode> getNodeFilter() { http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/README.txt ---------------------------------------------------------------------- diff --git a/modules/yardstick/README.txt b/modules/yardstick/README.txt index 5903fd4..c21ed2a 100644 --- a/modules/yardstick/README.txt +++ b/modules/yardstick/README.txt @@ -120,8 +120,6 @@ would behave like a `servers`. * `-nn <num>` or `--nodeNumber <num>` - Number of nodes (automatically set in `benchmark.properties`), used to wait for the specified number of nodes to start * `-sm <mode>` or `-syncMode <mode>` - Synchronization mode (defined in `CacheWriteSynchronizationMode`) -* `-ot` or `--offheapTiered` - Flag indicating whether tiered off-heap mode is on -* `-ov` or `--offheapValuesOnly` - Flag indicating whether off-heap mode is on and only cache values are stored off-heap * `-r <num>` or `--range` - Range of keys that are randomly generated for cache operations * `-rd or --restartdelay` - Restart delay in seconds * `-rs or --restartsleep` - Restart sleep in seconds http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-atomic-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-atomic-win.properties b/modules/yardstick/config/benchmark-atomic-win.properties index 202306e..be13d77 100644 --- a/modules/yardstick/config/benchmark-atomic-win.properties +++ b/modules/yardstick/config/benchmark-atomic-win.properties @@ -54,11 +54,5 @@ set DRIVER_HOSTS=localhost :: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). set CONFIGS=^ -cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds atomic-get-offheap-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-get-offheap-val-1-backup,^ -cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds atomic-put-get-offheap-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-get-offheap-val-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds atomic-put-offheap-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-offheap-val-1-backup +-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-atomic.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-atomic.properties b/modules/yardstick/config/benchmark-atomic.properties index 967a603..beb3ec1 100644 --- a/modules/yardstick/config/benchmark-atomic.properties +++ b/modules/yardstick/config/benchmark-atomic.properties @@ -71,13 +71,7 @@ sm=PRIMARY_SYNC # Run configuration. # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapBenchmark -sn IgniteNode -ds atomic-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-get-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds atomic-put-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-get-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds atomic-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds atomic-put-offheap-val-${b}-backup\ +-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetBenchmark -sn IgniteNode -ds atomic-get-1-backup,\ +-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetBenchmark -sn IgniteNode -ds atomic-put-get-1-backup,\ +-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutBenchmark -sn IgniteNode -ds atomic-put-1-backup,\ " http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-client-mode.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-client-mode.properties b/modules/yardstick/config/benchmark-client-mode.properties index ad501f1..923c96a 100644 --- a/modules/yardstick/config/benchmark-client-mode.properties +++ b/modules/yardstick/config/benchmark-client-mode.properties @@ -95,13 +95,4 @@ CONFIGS="\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} --client -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup\ " http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-multicast.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-multicast.properties b/modules/yardstick/config/benchmark-multicast.properties index 7f76495..3e89d8f 100644 --- a/modules/yardstick/config/benchmark-multicast.properties +++ b/modules/yardstick/config/benchmark-multicast.properties @@ -100,15 +100,6 @@ CONFIGS="\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-optimistic-put-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}tx-putAll-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-multicast-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -bs 100 -dn IgnitePutAllSerializableTxBenchmark -sn IgniteNode -ds ${ver}tx-putAllSerializable-${b}-backup,\ http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-query-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-query-win.properties b/modules/yardstick/config/benchmark-query-win.properties index 6bd8fb9..0c410e3 100644 --- a/modules/yardstick/config/benchmark-query-win.properties +++ b/modules/yardstick/config/benchmark-query-win.properties @@ -54,8 +54,5 @@ set DRIVER_HOSTS=localhost :: Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). set CONFIGS=^ -cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds sql-query-offheap-1-backup,^ -cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds sql-query-join-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds sql-query-join-offheap-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds sql-query-put-offheap-1-backup +-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-1-backup http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-query.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-query.properties b/modules/yardstick/config/benchmark-query.properties index 9192512..447798c 100644 --- a/modules/yardstick/config/benchmark-query.properties +++ b/modules/yardstick/config/benchmark-query.properties @@ -72,11 +72,8 @@ sm=PRIMARY_SYNC # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryBenchmark -sn IgniteNode -ds sql-query-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds sql-query-offheap-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinBenchmark -sn IgniteNode -ds sql-query-join-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds sql-query-join-offheap-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutBenchmark -sn IgniteNode -ds sql-query-put-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds sql-query-put-offheap-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite://127.0.0.1/query -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -jdbc jdbc:ignite:cfg://cache=query@config/ignite-jdbc-config.xml -t ${t} -sm ${sm} -dn IgniteJdbcSqlQueryBenchmark -sn IgniteNode -ds sql-query-jdbc-${b}-backup\ " http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-tx-win.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-tx-win.properties b/modules/yardstick/config/benchmark-tx-win.properties index 490b9d7..ad9cc41 100644 --- a/modules/yardstick/config/benchmark-tx-win.properties +++ b/modules/yardstick/config/benchmark-tx-win.properties @@ -56,8 +56,4 @@ set CONFIGS=^ -cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-1-backup,^ -cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-1-backup,^ -cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds tx-invoke-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds tx-put-offheap-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-offheap-val-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxOffHeapBenchmark -sn IgniteNode -ds tx-put-get-offheap-1-backup,^ --cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-get-offheap-val-1-backup +-cfg %SCRIPT_DIR%\..\config\ignite-localhost-config.xml -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-1-backup http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark-tx.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-tx.properties b/modules/yardstick/config/benchmark-tx.properties index cc48c53..e579f76 100644 --- a/modules/yardstick/config/benchmark-tx.properties +++ b/modules/yardstick/config/benchmark-tx.properties @@ -74,9 +74,5 @@ CONFIGS="\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxBenchmark -sn IgniteNode -ds tx-put-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteGetAndPutTxBenchmark -sn IgniteNode -ds tx-getAndPut-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteInvokeTxBenchmark -sn IgniteNode -ds tx-invoke-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds tx-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-offheap-val-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxBenchmark -sn IgniteNode -ds tx-put-get-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapBenchmark -sn IgniteNode -ds tx-put-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetTxOffHeapValuesBenchmark -sn IgniteNode -ds tx-put-get-offheap-val-${b}-backup\ " http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/benchmark.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark.properties b/modules/yardstick/config/benchmark.properties index cccbf2a..2dd51eb 100644 --- a/modules/yardstick/config/benchmark.properties +++ b/modules/yardstick/config/benchmark.properties @@ -95,16 +95,7 @@ CONFIGS="\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteApplyBenchmark -sn IgniteNode -ds ${ver}apply-compute-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteBroadcastBenchmark -sn IgniteNode -ds ${ver}broad-compute-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteExecuteBenchmark -sn IgniteNode -ds ${ver}exec-compute-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutGetOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-get-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}atomic-put-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgnitePutTxOffHeapValuesBenchmark -sn IgniteNode -ds ${ver}tx-put-offheap-val-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryJoinOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-join-offheap-${b}-backup,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -dn IgniteSqlQueryPutOffHeapBenchmark -sn IgniteNode -ds ${ver}sql-query-put-offheap-${b}-backup,\ +-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -sm ${sm} -j ${j} -dn IgniteRunBenchmark -sn IgniteNode -ds ${ver}run-compute-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -col -sm PRIMARY_SYNC -dn IgnitePutAllBenchmark -sn IgniteNode -ds ${ver}atomic-collocated-putAll-${b}-backup,\ -cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} -t ${t} -bs 1000 -sm PRIMARY_SYNC -dn IgnitePutAllTxBenchmark -sn IgniteNode -ds ${ver}atomic-putAll-tx-${b}-backup,\ http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-base-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml index 2ef3ba6..fe2c0e9 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -40,27 +40,6 @@ </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="atomic-offheap"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="ATOMIC"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - </bean> - - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="atomic-offheap-values"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="ATOMIC"/> - - <property name="memoryMode" value="OFFHEAP_VALUES"/> - - </bean> - - <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="tx"/> <property name="cacheMode" value="PARTITIONED"/> @@ -70,28 +49,6 @@ </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="tx-offheap"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="TRANSACTIONAL"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - - </bean> - - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="tx-offheap-values"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="TRANSACTIONAL"/> - - <property name="memoryMode" value="OFFHEAP_VALUES"/> - - </bean> - - <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="atomic-index"/> <property name="cacheMode" value="PARTITIONED"/> @@ -190,26 +147,6 @@ </bean> <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="query-offheap"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="ATOMIC"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - - <property name="indexedTypes"> - <list> - <value>java.lang.Integer</value> - <value>org.apache.ignite.yardstick.cache.model.Organization</value> - - <value>java.lang.Integer</value> - <value>org.apache.ignite.yardstick.cache.model.Person</value> - </list> - </property> - </bean> - - <bean class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="compute"/> <property name="cacheMode" value="PARTITIONED"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-base-load-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-base-load-config.xml b/modules/yardstick/config/ignite-base-load-config.xml index dfa3304..cd9eb06 100644 --- a/modules/yardstick/config/ignite-base-load-config.xml +++ b/modules/yardstick/config/ignite-base-load-config.xml @@ -48,27 +48,6 @@ <property name="atomicityMode" value="ATOMIC"/> </bean> - <bean name="atomic-offheap" class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="atomic-offheap"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="ATOMIC"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - </bean> - - <bean name="atomic-offheap-values" class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="atomic-offheap-values"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="ATOMIC"/> - - <property name="memoryMode" value="OFFHEAP_VALUES"/> - - </bean> - <bean name="tx" class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="tx-fat-values"/> @@ -78,28 +57,6 @@ </bean> - <bean name="tx-offheap" class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="tx-offheap"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="TRANSACTIONAL"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - - </bean> - - <bean name="tx-offheap-values" class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="tx-offheap-values"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="TRANSACTIONAL"/> - - <property name="memoryMode" value="OFFHEAP_VALUES"/> - - </bean> - <bean name="atomic-index" class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="atomic-index"/> @@ -197,26 +154,6 @@ </property> </bean> - <bean name="query-offheap" class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="query-offheap"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="ATOMIC"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - - <property name="indexedTypes"> - <list> - <value>java.lang.Integer</value> - <value>org.apache.ignite.yardstick.cache.model.Organization</value> - - <value>java.lang.Integer</value> - <value>org.apache.ignite.yardstick.cache.model.Person</value> - </list> - </property> - </bean> - <bean name="compute" class="org.apache.ignite.configuration.CacheConfiguration"> <property name="name" value="compute"/> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-cache-load-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-cache-load-config.xml b/modules/yardstick/config/ignite-cache-load-config.xml index 6c6ac89..f58237f 100644 --- a/modules/yardstick/config/ignite-cache-load-config.xml +++ b/modules/yardstick/config/ignite-cache-load-config.xml @@ -32,15 +32,10 @@ <property name="cacheConfiguration"> <list> <ref bean="atomic" /> - <ref bean="atomic-offheap" /> - <ref bean="atomic-offheap-values" /> <ref bean="tx" /> - <ref bean="tx-offheap" /> - <ref bean="tx-offheap-values" /> <ref bean="atomic-index" /> <ref bean="query" /> <ref bean="orgCache" /> - <!--<ref bean="query-offheap" />--> <ref bean="compute" /> </list> </property> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-failover-base-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-failover-base-config.xml b/modules/yardstick/config/ignite-failover-base-config.xml index 1e1dcff..3e40765 100644 --- a/modules/yardstick/config/ignite-failover-base-config.xml +++ b/modules/yardstick/config/ignite-failover-base-config.xml @@ -37,41 +37,21 @@ <property name="name" value="atomic-reties"/> </bean> - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="atomic-offheap"> - <property name="name" value="atomic-offheap-reties"/> - </bean> - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="atomic"> <property name="name" value="atomic-invoke-retry"/> </bean> - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="atomic-offheap"> - <property name="name" value="atomic-offheap-invoke-retry"/> - </bean> - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx"> <property name="name" value="tx-invoke-retry"/> </bean> - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx-offheap"> - <property name="name" value="tx-offheap-invoke-retry"/> - </bean> - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx"> <property name="name" value="tx-write-read"/> </bean> - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx-offheap"> - <property name="name" value="tx-offheap-write-read"/> - </bean> - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx"> <property name="name" value="tx-write-invoke"/> </bean> - - <bean class="org.apache.ignite.configuration.CacheConfiguration" parent="tx-offheap"> - <property name="name" value="tx-offheap-write-invoke"/> - </bean> </list> </property> @@ -94,18 +74,6 @@ <property name="swapEnabled" value="false"/> </bean> - <bean id="atomic-offheap" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> - <property name="name" value="atomic-offheap"/> - - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="ATOMIC"/> - - <property name="swapEnabled" value="false"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - </bean> - <bean id="tx" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> <property name="cacheMode" value="PARTITIONED"/> @@ -114,13 +82,4 @@ <property name="swapEnabled" value="false"/> </bean> - <bean id="tx-offheap" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> - <property name="cacheMode" value="PARTITIONED"/> - - <property name="atomicityMode" value="TRANSACTIONAL"/> - - <property name="swapEnabled" value="false"/> - - <property name="memoryMode" value="OFFHEAP_TIERED"/> - </bean> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-int-max-values-offheap-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-int-max-values-offheap-config.xml b/modules/yardstick/config/ignite-int-max-values-offheap-config.xml deleted file mode 100644 index 86e9656..0000000 --- a/modules/yardstick/config/ignite-int-max-values-offheap-config.xml +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Ignite Spring configuration file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="peerClassLoadingEnabled" value="true"/> - - <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> - <property name="requireSerializable" value="false"/> - </bean> - </property> - -<!-- - <property name="marshaller"> - <bean class="org.apache.ignite.internal.binary.BinaryMarshaller"/> - </property> ---> - - <property name="networkTimeout" value="600000"/> - - <property name="discoverySpi"> - <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> - <property name="networkTimeout" value="600000"/> - - <property name="socketTimeout" value="600000"/> - - <property name="ackTimeout" value="60000"/> - - <property name="ipFinder"> - <!-- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> --> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> - <!-- - <property name="addresses"> - <list> - <!– In distributed environment, replace with actual host IP address. –> - <value>127.0.0.1:47500..47509</value> - </list> - </property> - --> - </bean> - </property> - </bean> - </property> - - <property name="cacheConfiguration"> - <list> - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="int-max-value-cache"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="backups" value="0"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="memoryMode" value="ONHEAP_TIERED"/> - <property name="offHeapMaxMemory" value="#{32 * 1024 * 1024 * 1024L}"/> - <property name="swapEnabled" value="false"/> - <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy"> - <property name="maxSize" value="4000000"/> - <property name="batchSize" value="500000"/> - </bean> - </property> - </bean> - </list> - </property> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/ignite-int-max-values-swap-config.xml ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/ignite-int-max-values-swap-config.xml b/modules/yardstick/config/ignite-int-max-values-swap-config.xml deleted file mode 100644 index edb15d3..0000000 --- a/modules/yardstick/config/ignite-int-max-values-swap-config.xml +++ /dev/null @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<!-- - Ignite Spring configuration file. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> - <property name="peerClassLoadingEnabled" value="true"/> - - <property name="marshaller"> - <bean class="org.apache.ignite.marshaller.optimized.OptimizedMarshaller"> - <property name="requireSerializable" value="false"/> - </bean> - </property> - -<!-- - <property name="marshaller"> - <bean class="org.apache.ignite.internal.binary.BinaryMarshaller"/> - </property> ---> - - <property name="networkTimeout" value="600000"/> - - <property name="discoverySpi"> - <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> - <property name="networkTimeout" value="600000"/> - - <property name="socketTimeout" value="600000"/> - - <property name="ackTimeout" value="60000"/> - - <property name="ipFinder"> - <!-- <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder"> --> - <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder"> - <!-- - <property name="addresses"> - <list> - <!– In distributed environment, replace with actual host IP address. –> - <value>127.0.0.1:47500..47509</value> - </list> - </property> - --> - </bean> - </property> - </bean> - </property> - - <property name="cacheConfiguration"> - <list> - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="int-max-value-cache"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="backups" value="0"/> - <property name="atomicityMode" value="ATOMIC"/> - <property name="memoryMode" value="ONHEAP_TIERED"/> - <property name="offHeapMaxMemory" value="#{32 * 1024 * 1024 * 1024L}"/> - <property name="swapEnabled" value="true"/> - <property name="evictionPolicy"> - <bean class="org.apache.ignite.cache.eviction.fifo.FifoEvictionPolicy"> - <property name="maxSize" value="4000000"/> - <property name="batchSize" value="500000"/> - </bean> - </property> - </bean> - </list> - </property> - - <property name="swapSpaceSpi"> - <bean class="org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi"/> - </property> - </bean> -</beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/test-max-int-values-offheap.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/test-max-int-values-offheap.properties b/modules/yardstick/config/test-max-int-values-offheap.properties deleted file mode 100644 index 838986d..0000000 --- a/modules/yardstick/config/test-max-int-values-offheap.properties +++ /dev/null @@ -1,62 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Contains benchmarks for SQL queries. -# - -# JVM options. -# JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" - -# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. -JVM_OPTS=${JVM_OPTS}" \ --Xms8g \ --Xmx8g \ --Xloggc:./gc${now0}.log \ --XX:+PrintGCDetails \ --verbose:gc \ --XX:+UseParNewGC \ --XX:+UseConcMarkSweepGC \ -" - -# List of default probes. -# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux). -# BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe - -# Packages where the specified benchmark is searched by reflection mechanism. -BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick - -# Probe point writer class name. -# BENCHMARK_WRITER= - -# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default. -SERVER_HOSTS=fosters-215,fosters-216,fosters-217,fosters-226,fosters-219,fosters-221,fosters-222,fosters-223 - -# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default. -DRIVER_HOSTS=fosters-218 - -# Remote username. -# REMOTE_USER= - -# Number of nodes, used to wait for the specified number of nodes to start. -nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`)) - -# Run configuration. -# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). -CONFIGS="\ --cfg ${SCRIPT_DIR}/../config/ignite-int-max-values-offheap-config.xml -nn ${nodesNum} -b 0 -w 0 -d 9999999 -t 1 -sm PRIMARY_SYNC -dn IntMaxValueEntriesTest -sn IgniteNode -ds int-max-values-offheap\ -" - - http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/config/test-max-int-values-swap.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/test-max-int-values-swap.properties b/modules/yardstick/config/test-max-int-values-swap.properties deleted file mode 100644 index c462ada..0000000 --- a/modules/yardstick/config/test-max-int-values-swap.properties +++ /dev/null @@ -1,61 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Contains benchmarks for SQL queries. -# - -# JVM options. -# JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" - -# Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. -JVM_OPTS=${JVM_OPTS}" \ --Xms8g \ --Xmx8g \ --Xloggc:./gc${now0}.log \ --XX:+PrintGCDetails \ --verbose:gc \ --XX:+UseParNewGC \ --XX:+UseConcMarkSweepGC \ -" - -# List of default probes. -# Add DStatProbe or VmStatProbe if your OS supports it (e.g. if running on Linux). -# BENCHMARK_DEFAULT_PROBES=ThroughputLatencyProbe,PercentileProbe - -# Packages where the specified benchmark is searched by reflection mechanism. -BENCHMARK_PACKAGES=org.yardstickframework,org.apache.ignite.yardstick - -# Probe point writer class name. -# BENCHMARK_WRITER= - -# Comma-separated list of the hosts to run BenchmarkServers on. 2 nodes on local host are enabled by default. -SERVER_HOSTS=fosters-215,fosters-216,fosters-217,fosters-226,fosters-219,fosters-221,fosters-222,fosters-223 - -# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default. -DRIVER_HOSTS=fosters-218 - -# Remote username. -# REMOTE_USER= - -# Number of nodes, used to wait for the specified number of nodes to start. -nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS} | tr ',' '\n' | wc -l`)) - -# Run configuration. -# Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). -CONFIGS="\ --cfg ${SCRIPT_DIR}/../config/ignite-int-max-values-swap-config.xml -nn ${nodesNum} -b 0 -w 0 -d 9999999 -t 1 -sm PRIMARY_SYNC -dn IntMaxValueEntriesTest -sn IgniteNode -ds int-max-values-swap\ -" - http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java index cef783e..e096caf 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteBenchmarkArguments.java @@ -78,14 +78,6 @@ public class IgniteBenchmarkArguments { private TransactionIsolation txIsolation = TransactionIsolation.REPEATABLE_READ; /** */ - @Parameter(names = {"-ot", "--offheapTiered"}, description = "Tiered offheap") - private boolean offheapTiered; - - /** */ - @Parameter(names = {"-ov", "--offheapValuesOnly"}, description = "Offheap values only") - private boolean offheapVals; - - /** */ @Parameter(names = {"-rtp", "--restPort"}, description = "REST TCP port") private int restTcpPort; @@ -295,27 +287,6 @@ public class IgniteBenchmarkArguments { } /** - * @return Offheap tiered. - */ - public boolean isOffheapTiered() { - return offheapTiered; - } - - /** - * @return Offheap values. - */ - public boolean isOffheapValues() { - return offheapVals; - } - - /** - * @return {@code True} if any offheap is enabled. - */ - public boolean isOffHeap() { - return offheapTiered || offheapVals; - } - - /** * @return Nodes. */ public int nodes() { http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java deleted file mode 100644 index 4e1d9d9..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs get operations with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} - * memory mode. - */ -public class IgniteGetOffHeapBenchmark extends IgniteGetBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("atomic-offheap"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java deleted file mode 100644 index 4042abe..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteGetOffHeapValuesBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs get operations with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES} - * memory mode. - */ -public class IgniteGetOffHeapValuesBenchmark extends IgniteGetBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("atomic-offheap-values"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java deleted file mode 100644 index 1074a49..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs put and get operations with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIRED} - * memory mode. - */ -public class IgnitePutGetOffHeapBenchmark extends IgnitePutGetBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("atomic-offheap"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java deleted file mode 100644 index 2ec457c..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetOffHeapValuesBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs put and get operations - * with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES} memory mode. - */ -public class IgnitePutGetOffHeapValuesBenchmark extends IgnitePutGetBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("atomic-offheap-values"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java deleted file mode 100644 index 3359a14..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs transactional put and get operations - * with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} memory mode. - */ -public class IgnitePutGetTxOffHeapBenchmark extends IgnitePutGetTxBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("tx-offheap"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java deleted file mode 100644 index b911051..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutGetTxOffHeapValuesBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs transactional put and get operations - * with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES} memory mode. - */ -public class IgnitePutGetTxOffHeapValuesBenchmark extends IgnitePutGetTxBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("tx-offheap-values"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java deleted file mode 100644 index 5271671..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs put operations with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} - * memory mode. - */ -public class IgnitePutOffHeapBenchmark extends IgnitePutBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("atomic-offheap"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java deleted file mode 100644 index 8db4429..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutOffHeapValuesBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs put operations with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES} - * memory mode. - */ -public class IgnitePutOffHeapValuesBenchmark extends IgnitePutBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("atomic-offheap-values"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java index be85b9f..180b50e 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutRandomValueSizeBenchmark.java @@ -36,6 +36,6 @@ public class IgnitePutRandomValueSizeBenchmark extends IgniteCacheAbstractBenchm /** {@inheritDoc} */ @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("atomic-offheap"); + return ignite().cache("atomic"); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java deleted file mode 100644 index 03e6e42..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs transactional put operations - * with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIRED} memory mode. - */ -public class IgnitePutTxOffHeapBenchmark extends IgnitePutTxImplicitBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("tx-offheap"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java deleted file mode 100644 index 1cf04d7..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxOffHeapValuesBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs transactional put operations - * with {@link CacheMemoryMode#OFFHEAP_VALUES OFFHEAP VALUES} memory mode. - */ -public class IgnitePutTxOffHeapValuesBenchmark extends IgnitePutTxImplicitBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("tx-offheap-values"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java deleted file mode 100644 index 3ea3d38..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinOffHeapBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs query operations with joins - * and {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} memory mode. - */ -public class IgniteSqlQueryJoinOffHeapBenchmark extends IgniteSqlQueryJoinBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("query-offheap"); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/4ea0316e/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java deleted file mode 100644 index 8ad10e7..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryOffHeapBenchmark.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.yardstick.cache; - -import org.apache.ignite.IgniteCache; -import org.apache.ignite.cache.CacheMemoryMode; - -/** - * Ignite benchmark that performs query operations with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} - * memory mode. - */ -public class IgniteSqlQueryOffHeapBenchmark extends IgniteSqlQueryBenchmark { - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().cache("query-offheap"); - } -} \ No newline at end of file
