GEODE-5265: fix dataStoreEntryCount statistic #2006
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dhemery
approved these changes
May 31, 2018
| @@ -884,7 +886,9 @@ public boolean initialImagePut(final Object key, final long lastModified, Object | |||
| } | |||
| } | |||
| if (newValue == Token.TOMBSTONE) { | |||
| owner.updateSizeOnRemove(key, oldSize); | |||
| if (!oldIsTombstone) { | |||
There was a problem hiding this comment.
seems like this should care about old being "isRemoved()" instead of only "isTombstone()".
| @@ -1065,6 +1069,7 @@ public void txApplyDestroy(Object key, TransactionId txId, TXRmtEvent txEvent, | |||
| if (!re.isRemoved() || re.isTombstone()) { | |||
| Object oldValue = re.getValueInVM(owner); | |||
| final int oldSize = owner.calculateRegionEntryValueSize(re); | |||
| final boolean wasTombstone = re.isTombstone(); | |||
There was a problem hiding this comment.
isTombstone is not enough. Token.DESTROYED should also be handled.
| @@ -1196,8 +1203,9 @@ public void txApplyDestroy(Object key, TransactionId txId, TXRmtEvent txEvent, | |||
| EntryLogger.logTXDestroy(_getOwnerObject(), key); | |||
| if (wasTombstone) { | |||
| owner.unscheduleTombstone(oldRe); | |||
| } else { | |||
There was a problem hiding this comment.
I think this code should also handle Token.DESTROY
dschneider-pivotal
added a commit
that referenced
this pull request
Jun 1, 2018
This reverts commit 44e5d36.
dschneider-pivotal
added a commit
that referenced
this pull request
Jun 1, 2018
fixed new unit test to not expect updateSizeOnCreate to be called
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A number of places existed in which even though the entry had already been destroyed; it could be destroyed again. In those cases the statistic would decremented an extra time.
In one place the stat was incremented when doing txApplyDestroy even though an entry was not being added to the region.
Unit tests were added for all these places that failed before the code was fixed.
@dhemery