GEODE-6472 Fix double increment gets stat for partitioned region (apa…

…che#3640)

This also fixes the "misses" stat on partitioned region.

geode-core/src/distributedTest/java/org/apache/geode/management/PartitionedRegionStatsTest.java

@@ -0,0 +1,76 @@
+/*
+ * 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.geode.management;
+
+import static org.apache.geode.security.SecurityTestUtil.createClientCache;
+import static org.apache.geode.security.SecurityTestUtil.createProxyRegion;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Rule;
+import org.junit.Test;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.internal.cache.CachePerfStats;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.junit.rules.ServerStarterRule;
+
+public class PartitionedRegionStatsTest extends JUnit4DistributedTestCase {
+
+  private static String REGION_NAME = "testRegion";
+  private final int numOfEntries = 10;
+
+  final Host host = Host.getHost(0);
+  final VM client1 = host.getVM(1);
+
+  @Rule
+  public ServerStarterRule server =
+      new ServerStarterRule().withAutoStart().withRegion(RegionShortcut.PARTITION, REGION_NAME);
+
+  @Test
+  public void testGetsRate() throws Exception {
+
+    client1.invoke(() -> {
+
+      ClientCache clientCache = createClientCache("superUser", "123", server.getPort());
+      Region region = createProxyRegion(clientCache, REGION_NAME);
+
+      for (int i = 1; i < numOfEntries; i++) {
+        region.put("key" + i, "value" + i);
+        region.get("key" + i);
+      }
+      region.get("key" + numOfEntries);
+
+    });
+
+    assertThat(server.getCache()).isNotNull();
+
+    CachePerfStats regionStats =
+        ((PartitionedRegion) server.getCache().getRegion(REGION_NAME)).getCachePerfStats();
+
+    CachePerfStats cacheStats = server.getCache().getCachePerfStats();
+
+    assertThat(regionStats.getGets()).isEqualTo(numOfEntries);
+    assertThat(regionStats.getMisses()).isEqualTo(1);
+
+    assertThat(cacheStats.getGets()).isEqualTo(numOfEntries);
+    assertThat(cacheStats.getMisses()).isEqualTo(1);
+
+  }
+}

geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java

@@ -1349,8 +1349,7 @@ Object get(Object key, Object aCallbackArgument, boolean generateCallbacks,
     checkReadiness();
     checkForNoAccess();
     discoverJTA();
-    CachePerfStats stats = getCachePerfStats();
-    long start = stats.startGet();
+    long start = startGet();
     boolean isMiss = true;
     try {
       KeyInfo keyInfo = getKeyInfo(key, aCallbackArgument);
@@ -1381,10 +1380,18 @@ Object get(Object key, Object aCallbackArgument, boolean generateCallbacks,
       }
       return value;
     } finally {
-      stats.endGet(start, isMiss);
+      endGet(start, isMiss);
     }
   }
 
+  protected long startGet() {
+    return getCachePerfStats().startGet();
+  }
+
+  protected void endGet(long start, boolean isMiss) {
+    getCachePerfStats().endGet(start, isMiss);
+  }
+
   /**
    * Update region and potentially entry stats for the miss case
    *

geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java

@@ -3220,7 +3220,6 @@ public Object get(Object key, Object aCallbackArgument, boolean generateCallback
     checkForNoAccess();
     discoverJTA();
     boolean miss = true;
-
     Object value = getDataView().findObject(getKeyInfo(key, aCallbackArgument), this,
         true/* isCreate */, generateCallbacks, null /* no local value */, disableCopyOnRead,
         preferCD, requestingClient, clientEvent, returnTombstones);
@@ -3230,6 +3229,17 @@ public Object get(Object key, Object aCallbackArgument, boolean generateCallback
     return value;
   }
 
+  @Override
+  protected long startGet() {
+    return 0;
+  }
+
+  @Override
+  protected void endGet(long start, boolean isMiss) {
+    // get stats are recorded by the BucketRegion
+    // so nothing is needed on the PartitionedRegion.
+  }
+
   public InternalDistributedMember getOrCreateNodeForBucketRead(int bucketId) {
     InternalDistributedMember targetNode = getNodeForBucketRead(bucketId);
     if (targetNode != null) {