Skip to content
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

Jump to bottom

[Type removal] Remove _type support in NOOP bulk indexing from client benchmark #3076

Merged
merged 2 commits into from
Apr 26, 2022
Merged

[Type removal] Remove _type support in NOOP bulk indexing from client benchmark #3076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81d7038
[Type removal] Remove _type support in bulk indexing from client benc…
dreamer-89 Apr 25, 2022
dbdd9db
Update README
dreamer-89 Apr 26, 2022
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
3 changes: 1 addition & 2 deletions client/benchmark/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Example invocation:
wget http://benchmarks.elasticsearch.org.s3.amazonaws.com/corpora/geonames/documents-2.json.bz2
bzip2 -d documents-2.json.bz2
mv documents-2.json client/benchmark/build
gradlew -p client/benchmark run --args ' rest bulk localhost build/documents-2.json geonames type 8647880 5000'
gradlew -p client/benchmark run --args ' rest bulk localhost build/documents-2.json geonames 8647880 5000'
```

The parameters are all in the `'`s and are in order:
Expand All @@ -39,7 +39,6 @@ The parameters are all in the `'`s and are in order:
* Benchmark target host IP (the host where OpenSearch is running)
* full path to the file that should be bulk indexed
* name of the index
* name of the (sole) type in the index
* number of documents in the file
* bulk size

Expand Down
13 changes: 6 additions & 7 deletions client/benchmark/src/main/java/org/opensearch/client/benchmark/AbstractBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public abstract class AbstractBenchmark<T extends Closeable> {

protected abstract T client(String benchmarkTargetHost) throws Exception;

protected abstract BulkRequestExecutor bulkRequestExecutor(T client, String indexName, String typeName);
protected abstract BulkRequestExecutor bulkRequestExecutor(T client, String indexName);

protected abstract SearchRequestExecutor searchRequestExecutor(T client, String indexName);

Expand All @@ -76,16 +76,15 @@ public final void run(String[] args) throws Exception {

@SuppressForbidden(reason = "system out is ok for a command line tool")
private void runBulkIndexBenchmark(String[] args) throws Exception {
if (args.length != 7) {
System.err.println("usage: 'bulk' benchmarkTargetHostIp indexFilePath indexName typeName numberOfDocuments bulkSize");
if (args.length != 6) {
System.err.println("usage: 'bulk' benchmarkTargetHostIp indexFilePath indexName numberOfDocuments bulkSize");
System.exit(1);
}
String benchmarkTargetHost = args[1];
String indexFilePath = args[2];
String indexName = args[3];
String typeName = args[4];
int totalDocs = Integer.valueOf(args[5]);
int bulkSize = Integer.valueOf(args[6]);
int totalDocs = Integer.valueOf(args[4]);
int bulkSize = Integer.valueOf(args[5]);

int totalIterationCount = (int) Math.floor(totalDocs / bulkSize);
// consider 40% of all iterations as warmup iterations
Expand All @@ -97,7 +96,7 @@ private void runBulkIndexBenchmark(String[] args) throws Exception {
BenchmarkRunner benchmark = new BenchmarkRunner(
warmupIterations,
iterations,
new BulkBenchmarkTask(bulkRequestExecutor(client, indexName, typeName), indexFilePath, warmupIterations, iterations, bulkSize)
new BulkBenchmarkTask(bulkRequestExecutor(client, indexName), indexFilePath, warmupIterations, iterations, bulkSize)
);

try {
Expand Down
10 changes: 5 additions & 5 deletions client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ protected RestClient client(String benchmarkTargetHost) {
}

@Override
protected BulkRequestExecutor bulkRequestExecutor(RestClient client, String indexName, String typeName) {
return new RestBulkRequestExecutor(client, indexName, typeName);
protected BulkRequestExecutor bulkRequestExecutor(RestClient client, String indexName) {
return new RestBulkRequestExecutor(client, indexName);
}

@Override
Expand All @@ -78,9 +78,9 @@ private static final class RestBulkRequestExecutor implements BulkRequestExecuto
private final RestClient client;
private final String actionMetadata;

RestBulkRequestExecutor(RestClient client, String index, String type) {
RestBulkRequestExecutor(RestClient client, String index) {
this.client = client;
this.actionMetadata = String.format(Locale.ROOT, "{ \"index\" : { \"_index\" : \"%s\", \"_type\" : \"%s\" } }%n", index, type);
this.actionMetadata = String.format(Locale.ROOT, "{ \"index\" : { \"_index\" : \"%s\" } }%n", index);
}

@Override
Expand All @@ -91,7 +91,7 @@ public boolean bulkIndex(List<String> bulkData) {
bulkRequestBody.append(bulkItem);
bulkRequestBody.append("\n");
}
Request request = new Request("POST", "/geonames/type/_noop_bulk");
Request request = new Request("POST", "/geonames/_noop_bulk");
request.setJsonEntity(bulkRequestBody.toString());
try {
Response response = client.performRequest(request);
Expand Down