Skip to content

Commit

Permalink
CLEANUP: Refactored SMGetFuture.
Browse files Browse the repository at this point in the history
  • Loading branch information
@uhm0311
uhm0311 committed Oct 12, 2023
1 parent 54a8417 commit f380894
Show file tree
Hide file tree
Showing 2 changed files with 192 additions and 140 deletions.
155 changes: 25 additions & 130 deletions src/main/java/net/spy/memcached/ArcusClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.jar.JarFile;
Expand Down Expand Up @@ -120,7 +118,6 @@
import net.spy.memcached.internal.BTreeStoreAndGetFuture;
import net.spy.memcached.internal.BroadcastFuture;
import net.spy.memcached.internal.BulkOperationFuture;
import net.spy.memcached.internal.CheckedOperationTimeoutException;
import net.spy.memcached.internal.CollectionFuture;
import net.spy.memcached.internal.CollectionGetBulkFuture;
import net.spy.memcached.internal.CollectionGetFuture;
Expand All @@ -144,7 +141,6 @@
import net.spy.memcached.ops.Mutator;
import net.spy.memcached.ops.Operation;
import net.spy.memcached.ops.OperationCallback;
import net.spy.memcached.ops.OperationState;
import net.spy.memcached.ops.OperationStatus;
import net.spy.memcached.ops.StoreType;
import net.spy.memcached.plugin.FrontCacheMemcachedClient;
Expand Down Expand Up @@ -2248,69 +2244,19 @@ public void gotMissedKey(byte[] data) {
addOp(smGet.getMemcachedNode(), op);
}

return new SMGetFuture<List<SMGetElement<T>>>(ops, operationTimeout) {
@Override
public List<SMGetElement<T>> get(long duration, TimeUnit units)
throws InterruptedException, TimeoutException, ExecutionException {

if (!blatch.await(duration, units)) {
Collection<Operation> timedoutOps = new HashSet<Operation>();
for (Operation op : ops) {
if (op.getState() != OperationState.COMPLETE) {
timedoutOps.add(op);
} else {
MemcachedConnection.opSucceeded(op);
}
}
if (timedoutOps.size() > 0) {
MemcachedConnection.opsTimedOut(timedoutOps);
throw new CheckedOperationTimeoutException(duration, units, timedoutOps);
}
} else {
// continuous timeout counter will be reset
MemcachedConnection.opsSucceeded(ops);
}

for (Operation op : ops) {
if (op != null && op.hasErrored()) {
throw new ExecutionException(op.getException());
}

if (op != null && op.isCancelled()) {
throw new ExecutionException(new RuntimeException(op.getCancelCause()));
}
}

if (smGetList.size() == 1) {
return mergedResult;
}

return getSubList(mergedResult, offset, count);
}

@Override
public List<String> getMissedKeyList() {
return missedKeyList;
}

@Override
public Map<String, CollectionOperationStatus> getMissedKeys() {
return missedKeys;
}

@Override
public List<SMGetTrimKey> getTrimmedKeys() {
return mergedTrimmedKeys;
}

@Override
public CollectionOperationStatus getOperationStatus() {
if (!failedOperationStatus.isEmpty()) {
return new CollectionOperationStatus(failedOperationStatus.get(0));
}
return new CollectionOperationStatus(resultOperationStatus.get(0));
}
};
return SMGetFuture.<List<SMGetElement<T>>>builder()
.latch(blatch)
.ops(ops)
.timeout(operationTimeout)
.offset(offset)
.count(count)
.mergedResult(mergedResult)
.resultOperationStatus(resultOperationStatus)
.failedOperationStatus(failedOperationStatus)
.mergedTrimmedKeys(mergedTrimmedKeys)
.missedKeyList(missedKeyList)
.missedKeys(missedKeys)
.build();
}

