Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import co.elastic.clients.elasticsearch.core.bulk.CreateOperation;
import co.elastic.clients.elasticsearch.core.bulk.DeleteOperation;
import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
import co.elastic.clients.elasticsearch.core.bulk.UpdateAction;
import co.elastic.clients.elasticsearch.core.bulk.UpdateOperation;
import co.elastic.clients.elasticsearch.core.bulk.WriteOperation;
import co.elastic.clients.json.JsonEnum;
import co.elastic.clients.json.JsonpMapper;
import co.elastic.clients.util.BinaryData;
Expand Down Expand Up @@ -83,11 +85,12 @@ public boolean canRetry() {
return repeatableOp.canRetry();
}

@SuppressWarnings("unchecked")
private static <Context> IngesterOperation<Context> createOperation(RetryableBulkOperation<Context> repeatableOp, JsonpMapper mapper) {
CreateOperation<?> create = repeatableOp.operation().create();
RetryableBulkOperation<Context> newOperation;

long size = basePropertiesSize(create);
long size = writePropertiesSize(create);

if (create.document() instanceof BinaryData) {
newOperation = repeatableOp;
Expand All @@ -96,20 +99,20 @@ private static <Context> IngesterOperation<Context> createOperation(RetryableBul
} else {
BinaryData binaryDoc = BinaryData.of(create.document(), mapper);
size += binaryDoc.size();
newOperation = new RetryableBulkOperation<>(BulkOperation.of(bo -> bo.create(idx -> {
copyCreateProperties(create, idx);
return idx.document(binaryDoc);
})),repeatableOp.context(),repeatableOp.retries());
newOperation = new RetryableBulkOperation<>(
BulkOperation.of(bo -> bo.create(create.rebuild().document(binaryDoc).build())),
repeatableOp.context(), repeatableOp.retries());
}

return new IngesterOperation<>(newOperation, size);
}

@SuppressWarnings("unchecked")
private static <Context> IngesterOperation<Context> indexOperation(RetryableBulkOperation<Context> repeatableOp, JsonpMapper mapper) {
IndexOperation<?> index = repeatableOp.operation().index();
RetryableBulkOperation<Context> newOperation;

long size = basePropertiesSize(index);
long size = writePropertiesSize(index);

if (index.document() instanceof BinaryData) {
newOperation = repeatableOp;
Expand All @@ -118,15 +121,15 @@ private static <Context> IngesterOperation<Context> indexOperation(RetryableBulk
} else {
BinaryData binaryDoc = BinaryData.of(index.document(), mapper);
size += binaryDoc.size();
newOperation = new RetryableBulkOperation<>(BulkOperation.of(bo -> bo.index(idx -> {
copyIndexProperties(index, idx);
return idx.document(binaryDoc);
})),repeatableOp.context(),repeatableOp.retries());
newOperation = new RetryableBulkOperation<>(
BulkOperation.of(bo -> bo.index(index.rebuild().document(binaryDoc).build())),
repeatableOp.context(), repeatableOp.retries());
}

return new IngesterOperation<>(newOperation, size);
}

@SuppressWarnings("unchecked")
private static <Context> IngesterOperation<Context> updateOperation(RetryableBulkOperation<Context> repeatableOp, JsonpMapper mapper) {
UpdateOperation<?, ?> update = repeatableOp.operation().update();
RetryableBulkOperation<Context> newOperation;
Expand All @@ -142,13 +145,9 @@ private static <Context> IngesterOperation<Context> updateOperation(RetryableBul
} else {
BinaryData action = BinaryData.of(update.action(), mapper);
size += action.size();
newOperation = new RetryableBulkOperation<>(BulkOperation.of(bo -> bo.update(u -> {
copyBaseProperties(update, u);
return u
.binaryAction(action)
.requireAlias(update.requireAlias())
.retryOnConflict(update.retryOnConflict());
})),repeatableOp.context(),repeatableOp.retries());
newOperation = new RetryableBulkOperation<>(
BulkOperation.of(bo -> bo.update(update.rebuild().action((UpdateAction<?, ?>) null).binaryAction(action).build())),
repeatableOp.context(), repeatableOp.retries());
}

return new IngesterOperation<>(newOperation, size);
Expand All @@ -159,30 +158,6 @@ private static <Context> IngesterOperation<Context> deleteOperation(RetryableBul
return new IngesterOperation<>(repeatableOp, basePropertiesSize(delete));
}


private static void copyBaseProperties(BulkOperationBase op, BulkOperationBase.AbstractBuilder<?> builder) {
builder
.id(op.id())
.index(op.index())
.ifPrimaryTerm(op.ifPrimaryTerm())
.ifSeqNo(op.ifSeqNo())
.routing(op.routing())
.version(op.version())
.versionType(op.versionType());
}

private static void copyIndexProperties(IndexOperation<?> op, IndexOperation.Builder<?> builder) {
copyBaseProperties(op, builder);
builder.pipeline(op.pipeline());
builder.requireAlias(op.requireAlias());
}

private static void copyCreateProperties(CreateOperation<?> op, CreateOperation.Builder<?> builder) {
copyBaseProperties(op, builder);
builder.pipeline(op.pipeline());
builder.requireAlias(op.requireAlias());
}

private static int size(String name, @Nullable Boolean value) {
if (value != null) {
return name.length() + 12; // 12 added chars for "name":"false",
Expand Down Expand Up @@ -257,4 +232,10 @@ private static int basePropertiesSize(BulkOperationBase op) {
size("version_type", op.versionType()) +
4; // Open/closing brace, 2 newlines
}

private static int writePropertiesSize(WriteOperation op) {
return basePropertiesSize(op) +
size("pipeline", op.pipeline()) +
size("require_alias", op.requireAlias());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1530,19 +1530,19 @@
'graph.explore.Request': 'graph/explore/GraphExploreRequest.ts#L28-L87',
'graph.explore.Response': 'graph/explore/GraphExploreResponse.ts#L25-L33',
'ilm._types.Actions': 'ilm/_types/Phase.ts#L39-L93',
'ilm._types.AllocateAction': 'ilm/_types/Phase.ts#L151-L157',
'ilm._types.DeleteAction': 'ilm/_types/Phase.ts#L167-L169',
'ilm._types.AllocateAction': 'ilm/_types/Phase.ts#L162-L168',
'ilm._types.DeleteAction': 'ilm/_types/Phase.ts#L178-L180',
'ilm._types.DownsampleAction': 'ilm/_types/Phase.ts#L115-L118',
'ilm._types.ForceMergeAction': 'ilm/_types/Phase.ts#L126-L129',
'ilm._types.MigrateAction': 'ilm/_types/Phase.ts#L159-L161',
'ilm._types.MigrateAction': 'ilm/_types/Phase.ts#L170-L172',
'ilm._types.Phase': 'ilm/_types/Phase.ts#L26-L29',
'ilm._types.Phases': 'ilm/_types/Phase.ts#L31-L37',
'ilm._types.Policy': 'ilm/_types/Policy.ts#L23-L29',
'ilm._types.RolloverAction': 'ilm/_types/Phase.ts#L99-L113',
'ilm._types.SearchableSnapshotAction': 'ilm/_types/Phase.ts#L131-L149',
'ilm._types.SearchableSnapshotAction': 'ilm/_types/Phase.ts#L131-L160',
'ilm._types.SetPriorityAction': 'ilm/_types/Phase.ts#L95-L97',
'ilm._types.ShrinkAction': 'ilm/_types/Phase.ts#L120-L124',
'ilm._types.WaitForSnapshotAction': 'ilm/_types/Phase.ts#L163-L165',
'ilm._types.WaitForSnapshotAction': 'ilm/_types/Phase.ts#L174-L176',
'ilm.delete_lifecycle.Request': 'ilm/delete_lifecycle/DeleteLifecycleRequest.ts#L24-L60',
'ilm.delete_lifecycle.Response': 'ilm/delete_lifecycle/DeleteLifecycleResponse.ts#L22-L25',
'ilm.explain_lifecycle.LifecycleExplain': 'ilm/explain_lifecycle/types.ts#L75-L78',
Expand Down Expand Up @@ -1573,7 +1573,8 @@
'ilm.stop.Response': 'ilm/stop/StopIlmResponse.ts#L22-L25',
'indices._types.Alias': 'indices/_types/Alias.ts#L22-L52',
'indices._types.AliasDefinition': 'indices/_types/AliasDefinition.ts#L22-L54',
'indices._types.CacheQueries': 'indices/_types/IndexSettings.ts#L464-L466',
'indices._types.CacheQueries': 'indices/_types/IndexSettings.ts#L465-L467',
'indices._types.CacheRequests': 'indices/_types/IndexSettings.ts#L473-L481',
'indices._types.DataStream': 'indices/_types/DataStream.ts#L55-L151',
'indices._types.DataStreamFailureStore': 'indices/_types/DataStreamFailureStore.ts#L22-L37',
'indices._types.DataStreamFailureStoreTemplate': 'indices/_types/DataStreamFailureStore.ts#L39-L54',
Expand All @@ -1591,7 +1592,7 @@
'indices._types.FailureStoreLifecycle': 'indices/_types/DataStreamFailureStore.ts#L56-L72',
'indices._types.FailureStoreLifecycleTemplate': 'indices/_types/DataStreamFailureStore.ts#L74-L90',
'indices._types.FielddataFrequencyFilter': 'indices/_types/FielddataFrequencyFilter.ts#L22-L26',
'indices._types.IndexCheckOnStartup': 'indices/_types/IndexSettings.ts#L291-L298',
'indices._types.IndexCheckOnStartup': 'indices/_types/IndexSettings.ts#L292-L299',
'indices._types.IndexMode': 'indices/_types/DataStream.ts#L42-L47',
'indices._types.IndexRouting': 'indices/_types/IndexRouting.ts#L23-L26',
'indices._types.IndexRoutingAllocation': 'indices/_types/IndexRouting.ts#L28-L39',
Expand All @@ -1602,71 +1603,72 @@
'indices._types.IndexRoutingRebalance': 'indices/_types/IndexRouting.ts#L46-L48',
'indices._types.IndexRoutingRebalanceOptions': 'indices/_types/IndexRouting.ts#L57-L62',
'indices._types.IndexSegmentSort': 'indices/_types/IndexSegmentSort.ts#L22-L27',
'indices._types.IndexSettingBlocks': 'indices/_types/IndexSettings.ts#L272-L278',
'indices._types.IndexSettings': 'indices/_types/IndexSettings.ts#L71-L186',
'indices._types.IndexSettingsAnalysis': 'indices/_types/IndexSettings.ts#L368-L374',
'indices._types.IndexSettingsLifecycle': 'indices/_types/IndexSettings.ts#L305-L345',
'indices._types.IndexSettingsLifecycleStep': 'indices/_types/IndexSettings.ts#L347-L353',
'indices._types.IndexSettingsTimeSeries': 'indices/_types/IndexSettings.ts#L376-L387',
'indices._types.IndexSettingsUnassigned': 'indices/_types/IndexSettings.ts#L355-L357',
'indices._types.IndexSettingsUnassignedNodeLeft': 'indices/_types/IndexSettings.ts#L359-L366',
'indices._types.IndexSettingBlocks': 'indices/_types/IndexSettings.ts#L273-L279',
'indices._types.IndexSettings': 'indices/_types/IndexSettings.ts#L71-L187',
'indices._types.IndexSettingsAnalysis': 'indices/_types/IndexSettings.ts#L369-L375',
'indices._types.IndexSettingsLifecycle': 'indices/_types/IndexSettings.ts#L306-L346',
'indices._types.IndexSettingsLifecycleStep': 'indices/_types/IndexSettings.ts#L348-L354',
'indices._types.IndexSettingsTimeSeries': 'indices/_types/IndexSettings.ts#L377-L388',
'indices._types.IndexSettingsUnassigned': 'indices/_types/IndexSettings.ts#L356-L358',
'indices._types.IndexSettingsUnassignedNodeLeft': 'indices/_types/IndexSettings.ts#L360-L367',
'indices._types.IndexState': 'indices/_types/IndexState.ts#L27-L40',
'indices._types.IndexTemplate': 'indices/_types/IndexTemplate.ts#L34-L111',
'indices._types.IndexTemplateDataStreamConfiguration': 'indices/_types/IndexTemplate.ts#L113-L124',
'indices._types.IndexTemplateSummary': 'indices/_types/IndexTemplate.ts#L126-L153',
'indices._types.IndexTemplateSummaryWithRollover': 'indices/_types/IndexTemplate.ts#L155-L159',
'indices._types.IndexTemplateWithRollover': 'indices/_types/IndexTemplate.ts#L161-L163',
'indices._types.IndexVersioning': 'indices/_types/IndexSettings.ts#L300-L303',
'indices._types.IndexingPressure': 'indices/_types/IndexSettings.ts#L623-L625',
'indices._types.IndexingPressureMemory': 'indices/_types/IndexSettings.ts#L627-L634',
'indices._types.IndexingSlowlogSettings': 'indices/_types/IndexSettings.ts#L636-L641',
'indices._types.IndexingSlowlogTresholds': 'indices/_types/IndexSettings.ts#L643-L650',
'indices._types.IndicesBlockOptions': 'indices/_types/IndexSettings.ts#L280-L289',
'indices._types.IndexVersioning': 'indices/_types/IndexSettings.ts#L301-L304',
'indices._types.IndexingPressure': 'indices/_types/IndexSettings.ts#L638-L640',
'indices._types.IndexingPressureMemory': 'indices/_types/IndexSettings.ts#L642-L649',
'indices._types.IndexingSlowlogSettings': 'indices/_types/IndexSettings.ts#L651-L656',
'indices._types.IndexingSlowlogTresholds': 'indices/_types/IndexSettings.ts#L658-L665',
'indices._types.IndicesBlockOptions': 'indices/_types/IndexSettings.ts#L281-L290',
'indices._types.ManagedBy': 'indices/_types/DataStream.ts#L34-L39',
'indices._types.MappingLimitSettings': 'indices/_types/IndexSettings.ts#L468-L483',
'indices._types.MappingLimitSettingsDepth': 'indices/_types/IndexSettings.ts#L506-L513',
'indices._types.MappingLimitSettingsDimensionFields': 'indices/_types/IndexSettings.ts#L543-L549',
'indices._types.MappingLimitSettingsFieldNameLength': 'indices/_types/IndexSettings.ts#L534-L541',
'indices._types.MappingLimitSettingsNestedFields': 'indices/_types/IndexSettings.ts#L515-L523',
'indices._types.MappingLimitSettingsNestedObjects': 'indices/_types/IndexSettings.ts#L525-L532',
'indices._types.MappingLimitSettingsSourceFields': 'indices/_types/IndexSettings.ts#L551-L553',
'indices._types.MappingLimitSettingsTotalFields': 'indices/_types/IndexSettings.ts#L485-L504',
'indices._types.Merge': 'indices/_types/IndexSettings.ts#L389-L391',
'indices._types.MergeScheduler': 'indices/_types/IndexSettings.ts#L393-L396',
'indices._types.MappingLimitSettings': 'indices/_types/IndexSettings.ts#L483-L498',
'indices._types.MappingLimitSettingsDepth': 'indices/_types/IndexSettings.ts#L521-L528',
'indices._types.MappingLimitSettingsDimensionFields': 'indices/_types/IndexSettings.ts#L558-L564',
'indices._types.MappingLimitSettingsFieldNameLength': 'indices/_types/IndexSettings.ts#L549-L556',
'indices._types.MappingLimitSettingsNestedFields': 'indices/_types/IndexSettings.ts#L530-L538',
'indices._types.MappingLimitSettingsNestedObjects': 'indices/_types/IndexSettings.ts#L540-L547',
'indices._types.MappingLimitSettingsSourceFields': 'indices/_types/IndexSettings.ts#L566-L568',
'indices._types.MappingLimitSettingsTotalFields': 'indices/_types/IndexSettings.ts#L500-L519',
'indices._types.Merge': 'indices/_types/IndexSettings.ts#L390-L392',
'indices._types.MergeScheduler': 'indices/_types/IndexSettings.ts#L394-L397',
'indices._types.NumericFielddata': 'indices/_types/NumericFielddata.ts#L22-L24',
'indices._types.NumericFielddataFormat': 'indices/_types/NumericFielddataFormat.ts#L20-L23',
'indices._types.Queries': 'indices/_types/IndexSettings.ts#L460-L462',
'indices._types.Queries': 'indices/_types/IndexSettings.ts#L461-L463',
'indices._types.Requests': 'indices/_types/IndexSettings.ts#L469-L471',
'indices._types.RetentionLease': 'indices/_types/IndexSettings.ts#L67-L69',
'indices._types.RetentionSource': 'indices/_types/DataStreamLifecycle.ts#L67-L72',
'indices._types.SamplingMethod': 'indices/_types/Downsample.ts#L33-L36',
'indices._types.SearchIdle': 'indices/_types/IndexSettings.ts#L263-L266',
'indices._types.SearchIdle': 'indices/_types/IndexSettings.ts#L264-L267',
'indices._types.SegmentSortMissing': 'indices/_types/IndexSegmentSort.ts#L43-L46',
'indices._types.SegmentSortMode': 'indices/_types/IndexSegmentSort.ts#L36-L41',
'indices._types.SegmentSortOrder': 'indices/_types/IndexSegmentSort.ts#L29-L34',
'indices._types.SettingsAnalyze': 'indices/_types/IndexSettings.ts#L253-L256',
'indices._types.SettingsHighlight': 'indices/_types/IndexSettings.ts#L248-L251',
'indices._types.SettingsQueryString': 'indices/_types/IndexSettings.ts#L268-L270',
'indices._types.SettingsSearch': 'indices/_types/IndexSettings.ts#L258-L261',
'indices._types.SettingsSimilarity': 'indices/_types/IndexSettings.ts#L188-L200',
'indices._types.SettingsSimilarityBm25': 'indices/_types/IndexSettings.ts#L206-L211',
'indices._types.SettingsSimilarityBoolean': 'indices/_types/IndexSettings.ts#L202-L204',
'indices._types.SettingsSimilarityDfi': 'indices/_types/IndexSettings.ts#L213-L216',
'indices._types.SettingsSimilarityDfr': 'indices/_types/IndexSettings.ts#L218-L223',
'indices._types.SettingsSimilarityIb': 'indices/_types/IndexSettings.ts#L225-L230',
'indices._types.SettingsSimilarityLmd': 'indices/_types/IndexSettings.ts#L232-L235',
'indices._types.SettingsSimilarityLmj': 'indices/_types/IndexSettings.ts#L237-L240',
'indices._types.SettingsSimilarityScripted': 'indices/_types/IndexSettings.ts#L242-L246',
'indices._types.SlowlogSettings': 'indices/_types/IndexSettings.ts#L561-L566',
'indices._types.SlowlogTresholdLevels': 'indices/_types/IndexSettings.ts#L573-L578',
'indices._types.SlowlogTresholds': 'indices/_types/IndexSettings.ts#L568-L571',
'indices._types.SettingsAnalyze': 'indices/_types/IndexSettings.ts#L254-L257',
'indices._types.SettingsHighlight': 'indices/_types/IndexSettings.ts#L249-L252',
'indices._types.SettingsQueryString': 'indices/_types/IndexSettings.ts#L269-L271',
'indices._types.SettingsSearch': 'indices/_types/IndexSettings.ts#L259-L262',
'indices._types.SettingsSimilarity': 'indices/_types/IndexSettings.ts#L189-L201',
'indices._types.SettingsSimilarityBm25': 'indices/_types/IndexSettings.ts#L207-L212',
'indices._types.SettingsSimilarityBoolean': 'indices/_types/IndexSettings.ts#L203-L205',
'indices._types.SettingsSimilarityDfi': 'indices/_types/IndexSettings.ts#L214-L217',
'indices._types.SettingsSimilarityDfr': 'indices/_types/IndexSettings.ts#L219-L224',
'indices._types.SettingsSimilarityIb': 'indices/_types/IndexSettings.ts#L226-L231',
'indices._types.SettingsSimilarityLmd': 'indices/_types/IndexSettings.ts#L233-L236',
'indices._types.SettingsSimilarityLmj': 'indices/_types/IndexSettings.ts#L238-L241',
'indices._types.SettingsSimilarityScripted': 'indices/_types/IndexSettings.ts#L243-L247',
'indices._types.SlowlogSettings': 'indices/_types/IndexSettings.ts#L576-L581',
'indices._types.SlowlogTresholdLevels': 'indices/_types/IndexSettings.ts#L588-L593',
'indices._types.SlowlogTresholds': 'indices/_types/IndexSettings.ts#L583-L586',
'indices._types.SoftDeletes': 'indices/_types/IndexSettings.ts#L52-L65',
'indices._types.SourceMode': 'indices/_types/IndexSettings.ts#L555-L559',
'indices._types.Storage': 'indices/_types/IndexSettings.ts#L580-L591',
'indices._types.StorageType': 'indices/_types/IndexSettings.ts#L593-L621',
'indices._types.SourceMode': 'indices/_types/IndexSettings.ts#L570-L574',
'indices._types.Storage': 'indices/_types/IndexSettings.ts#L595-L606',
'indices._types.StorageType': 'indices/_types/IndexSettings.ts#L608-L636',
'indices._types.TemplateMapping': 'indices/_types/TemplateMapping.ts#L27-L34',
'indices._types.Translog': 'indices/_types/IndexSettings.ts#L398-L420',
'indices._types.TranslogDurability': 'indices/_types/IndexSettings.ts#L422-L437',
'indices._types.TranslogRetention': 'indices/_types/IndexSettings.ts#L439-L458',
'indices._types.Translog': 'indices/_types/IndexSettings.ts#L399-L421',
'indices._types.TranslogDurability': 'indices/_types/IndexSettings.ts#L423-L438',
'indices._types.TranslogRetention': 'indices/_types/IndexSettings.ts#L440-L459',
'indices.add_block.AddIndicesBlockStatus': 'indices/add_block/IndicesAddBlockResponse.ts#L30-L33',
'indices.add_block.Request': 'indices/add_block/IndicesAddBlockRequest.ts#L25-L96',
'indices.add_block.Response': 'indices/add_block/IndicesAddBlockResponse.ts#L22-L28',
Expand Down Expand Up @@ -3574,10 +3576,10 @@
if (hash.length > 1) {
hash = hash.substring(1);
}
window.location = "https://github.com/elastic/elasticsearch-specification/tree/c947a13e96ea20d5a40c639f0b2bbd2a9f7790df/specification/" + (paths[hash] || "");
window.location = "https://github.com/elastic/elasticsearch-specification/tree/84a2141415f45cd5078d0785c5686f801d479e6f/specification/" + (paths[hash] || "");
</script>
</head>
<body>
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/c947a13e96ea20d5a40c639f0b2bbd2a9f7790df/specification/">Elasticsearch API specification</a>.
Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/84a2141415f45cd5078d0785c5686f801d479e6f/specification/">Elasticsearch API specification</a>.
</body>
</html>
Loading
Loading