-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Optimisations for indirect ingestion (#24)
* First batch of optimisations * completed optimisation on multiget * new bachting system * Delete internals/ingester/test.json * Delete internals/ingester/.gitignore * Update .gitignore
- Loading branch information
1 parent
f4d5189
commit 68f3473
Showing
9 changed files
with
370 additions
and
236 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| package ingester | ||
|
|
||
| import ( | ||
| "context" | ||
| "github.com/elastic/go-elasticsearch/v8/typedapi/core/mget" | ||
| "github.com/elastic/go-elasticsearch/v8/typedapi/some" | ||
| "github.com/elastic/go-elasticsearch/v8/typedapi/types" | ||
| "github.com/myrteametrics/myrtea-sdk/v4/elasticsearchv8" | ||
| "github.com/myrteametrics/myrtea-sdk/v4/models" | ||
| "go.uber.org/zap" | ||
| "time" | ||
| ) | ||
|
|
||
| // directBulkChainedUpdate part of ELASTICSEARCH_DIRECT_MULTI_GET_MODE=true | ||
| func (worker *IndexingWorkerV8) directBulkChainedUpdate(updateCommandGroups [][]UpdateCommand) { | ||
| zap.L().Debug("DirectBulkChainUpdate", zap.String("TypedIngester", worker.TypedIngester.DocumentType), zap.Int("WorkerID", worker.ID), zap.String("step", "starting")) | ||
| zap.L().Debug("DirectBulkChainUpdate", zap.String("TypedIngester", worker.TypedIngester.DocumentType), zap.Int("WorkerID", worker.ID), zap.String("step", "directMultiGetDocs")) | ||
|
|
||
| start := time.Now() | ||
| refDocs, err := worker.directMultiGetDocs(updateCommandGroups) | ||
| worker.metricWorkerDirectMultiGetDuration.Observe(float64(time.Since(start).Nanoseconds()) / 1e9) | ||
|
|
||
| if err != nil { | ||
| zap.L().Error("directMultiGetDocs", zap.Error(err)) | ||
| } | ||
|
|
||
| zap.L().Debug("DirectBulkChainUpdate", zap.String("TypedIngester", worker.TypedIngester.DocumentType), zap.Int("WorkerID", worker.ID), zap.String("step", "applyMerges")) | ||
|
|
||
| start = time.Now() | ||
| push, err := worker.applyDirectMerges(updateCommandGroups, refDocs) | ||
| worker.metricWorkerApplyMergesDuration.Observe(float64(time.Since(start).Nanoseconds()) / 1e9) | ||
|
|
||
| if err != nil { | ||
| zap.L().Error("applyDirectMerges", zap.Error(err)) | ||
| } | ||
|
|
||
| zap.L().Debug("DirectBulkChainUpdate", zap.String("TypedIngester", worker.TypedIngester.DocumentType), zap.Int("WorkerID", worker.ID), zap.String("step", "bulkIndex")) | ||
|
|
||
| start = time.Now() | ||
| err = worker.bulkIndex(push) | ||
| worker.metricWorkerBulkIndexDuration.Observe(float64(time.Since(start).Nanoseconds()) / 1e9) | ||
|
|
||
| if err != nil { | ||
| zap.L().Error("bulkIndex", zap.Error(err)) | ||
| } | ||
| zap.L().Debug("DirectBulkChainUpdate", zap.String("TypedIngester", worker.TypedIngester.DocumentType), zap.Int("WorkerID", worker.ID), zap.String("step", "done")) | ||
| } | ||
|
|
||
| // multiGetFindRefDocs part of ELASTICSEARCH_DIRECT_MULTI_GET_MODE=true | ||
| func (worker *IndexingWorkerV8) applyDirectMerges(updateCommandGroups [][]UpdateCommand, refDocs []models.Document) ([]models.Document, error) { | ||
|
|
||
| push := make([]models.Document, 0) | ||
| for i, updateCommandGroup := range updateCommandGroups { | ||
| var pushDoc models.Document | ||
| if len(refDocs) > i { | ||
| pushDoc = models.Document{ID: refDocs[i].ID, Index: refDocs[i].Index, IndexType: refDocs[i].IndexType, Source: refDocs[i].Source} | ||
| } | ||
| for _, command := range updateCommandGroup { | ||
| if pushDoc.ID == "" { | ||
| pushDoc = models.Document{ID: command.NewDoc.ID, Index: command.NewDoc.Index, IndexType: command.NewDoc.IndexType, Source: command.NewDoc.Source} | ||
| } else { | ||
| pushDoc = ApplyMergeLight(pushDoc, command) | ||
| } | ||
| } | ||
| push = append(push, pushDoc) | ||
| } | ||
|
|
||
| return push, nil | ||
| } | ||
|
|
||
| // directMultiGetDocs part of ELASTICSEARCH_DIRECT_MULTI_GET_MODE=true | ||
| func (worker *IndexingWorkerV8) directMultiGetDocs(updateCommandGroups [][]UpdateCommand) ([]models.Document, error) { | ||
| docs := make([]*models.Document, 0) | ||
| for _, updateCommandGroup := range updateCommandGroups { | ||
| docs = append(docs, &models.Document{Index: updateCommandGroup[0].Index, ID: updateCommandGroup[0].DocumentID}) | ||
| } | ||
|
|
||
| zap.L().Debug("Executing multiget", zap.String("TypedIngester", worker.TypedIngester.DocumentType), zap.Int("WorkerID", worker.ID)) | ||
|
|
||
| source := make(map[string]interface{}) | ||
| sourceItems := make([]types.MgetOperation, len(docs)) | ||
| for i, doc := range docs { | ||
| sourceItems[i] = types.MgetOperation{Index_: some.String(doc.Index), Id_: doc.ID} | ||
| } | ||
| source["docs"] = sourceItems | ||
|
|
||
| req := mget.NewRequest() | ||
| req.Docs = sourceItems | ||
|
|
||
| ctx, cancel := context.WithTimeout(context.Background(), 3*time.Minute) | ||
| defer cancel() | ||
| zap.L().Debug("Executing multiget", zap.String("TypedIngester", worker.TypedIngester.DocumentType), zap.Int("WorkerID", worker.ID), zap.String("status", "done")) | ||
| response, err := worker.perfomMgetRequest(elasticsearchv8.C().Mget().Request(req), ctx) | ||
| if err != nil { | ||
| zap.L().Warn("perfomMgetRequest", zap.Error(err)) | ||
| } | ||
|
|
||
| if err != nil || response.Docs == nil || len(response.Docs) == 0 { | ||
| zap.L().Error("MultiGet (self)", zap.Error(err)) | ||
| } | ||
|
|
||
| refDocs := make([]models.Document, 0) | ||
| for _, d := range response.Docs { | ||
| if len(d.Source_) == 0 { | ||
| // no source => MultiGetError | ||
| refDocs = append(refDocs, models.Document{}) | ||
| continue | ||
| } | ||
|
|
||
| if d.Found { | ||
| refDocs = append(refDocs, models.Document{ID: d.Id_, Index: d.Index_, IndexType: "_doc", Source: source}) | ||
| } else { | ||
| refDocs = append(refDocs, models.Document{}) | ||
| } | ||
|
|
||
| // if len(refDocs) > i && refDocs[i].ID == "" { | ||
| // if typedDocOk.Found { | ||
| // refDocs[i] = models.Document{ID: typedDocOk.Id_, Index: typedDocOk.Index_, IndexType: "_doc", Source: source} | ||
| // } | ||
| // } else { | ||
| // if typedDocOk.Found { | ||
| // refDocs = append(refDocs, models.Document{ID: typedDocOk.Id_, Index: typedDocOk.Index_, IndexType: "_doc", Source: source}) | ||
| // } else { | ||
| // refDocs = append(refDocs, models.Document{}) | ||
| // } | ||
| // } | ||
| } | ||
|
|
||
| return refDocs, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters