DonalEvans commented on a change in pull request #6500:
URL: https://github.com/apache/geode/pull/6500#discussion_r636252877
##########
File path:
geode-core/src/test/java/org/apache/geode/internal/DataSerializableJUnitTest.java
##########
@@ -1166,13 +1166,13 @@ public void testVersionedDataSerializable() throws
Exception {
VersionedDataSerializableImpl ds = new
VersionedDataSerializableImpl(getRandom());
VersionedDataOutputStream v =
- new VersionedDataOutputStream(this.baos, KnownVersion.GFE_70);
+ new VersionedDataOutputStream(this.baos, KnownVersion.GEODE_1_11_0);
Review comment:
Is there a specific reason for this version to be used here? Similarly
for the use of `GEODE_1_12_0` below.
##########
File path: geode-core/src/main/java/org/apache/geode/internal/cache/Oplog.java
##########
@@ -5723,89 +5590,79 @@ public DirectoryHolder getDirectoryHolder() {
* @return long value indicating the current size of the oplog.
*/
long getOplogSize() {
- return this.crf.currSize + this.drf.currSize;
+ return crf.currSize + drf.currSize;
}
boolean isOplogEmpty() {
- return this.crf.currSize <= (OPLOG_DISK_STORE_REC_SIZE +
OPLOG_MAGIC_SEQ_REC_SIZE)
- && this.drf.currSize <= (OPLOG_DISK_STORE_REC_SIZE +
OPLOG_MAGIC_SEQ_REC_SIZE);
+ return crf.currSize <= (OPLOG_DISK_STORE_REC_SIZE +
OPLOG_MAGIC_SEQ_REC_SIZE)
+ && drf.currSize <= (OPLOG_DISK_STORE_REC_SIZE +
OPLOG_MAGIC_SEQ_REC_SIZE);
}
void incLiveCount() {
- this.totalLiveCount.incrementAndGet();
+ totalLiveCount.incrementAndGet();
}
private void decLiveCount() {
- this.totalLiveCount.decrementAndGet();
+ totalLiveCount.decrementAndGet();
}
/**
* Return true if a record (crf or drf) has been added to this oplog
*/
boolean hasBeenUsed() {
- return this.hasDeletes.get() || this.totalCount.get() > 0;
+ return hasDeletes.get() || totalCount.get() > 0;
}
void incTotalCount() {
if (!isPhase2()) {
- this.totalCount.incrementAndGet();
+ totalCount.incrementAndGet();
}
}
private void finishedAppending() {
// No need to get the backup lock prior to synchronizing (correct lock
order) since the
// synchronized block does not attempt to get the backup lock (incorrect
lock order)
- synchronized (this.lock/* crf */) {
- this.doneAppending = true;
+ synchronized (lock/* crf */) {
+ doneAppending = true;
}
handleNoLiveValues();
// I'm deadcoding the following because it is not safe unless we change to
// always recover values. If we don't recover values then
// an oplog we recovered from may still need to fault values in from
memory.
Review comment:
This comment no longer refers to any code, commented out or otherwise,
so it should also be removed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
