Repository: ignite Updated Branches: refs/heads/master f01825165 -> 2ab949349
http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/platforms/cpp/odbc-test/config/queries-default.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-default.xml b/modules/platforms/cpp/odbc-test/config/queries-default.xml index 659ad14..996ef6e 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-default.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-default.xml @@ -40,103 +40,8 @@ <property name="cacheConfiguration"> <list> - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="cache"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="writeSynchronizationMode" value="FULL_SYNC"/> - - <!-- Configure type metadata to enable queries. --> - <property name="queryEntities"> - <list> - <bean class="org.apache.ignite.cache.QueryEntity"> - <property name="keyType" value="java.lang.Long"/> - <property name="valueType" value="TestType"/> - - <property name="fields"> - <map> - <entry key="i8Field" value="java.lang.Byte"/> - <entry key="i16Field" value="java.lang.Short"/> - <entry key="i32Field" value="java.lang.Integer"/> - <entry key="i64Field" value="java.lang.Long"/> - <entry key="strField" value="java.lang.String"/> - <entry key="floatField" value="java.lang.Float"/> - <entry key="doubleField" value="java.lang.Double"/> - <entry key="boolField" value="java.lang.Boolean"/> - <entry key="guidField" value="java.util.UUID"/> - <entry key="dateField" value="java.util.Date"/> - <entry key="timeField" value="java.sql.Time"/> - <entry key="timestampField" value="java.sql.Timestamp"/> - <entry key="i8ArrayField" value="[B"/> - </map> - </property> - - <property name="keyFields"> - <list></list> - </property> - - <property name="indexes"> - <list> - <bean class="org.apache.ignite.cache.QueryIndex"> - <constructor-arg value="i32Field"/> - </bean> - <bean class="org.apache.ignite.cache.QueryIndex"> - <constructor-arg value="i64Field"/> - </bean> - </list> - </property> - - <property name="fieldsPrecision"> - <map> - <entry key="strField" value="60" /> - </map> - </property> - </bean> - </list> - </property> - </bean> - - <bean class="org.apache.ignite.configuration.CacheConfiguration"> - <property name="name" value="cache2"/> - <property name="cacheMode" value="PARTITIONED"/> - <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="writeSynchronizationMode" value="FULL_SYNC"/> - - <!-- Configure type metadata to enable queries. --> - <property name="queryEntities"> - <list> - <bean class="org.apache.ignite.cache.QueryEntity"> - <property name="keyType" value="java.lang.Long"/> - <property name="valueType" value="ComplexType"/> - - <property name="keyFieldName" value="k"/> - <property name="valueFieldName" value="v"/> - - <property name="fields"> - <map> - <entry key="k" value="java.lang.Long"/> - <entry key="v" value="ComplexType"/> - <entry key="i32Field" value="java.lang.Integer"/> - <entry key="objField" value="TestObject"/> - <entry key="strField" value="java.lang.String"/> - </map> - </property> - - <property name="keyFields"> - <list></list> - </property> - - <property name="indexes"> - <list> - <bean class="org.apache.ignite.cache.QueryIndex"> - <constructor-arg value="i32Field"/> - </bean> - </list> - </property> - </bean> - </list> - </property> - </bean> + <bean parent="test-type-template"/> + <bean parent="complex-type-template"/> </list> </property> @@ -162,4 +67,103 @@ </bean> </property> </bean> + + <bean id="test-type-template" abstract="true" class="org.apache.ignite.configuration.CacheConfiguration"> + <property name="name" value="cache"/> + <property name="writeSynchronizationMode" value="FULL_SYNC"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + + <!-- Configure type metadata to enable queries. --> + <property name="queryEntities"> + <list> + <bean class="org.apache.ignite.cache.QueryEntity"> + <property name="keyType" value="java.lang.Long"/> + <property name="valueType" value="TestType"/> + + + <property name="fields"> + <map> + <entry key="i8Field" value="java.lang.Byte"/> + <entry key="i16Field" value="java.lang.Short"/> + <entry key="i32Field" value="java.lang.Integer"/> + <entry key="i64Field" value="java.lang.Long"/> + <entry key="strField" value="java.lang.String"/> + <entry key="floatField" value="java.lang.Float"/> + <entry key="doubleField" value="java.lang.Double"/> + <entry key="boolField" value="java.lang.Boolean"/> + <entry key="guidField" value="java.util.UUID"/> + <entry key="dateField" value="java.util.Date"/> + <entry key="timeField" value="java.sql.Time"/> + <entry key="timestampField" value="java.sql.Timestamp"/> + <entry key="i8ArrayField" value="[B"/> + </map> + </property> + + <property name="keyFields"> + <list></list> + </property> + + <property name="indexes"> + <list> + <bean class="org.apache.ignite.cache.QueryIndex"> + <constructor-arg value="i32Field"/> + </bean> + <bean class="org.apache.ignite.cache.QueryIndex"> + <constructor-arg value="i64Field"/> + </bean> + </list> + </property> + + <property name="fieldsPrecision"> + <map> + <entry key="strField" value="60" /> + </map> + </property> + </bean> + </list> + </property> + </bean> + + <bean id="complex-type-template" abstract="true" class="org.apache.ignite.configuration.CacheConfiguration"> + <property name="name" value="cache2"/> + <property name="writeSynchronizationMode" value="FULL_SYNC"/> + <property name="cacheMode" value="PARTITIONED"/> + <property name="atomicityMode" value="TRANSACTIONAL"/> + + <!-- Configure type metadata to enable queries. --> + <property name="queryEntities"> + <list> + <bean class="org.apache.ignite.cache.QueryEntity"> + <property name="keyType" value="java.lang.Long"/> + <property name="valueType" value="ComplexType"/> + + <property name="keyFieldName" value="k"/> + <property name="valueFieldName" value="v"/> + + <property name="fields"> + <map> + <entry key="k" value="java.lang.Long"/> + <entry key="v" value="ComplexType"/> + <entry key="i32Field" value="java.lang.Integer"/> + <entry key="objField" value="TestObject"/> + <entry key="strField" value="java.lang.String"/> + </map> + </property> + + <property name="keyFields"> + <list></list> + </property> + + <property name="indexes"> + <list> + <bean class="org.apache.ignite.cache.QueryIndex"> + <constructor-arg value="i32Field"/> + </bean> + </list> + </property> + </bean> + </list> + </property> + </bean> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/platforms/cpp/odbc-test/config/queries-transaction-32.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-transaction-32.xml b/modules/platforms/cpp/odbc-test/config/queries-transaction-32.xml index 94ddd3d..b5479c7 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-transaction-32.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-transaction-32.xml @@ -27,7 +27,16 @@ <import resource="queries-default.xml"/> <bean parent="queries.cfg"> - <property name="mvccEnabled" value="true"/> + <property name="cacheConfiguration"> + <list> + <bean parent="test-type-template"> + <property name="atomicityMode" value="TRANSACTIONAL_SNAPSHOT"/> + </bean> + <bean parent="complex-type-template"> + <property name="atomicityMode" value="TRANSACTIONAL_SNAPSHOT"/> + </bean> + </list> + </property> <property name="memoryConfiguration"> <bean class="org.apache.ignite.configuration.MemoryConfiguration"> http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/platforms/cpp/odbc-test/config/queries-transaction.xml ---------------------------------------------------------------------- diff --git a/modules/platforms/cpp/odbc-test/config/queries-transaction.xml b/modules/platforms/cpp/odbc-test/config/queries-transaction.xml index 7d74fc9..9d8c535 100644 --- a/modules/platforms/cpp/odbc-test/config/queries-transaction.xml +++ b/modules/platforms/cpp/odbc-test/config/queries-transaction.xml @@ -27,6 +27,15 @@ <import resource="queries-default.xml"/> <bean parent="queries.cfg"> - <property name="mvccEnabled" value="true"/> + <property name="cacheConfiguration"> + <list> + <bean parent="test-type-template"> + <property name="atomicityMode" value="TRANSACTIONAL_SNAPSHOT"/> + </bean> + <bean parent="complex-type-template"> + <property name="atomicityMode" value="TRANSACTIONAL_SNAPSHOT"/> + </bean> + </list> + </property> </bean> </beans> http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/yardstick/config/mvcc/benchmark-mvcc-messages.sh ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/mvcc/benchmark-mvcc-messages.sh b/modules/yardstick/config/mvcc/benchmark-mvcc-messages.sh index 32068d3..47f546d 100644 --- a/modules/yardstick/config/mvcc/benchmark-mvcc-messages.sh +++ b/modules/yardstick/config/mvcc/benchmark-mvcc-messages.sh @@ -78,21 +78,20 @@ sm=FULL_SYNC commonParams="-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -w ${w} -d ${d} \ -jdbc jdbc:ignite:thin://auto.find/ -t ${t} -sm ${sm} \ --clientNodesAfterId 100 \ - -sn IgniteNode -cl --range 1000000 \ - --atomic-mode TRANSACTIONAL" + -sn IgniteNode -cl --range 1000000" # Run configuration which contains all benchmarks. # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-off -b 0 --sqlRange 1, \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-on -b 0 --sqlRange 1 --mvcc, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-off -b 0 --sqlRange 1 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-on -b 0 --sqlRange 1 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-off -b 0 --sqlRange 1000, \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-on -b 0 --sqlRange 1000 --mvcc, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-off -b 0 --sqlRange 1000, --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-on -b 0 --sqlRange 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-backup-2-mvcc-off -b 2 --sqlRange 1, \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-backup-2-mvcc-on -b 2 --sqlRange 1 --mvcc, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-backup-2-mvcc-off -b 2 --sqlRange 1 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-backup-2-mvcc-on -b 2 --sqlRange 1 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-backup-2-mvcc-off -b 2 --sqlRange 1000, \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-backup-2-mvcc-on -b 2 --sqlRange 1000 --mvcc, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-backup-2-mvcc-off -b 2 --sqlRange 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-backup-2-mvcc-on -b 2 --sqlRange 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ " http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/yardstick/config/mvcc/benchmark-mvcc-processor.sh ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/mvcc/benchmark-mvcc-processor.sh b/modules/yardstick/config/mvcc/benchmark-mvcc-processor.sh index db45199..25525a4 100644 --- a/modules/yardstick/config/mvcc/benchmark-mvcc-processor.sh +++ b/modules/yardstick/config/mvcc/benchmark-mvcc-processor.sh @@ -78,18 +78,17 @@ sm=FULL_SYNC commonParams="-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -w ${w} -d ${d} \ -jdbc jdbc:ignite:thin://auto.find/ -t ${t} -sm ${sm} \ --clientNodesAfterId 100 \ - -sn IgniteNode -cl --range 1000000 \ - --atomic-mode TRANSACTIONAL" + -sn IgniteNode -cl --range 1000000" # Run configuration which contains all benchmarks. # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ -${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-off -b 0 --sqlRange 1, \ -${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-on -b 0 --sqlRange 1 --mvcc, \ +${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-off -b 0 --sqlRange 1 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-on -b 0 --sqlRange 1 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-25-backup-0-mvcc-off -b 0 --sqlRange 25, \ -${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-25-backup-0-mvcc-on -b 0 --sqlRange 25 --mvcc, \ +${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-25-backup-0-mvcc-off -b 0 --sqlRange 25 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-25-backup-0-mvcc-on -b 0 --sqlRange 25 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-off -b 0 --sqlRange 1000, \ -${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-on -b 0 --sqlRange 1000 --mvcc \ +${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-off -b 0 --sqlRange 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn MvccProcessorBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-on -b 0 --sqlRange 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT \ " http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/yardstick/config/mvcc/benchmark-mvcc-updates-contention.sh ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/mvcc/benchmark-mvcc-updates-contention.sh b/modules/yardstick/config/mvcc/benchmark-mvcc-updates-contention.sh index 0a92bce..39f7424 100644 --- a/modules/yardstick/config/mvcc/benchmark-mvcc-updates-contention.sh +++ b/modules/yardstick/config/mvcc/benchmark-mvcc-updates-contention.sh @@ -79,18 +79,17 @@ commonParams="-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nod -jdbc jdbc:ignite:thin://auto.find/ -t ${t} -sm ${sm} \ --clientNodesAfterId 100 \ -sn IgniteNode -cl \ - --range 1000000 --mvcc-contention-range 10000 \ - --atomic-mode TRANSACTIONAL" + --range 1000000 --mvcc-contention-range 10000" # Run configuration which contains all benchmarks. # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ -${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-off -b 0 --sqlRange 1, \ -${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-on -b 0 --sqlRange 1 --mvcc, \ +${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-off -b 0 --sqlRange 1 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-1-backup-0-mvcc-on -b 0 --sqlRange 1 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-25-backup-0-mvcc-off -b 0 --sqlRange 25, \ -${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-25-backup-0-mvcc-on -b 0 --sqlRange 25 --mvcc, \ +${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-25-backup-0-mvcc-off -b 0 --sqlRange 25 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-25-backup-0-mvcc-on -b 0 --sqlRange 25 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-off -b 0 --sqlRange 1000, \ -${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-on -b 0 --sqlRange 1000 --mvcc \ +${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-off -b 0 --sqlRange 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn MvccUpdateContentionBenchmark -ds ${ver}sql-update-batch-1000-backup-0-mvcc-on -b 0 --sqlRange 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT \ " http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/yardstick/config/mvcc/benchmark-thin-native.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/mvcc/benchmark-thin-native.properties b/modules/yardstick/config/mvcc/benchmark-thin-native.properties index 3fae9a8..7281f21 100644 --- a/modules/yardstick/config/mvcc/benchmark-thin-native.properties +++ b/modules/yardstick/config/mvcc/benchmark-thin-native.properties @@ -81,44 +81,43 @@ sm=FULL_SYNC commonParams="-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b ${b} -w ${w} -d ${d} \ -jdbc jdbc:ignite:thin://auto.find/ -t ${t} -sm ${sm} \ --clientNodesAfterId 0 \ - -sn IgniteNode -cl --range 1000000 \ - --atomic-mode TRANSACTIONAL" + -sn IgniteNode -cl --range 1000000" # Run configuration which contains all benchmarks. # Note that each benchmark is set to run for 300 seconds (5 min) with warm-up set to 60 seconds (1 minute). CONFIGS="\ -${commonParams} -dn JdbcSqlInsertDeleteBenchmark -ds ${ver}sql-insert-delete-batch-1-jdbc-thin-mvcc-off, \ -${commonParams} -dn JdbcSqlInsertDeleteBenchmark -ds ${ver}sql-insert-delete-batch-1-jdbc-thin-mvcc-on --mvcc, \ +${commonParams} -dn JdbcSqlInsertDeleteBenchmark -ds ${ver}sql-insert-delete-batch-1-jdbc-thin-mvcc-off --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn JdbcSqlInsertDeleteBenchmark -ds ${ver}sql-insert-delete-batch-1-jdbc-thin-mvcc-on --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn JdbcSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1-jdbc-thin-mvcc-off --sqlRange 1, \ -${commonParams} -dn JdbcSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1-jdbc-thin-mvcc-on --sqlRange 1 --mvcc, \ +${commonParams} -dn JdbcSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1-jdbc-thin-mvcc-off --sqlRange 1 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn JdbcSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1-jdbc-thin-mvcc-on --sqlRange 1 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn JdbcSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1000-jdbc-thin-mvcc-off --sqlRange 1000, \ -${commonParams} -dn JdbcSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1000-jdbc-thin-mvcc-on --sqlRange 1000 --mvcc, \ +${commonParams} -dn JdbcSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1000-jdbc-thin-mvcc-off --sqlRange 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn JdbcSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1000-jdbc-thin-mvcc-on --sqlRange 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn JdbcSqlUpdateBenchmark -ds ${ver}sql-update-batch-1-jdbc-thin-mvcc-off --sqlRange 1, \ -${commonParams} -dn JdbcSqlUpdateBenchmark -ds ${ver}sql-update-batch-1-jdbc-thin-mvcc-on --sqlRange 1 --mvcc, \ +${commonParams} -dn JdbcSqlUpdateBenchmark -ds ${ver}sql-update-batch-1-jdbc-thin-mvcc-off --sqlRange 1 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn JdbcSqlUpdateBenchmark -ds ${ver}sql-update-batch-1-jdbc-thin-mvcc-on --sqlRange 1 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn JdbcSqlUpdateBenchmark -ds ${ver}sql-update-batch-1000-jdbc-thin-mvcc-off --sqlRange 1000, \ -${commonParams} -dn JdbcSqlUpdateBenchmark -ds ${ver}sql-update-batch-1000-jdbc-thin-mvcc-on --sqlRange 1000 --mvcc, \ +${commonParams} -dn JdbcSqlUpdateBenchmark -ds ${ver}sql-update-batch-1000-jdbc-thin-mvcc-off --sqlRange 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn JdbcSqlUpdateBenchmark -ds ${ver}sql-update-batch-1000-jdbc-thin-mvcc-on --sqlRange 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ \ -${commonParams} -dn NativeSqlInsertDeleteBenchmark -ds ${ver}sql-insert-delete-batch-1-native-sql-mvcc-off, \ -${commonParams} -dn NativeSqlInsertDeleteBenchmark -ds ${ver}sql-insert-delete-batch-1-native-sql-mvcc-on --mvcc, \ +${commonParams} -dn NativeSqlInsertDeleteBenchmark -ds ${ver}sql-insert-delete-batch-1-native-sql-mvcc-off --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlInsertDeleteBenchmark -ds ${ver}sql-insert-delete-batch-1-native-sql-mvcc-on --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn NativeSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1-native-sql-mvcc-off --sqlRange 1, \ -${commonParams} -dn NativeSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1-native-sql-mvcc-on --sqlRange 1 --mvcc, \ +${commonParams} -dn NativeSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1-native-sql-mvcc-off --sqlRange 1 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1-native-sql-mvcc-on --sqlRange 1 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn NativeSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1000-native-sql-mvcc-off --sqlRange 1000, \ -${commonParams} -dn NativeSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1000-native-sql-mvcc-on --sqlRange 1000 --mvcc, \ +${commonParams} -dn NativeSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1000-native-sql-mvcc-off --sqlRange 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlQueryRangeBenchmark -ds ${ver}sql-select-batch-1000-native-sql-mvcc-on --sqlRange 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-native-sql-mvcc-off --sqlRange 1, \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-native-sql-mvcc-on --sqlRange 1 --mvcc, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-native-sql-mvcc-off --sqlRange 1 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1-native-sql-mvcc-on --sqlRange 1 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-native-sql-mvcc-off --sqlRange 1000, \ -${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-native-sql-mvcc-on --sqlRange 1000 --mvcc, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-native-sql-mvcc-off --sqlRange 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeSqlUpdateRangeBenchmark -ds ${ver}sql-update-batch-1000-native-sql-mvcc-on --sqlRange 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ \ -${commonParams} -dn NativeJavaApiPutRemoveBenchmark -ds ${ver}sql-update-batch-1-native-sql-mvcc-off, \ -${commonParams} -dn NativeJavaApiPutRemoveBenchmark -ds ${ver}sql-update-batch-1-native-sql-mvcc-on --mvcc \ +${commonParams} -dn NativeJavaApiPutRemoveBenchmark -ds ${ver}sql-update-batch-1-native-sql-mvcc-off --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeJavaApiPutRemoveBenchmark -ds ${ver}sql-update-batch-1-native-sql-mvcc-on --atomic-mode TRANSACTIONAL_SNAPSHOT \ " http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/yardstick/config/upload/benchmark-jdbc-thin-inmemory-mvcc.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/upload/benchmark-jdbc-thin-inmemory-mvcc.properties b/modules/yardstick/config/upload/benchmark-jdbc-thin-inmemory-mvcc.properties index 6e55b9b..dad8ed7 100644 --- a/modules/yardstick/config/upload/benchmark-jdbc-thin-inmemory-mvcc.properties +++ b/modules/yardstick/config/upload/benchmark-jdbc-thin-inmemory-mvcc.properties @@ -82,24 +82,23 @@ commonParams="\ --threads ${t} --syncMode ${sm} -sn IgniteNode \ --upload-rows 1000000 -cl \ --clientNodesAfterId 0 \ - --atomic-mode TRANSACTIONAL \ " # Run configuration which contains all benchmarks. # Note that each benchmark is set to run only one time, warmup parameter is set to 0 due to custom warmup operation. CONFIGS="\ -${commonParams} -dn NativePutBenchmark -ds ${ver}upload-native-put-mvcc-off, \ -${commonParams} -dn NativePutBenchmark -ds ${ver}upload-native-put-mvcc-on --mvcc, \ +${commonParams} -dn NativePutBenchmark -ds ${ver}upload-native-put-mvcc-off --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativePutBenchmark -ds ${ver}upload-native-put-mvcc-on --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn NativeStreamerBenchmark -ds ${ver}upload-native-streamer-mvcc-off --streamer-local-batch-size 1000, \ -${commonParams} -dn NativeStreamerBenchmark -ds ${ver}upload-native-streamer-mvcc-on --streamer-local-batch-size 1000 --mvcc, \ +${commonParams} -dn NativeStreamerBenchmark -ds ${ver}upload-native-streamer-mvcc-off --streamer-local-batch-size 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn NativeStreamerBenchmark -ds ${ver}upload-native-streamer-mvcc-on --streamer-local-batch-size 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn CopyBenchmark -ds ${ver}upload-copy-mvcc-off, \ -${commonParams} -dn CopyBenchmark -ds ${ver}upload-copy-mvcc-on --mvcc, \ +${commonParams} -dn CopyBenchmark -ds ${ver}upload-copy-mvcc-off --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn CopyBenchmark -ds ${ver}upload-copy-mvcc-on --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn InsertBenchmark -ds ${ver}upload-insert-mvcc-off, \ -${commonParams} -dn InsertBenchmark -ds ${ver}upload-insert-mvcc-on --mvcc, \ +${commonParams} -dn InsertBenchmark -ds ${ver}upload-insert-mvcc-off --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn InsertBenchmark -ds ${ver}upload-insert-mvcc-on --atomic-mode TRANSACTIONAL_SNAPSHOT, \ \ -${commonParams} -dn BatchedInsertBenchmark -ds ${ver}upload-batched-insert-mvcc-off --upload-jdbc-batch-size 1000, \ -${commonParams} -dn BatchedInsertBenchmark -ds ${ver}upload-batched-insert-mvcc-on --upload-jdbc-batch-size 1000 --mvcc \ +${commonParams} -dn BatchedInsertBenchmark -ds ${ver}upload-batched-insert-mvcc-off --upload-jdbc-batch-size 1000 --atomic-mode TRANSACTIONAL, \ +${commonParams} -dn BatchedInsertBenchmark -ds ${ver}upload-batched-insert-mvcc-on --upload-jdbc-batch-size 1000 --atomic-mode TRANSACTIONAL_SNAPSHOT \ " http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/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 bbe2ab3..3f4fddc 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 @@ -19,19 +19,16 @@ package org.apache.ignite.yardstick; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParametersDelegate; -import java.util.Collections; +import java.util.ArrayList; +import java.util.List; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.CacheWriteSynchronizationMode; -import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.DataStorageConfiguration; import org.apache.ignite.internal.util.tostring.GridToStringBuilder; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.transactions.TransactionConcurrency; import org.apache.ignite.transactions.TransactionIsolation; - -import java.util.ArrayList; -import java.util.List; import org.apache.ignite.yardstick.cache.IgniteStreamerBenchmark; import org.apache.ignite.yardstick.upload.UploadBenchmarkArguments; import org.jetbrains.annotations.Nullable; @@ -269,17 +266,6 @@ public class IgniteBenchmarkArguments { private int streamerBufSize = IgniteDataStreamer.DFLT_PER_NODE_BUFFER_SIZE; /** */ - @Parameter(names = {"-mvcc", "--mvcc"}, description = "Enable MVCC for cache") - private boolean mvcc; - - /** - * @return {@code True} if need enable cache mvcc (see {@link CacheConfiguration#isMvccEnabled()}). - */ - public boolean mvccEnabled() { - return mvcc; - } - - /** */ @Parameter(names = {"-sqlr", "--sqlRange"}, description = "Result set size") @GridToStringInclude private int sqlRange = 1; http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/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 a259cbf..0c61435 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 @@ -103,8 +103,6 @@ public class IgniteNode implements BenchmarkServer { CacheConfiguration[] ccfgs = c.getCacheConfiguration(); - c.setMvccEnabled(args.mvccEnabled()); - if (ccfgs != null) { for (CacheConfiguration cc : ccfgs) { // IgniteNode can not run in CLIENT_ONLY mode, http://git-wip-us.apache.org/repos/asf/ignite/blob/2ab94934/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/mvcc/MvccUpdateContentionBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/mvcc/MvccUpdateContentionBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/mvcc/MvccUpdateContentionBenchmark.java index 09179db..77c8c50 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/mvcc/MvccUpdateContentionBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/jdbc/mvcc/MvccUpdateContentionBenchmark.java @@ -20,6 +20,7 @@ package org.apache.ignite.yardstick.jdbc.mvcc; import java.util.Map; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.atomic.AtomicLong; +import org.apache.ignite.cache.CacheAtomicityMode; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.internal.processors.query.IgniteSQLException; @@ -52,8 +53,8 @@ public class MvccUpdateContentionBenchmark extends AbstractDistributedMvccBenchm execute(new SqlFieldsQuery(UPDATE_QRY).setArgs(start, end)); } catch (IgniteSQLException exc) { - if ((args.mvccEnabled() && !exc.getMessage().equals(MVCC_EXC_MSG)) || - (!args.mvccEnabled() && !exc.getMessage().startsWith(NO_MVCC_EXC_MSG_PREFIX))) + if ((args.atomicMode() == CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT && !exc.getMessage().equals(MVCC_EXC_MSG)) || + (args.atomicMode() != CacheAtomicityMode.TRANSACTIONAL_SNAPSHOT && !exc.getMessage().startsWith(NO_MVCC_EXC_MSG_PREFIX))) throw new RuntimeException("Exception with unexpected message is thrown.", exc); failsCnt.incrementAndGet();
