apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-15 02:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Addressing PR comments

Browse Source
This commit is contained in:
Scott Fines 2021-03-05 13:55:44 -06:00
parent c6731cc053
commit 75be7243e8
7 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bindings/java/src/junit/com/apple/foundationdb/EventKeeperTest.java
View File

@ -112,7 +112,7 @@ class EventKeeperTest {
// now check the timer and see if it recorded any events // now check the timer and see if it recorded any events
Assertions.assertEquals(1, timer.getCount(Events.RANGE_QUERY_FETCHES), "Unexpected number of chunk fetches"); Assertions.assertEquals(1, timer.getCount(Events.RANGE_QUERY_FETCHES), "Unexpected number of chunk fetches");
Assertions.assertEquals(testKvs.size(), timer.getCount(Events.RANGE_QUERY_TUPLES_FETCHED), Assertions.assertEquals(testKvs.size(), timer.getCount(Events.RANGE_QUERY_RECORDS_FETCHED),
"Unexpected number of tuples fetched"); "Unexpected number of tuples fetched");
Assertions.assertEquals(expectedByteSize, timer.getCount(Events.BYTES_FETCHED), Assertions.assertEquals(expectedByteSize, timer.getCount(Events.BYTES_FETCHED),
"Incorrect number of bytes fetched"); "Incorrect number of bytes fetched");
@ -124,12 +124,7 @@ class EventKeeperTest {
@Override @Override
public void count(Event event, long amt) { public void count(Event event, long amt) {
Long currCnt = counterMap.get(event); counterMap.compute(event, (e,present)->present==null? amt:amt+present);
if (currCnt == null) {
counterMap.put(event, amt);
} else {
counterMap.put(event, currCnt + amt);
}
} }
@Override @Override

4
bindings/java/src/main/com/apple/foundationdb/EventKeeper.java
View File

@ -1,5 +1,5 @@
/* /*
* TransactionTimer.java * EventKeeper.java
* *
* This source file is part of the FoundationDB open source project * This source file is part of the FoundationDB open source project
* *
@ -160,7 +160,7 @@ public interface EventKeeper {
/** /**
* The number of tuples fetched during a range query * The number of tuples fetched during a range query
*/ */
RANGE_QUERY_TUPLES_FETCHED, RANGE_QUERY_RECORDS_FETCHED,
/** /**
* The number of times a range query chunk fetch failed * The number of times a range query chunk fetch failed
*/ */

20
bindings/java/src/main/com/apple/foundationdb/FutureResults.java
View File

@ -54,25 +54,23 @@ class FutureResults extends NativeFuture<RangeResultInfo> {
} }
public RangeResult getResults() { public RangeResult getResults() {
ByteBuffer buffer = enableDirectBufferQueries ByteBuffer buffer = enableDirectBufferQueries ? DirectBufferPool.getInstance().poll() : null;
? DirectBufferPool.getInstance().poll() if (buffer != null && eventKeeper != null) {
: null; eventKeeper.increment(Events.RANGE_QUERY_DIRECT_BUFFER_HIT);
eventKeeper.increment(Events.JNI_CALL);
} else if (eventKeeper != null) {
eventKeeper.increment(Events.RANGE_QUERY_DIRECT_BUFFER_MISS);
eventKeeper.increment(Events.JNI_CALL);
}
try { try {
pointerReadLock.lock(); pointerReadLock.lock();
if (buffer != null) { if (buffer != null) {
if (eventKeeper != null) {
eventKeeper.increment(Events.RANGE_QUERY_DIRECT_BUFFER_HIT);
eventKeeper.increment(Events.JNI_CALL);
}
try (DirectBufferIterator directIterator = new DirectBufferIterator(buffer)) { try (DirectBufferIterator directIterator = new DirectBufferIterator(buffer)) {
FutureResults_getDirect(getPtr(), directIterator.getBuffer(), directIterator.getBuffer().capacity()); FutureResults_getDirect(getPtr(), directIterator.getBuffer(), directIterator.getBuffer().capacity());
return new RangeResult(directIterator); return new RangeResult(directIterator);
} }
} else { } else {
if (eventKeeper != null) {
eventKeeper.increment(Events.RANGE_QUERY_DIRECT_BUFFER_MISS);
eventKeeper.increment(Events.JNI_CALL);
}
return FutureResults_get(getPtr()); return FutureResults_get(getPtr());
} }
} finally { } finally {

2
bindings/java/src/main/com/apple/foundationdb/NativeFuture.java
View File

@ -53,7 +53,7 @@ abstract class NativeFuture<T> extends CompletableFuture<T> implements AutoClose
} }
} }
void marshalWhenDone() { private void marshalWhenDone() {
try { try {
T val = null; T val = null;
boolean shouldComplete = false; boolean shouldComplete = false;

2
bindings/java/src/main/com/apple/foundationdb/RangeQuery.java
View File

@ -288,7 +288,7 @@ class RangeQuery implements AsyncIterable<KeyValue>, Iterable<KeyValue> {
// (note: account for the length fields as well when recording the bytes // (note: account for the length fields as well when recording the bytes
// fetched) // fetched)
eventKeeper.count(Events.BYTES_FETCHED, result.getKey().length + result.getValue().length + 8); eventKeeper.count(Events.BYTES_FETCHED, result.getKey().length + result.getValue().length + 8);
eventKeeper.increment(Events.RANGE_QUERY_TUPLES_FETCHED); eventKeeper.increment(Events.RANGE_QUERY_RECORDS_FETCHED);
} }
// If this is the first call to next() on a chunk there cannot // If this is the first call to next() on a chunk there cannot