Repository: ignite Updated Branches: refs/heads/ignite-3477-master 7102d532c -> c56c4b8c6
http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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 0a3bd88..8de4142 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> @@ -92,16 +72,6 @@ <property name="atomicityMode" value="ATOMIC"/> </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="memoryMode" value="OFFHEAP_TIERED"/> - </bean> - <bean id="tx" class="org.apache.ignite.configuration.CacheConfiguration" abstract="true"> <property name="cacheMode" value="PARTITIONED"/> @@ -110,11 +80,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="memoryMode" value="OFFHEAP_TIERED"/> - </bean> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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 353744e..0000000 --- a/modules/yardstick/config/ignite-int-max-values-offheap-config.xml +++ /dev/null @@ -1,88 +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="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/c56c4b8c/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/c56c4b8c/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 4a42538..0000000 --- a/modules/yardstick/config/test-max-int-values-offheap.properties +++ /dev/null @@ -1,65 +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 \ -" - -#Ignite version -ver="RELEASE-" - -# 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 ${ver}int-max-values-offheap\ -" - - http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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 be0aed4..0000000 --- a/modules/yardstick/config/test-max-int-values-swap.properties +++ /dev/null @@ -1,64 +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 \ -" - -#Ignite version -ver="RELEASE-" - -# 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 ${ver}int-max-values-swap\ -" - http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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/c56c4b8c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index b8f3a59..59b31f9 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -43,7 +43,6 @@ import org.yardstickframework.BenchmarkConfiguration; import org.yardstickframework.BenchmarkServer; import org.yardstickframework.BenchmarkUtils; -import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_VALUES; import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MARSHALLER; /** @@ -126,15 +125,6 @@ public class IgniteNode implements BenchmarkServer { c.setConnectorConfiguration(ccc); } - if (args.isOffHeap()) { - cc.setOffHeapMaxMemory(0); - - if (args.isOffheapValues()) - cc.setMemoryMode(OFFHEAP_VALUES); - else - cc.setEvictionPolicy(new LruEvictionPolicy(50000)); - } - cc.setReadThrough(args.isStoreEnabled()); cc.setWriteThrough(args.isStoreEnabled()); http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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/c56c4b8c/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 http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.java deleted file mode 100644 index c820db7..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutOffHeapBenchmark.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 query operations - * with {@link CacheMemoryMode#OFFHEAP_TIERED OFFHEAP TIERED} memory mode. - */ -public class IgniteSqlQueryPutOffHeapBenchmark extends IgniteSqlQueryPutBenchmark { - /** {@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/c56c4b8c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapInvokeRetryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapInvokeRetryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapInvokeRetryBenchmark.java deleted file mode 100644 index c8b0b1d..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapInvokeRetryBenchmark.java +++ /dev/null @@ -1,31 +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.failover; - -/** - * Invoke retry failover benchmark. <p> Each client maintains a local map that it updates together with cache. Client - * invokes an increment closure for all generated keys and atomically increments value for corresponding keys in the - * local map. To validate cache contents, all writes from the client are stopped, values in the local map are compared - * to the values in the cache. - */ -public class IgniteAtomicOffHeapInvokeRetryBenchmark extends IgniteAtomicInvokeRetryBenchmark { - /** {@inheritDoc} */ - @Override protected String cacheName() { - return "atomic-offheap-invoke-retry"; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapRetriesBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapRetriesBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapRetriesBenchmark.java deleted file mode 100644 index ebb9eac..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteAtomicOffHeapRetriesBenchmark.java +++ /dev/null @@ -1,31 +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.failover; - -/** - * Atomic retries failover benchmark. - * <p> - * Client generates continuous load to the cluster (random get, put, invoke, remove - * operations). - */ -public class IgniteAtomicOffHeapRetriesBenchmark extends IgniteAtomicRetriesBenchmark { - /** {@inheritDoc} */ - @Override protected String cacheName() { - return "atomic-offheap-reties"; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapInvokeRetryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapInvokeRetryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapInvokeRetryBenchmark.java deleted file mode 100644 index 4cbcf67..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapInvokeRetryBenchmark.java +++ /dev/null @@ -1,33 +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.failover; - -/** - * Invoke retry failover benchmark. - * <p> - * Each client maintains a local map that it updates together with cache. - * Client invokes an increment closure for all generated keys and atomically increments value for corresponding - * keys in the local map. To validate cache contents, all writes from the client are stopped, values in - * the local map are compared to the values in the cache. - */ -public class IgniteTransactionalOffHeapInvokeRetryBenchmark extends IgniteTransactionalInvokeRetryBenchmark { - /** {@inheritDoc} */ - @Override protected String cacheName() { - return "tx-offheap-invoke-retry"; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteInvokeBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteInvokeBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteInvokeBenchmark.java deleted file mode 100644 index 7fa2d1a..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteInvokeBenchmark.java +++ /dev/null @@ -1,37 +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.failover; - -/** - * Transactional write invoke failover benchmark. - * <p> - * Each client generates a random integer K in a limited range and creates keys in the form 'key-' + K + 'master', - * 'key-' + K + '-1', 'key-' + K + '-2', ... Then client starts a pessimistic repeatable read transaction - * and randomly chooses between read and write scenarios: - * <ul> - * <li>Reads value associated with the master key and child keys. Values must be equal.</li> - * <li>Reads value associated with the master key, increments it by 1 and puts the value, then invokes increment - * closure on child keys. No validation is performed.</li> - * </ul> - */ -public class IgniteTransactionalOffHeapWriteInvokeBenchmark extends IgniteTransactionalWriteInvokeBenchmark { - /** {@inheritDoc} */ - @Override protected String cacheName() { - return "tx-offheap-write-invoke"; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteReadBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteReadBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteReadBenchmark.java deleted file mode 100644 index bdecca7..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteTransactionalOffHeapWriteReadBenchmark.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.failover; - -/** - * Transactional write read failover benchmark. - * <p> - * Each client generates a random integer K in a limited range and creates keys in the form 'key-' + K + '-1', - * 'key-' + K + '-2', ... Then client starts a pessimistic repeatable read transaction, reads value associated with - * each key. Values must be equal. Client increments value by 1, commits the transaction. - */ -public class IgniteTransactionalOffHeapWriteReadBenchmark extends IgniteTransactionalWriteReadBenchmark { - /** {@inheritDoc} */ - @Override protected String cacheName() { - return "tx-offheap-write-read"; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/c56c4b8c/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java index 437d309..4010f5e 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/load/IgniteCacheRandomOperationBenchmark.java @@ -47,7 +47,6 @@ import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; -import org.apache.ignite.cache.CacheMemoryMode; import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.QueryEntity; import org.apache.ignite.cache.QueryIndex; @@ -253,12 +252,6 @@ public class IgniteCacheRandomOperationBenchmark extends IgniteAbstractBenchmark CacheConfiguration configuration = cache.getConfiguration(CacheConfiguration.class); if (isClassDefinedInConfig(configuration)) { - if (configuration.getMemoryMode() == CacheMemoryMode.OFFHEAP_TIERED && - configuration.getQueryEntities().size() > 2) { - throw new IgniteException("Off-heap mode is unsupported by the load test due to bugs IGNITE-2982" + - " and IGNITE-2997"); - } - ArrayList<Class> keys = new ArrayList<>(); ArrayList<Class> values = new ArrayList<>();