private <T> SMGetFuture<List<SMGetElement<T>>> smget(
Expand Down Expand Up @@ -2507,69 +2453,18 @@ public void gotTrimmedKey(String key, Object subkey) {
addOp(smGet.getMemcachedNode(), op);
}

return new SMGetFuture<List<SMGetElement<T>>>(ops, operationTimeout) {
@Override
public List<SMGetElement<T>> get(long duration, TimeUnit units)
throws InterruptedException, TimeoutException, ExecutionException {

if (!blatch.await(duration, units)) {
Collection<Operation> timedoutOps = new HashSet<Operation>();
for (Operation op : ops) {
if (op.getState() != OperationState.COMPLETE) {
timedoutOps.add(op);
} else {
MemcachedConnection.opSucceeded(op);
}
}
if (timedoutOps.size() > 0) {
MemcachedConnection.opsTimedOut(timedoutOps);
throw new CheckedOperationTimeoutException(duration, units, timedoutOps);
}
} else {
// continuous timeout counter will be reset
MemcachedConnection.opsSucceeded(ops);
}

for (Operation op : ops) {
if (op != null && op.hasErrored()) {
throw new ExecutionException(op.getException());
}

if (op != null && op.isCancelled()) {
throw new ExecutionException(new RuntimeException(op.getCancelCause()));
}
}

if (smGetList.size() == 1) {
return mergedResult;
}

return getSubList(mergedResult, 0, count);
}

@Override
public List<String> getMissedKeyList() {
return missedKeyList;
}

@Override
public Map<String, CollectionOperationStatus> getMissedKeys() {
return missedKeys;
}

@Override
public List<SMGetTrimKey> getTrimmedKeys() {
return mergedTrimmedKeys;
}

@Override
public CollectionOperationStatus getOperationStatus() {
if (!failedOperationStatus.isEmpty()) {
return new CollectionOperationStatus(failedOperationStatus.get(0));
}
return new CollectionOperationStatus(resultOperationStatus.get(0));
}
};
return SMGetFuture.<List<SMGetElement<T>>>builder()
.latch(blatch)
.ops(ops)
.timeout(operationTimeout)
.count(count)
.mergedResult(mergedResult)
.resultOperationStatus(resultOperationStatus)
.failedOperationStatus(failedOperationStatus)
.mergedTrimmedKeys(mergedTrimmedKeys)
.missedKeyList(missedKeyList)
.missedKeys(missedKeys)
.build();
}

@Override
Expand Down
177 changes: 167 additions & 10 deletions src/main/java/net/spy/memcached/internal/SMGetFuture.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,84 @@
package net.spy.memcached.internal;

import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import net.spy.memcached.MemcachedConnection;
import net.spy.memcached.OperationTimeoutException;
import net.spy.memcached.collection.SMGetTrimKey;
import net.spy.memcached.ops.CollectionOperationStatus;
import net.spy.memcached.ops.Operation;
import net.spy.memcached.ops.OperationState;
import net.spy.memcached.ops.OperationStatus;

