Repository: incubator-ignite Updated Branches: refs/heads/ignite-497 [created] 966c9b93f
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java index 172c142..d434c57 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryBenchmark.java @@ -84,9 +84,4 @@ public class IgniteSqlQueryBenchmark extends IgniteCacheAbstractBenchmark { return cache.query(qry).getAll(); } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java index 19ab337..e47d6f5 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java @@ -108,9 +108,4 @@ public class IgniteSqlQueryJoinBenchmark extends IgniteCacheAbstractBenchmark { return cache.queryFields(qry).getAll(); } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/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 517aabf..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.*; -import org.apache.ignite.cache.*; - -/** - * 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().jcache("query-offheap"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/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 42bda51..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.*; -import org.apache.ignite.cache.*; - -/** - * 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().jcache("query-offheap"); - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/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 9f1e136..1407430 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 @@ -76,9 +76,4 @@ public class IgniteSqlQueryPutBenchmark extends IgniteCacheAbstractBenchmark { return cache.query(qry).getAll(); } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/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 index d5c2012..c9563e3 100644 --- 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 @@ -26,7 +26,7 @@ import org.apache.ignite.cache.*; */ public class IgniteSqlQueryPutOffHeapBenchmark extends IgniteSqlQueryPutBenchmark { /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query-offheap"); - } +// @Override protected IgniteCache<Integer, Object> cache() { +// return ignite().jcache("query-offheap"); +// } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java index 77a4747..4cb5992 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreAbstractBenchmark.java @@ -34,13 +34,6 @@ public abstract class IgniteJdbcStoreAbstractBenchmark extends IgniteAbstractBen protected IgniteCache<Object, Object> cache; /** - * Each benchmark must determine which cache will be used. - * - * @return GridCache Cache to use. - */ - protected abstract IgniteCache<Object, Object> cache(); - - /** * Each benchmark must determine key range (from {@code 0} to this number) for fill. * * @return GridCache Cache to use. @@ -51,7 +44,7 @@ public abstract class IgniteJdbcStoreAbstractBenchmark extends IgniteAbstractBen @Override public void setUp(BenchmarkConfiguration cfg) throws Exception { super.setUp(cfg); - cache = cache(); + cache = ignite().jcache(args.cacheName()); CacheConfiguration cc = cache.getConfiguration(CacheConfiguration.class); @@ -124,6 +117,8 @@ public abstract class IgniteJdbcStoreAbstractBenchmark extends IgniteAbstractBen U.closeQuiet(stmt); } + ignite().destroyCache(cache.getName()); + super.tearDown(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java index e426332..3a6a7dd 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetBenchmark.java @@ -35,13 +35,8 @@ public class IgniteJdbcStoreGetBenchmark extends IgniteJdbcStoreAbstractBenchmar @Override public boolean test(Map<Object, Object> ctx) throws Exception { int id = nextRandom(args.range()); - cache().get(new SampleKey(id)); + cache.get(new SampleKey(id)); return true; } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("atomic"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java index 947ec1e..92cf09d 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStoreGetTxBenchmark.java @@ -35,13 +35,8 @@ public class IgniteJdbcStoreGetTxBenchmark extends IgniteJdbcStoreAbstractBenchm @Override public boolean test(Map<Object, Object> ctx) throws Exception { int id = nextRandom(args.range()); - cache().get(new SampleKey(id)); + cache.get(new SampleKey(id)); return true; } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("tx"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java index 4b70eeb..6dc4dd5 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutBenchmark.java @@ -39,9 +39,4 @@ public class IgniteJdbcStorePutBenchmark extends IgniteJdbcStoreAbstractBenchmar return true; } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("atomic"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java index 330f09c..4219ec5 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetBenchmark.java @@ -44,9 +44,4 @@ public class IgniteJdbcStorePutGetBenchmark extends IgniteJdbcStoreAbstractBench return true; } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("atomic"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java index 81b1637..2f3d00c 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutGetTxBenchmark.java @@ -44,9 +44,4 @@ public class IgniteJdbcStorePutGetTxBenchmark extends IgniteJdbcStoreAbstractBen return true; } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("tx"); - } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5a0e2ce/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java index f470265..54c01bb 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/store/jdbc/IgniteJdbcStorePutTxBenchmark.java @@ -41,7 +41,7 @@ public class IgniteJdbcStorePutTxBenchmark extends IgniteJdbcStoreAbstractBenchm } /** {@inheritDoc} */ - @Override protected IgniteCache<Object, Object> cache() { - return ignite().jcache("tx"); - } +// @Override protected IgniteCache<Object, Object> cache() { +// return ignite().jcache("tx"); +// } }
