diff --git a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java index d60a9135b19d..1edb4884e908 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java +++ b/geode-core/src/main/java/org/apache/geode/internal/DSFIDFactory.java @@ -239,6 +239,7 @@ import org.apache.geode.internal.cache.InvalidateRegionOperation.InvalidateRegionMessage; import org.apache.geode.internal.cache.JtaAfterCompletionMessage; import org.apache.geode.internal.cache.JtaBeforeCompletionMessage; +import org.apache.geode.internal.cache.LatestLastAccessTimeMessage; import org.apache.geode.internal.cache.MemberFunctionStreamingMessage; import org.apache.geode.internal.cache.Node; import org.apache.geode.internal.cache.PRQueryProcessor; @@ -831,6 +832,7 @@ private static void registerDSFIDTypes() { registerDSFID(DURABLE_CLIENT_INFO_REQUEST, DurableClientInfoRequest.class); registerDSFID(DURABLE_CLIENT_INFO_RESPONSE, DurableClientInfoResponse.class); registerDSFID(CLIENT_INTEREST_MESSAGE, ClientInterestMessageImpl.class); + registerDSFID(LATEST_LAST_ACCESS_TIME_MESSAGE, LatestLastAccessTimeMessage.class); registerDSFID(STAT_ALERT_DEFN_NUM_THRESHOLD, NumberThresholdDecoratorImpl.class); registerDSFID(STAT_ALERT_DEFN_GAUGE_THRESHOLD, GaugeThresholdDecoratorImpl.class); registerDSFID(CLIENT_HEALTH_STATS, ClientHealthStats.class); diff --git a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java index 7f8cd5d69d96..32e89b696a4a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java +++ b/geode-core/src/main/java/org/apache/geode/internal/DataSerializableFixedID.java @@ -234,7 +234,9 @@ public interface DataSerializableFixedID extends SerializationVersions { public static final byte CLIENT_INTEREST_MESSAGE = -21; - // IDs -20 .. -16 are not used + public static final byte LATEST_LAST_ACCESS_TIME_MESSAGE = -20; + + // IDs -19 .. -16 are not used /** * A header byte meaning that the next element in the stream is a VMIdProfile. diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java index aa91c4044487..15a4366ea316 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/Version.java +++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java @@ -207,6 +207,7 @@ public class Version implements Comparable { public static final Version GEODE_140 = new Version("GEODE", "1.4.0", (byte) 1, (byte) 4, (byte) 0, (byte) 0, GEODE_140_ORDINAL); + /** * This constant must be set to the most current version of the product. !!! NOTE: update * HIGHEST_VERSION when changing CURRENT !!! diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java index c76e81311742..7111c83c0075 100755 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DistributedRegion.java @@ -127,7 +127,7 @@ import org.apache.geode.internal.util.concurrent.StoppableCountDownLatch; @SuppressWarnings("deprecation") -public class DistributedRegion extends LocalRegion implements CacheDistributionAdvisee { +public class DistributedRegion extends LocalRegion implements InternalDistributedRegion { private static final Logger logger = LogService.getLogger(); /** causes cache profile to be added to afterRemoteRegionCreate notification for testing */ @@ -3869,4 +3869,11 @@ protected VersionTag fetchRemoteVersionTag(Object key) { public boolean hasNetLoader() { return this.hasNetLoader(getCacheDistributionAdvisor()); } + + @Override + public long getLatestLastAccessTimeFromOthers(Object key) { + LatestLastAccessTimeOperation op = new LatestLastAccessTimeOperation(this, key); + return op.getLatestLastAccessTime(); + } + } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java index 45df43532ca0..294f22146243 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java @@ -22,6 +22,7 @@ import org.apache.geode.cache.*; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.internal.InternalStatisticsDisabledException; +import org.apache.geode.internal.lang.SystemPropertyHelper; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.offheap.annotations.Released; import org.apache.logging.log4j.Logger; @@ -253,6 +254,37 @@ protected ExpirationAction getAction() { return action; } + @Override + protected boolean isIdleExpiredOnOthers() throws EntryNotFoundException { + if (getIdleAttributes().getTimeout() <= 0L) { + // idle expiration is not being used + return true; + } + if (getIdleAttributes().getAction().isLocal()) { + // no need to consult with others if using a local action + return true; + } + if (SystemPropertyHelper.restoreIdleExpirationBehavior()) { + return true; + } + + long latestLastAccessTime = getLatestLastAccessTimeOnOtherMembers(); + if (latestLastAccessTime > getLastAccessedTime()) { + setLastAccessedTime(latestLastAccessTime); + return false; + } + return true; + } + + private long getLatestLastAccessTimeOnOtherMembers() { + return getLocalRegion().getLatestLastAccessTimeFromOthers(getKey()); + } + + private void setLastAccessedTime(long lastAccessedTime) throws EntryNotFoundException { + RegionEntry re = getCheckedRegionEntry(); + re.setLastAccessed(lastAccessedTime); + } + /** * Called by LocalRegion#performExpiryTimeout */ diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java index 9e21115baa03..6fcaa52be1b6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java @@ -121,15 +121,21 @@ public long getTTLExpirationTime() throws EntryNotFoundException { /** Return the absolute time when idle expiration occurs, or 0 if not used */ public long getIdleExpirationTime() throws EntryNotFoundException { + long idle = getIdleTimeoutInMillis(); + if (idle > 0) { + return getLastAccessedTime() + idle; + } + return 0L; + } + + protected long getIdleTimeoutInMillis() { long idle = getIdleAttributes().getTimeout(); - long tilt = 0; if (idle > 0) { if (getLocalRegion() != null && !getLocalRegion().EXPIRY_UNITS_MS) { idle *= 1000; } - tilt = getLastAccessedTime() + idle; } - return tilt; + return idle; } /** @@ -149,12 +155,33 @@ long getExpiryMillis() throws EntryNotFoundException { */ protected boolean isExpirationPossible() throws EntryNotFoundException { long expTime = getExpirationTime(); - if (expTime > 0L && getNow() >= expTime) { - return true; + if (expTime > 0L) { + long now = getNow(); + if (now >= expTime) { + if (isIdleExpiredOnOthers()) { + return true; + } else { + // our last access time was reset so recheck + expTime = getExpirationTime(); + if (expTime > 0L && now >= expTime) { + return true; + } + } + } } return false; } + /** + * Added for GEODE-3764. + * + * @return true if other members last access time indicates we have expired + */ + protected boolean isIdleExpiredOnOthers() throws EntryNotFoundException { + // by default return true since we don't need to check with others + return true; + } + /** * Returns false if the region reliability state does not allow this expiry task to fire. */ diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDistributedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDistributedRegion.java new file mode 100644 index 000000000000..281f96b42c3e --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalDistributedRegion.java @@ -0,0 +1,19 @@ +/* + * 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.internal.cache; + +public interface InternalDistributedRegion + extends InternalRegion, CacheDistributionAdvisee { +} diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java index a58df4cfc018..a4a635db7e0c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalRegion.java @@ -15,6 +15,7 @@ package org.apache.geode.internal.cache; import org.apache.geode.cache.Region; +import org.apache.geode.distributed.internal.DM; /** * Interface to be used instead of type-casting to LocalRegion. @@ -32,7 +33,7 @@ * * */ -public interface InternalRegion extends Region, HasCachePerfStats { +public interface InternalRegion extends Region, HasCachePerfStats { - CachePerfStats getCachePerfStats(); + RegionEntry getRegionEntry(K key); } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeMessage.java new file mode 100644 index 000000000000..063e0ae51333 --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeMessage.java @@ -0,0 +1,93 @@ +/* + * 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.internal.cache; + +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.Set; + +import org.apache.geode.DataSerializer; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.distributed.internal.MessageWithReply; +import org.apache.geode.distributed.internal.PooledDistributionMessage; +import org.apache.geode.distributed.internal.ReplyMessage; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.InternalStatisticsDisabledException; + +/** + * Sends the region name and key of the entry that we want the last access time for. If for any + * reason this message can not obtain the last access time then zero will be returned. + * + * @since Geode 1.4 + */ +public class LatestLastAccessTimeMessage extends PooledDistributionMessage + implements MessageWithReply { + + private int processorId; + private String regionName; + private K key; + + public LatestLastAccessTimeMessage() { + // nothing + } + + public LatestLastAccessTimeMessage(LatestLastAccessTimeReplyProcessor replyProcessor, + Set recipients, InternalDistributedRegion region, K key) { + this.setRecipients(recipients); + this.processorId = replyProcessor.getProcessorId(); + this.key = key; + this.regionName = region.getFullPath(); + } + + @Override + public int getDSFID() { + return LATEST_LAST_ACCESS_TIME_MESSAGE; + } + + @Override + protected void process(DistributionManager dm) { + long latestLastAccessTime = 0L; + InternalDistributedRegion region = + (InternalDistributedRegion) dm.getCache().getRegion(this.regionName); + if (region != null) { + RegionEntry entry = region.getRegionEntry(this.key); + if (entry != null) { + try { + latestLastAccessTime = entry.getLastAccessed(); + } catch (InternalStatisticsDisabledException ignored) { + // last access time is not available + } + } + } + ReplyMessage.send(getSender(), this.processorId, latestLastAccessTime, dm); + } + + @Override + public void fromData(DataInput in) throws IOException, ClassNotFoundException { + super.fromData(in); + this.processorId = DataSerializer.readPrimitiveInt(in); + this.regionName = DataSerializer.readString(in); + this.key = DataSerializer.readObject(in); + } + + @Override + public void toData(DataOutput out) throws IOException { + super.toData(out); + DataSerializer.writePrimitiveInt(this.processorId, out); + DataSerializer.writeString(this.regionName, out); + DataSerializer.writeObject(this.key, out); + } +} diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java new file mode 100644 index 000000000000..231e83f3cddf --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeOperation.java @@ -0,0 +1,60 @@ +/* + * 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.internal.cache; + +import java.util.Set; + +import org.apache.geode.CancelException; +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.ReplyException; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.Version; + +/** + * Operation that determines the latest last access time for a given region and key + * + * @since Geode 1.4 + */ +public class LatestLastAccessTimeOperation { + private final InternalDistributedRegion region; + private final K key; + + public LatestLastAccessTimeOperation(InternalDistributedRegion region, K key) { + this.region = region; + this.key = key; + } + + public long getLatestLastAccessTime() { + final Set recipients = + this.region.getCacheDistributionAdvisor().adviseInitializedReplicates(); + final DM dm = this.region.getDistributionManager(); + dm.retainMembersWithSameOrNewerVersion(recipients, Version.GEODE_140); + final LatestLastAccessTimeReplyProcessor replyProcessor = + new LatestLastAccessTimeReplyProcessor(dm, recipients); + dm.putOutgoing( + new LatestLastAccessTimeMessage<>(replyProcessor, recipients, this.region, this.key)); + try { + replyProcessor.waitForReplies(); + } catch (ReplyException e) { + if (!(e.getCause() instanceof CancelException)) { + throw e; + } + } catch (InterruptedException e) { + dm.getCancelCriterion().checkCancelInProgress(e); + Thread.currentThread().interrupt(); + } + return replyProcessor.getLatestLastAccessTime(); + } +} diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeReplyProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeReplyProcessor.java new file mode 100644 index 000000000000..b211875ed700 --- /dev/null +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LatestLastAccessTimeReplyProcessor.java @@ -0,0 +1,69 @@ +/* + * 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.internal.cache; + +import java.util.Set; + +import org.apache.logging.log4j.Logger; + +import org.apache.geode.distributed.internal.DM; +import org.apache.geode.distributed.internal.DistributionMessage; +import org.apache.geode.distributed.internal.ReplyMessage; +import org.apache.geode.distributed.internal.ReplyProcessor21; +import org.apache.geode.distributed.internal.membership.InternalDistributedMember; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.logging.log4j.LogMarker; + +/** + * Processes the replies from a LatestLastAccessTimeMessage. This reply processor only keeps the + * largest value returned. It waits for every recipient to respond. + * + * @since Geode 1.4 + */ +public class LatestLastAccessTimeReplyProcessor extends ReplyProcessor21 { + private static final Logger logger = LogService.getLogger(); + + private long latestLastAccessTime = 0; + + public LatestLastAccessTimeReplyProcessor(DM dm, Set recipients) { + super(dm, recipients); + } + + @Override + public void process(DistributionMessage msg) { + try { + ReplyMessage reply = (ReplyMessage) msg; + long replyTime = (long) reply.getReturnValue(); + updateLatestLastAccessTime(replyTime); + if (logger.isTraceEnabled(LogMarker.DM)) { + logger.trace(LogMarker.DM, "LatestLastAccessTimeReplyMessage return value is {}", + replyTime); + } + } finally { + super.process(msg); + } + } + + private synchronized void updateLatestLastAccessTime(long newTime) { + if (newTime > this.latestLastAccessTime) { + this.latestLastAccessTime = newTime; + } + } + + public synchronized long getLatestLastAccessTime() { + return this.latestLastAccessTime; + } + +} diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp index e8d3a2acd713..1ad1fd0fda78 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LeafRegionEntry.cpp @@ -461,7 +461,8 @@ public class LEAF_CLASS extends PARENT_CLASS { public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } @Override diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java index 35a0cc37eb04..6ff6f7f9b44b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java @@ -12026,4 +12026,13 @@ public int testHookGetValuesOnDisk() { return result; } + /** + * Send a message to all other members that can have this same region entry and return the latest + * last access time. + */ + public long getLatestLastAccessTimeFromOthers(Object key) { + // local regions have no other members so return 0. + return 0L; + } + } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java index 265062683dfd..785defa2e520 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionEntry.java @@ -76,6 +76,13 @@ public interface RegionEntry { public long getLastAccessed() throws InternalStatisticsDisabledException; + /** + * Sets the entry's last accessed time if it has one. + */ + public default void setLastAccessed(long lastAccessed) { + // do nothing by default + } + public long getHitCount() throws InternalStatisticsDisabledException; public long getMissCount() throws InternalStatisticsDisabledException; diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java index 12052eebf1ec..82e4373d8703 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapIntKey.java @@ -272,7 +272,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java index 219dbfaade27..001be3fc9138 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapLongKey.java @@ -272,7 +272,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java index b2fb66fe54d1..aac0beb5beb2 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapObjectKey.java @@ -276,7 +276,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java index f2387b966d13..47476864ce01 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey1.java @@ -293,7 +293,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java index 38e5392388d6..2af8f532b6d6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapStringKey2.java @@ -305,7 +305,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java index 6833e87a309e..5307f60d90d1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryHeapUUIDKey.java @@ -274,7 +274,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java index e02c26d4d2b2..c19489081d39 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapIntKey.java @@ -330,7 +330,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java index a565062c9e82..c05f1894b76b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapLongKey.java @@ -330,7 +330,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java index 8a1cd292e2c3..f7c73cf7dcf1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapObjectKey.java @@ -331,7 +331,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java index f961f195f0d2..c019bf8ce949 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey1.java @@ -348,7 +348,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java index 64e7c9afe5b4..d56af5164034 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapStringKey2.java @@ -360,7 +360,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java index 088e072fb19c..05651097b976 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskLRURegionEntryOffHeapUUIDKey.java @@ -332,7 +332,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java index 50c6239a5164..09d39519eee1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapIntKey.java @@ -170,7 +170,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java index 184ca7d1b915..bf3ce32841e1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapLongKey.java @@ -170,7 +170,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java index f3a37fe264c0..34eeebf26d5a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapObjectKey.java @@ -170,7 +170,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java index a77495f6b3dc..735eefede63b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey1.java @@ -188,7 +188,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java index dacd9a6655ef..29a745aad551 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapStringKey2.java @@ -200,7 +200,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java index 6122a4ef59fa..50572328d73b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryHeapUUIDKey.java @@ -172,7 +172,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java index 11000e56df56..e6f50c1dad47 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapIntKey.java @@ -225,7 +225,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java index 10d05a2d821e..fa198988c00d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapLongKey.java @@ -225,7 +225,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java index 2ad59d7cb7d2..af43ec47c1b5 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapObjectKey.java @@ -228,7 +228,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java index e1a3d9c2f159..22e4090dc00e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey1.java @@ -245,7 +245,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java index 6c091a578212..aa1b463a0599 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapStringKey2.java @@ -257,7 +257,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java index aca0cf304393..57963e357803 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsDiskRegionEntryOffHeapUUIDKey.java @@ -227,7 +227,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java index de18af0b982c..1bf274e9b3e3 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapIntKey.java @@ -216,7 +216,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java index 30e27774f785..91daafbb750e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapLongKey.java @@ -216,7 +216,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java index 5d53244fa501..86f27a6c1826 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapObjectKey.java @@ -216,7 +216,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java index aab6d196e3fa..3df8fb096eee 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey1.java @@ -234,7 +234,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java index 3b5d2f95fc7e..a9966b0aa5c8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapStringKey2.java @@ -246,7 +246,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java index 10620fa54ca4..77cb60df486a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryHeapUUIDKey.java @@ -218,7 +218,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java index 443885c6d4b6..cadb2ee781f9 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapIntKey.java @@ -271,7 +271,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java index abab53c7c7e7..a1e79eefebcc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapLongKey.java @@ -271,7 +271,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java index 7ea99d58fc24..c7c2e7f4f99c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapObjectKey.java @@ -273,7 +273,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java index 38e608009ebf..ea326b5c5b74 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey1.java @@ -291,7 +291,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java index 450a72cac510..84399983762a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapStringKey2.java @@ -303,7 +303,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java index 48e20ae08ec8..7ffddd510e77 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsLRURegionEntryOffHeapUUIDKey.java @@ -273,7 +273,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java index b01a3f7a1920..a48ff9877519 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapIntKey.java @@ -130,7 +130,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java index a91052212aba..93a470d84b3c 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapLongKey.java @@ -130,7 +130,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java index 9716f410f546..e2a70d903625 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapObjectKey.java @@ -130,7 +130,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java index 01ca1cb4b3d0..63bb9a63216e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey1.java @@ -148,7 +148,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java index ecf9f2f44a8f..6c217c4c9330 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapStringKey2.java @@ -160,7 +160,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java index c88c60056a91..2e62df2e8f99 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryHeapUUIDKey.java @@ -132,7 +132,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java index d6ef8ec733dc..7ba3ef094f03 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapIntKey.java @@ -185,7 +185,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java index a6ea1d82d0fb..f349001845d7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapLongKey.java @@ -185,7 +185,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java index 3ad6d3e3b8db..36b218f24a6e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapObjectKey.java @@ -185,7 +185,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java index bc500aed4d1b..2c4d7a7365b8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey1.java @@ -202,7 +202,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java index aa47230eee16..2578cfdf2611 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapStringKey2.java @@ -214,7 +214,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java index e391ff793b3f..c6dbf3451b5a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VMStatsRegionEntryOffHeapUUIDKey.java @@ -187,7 +187,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java index 92c56b56b4fd..ae524f7af542 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapIntKey.java @@ -282,7 +282,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java index 4594de98635b..8be0c3f810cc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapLongKey.java @@ -282,7 +282,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java index 2048451e6a11..9b829d3bbb03 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapObjectKey.java @@ -282,7 +282,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java index f4121b724ed4..a7bf1ff3eb31 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey1.java @@ -299,7 +299,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java index dcbd4e56c148..7adf88ba18dc 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapStringKey2.java @@ -311,7 +311,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java index 77c2633c83d5..2b39488e7910 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryHeapUUIDKey.java @@ -284,7 +284,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java index 61b5adae4b1d..7618bad51bbe 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapIntKey.java @@ -337,7 +337,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java index c948cebb811e..420702654fc6 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapLongKey.java @@ -337,7 +337,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java index 7a8292bc6b9e..166c33b3a344 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapObjectKey.java @@ -337,7 +337,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java index 64df56c647c8..38e949539a48 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey1.java @@ -354,7 +354,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java index f7a06aa2c549..9922420ec545 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapStringKey2.java @@ -366,7 +366,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java index 7df21b13b08c..a65b91f13bfb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskLRURegionEntryOffHeapUUIDKey.java @@ -339,7 +339,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java index e848cca31f43..9dd509a09bce 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapIntKey.java @@ -179,7 +179,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java index 940be11e0a59..7234639d3e99 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapLongKey.java @@ -179,7 +179,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java index df9e83db8260..e27955bec3ca 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapObjectKey.java @@ -179,7 +179,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java index d5271e57e125..a1b15fa4b9a1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey1.java @@ -196,7 +196,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java index 5d20543b59e0..5fd38b7eec6a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapStringKey2.java @@ -208,7 +208,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java index 6c705764c649..7bff6e16107d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryHeapUUIDKey.java @@ -181,7 +181,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java index f2ff6892e64a..eea2af0a751b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapIntKey.java @@ -235,7 +235,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java index 5bcc4c1fc693..606742adf71d 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapLongKey.java @@ -235,7 +235,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java index 14217bd35f6f..385e05aa6cf9 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapObjectKey.java @@ -235,7 +235,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java index 5fd2d8e33f52..54159d71b371 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey1.java @@ -252,7 +252,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java index 1dc0cf21a5a2..13250b10d3ce 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapStringKey2.java @@ -264,7 +264,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java index cfd86230f77c..26c4468212e3 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsDiskRegionEntryOffHeapUUIDKey.java @@ -237,7 +237,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java index a6446b5abf71..9a8c481b4e1b 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapIntKey.java @@ -224,7 +224,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java index 1bdd183f415f..8016766af4ce 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapLongKey.java @@ -225,7 +225,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java index de0111d71ae5..e7b8ba8c4e60 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapObjectKey.java @@ -225,7 +225,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java index 27f43a5178f2..98c5fe23f0fb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey1.java @@ -242,7 +242,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java index 675e19bf7a34..0be92b7af693 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapStringKey2.java @@ -254,7 +254,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java index 43736b9faedc..49bc7edb42bb 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryHeapUUIDKey.java @@ -227,7 +227,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java index 7309f9d286c2..cb67874b17f8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapIntKey.java @@ -280,7 +280,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java index f1a969f5d5a4..b6153a55bb1e 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapLongKey.java @@ -281,7 +281,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java index ce01dd5745d8..4cf5aa6e08f1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapObjectKey.java @@ -281,7 +281,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java index f93d7b3226de..6c883fc42af8 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey1.java @@ -298,7 +298,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java index 068b954db22c..ca0c1ae452af 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapStringKey2.java @@ -310,7 +310,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java index 86f05a290210..9fa6b04a1914 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsLRURegionEntryOffHeapUUIDKey.java @@ -283,7 +283,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java index 1dff8beac4f9..9c7a9ff53aa1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapIntKey.java @@ -135,7 +135,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java index dd944b397032..8075a6d6dce7 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapLongKey.java @@ -135,7 +135,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java index eeaabfcc2fec..d176609c2ac1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapObjectKey.java @@ -139,7 +139,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java index 1b49858b0942..7e4ebc460a64 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey1.java @@ -156,7 +156,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java index 3a51688e939c..7017e5bb6185 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapStringKey2.java @@ -168,7 +168,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java index 35cc901389c7..a8db8f17c6cf 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryHeapUUIDKey.java @@ -137,7 +137,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java index 2fe5fc843114..33e0edc87055 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapIntKey.java @@ -193,7 +193,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java index c224bd16b38b..37fdfc7dbf66 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapLongKey.java @@ -193,7 +193,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java index a046f1b0ff9e..c5f7268f28ad 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapObjectKey.java @@ -194,7 +194,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java index 37a17e7a616c..fbc233b8fd7a 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey1.java @@ -211,7 +211,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java index b60e4af65058..ffd62aa31534 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapStringKey2.java @@ -223,7 +223,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java index 6b493b76b2d2..19b3bc2d98e1 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java +++ b/geode-core/src/main/java/org/apache/geode/internal/cache/VersionedStatsRegionEntryOffHeapUUIDKey.java @@ -195,7 +195,8 @@ public long getLastAccessed() throws InternalStatisticsDisabledException { return this.lastAccessed; } - private void setLastAccessed(long lastAccessed) { + @Override + public void setLastAccessed(long lastAccessed) { this.lastAccessed = lastAccessed; } diff --git a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemPropertyHelper.java b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemPropertyHelper.java index ec8a1f823642..178f14ce4dfd 100644 --- a/geode-core/src/main/java/org/apache/geode/internal/lang/SystemPropertyHelper.java +++ b/geode-core/src/main/java/org/apache/geode/internal/lang/SystemPropertyHelper.java @@ -54,4 +54,17 @@ private static boolean getProductBooleanProperty(String name) { public static boolean restoreSetOperationTransactionBehavior() { return getProductBooleanProperty("restoreSetOperationTransactionBehavior"); } + + /** + * As of Geode 1.4.0, idle expiration on a replicate or partitioned region will now do a + * distributed check for a more recent last access time on one of the other copies of the region. + * + * This system property can be set to true to turn off this new check and restore the previous + * behavior of only using the local last access time as the basis for expiration. + * + * @since Geode 1.4.0 + */ + public static boolean restoreIdleExpirationBehavior() { + return getProductBooleanProperty("restoreIdleExpirationBehavior"); + } } diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PREntryIdleExpirationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PREntryIdleExpirationTest.java new file mode 100644 index 000000000000..630cf8a14943 --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PREntryIdleExpirationTest.java @@ -0,0 +1,50 @@ +/* + * 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.internal.cache; + +import static org.apache.geode.cache.ExpirationAction.DESTROY; +import static org.apache.geode.cache.RegionShortcut.PARTITION; + +import org.junit.Before; +import org.junit.experimental.categories.Category; + +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.PartitionAttributesFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.test.junit.categories.DistributedTest; + +@Category(DistributedTest.class) +@SuppressWarnings("serial") +public class PREntryIdleExpirationTest extends ReplicateEntryIdleExpirationTest { + + @Before + public void setUpPREntryIdleExpirationTest() throws Exception { + // make member1 the primary bucket for KEY + member1.invoke(() -> { + Region region = cacheRule.getCache().getRegion(regionName); + region.put(KEY, VALUE); + }); + } + + @Override + protected void createRegion() { + RegionFactory factory = cacheRule.getCache().createRegionFactory(PARTITION); + factory.setPartitionAttributes( + new PartitionAttributesFactory().setRedundantCopies(2).create()); + factory.setEntryIdleTimeout(new ExpirationAttributes(1, DESTROY)); + factory.create(regionName); + } +} diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationTest.java new file mode 100644 index 000000000000..eb26680c1e9b --- /dev/null +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ReplicateEntryIdleExpirationTest.java @@ -0,0 +1,128 @@ +/* + * 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.internal.cache; + +import static java.util.concurrent.TimeUnit.SECONDS; +import static org.apache.geode.cache.ExpirationAction.DESTROY; +import static org.apache.geode.cache.RegionShortcut.REPLICATE; +import static org.apache.geode.test.dunit.Host.getHost; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; + +import java.io.Serializable; +import java.util.concurrent.atomic.AtomicBoolean; + +import com.google.common.base.Stopwatch; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +import org.apache.geode.cache.ExpirationAttributes; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.RegionFactory; +import org.apache.geode.test.dunit.AsyncInvocation; +import org.apache.geode.test.dunit.VM; +import org.apache.geode.test.dunit.rules.CacheRule; +import org.apache.geode.test.dunit.rules.DistributedTestRule; +import org.apache.geode.test.junit.categories.DistributedTest; + +@Category(DistributedTest.class) +@SuppressWarnings("serial") +public class ReplicateEntryIdleExpirationTest implements Serializable { + + @ClassRule + public static DistributedTestRule distributedTestRule = new DistributedTestRule(); + + private static final AtomicBoolean KEEP_READING = new AtomicBoolean(true); + + protected static final String KEY = "KEY"; + protected static final String VALUE = "VALUE"; + + protected final VM member1 = getHost(0).getVM(0); + protected final VM member2 = getHost(0).getVM(1); + protected final VM member3 = getHost(0).getVM(2); + protected final String regionName = getClass().getSimpleName(); + + @Rule + public CacheRule cacheRule = CacheRule.builder().createCacheIn(member1).createCacheIn(member2) + .createCacheIn(member3).build(); + + @Before + public void setUp() throws Exception { + VM[] vms = new VM[] {member1, member2, member3}; + for (VM vm : vms) { + vm.invoke(() -> { + KEEP_READING.set(true); + ExpiryTask.suspendExpiration(); + createRegion(); + }); + } + } + + @After + public void tearDown() throws Exception { + VM[] vms = new VM[] {member1, member2, member3}; + for (VM vm : vms) { + vm.invoke(() -> { + KEEP_READING.set(false); + ExpiryTask.permitExpiration(); + }); + } + } + + @Test + public void readsInOtherMemberShouldPreventExpiration() throws Exception { + AsyncInvocation memberReading = member3.invokeAsync(() -> { + Region region = cacheRule.getCache().getRegion(regionName); + region.put(KEY, VALUE); + while (KEEP_READING.get()) { + region.get(KEY); + Thread.sleep(10); + } + }); + + member2.invoke(() -> { + Region region = cacheRule.getCache().getRegion(regionName); + await().atMost(30, SECONDS).until(() -> region.containsKey(KEY)); + assertThat(region.containsKey(KEY)).isTrue(); + }); + + member1.invoke(() -> { + Region region = cacheRule.getCache().getRegion(regionName); + await().atMost(30, SECONDS).until(() -> region.containsKey(KEY)); + assertThat(region.containsKey(KEY)).isTrue(); + + ExpiryTask.permitExpiration(); + Stopwatch stopwatch = Stopwatch.createStarted(); + while (stopwatch.elapsed(SECONDS) <= 5 && region.containsKey(KEY)) { + Thread.sleep(10); + } + assertThat(region.containsKey(KEY)).isTrue(); + }); + + member3.invoke(() -> KEEP_READING.set(false)); + + memberReading.await(); + } + + protected void createRegion() { + RegionFactory factory = cacheRule.getCache().createRegionFactory(REPLICATE); + factory.setEntryIdleTimeout(new ExpirationAttributes(1, DESTROY)); + factory.create(regionName); + } +} diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt index 56f79cbac4b8..d5e8b78ae122 100644 --- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt +++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt @@ -1138,6 +1138,10 @@ org/apache/geode/internal/cache/JtaAfterCompletionMessage,2 fromData,26,2a2bb700232a2bb900240100b500042a2bb900240100b50002b1 toData,26,2a2bb700212b2ab40004b9002202002b2ab40002b900220200b1 +org/apache/geode/internal/cache/LatestLastAccessTimeMessage,2 +fromData,30,2a2bb700122a2bb80013b500042a2bb80014b500072a2bb80015b50005b1 +toData,30,2a2bb700162ab400042bb800172ab400072bb800182ab400052bb80019b1 + org/apache/geode/internal/cache/MemberFunctionStreamingMessage,2 fromData,163,2a2bb700522bb9005301003d1c047e9900142a2bb900540100b500082ab40008b800551c077e99000d2a2bb900540100b500051c057e99000e2a2bb80056c00057b500062bb800564e2dc1002b9900252a03b5000a2a2dc0002bb80058b500072ab40007c7001b2a2dc0002bb5001ba700102a2dc00059b500072a04b5000a2a2bb80056b500092a2bb80056c0005ab500102a1c10407e99000704a7000403b5000bb1 toData,162,2a2bb7005c033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000b9900091c104080933d2b1cb9005d02002ab4000899000d2b2ab40008b9005e02002ab40005029f000d2b2ab40005b9005e02002ab40006c6000b2ab400062bb8005f2ab4000a99000e2ab400072bb8005fa700102ab40007b9002001002bb8005f2ab400092bb8005f2ab400102bb8005fb1