Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 300B617C51 for ; Tue, 14 Jul 2015 13:19:49 +0000 (UTC) Received: (qmail 70627 invoked by uid 500); 14 Jul 2015 13:19:49 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 70596 invoked by uid 500); 14 Jul 2015 13:19:49 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 70586 invoked by uid 99); 14 Jul 2015 13:19:49 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jul 2015 13:19:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id A1164C0098 for ; Tue, 14 Jul 2015 13:19:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id QH-sSdRVx-ET for ; Tue, 14 Jul 2015 13:19:43 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id DA7B623117 for ; Tue, 14 Jul 2015 13:19:35 +0000 (UTC) Received: (qmail 69602 invoked by uid 99); 14 Jul 2015 13:19:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Jul 2015 13:19:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34A64E180F; Tue, 14 Jul 2015 13:19:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 14 Jul 2015 13:19:41 -0000 Message-Id: <1bb5195d28ab490eb76fb65c619239c5@git.apache.org> In-Reply-To: <5754f504f550439ab6e9c7d828117761@git.apache.org> References: <5754f504f550439ab6e9c7d828117761@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [08/50] [abbrv] incubator-ignite git commit: Fixed notes Fixed notes Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a6948e8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a6948e8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a6948e8 Branch: refs/heads/ignite-890 Commit: 1a6948e8778d0e6379ffc0c99fee0d83d8bbebd7 Parents: 82f4992 Author: nikolay_tikhonov Authored: Wed Jul 8 13:04:31 2015 +0300 Committer: nikolay_tikhonov Committed: Wed Jul 8 13:04:31 2015 +0300 ---------------------------------------------------------------------- .../config/benchmark-index-put.properties | 64 -------- .../config/benchmark-put-indexed-val.properties | 64 ++++++++ .../cache/IgnitePutIndex1Benchmark.java | 42 ----- .../cache/IgnitePutIndex2Benchmark.java | 42 ----- .../cache/IgnitePutIndexedValue1Benchmark.java | 42 +++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 +++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 2 +- .../ignite/yardstick/cache/model/Person1.java | 29 +--- .../ignite/yardstick/cache/model/Person2.java | 45 +----- .../ignite/yardstick/cache/model/Person8.java | 155 ++----------------- 10 files changed, 167 insertions(+), 360 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/config/benchmark-index-put.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-index-put.properties b/modules/yardstick/config/benchmark-index-put.properties deleted file mode 100644 index fb73656..0000000 --- a/modules/yardstick/config/benchmark-index-put.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}" -DIGNITE_QUIET=false" \ - -XX:+UseParNewGC \ - -XX:+UseConcMarkSweepGC \ - -XX:+UseTLAB \ - -XX:NewSize=128m \ - -XX:MaxNewSize=128m \ - -XX:MaxTenuringThreshold=0 \ - -XX:SurvivorRatio=1024 \ - -XX:+UseCMSInitiatingOccupancyOnly \ - -XX:CMSInitiatingOccupancyFraction=60 \ -" - -# 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=localhost,localhost - -# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default. -DRIVER_HOSTS=localhost - -# 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 mins) with warm-up set to 60 seconds (1 minute). -CONFIGS="\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex1Benchmark -sn IgniteNode -ds atomic-indexed1-put,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex2Benchmark -sn IgniteNode -ds atomic-indexed2-put,\ --cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndex8Benchmark -sn IgniteNode -ds atomic-indexed8-put\ -" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/config/benchmark-put-indexed-val.properties ---------------------------------------------------------------------- diff --git a/modules/yardstick/config/benchmark-put-indexed-val.properties b/modules/yardstick/config/benchmark-put-indexed-val.properties new file mode 100644 index 0000000..8f3a505 --- /dev/null +++ b/modules/yardstick/config/benchmark-put-indexed-val.properties @@ -0,0 +1,64 @@ +# 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}" -DIGNITE_QUIET=false" \ + -XX:+UseParNewGC \ + -XX:+UseConcMarkSweepGC \ + -XX:+UseTLAB \ + -XX:NewSize=128m \ + -XX:MaxNewSize=128m \ + -XX:MaxTenuringThreshold=0 \ + -XX:SurvivorRatio=1024 \ + -XX:+UseCMSInitiatingOccupancyOnly \ + -XX:CMSInitiatingOccupancyFraction=60 \ +" + +# 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=localhost,localhost + +# Comma-separated list of the hosts to run BenchmarkDrivers on. 1 node on local host is enabled by default. +DRIVER_HOSTS=localhost + +# 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 mins) with warm-up set to 60 seconds (1 minute). +CONFIGS="\ +-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue1Benchmark -sn IgniteNode -ds atomic-put-indexed-val-1,\ +-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue2Benchmark -sn IgniteNode -ds atomic-put-indexed-val-2,\ +-cfg ${SCRIPT_DIR}/../config/ignite-localhost-config.xml -nn ${nodesNum} -b 1 -w 60 -d 300 -t 64 -sm PRIMARY_SYNC -dn IgnitePutIndexedValue8Benchmark -sn IgniteNode -ds atomic-put-indexed-val-8\ +" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java deleted file mode 100644 index 65dd39a..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex1Benchmark.java +++ /dev/null @@ -1,42 +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.*; -import org.apache.ignite.yardstick.cache.model.*; - -import java.util.*; - -/** - * Ignite benchmark that performs put operations for entity with indexed fields. - */ -public class IgnitePutIndex1Benchmark extends IgniteCacheAbstractBenchmark { - /** {@inheritDoc} */ - @Override public boolean test(Map ctx) throws Exception { - int key = nextRandom(args.range()); - - cache.put(key, new Person1(key)); - - return true; - } - - /** {@inheritDoc} */ - @Override protected IgniteCache cache() { - return ignite().cache("atomic-index"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java deleted file mode 100644 index b4cf86f..0000000 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndex2Benchmark.java +++ /dev/null @@ -1,42 +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.*; -import org.apache.ignite.yardstick.cache.model.*; - -import java.util.*; - -/** - * Ignite benchmark that performs put operations for entity with indexed fields. - */ -public class IgnitePutIndex2Benchmark extends IgniteCacheAbstractBenchmark { - /** {@inheritDoc} */ - @Override public boolean test(Map ctx) throws Exception { - int key = nextRandom(args.range()); - - cache.put(key, new Person2(key, key + 1)); - - return true; - } - - /** {@inheritDoc} */ - @Override protected IgniteCache cache() { - return ignite().cache("atomic-index"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue1Benchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue1Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue1Benchmark.java new file mode 100644 index 0000000..68de785 --- /dev/null +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue1Benchmark.java @@ -0,0 +1,42 @@ +/* + * 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.*; +import org.apache.ignite.yardstick.cache.model.*; + +import java.util.*; + +/** + * Ignite benchmark that performs put operations for entity with indexed fields. + */ +public class IgnitePutIndexedValue1Benchmark extends IgniteCacheAbstractBenchmark { + /** {@inheritDoc} */ + @Override public boolean test(Map ctx) throws Exception { + int key = nextRandom(args.range()); + + cache.put(key, new Person1(key)); + + return true; + } + + /** {@inheritDoc} */ + @Override protected IgniteCache cache() { + return ignite().cache("atomic-index"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue2Benchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue2Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue2Benchmark.java new file mode 100644 index 0000000..3256ee3 --- /dev/null +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue2Benchmark.java @@ -0,0 +1,42 @@ +/* + * 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.*; +import org.apache.ignite.yardstick.cache.model.*; + +import java.util.*; + +/** + * Ignite benchmark that performs put operations for entity with indexed fields. + */ +public class IgnitePutIndexedValue2Benchmark extends IgniteCacheAbstractBenchmark { + /** {@inheritDoc} */ + @Override public boolean test(Map ctx) throws Exception { + int key = nextRandom(args.range()); + + cache.put(key, new Person2(key)); + + return true; + } + + /** {@inheritDoc} */ + @Override protected IgniteCache cache() { + return ignite().cache("atomic-index"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java index b51ff34..42aa67d 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutIndexedValue8Benchmark.java @@ -30,7 +30,7 @@ public class IgnitePutIndexedValue8Benchmark extends IgniteCacheAbstractBenchmar @Override public boolean test(Map ctx) throws Exception { int key = nextRandom(args.range()); - cache.put(key, new Person8(key, key + 1, key + 2, key + 3, key + 4, key + 5, key + 6, key + 7)); + cache.put(key, new Person8(key)); return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java index 0b2a0bf..91d1ccc 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person1.java @@ -30,35 +30,12 @@ public class Person1 implements Serializable { private int val1; /** - * Empty constructor. - */ - public Person1() { - // No-op. - } - - /** * Constructs. * - * @param val1 Indexed value. - */ - public Person1(int val1) { - this.val1 = val1; - } - - /** - * @return Get value. - */ - public int getVal1() { - return val1; - } - - /** - * Set value. - * - * @param val1 Value. + * @param val Indexed value. */ - public void setVal1(int val1) { - this.val1 = val1; + public Person1(int val) { + this.val1 = val; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java index 3b1cb9e..dc5729c 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person2.java @@ -34,50 +34,13 @@ public class Person2 implements Serializable { private int val2; /** - * Empty constructor. - */ - public Person2() { - // No-op. - } - - /** * Constructs. - */ - public Person2(int val1, int val2) { - this.val1 = val1; - this.val2 = val2; - } - - /** - * @return Get value. - */ - public int getVal1() { - return val1; - } - - /** - * Set value. - * - * @param val1 Value. - */ - public void setVal1(int val1) { - this.val1 = val1; - } - - /** - * @return Get value. - */ - public int getVal2() { - return val2; - } - - /** - * Set value. * - * @param val2 Value. + * @param val Value. */ - public void setVal2(int val2) { - this.val2 = val2; + public Person2(int val) { + this.val1 = val; + this.val2 = val + 1; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a6948e8/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java index b8e3f7c..92d65ac 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/model/Person8.java @@ -58,152 +58,19 @@ public class Person8 implements Serializable { private int val8; /** - * Empty constructor. - */ - public Person8() { - // No-op. - } - - /** * Constructs. - */ - public Person8(int val1, int val2, int val3, int val4, int val5, int val6, int val7, int val8) { - this.val1 = val1; - this.val2 = val2; - this.val3 = val3; - this.val4 = val4; - this.val5 = val5; - this.val6 = val6; - this.val7 = val7; - this.val8 = val8; - } - - /** - * @return Get value. - */ - public int getVal1() { - return val1; - } - - /** - * Set value. - * - * @param val1 Value. - */ - public void setVal1(int val1) { - this.val1 = val1; - } - - /** - * @return Get value. - */ - public int getVal2() { - return val2; - } - - /** - * Set value. - * - * @param val2 Value. - */ - public void setVal2(int val2) { - this.val2 = val2; - } - - /** - * @return Get value. - */ - public int getVal3() { - return val3; - } - - /** - * Set value. - * - * @param val3 Value. - */ - public void setVal3(int val3) { - this.val3 = val3; - } - - /** - * @return Get value. - */ - public int getVal4() { - return val4; - } - - /** - * Set value. - * - * @param val4 Value. - */ - public void setVal4(int val4) { - this.val4 = val4; - } - - /** - * @return Get value. - */ - public int getVal5() { - return val5; - } - - /** - * Set value. - * - * @param val5 Value. - */ - public void setVal5(int val5) { - this.val5 = val5; - } - - /** - * @return Get value. - */ - public int getVal6() { - return val6; - } - - /** - * Set value. * - * @param val6 Value. - */ - public void setVal6(int val6) { - this.val6 = val6; - } - - /** - * @return Get value. - */ - public int getVal7() { - return val7; - } - - /** - * Set value. - * - * @param val7 Value. - */ - public void setVal7(int val7) { - this.val7 = val7; - } - - /** - * @return Get value. - */ - public int getVal8() { - return val8; - } - - /** - * Set value. - * - * @param val8 Value. - */ - public void setVal8(int val8) { - this.val8 = val8; + * @param val Indexed value. + */ + public Person8(int val) { + this.val1 = val; + this.val2 = val + 1; + this.val3 = val + 2; + this.val4 = val + 3; + this.val5 = val + 4; + this.val6 = val + 5; + this.val7 = val + 6; + this.val8 = val + 7; } /** {@inheritDoc} */