You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/05 17:28:41 UTC
[21/50] [abbrv] ignite git commit: ignite-1282 - Benchmarks fix.
ignite-1282 - Benchmarks fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1a6ff7a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1a6ff7a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1a6ff7a
Branch: refs/heads/ignite-1753-1282
Commit: c1a6ff7a3819909217c11899632cacaa044c2797
Parents: f7b308f
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Nov 5 11:51:24 2015 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Nov 5 11:51:24 2015 +0300
----------------------------------------------------------------------
modules/yardstick/config/ignite-base-config.xml | 37 ++++++++++++++++----
.../cache/IgniteSqlQueryPutBenchmark.java | 2 +-
2 files changed, 32 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1a6ff7a/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index c77cc9a..346f507 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -135,13 +135,38 @@
<property name="swapEnabled" value="false"/>
- <property name="indexedTypes">
+ <property name="typeMetadata">
<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>
+ <bean class="org.apache.ignite.cache.CacheTypeMetadata">
+ <property name="keyType" value="java.lang.Integer"/>
+ <property name="valueType" value="org.apache.ignite.yardstick.cache.model.Organization"/>
+
+ <property name="ascendingFields">
+ <map>
+ <entry key="id" value="java.lang.Integer"/>
+ <entry key="name" value="java.lang.String"/>
+ </map>
+ </property>
+ </bean>
+ <bean class="org.apache.ignite.cache.CacheTypeMetadata">
+ <property name="keyType" value="java.lang.Integer"/>
+ <property name="valueType" value="org.apache.ignite.yardstick.cache.model.Person"/>
+
+ <property name="ascendingFields">
+ <map>
+ <entry key="id" value="java.lang.Integer"/>
+ <entry key="orgId" value="java.lang.Integer"/>
+ <entry key="salary" value="java.lang.Double"/>
+ </map>
+ </property>
+
+ <property name="queryFields">
+ <map>
+ <entry key="firstName" value="java.lang.String"/>
+ <entry key="lastName" value="java.lang.String"/>
+ </map>
+ </property>
+ </bean>
</list>
</property>
</bean>
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1a6ff7a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java
index 606c68f..b09d478 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryPutBenchmark.java
@@ -84,7 +84,7 @@ public class IgniteSqlQueryPutBenchmark extends IgniteCacheAbstractBenchmark {
/** {@inheritDoc} */
@Override public void tearDown() throws Exception {
- ignite().log().info("Average number of entries per query: " + (resCnt.longValue() / cnt.longValue()));
+ ignite().log().info("Average number of entries per query: " + ((double)resCnt.longValue() / cnt.longValue()));
super.tearDown();
}