public abstract class SMGetFuture<T> implements Future<T> {
public class SMGetFuture<T extends List<?>> implements Future<T> {

private final Collection<Operation> ops;
private final long timeout;
private CountDownLatch latch;
private Collection<Operation> ops;
private long timeout;
private int offset;
private int count;
private T mergedResult;
private T mergedSubList;
private List<OperationStatus> resultOperationStatus;
private List<OperationStatus> failedOperationStatus;
private List<SMGetTrimKey> mergedTrimmedKeys;
private List<String> missedKeyList;
private Map<String, CollectionOperationStatus> missedKeys;

public SMGetFuture(Collection<Operation> ops, long timeout) {
this.ops = ops;
this.timeout = timeout;
private SMGetFuture() {
this.offset = 0;
}

@Override
public T get(long duration, TimeUnit units)
throws InterruptedException, TimeoutException, ExecutionException {

if (!latch.await(duration, units)) {
Collection<Operation> timedoutOps = new HashSet<Operation>();
for (Operation op : ops) {
if (op.getState() != OperationState.COMPLETE) {
timedoutOps.add(op);
} else {
MemcachedConnection.opSucceeded(op);
}
}
if (!timedoutOps.isEmpty()) {
MemcachedConnection.opsTimedOut(timedoutOps);
throw new CheckedOperationTimeoutException(duration, units, timedoutOps);
}
} else {
// continuous timeout counter will be reset
MemcachedConnection.opsSucceeded(ops);
}

for (Operation op : ops) {
if (op != null && op.hasErrored()) {
throw new ExecutionException(op.getException());
}

if (op != null && op.isCancelled()) {
throw new ExecutionException(new RuntimeException(op.getCancelCause()));
}
}

if (ops.size() == 1) {
return mergedResult;
}

if (mergedSubList == null) {
mergedSubList = getSubList();
}

return mergedSubList;
}

@Override
Expand Down Expand Up @@ -78,11 +135,111 @@ public boolean isDone() {
return true;
}

public abstract Map<String, CollectionOperationStatus> getMissedKeys();
public List<String> getMissedKeyList() {
return missedKeyList;
}

public Map<String, CollectionOperationStatus> getMissedKeys() {
return missedKeys;
}

public List<SMGetTrimKey> getTrimmedKeys() {
return mergedTrimmedKeys;
}

public CollectionOperationStatus getOperationStatus() {
if (!failedOperationStatus.isEmpty()) {
return new CollectionOperationStatus(failedOperationStatus.get(0));
}
return new CollectionOperationStatus(resultOperationStatus.get(0));
}

@SuppressWarnings("unchecked")
private T getSubList() {
if (offset > 0) {
if ((offset + count) < mergedResult.size()) {
return (T) mergedResult.subList(offset, (offset + count));
}
if (offset < mergedResult.size()) {
return (T) mergedResult.subList(offset, mergedResult.size());
}
return (T) Collections.emptyList();
} else {
if (count < mergedResult.size()) {
return (T) mergedResult.subList(0, count);
}
return (T) mergedResult;
}
}

public static <T extends List<?>> Builder<T> builder() {
return new Builder<T>();
}

public static class Builder<T extends List<?>> {
private final SMGetFuture<T> result = new SMGetFuture<T>();

public Builder() {

}

public Builder<T> latch(CountDownLatch latch) {
result.latch = latch;
return this;
}

public Builder<T> ops(Collection<Operation> ops) {
result.ops = ops;
return this;
}

public Builder<T> timeout(long timeout) {
result.timeout = timeout;
return this;
}

public Builder<T> offset(int offset) {
result.offset = offset;
return this;
}

public Builder<T> count(int count) {
result.count = count;
return this;
}

public Builder<T> mergedResult(T mergedResult) {
result.mergedResult = mergedResult;
return this;
}

public abstract List<String> getMissedKeyList();
public Builder<T> resultOperationStatus(List<OperationStatus> resultOperationStatus) {
result.resultOperationStatus = resultOperationStatus;
return this;
}

public abstract List<SMGetTrimKey> getTrimmedKeys();
public Builder<T> failedOperationStatus(List<OperationStatus> failedOperationStatus) {
result.failedOperationStatus = failedOperationStatus;
return this;
}

public abstract CollectionOperationStatus getOperationStatus();
public Builder<T> mergedTrimmedKeys(List<SMGetTrimKey> mergedTrimmedKeys) {
result.mergedTrimmedKeys = mergedTrimmedKeys;
return this;
}

public Builder<T> missedKeyList(List<String> missedKeyList) {
result.missedKeyList = missedKeyList;
return this;
}

public Builder<T> missedKeys(Map<String, CollectionOperationStatus> missedKeys) {
result.missedKeys = missedKeys;
return this;
}

public SMGetFuture<T> build() {
return result;
}
}
}

0 comments on commit f380894

Please sign in to comment.