honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

* [Type removal] Remove _type support in bulk indexing from client benchmark

Signed-off-by: Suraj Singh <surajrider@gmail.com>

* Update README

Signed-off-by: Suraj Singh <surajrider@gmail.com>
This commit is contained in:
Suraj Singh 2022-04-26 10:21:31 -07:00 committed by GitHub
parent 0bab4730b6
commit c5ff8d62bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/benchmark/README.md
View File

@ -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:
@ -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

13
client/benchmark/src/main/java/org/opensearch/client/benchmark/AbstractBenchmark.java
View File

@ -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);
@ -76,16 +76,15 @@ public abstract class AbstractBenchmark<T extends Closeable> {
@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
@ -97,7 +96,7 @@ public abstract class AbstractBenchmark<T extends Closeable> {
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 {

10
client/benchmark/src/main/java/org/opensearch/client/benchmark/rest/RestClientBenchmark.java
View File

@ -65,8 +65,8 @@ public final class RestClientBenchmark extends AbstractBenchmark<RestClient> {
}
@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
@ -78,9 +78,9 @@ public final class RestClientBenchmark extends AbstractBenchmark<RestClient> {
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
@ -91,7 +91,7 @@ public final class RestClientBenchmark extends AbstractBenchmark<RestClient> {
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);