Skip to content

AsyncReadBenchmark should use v4 API e2e #6683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moderakh merged 5 commits into from
Dec 6, 2019
Merged

AsyncReadBenchmark should use v4 API e2e #6683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8b5ca3
async read use v4 api e2e
moderakh Nov 26, 2019
c12227a
minor update
moderakh Dec 6, 2019
77fbd48
removed unnecessary BridgeInternalBenchmark.java
moderakh Dec 6, 2019
18118eb
added a TOOD as per code review comment
moderakh Dec 6, 2019
d6dbca7
remoed a leftover import
moderakh Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions ...osmos/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@

package com.azure.cosmos.benchmark;

import com.azure.cosmos.implementation.AsyncDocumentClient;
import com.azure.cosmos.BridgeInternal;
import com.azure.cosmos.CosmosAsyncClient;
import com.azure.cosmos.CosmosBridgeInternal;
import com.azure.cosmos.CosmosClientBuilder;
import com.azure.cosmos.implementation.AsyncDocumentClient;
import com.azure.cosmos.implementation.Database;
import com.azure.cosmos.implementation.Document;
import com.azure.cosmos.implementation.DocumentCollection;
Expand Down Expand Up @@ -47,6 +50,7 @@ abstract class AsyncBenchmark<T> {
private Meter failureMeter;

final Logger logger;
final CosmosAsyncClient v4Client;
final AsyncDocumentClient client;
final DocumentCollection collection;
final String partitionKey;
Expand All @@ -56,15 +60,17 @@ abstract class AsyncBenchmark<T> {
Timer latency;

AsyncBenchmark(Configuration cfg) {
client = new AsyncDocumentClient.Builder()
.withServiceEndpoint(cfg.getServiceEndpoint())
.withMasterKeyOrResourceToken(cfg.getMasterKey())
.withConnectionPolicy(cfg.getConnectionPolicy())
.withConsistencyLevel(cfg.getConsistencyLevel())
.build();
v4Client = new CosmosClientBuilder()
.setEndpoint(cfg.getServiceEndpoint())
.setKey(cfg.getMasterKey())
.setConnectionPolicy(cfg.getConnectionPolicy())
.setConsistencyLevel(cfg.getConsistencyLevel())
.buildAsyncClient();

logger = LoggerFactory.getLogger(this.getClass());

client = CosmosBridgeInternal.getAsyncDocumentClient(v4Client);

Database database = DocDBUtils.getDatabase(client, cfg.getDatabaseId());
collection = DocDBUtils.getCollection(client, database.getSelfLink(), cfg.getCollectionId());
nameCollectionLink = String.format("dbs/%s/colls/%s", database.getId(), collection.getId());
Expand Down Expand Up @@ -133,7 +139,7 @@ protected void init() {
}

void shutdown() {
client.close();
v4Client.close();
}

protected void onSuccess() {
Expand Down
30 changes: 16 additions & 14 deletions ...s/azure-cosmos-benchmark/src/main/java/com/azure/cosmos/benchmark/AsyncReadBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@

package com.azure.cosmos.benchmark;

import com.azure.cosmos.CosmosAsyncContainer;
import com.azure.cosmos.CosmosAsyncItemResponse;
import com.azure.cosmos.implementation.Document;
import com.azure.cosmos.PartitionKey;
import com.azure.cosmos.implementation.RequestOptions;
import com.azure.cosmos.implementation.ResourceResponse;
import com.codahale.metrics.Timer;
import org.reactivestreams.Subscription;
import reactor.core.publisher.BaseSubscriber;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.scheduler.Schedulers;

class AsyncReadBenchmark extends AsyncBenchmark<ResourceResponse<Document>> {
class AsyncReadBenchmark extends AsyncBenchmark<CosmosAsyncItemResponse> {
private final CosmosAsyncContainer cosmosAsyncContainer;

class LatencySubscriber<T> extends BaseSubscriber<T> {

Timer.Context context;
BaseSubscriber<ResourceResponse<Document>> baseSubscriber;
BaseSubscriber<CosmosAsyncItemResponse> baseSubscriber;

LatencySubscriber(BaseSubscriber<ResourceResponse<Document>> baseSubscriber) {
LatencySubscriber(BaseSubscriber<CosmosAsyncItemResponse> baseSubscriber) {
this.baseSubscriber = baseSubscriber;
}

Expand Down Expand Up @@ -48,24 +48,26 @@ protected void hookOnError(Throwable throwable) {

AsyncReadBenchmark(Configuration cfg) {
super(cfg);
// TODO: once all benchmarks move to v4 api, we should rely on the container which is read in the parent, and remove this.
cosmosAsyncContainer = v4Client.getDatabase(cfg.getDatabaseId()).getContainer(cfg.getCollectionId()).read().block().getContainer();
}

@Override
protected void performWorkload(BaseSubscriber<ResourceResponse<Document>> baseSubscriber, long i) throws InterruptedException {
protected void performWorkload(BaseSubscriber<CosmosAsyncItemResponse> baseSubscriber, long i) throws InterruptedException {
int index = (int) (i % docsToRead.size());
RequestOptions options = new RequestOptions();
options.setPartitionKey(new PartitionKey(docsToRead.get(index).getId()));
Document doc = docsToRead.get(index);

Flux<ResourceResponse<Document>> obs = client.readDocument(getDocumentLink(docsToRead.get(index)), options);
String partitionKeyValue = doc.getId();
Mono<CosmosAsyncItemResponse> result = cosmosAsyncContainer.getItem(doc.getId(), partitionKeyValue).read();

concurrencyControlSemaphore.acquire();

if (configuration.getOperationType() == Configuration.Operation.ReadThroughput) {
obs.subscribeOn(Schedulers.parallel()).subscribe(baseSubscriber);
result.subscribeOn(Schedulers.parallel()).subscribe(baseSubscriber);
} else {
LatencySubscriber<ResourceResponse<Document>> latencySubscriber = new LatencySubscriber<>(baseSubscriber);
LatencySubscriber<CosmosAsyncItemResponse> latencySubscriber = new LatencySubscriber<>(baseSubscriber);
latencySubscriber.context = latency.time();
obs.subscribeOn(Schedulers.parallel()).subscribe(latencySubscriber);
result.subscribeOn(Schedulers.parallel()).subscribe(latencySubscriber);
}
}
}