Skip to content

Commit a905623

Browse files
committed
why swift
1 parent 852ff31 commit a905623

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

scripts/cts/testServer/replaceAllObjects.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ const raoState: Record<
2020
> = {};
2121

2222
export function assertValidReplaceAllObjects(expectedCount: number): void {
23-
const count = Object.values(raoState).filter((s) => s.successful && s.tmpIndexDeleted).length;
24-
if (count !== expectedCount) {
25-
throw new Error(`Expected ${expectedCount} call to replaceAllObjects, got ${count} instead.`);
23+
expect(Object.keys(raoState)).to.have.length(expectedCount);
24+
for (const lang in raoState) {
25+
expect(raoState[lang].successful).to.equal(true);
26+
expect(raoState[lang].tmpIndexDeleted).to.equal(true);
2627
}
2728
}
2829

templates/go/search_helpers.mustache

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -657,47 +657,39 @@ func (c *APIClient) ReplaceAllObjects(indexName string, objects []map[string]any
657657
return nil, err
658658
}
659659

660+
defer func() {
661+
_, _ = c.DeleteIndex(c.NewApiDeleteIndexRequest(tmpIndexName))
662+
}()
663+
660664
opts = append(opts, WithWaitForTasks(true))
661665

662666
batchResp, err := c.ChunkedBatch(tmpIndexName, objects, ACTION_ADD_OBJECT, opts...)
663667
if err != nil {
664-
_, _ = c.DeleteIndex(c.NewApiDeleteIndexRequest(tmpIndexName))
665-
666668
return nil, err
667669
}
668670

669671
_, err = c.WaitForTask(tmpIndexName, copyResp.TaskID, toIterableOptions(opts)...)
670672
if err != nil {
671-
_, _ = c.DeleteIndex(c.NewApiDeleteIndexRequest(tmpIndexName))
672-
673673
return nil, err
674674
}
675675

676676
copyResp, err = c.OperationIndex(c.NewApiOperationIndexRequest(indexName, NewOperationIndexParams(OPERATION_TYPE_COPY, tmpIndexName, WithOperationIndexParamsScope([]ScopeType{SCOPE_TYPE_SETTINGS, SCOPE_TYPE_RULES, SCOPE_TYPE_SYNONYMS}))), toRequestOptions(opts)...)
677677
if err != nil {
678-
_, _ = c.DeleteIndex(c.NewApiDeleteIndexRequest(tmpIndexName))
679-
680678
return nil, err
681679
}
682680

683681
_, err = c.WaitForTask(tmpIndexName, copyResp.TaskID, toIterableOptions(opts)...)
684682
if err != nil {
685-
_, _ = c.DeleteIndex(c.NewApiDeleteIndexRequest(tmpIndexName))
686-
687683
return nil, err
688684
}
689685

690686
moveResp, err := c.OperationIndex(c.NewApiOperationIndexRequest(tmpIndexName, NewOperationIndexParams(OPERATION_TYPE_MOVE, indexName)), toRequestOptions(opts)...)
691687
if err != nil {
692-
_, _ = c.DeleteIndex(c.NewApiDeleteIndexRequest(tmpIndexName))
693-
694688
return nil, err
695689
}
696690

697691
_, err = c.WaitForTask(tmpIndexName, moveResp.TaskID, toIterableOptions(opts)...)
698692
if err != nil {
699-
_, _ = c.DeleteIndex(c.NewApiDeleteIndexRequest(tmpIndexName))
700-
701693
return nil, err
702694
}
703695

0 commit comments

Comments
 (0)