[geode-benchmarks] branch develop updated: Removing references to Geode internal classes (#155)

[up...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-benchmarks.git


The following commit(s) were added to refs/heads/develop by this push:
     new 3ffa414  Removing references to Geode internal classes (#155)
3ffa414 is described below

commit 3ffa414ab775fa8a9f73b5c1784e5116f43bb05a
Author: Dan Smith <da...@vmware.com>
AuthorDate: Thu Oct 7 11:06:21 2021 -0700

    Removing references to Geode internal classes (#155)
    
    Geode internal classes shouldn't be used in the benchmarks. Using them makes it
    harder to run tests against different versions of geode, since we don't make
    garuantees about preserving the APIs of these classes between versions.
---
 geode-benchmarks/src/main/java/benchmark/geode/data/Portfolio.java   | 4 ----
 .../src/main/java/org/apache/geode/benchmark/tasks/OQLQuery.java     | 5 ++---
 .../src/main/java/org/apache/geode/benchmark/tasks/StartServer.java  | 4 ++--
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/geode-benchmarks/src/main/java/benchmark/geode/data/Portfolio.java b/geode-benchmarks/src/main/java/benchmark/geode/data/Portfolio.java
index 6184eec..36d3f67 100644
--- a/geode-benchmarks/src/main/java/benchmark/geode/data/Portfolio.java
+++ b/geode-benchmarks/src/main/java/benchmark/geode/data/Portfolio.java
@@ -23,9 +23,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.geode.internal.Assert;
-
-
 public class Portfolio {
 
   public enum Day {
@@ -88,7 +85,6 @@ public class Portfolio {
     collectionHolderMap.put("3", new CollectionHolder());
 
     unicodeṤtring = i % 2 == 0 ? "ṤṶẐ" : "ṤẐṶ";
-    Assert.assertTrue(unicodeṤtring.length() == 3);
   }
 
   public Portfolio(int i, int j) {
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/OQLQuery.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/OQLQuery.java
index 16fcdaa..0d6f373 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/OQLQuery.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/OQLQuery.java
@@ -14,8 +14,6 @@
  */
 package org.apache.geode.benchmark.tasks;
 
-import static org.apache.geode.util.internal.UncheckedUtils.uncheckedCast;
-
 import java.io.Serializable;
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
@@ -59,6 +57,7 @@ public class OQLQuery extends BenchmarkDriverAdapter implements Serializable {
   }
 
   @Override
+  @SuppressWarnings("unchecked")
   public boolean test(final Map<Object, Object> ctx) throws Exception {
     final long minId =
         ThreadLocalRandom.current().nextLong(keyRange.getMin(), keyRange.getMax() - queryRange);
@@ -67,7 +66,7 @@ public class OQLQuery extends BenchmarkDriverAdapter implements Serializable {
     final Object result = query.execute(minId, maxId);
 
     if (isValidationEnabled) {
-      verifyResults(uncheckedCast(result), minId, maxId);
+      verifyResults((SelectResults<Portfolio>) result, minId, maxId);
     }
 
     return true;
diff --git a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartServer.java b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartServer.java
index 56bac58..dbfa904 100644
--- a/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartServer.java
+++ b/geode-benchmarks/src/main/java/org/apache/geode/benchmark/tasks/StartServer.java
@@ -23,10 +23,10 @@ import java.io.File;
 import java.net.InetAddress;
 import java.util.Properties;
 
+import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.internal.cache.InternalCache;
 import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
 import org.apache.geode.perftest.Task;
 import org.apache.geode.perftest.TestContext;
@@ -53,7 +53,7 @@ public class StartServer implements Task {
 
     final CacheFactory cacheFactory = new CacheFactory(properties);
     configureCacheFactory(cacheFactory, context);
-    final InternalCache cache = (InternalCache) cacheFactory.create();
+    final Cache cache = cacheFactory.create();
 
     final CacheServer cacheServer = configureCacheServer(cache.addCacheServer(), context);
     if (null != cacheServer) {