|
52 | 52 | import org.elasticsearch.cluster.service.MasterServiceTaskQueue; |
53 | 53 | import org.elasticsearch.common.Priority; |
54 | 54 | import org.elasticsearch.common.TriConsumer; |
55 | | -import org.elasticsearch.common.bytes.BytesReference; |
56 | 55 | import org.elasticsearch.common.collect.ImmutableOpenMap; |
57 | 56 | import org.elasticsearch.common.logging.DeprecationCategory; |
58 | 57 | import org.elasticsearch.common.logging.DeprecationLogger; |
@@ -1391,45 +1390,11 @@ private void attemptToSampleData( |
1391 | 1390 | * We need both the original document and the fully updated document for sampling, so we make a copy of the original |
1392 | 1391 | * before overwriting it here. We can discard it after sampling. |
1393 | 1392 | */ |
1394 | | - samplingService.maybeSample(projectMetadata, indexRequest.index(), () -> { |
1395 | | - IndexRequest original = copyIndexRequestForSampling(indexRequest); |
1396 | | - updateIndexRequestMetadata(original, originalDocumentMetadata); |
1397 | | - return original; |
1398 | | - }, ingestDocument); |
| 1393 | + samplingService.maybeSample(projectMetadata, originalDocumentMetadata.getIndex(), indexRequest, ingestDocument); |
1399 | 1394 |
|
1400 | 1395 | } |
1401 | 1396 | } |
1402 | 1397 |
|
1403 | | - /** |
1404 | | - * Creates a copy of an IndexRequest to be used by random sampling. |
1405 | | - * @param original The IndexRequest to be copied |
1406 | | - * @return A copy of the IndexRequest |
1407 | | - */ |
1408 | | - private IndexRequest copyIndexRequestForSampling(IndexRequest original) { |
1409 | | - IndexRequest clonedRequest = new IndexRequest(original.index()); |
1410 | | - clonedRequest.id(original.id()); |
1411 | | - clonedRequest.routing(original.routing()); |
1412 | | - clonedRequest.version(original.version()); |
1413 | | - clonedRequest.versionType(original.versionType()); |
1414 | | - clonedRequest.setPipeline(original.getPipeline()); |
1415 | | - clonedRequest.setFinalPipeline(original.getFinalPipeline()); |
1416 | | - clonedRequest.setIfSeqNo(original.ifSeqNo()); |
1417 | | - clonedRequest.setIfPrimaryTerm(original.ifPrimaryTerm()); |
1418 | | - clonedRequest.setRefreshPolicy(original.getRefreshPolicy()); |
1419 | | - clonedRequest.waitForActiveShards(original.waitForActiveShards()); |
1420 | | - clonedRequest.timeout(original.timeout()); |
1421 | | - clonedRequest.opType(original.opType()); |
1422 | | - clonedRequest.setParentTask(original.getParentTask()); |
1423 | | - clonedRequest.setRequireDataStream(original.isRequireDataStream()); |
1424 | | - clonedRequest.setRequireAlias(original.isRequireAlias()); |
1425 | | - clonedRequest.setIncludeSourceOnError(original.getIncludeSourceOnError()); |
1426 | | - BytesReference source = original.source(); |
1427 | | - if (source != null) { |
1428 | | - clonedRequest.source(source, original.getContentType()); |
1429 | | - } |
1430 | | - return clonedRequest; |
1431 | | - } |
1432 | | - |
1433 | 1398 | private static void executePipeline( |
1434 | 1399 | final IngestDocument ingestDocument, |
1435 | 1400 | final Pipeline pipeline, |
|
0 commit comments