github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-24 15:17:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

Add shorthand for prepareIndex to test infrastructure (#101187)

Browse source 
Same as #101175, shorten `client().prepareIndex(index)` and
`client().prepareIndex().setIndex(index)` via a test utility.
Saves lots of code now and sets up some follow-up simplifcations.
This commit is contained in:
Armin Braun 2023-11-23 15:47:36 +01:00 • committed by GitHub
parent 05ead7ec59
commit cdc83ad29b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
410 changed files with 3050 additions and 4001 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/AdjacencyMatrixIT.java
View file

@ -61,19 +61,19 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase {
for (int i = 0; i < numTag1Docs; i++) {
numSingleTag1Docs++;
XContentBuilder source = jsonBuilder().startObject().field("value", i + 1).field("tag", "tag1").endObject();
builders.add(client().prepareIndex("idx").setId("" + i).setSource(source));
builders.add(prepareIndex("idx").setId("" + i).setSource(source));
if (randomBoolean()) {
// randomly index the document twice so that we have deleted
// docs that match the filter
builders.add(client().prepareIndex("idx").setId("" + i).setSource(source));
builders.add(prepareIndex("idx").setId("" + i).setSource(source));
}
}
for (int i = numTag1Docs; i < (numTag1Docs + numTag2Docs); i++) {
numSingleTag2Docs++;
XContentBuilder source = jsonBuilder().startObject().field("value", i + 1).field("tag", "tag2").endObject();
builders.add(client().prepareIndex("idx").setId("" + i).setSource(source));
builders.add(prepareIndex("idx").setId("" + i).setSource(source));
if (randomBoolean()) {
builders.add(client().prepareIndex("idx").setId("" + i).setSource(source));
builders.add(prepareIndex("idx").setId("" + i).setSource(source));
}
}
for (int i = numTag1Docs + numTag2Docs; i < numDocs; i++) {
@ -81,17 +81,15 @@ public class AdjacencyMatrixIT extends AggregationIntegTestCase {
numTag1Docs++;
numTag2Docs++;
XContentBuilder source = jsonBuilder().startObject().field("value", i + 1).array("tag", "tag1", "tag2").endObject();
builders.add(client().prepareIndex("idx").setId("" + i).setSource(source));
builders.add(prepareIndex("idx").setId("" + i).setSource(source));
if (randomBoolean()) {
builders.add(client().prepareIndex("idx").setId("" + i).setSource(source));
builders.add(prepareIndex("idx").setId("" + i).setSource(source));
}
}
prepareCreate("empty_bucket_idx").setMapping("value", "type=integer").get();
for (int i = 0; i < 2; i++) {
builders.add(
client().prepareIndex("empty_bucket_idx")
.setId("" + i)
.setSource(jsonBuilder().startObject().field("value", i * 2).endObject())
prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject())
);
}
indexRandom(true, builders);

3
modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/SearchCancellationIT.java
View file

@ -80,8 +80,7 @@ public class SearchCancellationIT extends AbstractSearchCancellationTestCase {
BulkRequestBuilder bulkRequestBuilder = client().prepareBulk().setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
for (int j = 0; j < numberOfDocsPerRefresh; j++) {
bulkRequestBuilder.add(
client().prepareIndex("test")
.setOpType(DocWriteRequest.OpType.CREATE)
prepareIndex("test").setOpType(DocWriteRequest.OpType.CREATE)
.setSource(
"@timestamp",
now + (long) i * numberOfDocsPerRefresh + j,

18
modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesAggregationsIT.java
View file

@ -170,7 +170,7 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase {
tsValues.put(timestamp, metrics);
docSource.field("@timestamp", timestamp);
docSource.endObject();
docs.add(client().prepareIndex("index" + findIndex(timestamp)).setOpType(DocWriteRequest.OpType.CREATE).setSource(docSource));
docs.add(prepareIndex("index" + findIndex(timestamp)).setOpType(DocWriteRequest.OpType.CREATE).setSource(docSource));
}
indexRandom(true, false, docs);
}
@ -503,20 +503,20 @@ public class TimeSeriesAggregationsIT extends AggregationIntegTestCase {
);
client().prepareBulk()
.add(client().prepareIndex("test").setId("2").setSource("key", "bar", "val", 2, "@timestamp", "2021-01-01T00:00:10Z"))
.add(client().prepareIndex("test").setId("1").setSource("key", "bar", "val", 10, "@timestamp", "2021-01-01T00:00:00Z"))
.add(prepareIndex("test").setId("2").setSource("key", "bar", "val", 2, "@timestamp", "2021-01-01T00:00:10Z"))
.add(prepareIndex("test").setId("1").setSource("key", "bar", "val", 10, "@timestamp", "2021-01-01T00:00:00Z"))
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
.get();
client().prepareBulk()
.add(client().prepareIndex("test").setId("4").setSource("key", "bar", "val", 50, "@timestamp", "2021-01-01T00:00:30Z"))
.add(client().prepareIndex("test").setId("3").setSource("key", "bar", "val", 40, "@timestamp", "2021-01-01T00:00:20Z"))
.add(prepareIndex("test").setId("4").setSource("key", "bar", "val", 50, "@timestamp", "2021-01-01T00:00:30Z"))
.add(prepareIndex("test").setId("3").setSource("key", "bar", "val", 40, "@timestamp", "2021-01-01T00:00:20Z"))
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
.get();
client().prepareBulk()
.add(client().prepareIndex("test").setId("7").setSource("key", "foo", "val", 20, "@timestamp", "2021-01-01T00:00:00Z"))
.add(client().prepareIndex("test").setId("8").setSource("key", "foo", "val", 30, "@timestamp", "2021-01-01T00:10:00Z"))
.add(client().prepareIndex("test").setId("5").setSource("key", "baz", "val", 20, "@timestamp", "2021-01-01T00:00:00Z"))
.add(client().prepareIndex("test").setId("6").setSource("key", "baz", "val", 30, "@timestamp", "2021-01-01T00:10:00Z"))
.add(prepareIndex("test").setId("7").setSource("key", "foo", "val", 20, "@timestamp", "2021-01-01T00:00:00Z"))
.add(prepareIndex("test").setId("8").setSource("key", "foo", "val", 30, "@timestamp", "2021-01-01T00:10:00Z"))
.add(prepareIndex("test").setId("5").setSource("key", "baz", "val", 20, "@timestamp", "2021-01-01T00:00:00Z"))
.add(prepareIndex("test").setId("6").setSource("key", "baz", "val", 30, "@timestamp", "2021-01-01T00:10:00Z"))
.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE)
.get();

2
modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/bucket/TimeSeriesNestedAggregationsIT.java
View file

@ -67,7 +67,7 @@ public class TimeSeriesNestedAggregationsIT extends AggregationIntegTestCase {
final BulkRequestBuilder bulkIndexRequest = client().prepareBulk();
for (int docId = 0; docId < numberOfDocuments; docId++) {
final XContentBuilder document = timeSeriesDocument(FOO_DIM_VALUE, BAR_DIM_VALUE, BAZ_DIM_VALUE, docId, timestamps::next);
bulkIndexRequest.add(client().prepareIndex("index").setOpType(DocWriteRequest.OpType.CREATE).setSource(document));
bulkIndexRequest.add(prepareIndex("index").setOpType(DocWriteRequest.OpType.CREATE).setSource(document));
}
final BulkResponse bulkIndexResponse = bulkIndexRequest.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE).get();

27
modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/DateDerivativeIT.java
View file

@ -64,21 +64,20 @@ public class DateDerivativeIT extends ESIntegTestCase {
}
private static IndexRequestBuilder indexDoc(String idx, ZonedDateTime date, int value) throws Exception {
return client().prepareIndex(idx).setSource(jsonBuilder().startObject().timeField("date", date).field("value", value).endObject());
return prepareIndex(idx).setSource(jsonBuilder().startObject().timeField("date", date).field("value", value).endObject());
}
private IndexRequestBuilder indexDoc(int month, int day, int value) throws Exception {
return client().prepareIndex("idx")
.setSource(
jsonBuilder().startObject()
.field("value", value)
.timeField("date", date(month, day))
.startArray("dates")
.timeValue(date(month, day))
.timeValue(date(month + 1, day + 1))
.endArray()
.endObject()
);
return prepareIndex("idx").setSource(
jsonBuilder().startObject()
.field("value", value)
.timeField("date", date(month, day))
.startArray("dates")
.timeValue(date(month, day))
.timeValue(date(month + 1, day + 1))
.endArray()
.endObject()
);
}
@Override
@ -90,9 +89,7 @@ public class DateDerivativeIT extends ESIntegTestCase {
List<IndexRequestBuilder> builders = new ArrayList<>();
for (int i = 0; i < 2; i++) {
builders.add(
client().prepareIndex("empty_bucket_idx")
.setId("" + i)
.setSource(jsonBuilder().startObject().field("value", i * 2).endObject())
prepareIndex("empty_bucket_idx").setId("" + i).setSource(jsonBuilder().startObject().field("value", i * 2).endObject())
);
}
builders.addAll(

5
modules/aggregations/src/internalClusterTest/java/org/elasticsearch/aggregations/pipeline/SerialDiffIT.java
View file

@ -142,8 +142,9 @@ public class SerialDiffIT extends AggregationIntegTestCase {
for (PipelineAggregationHelperTests.MockBucket mockBucket : mockHisto) {
for (double value : mockBucket.docValues) {
builders.add(
client().prepareIndex("idx")
.setSource(jsonBuilder().startObject().field(INTERVAL_FIELD, mockBucket.key).field(VALUE_FIELD, value).endObject())
prepareIndex("idx").setSource(
jsonBuilder().startObject().field(INTERVAL_FIELD, mockBucket.key).field(VALUE_FIELD, value).endObject()
)
);
}
}