BTS 2183 - Fix restore with vector index when feature disabled #21885
Conversation
| return data; | ||
| } | ||
|
|
||
| function createDumpJsonFile(path, databaseName, id) { |
There was a problem hiding this comment.
This looks like an unused function.
There was a problem hiding this comment.
I think instead of duplicating functions from tests/js/client/shell/shell-restore-integration.js they rather should be moved out of it to js/client/modules/\@arangodb/test-helper.js
There was a problem hiding this comment.
Ah I assumed eslint would report unused functions. I will move the copied stuff into test-helper.js
| const isCluster = require("internal").isCluster(); | ||
| const { executeExternalAndWaitWithSanitizer } = require('@arangodb/test-helper'); | ||
| const { versionHas } = require("@arangodb/test-helper"); | ||
| const dbs = [{"name": "maçã", "id": "9999994", "isUnicode": true}, { |
There was a problem hiding this comment.
dbs, validatorJson are also unused.
|
|
||
| const jsunity = require('jsunity'); | ||
| const {assertTrue, assertFalse, assertEqual, assertNotEqual, assertInstanceOf} = jsunity.jsUnity.assertions; | ||
| const internal = require('internal'); |
There was a problem hiding this comment.
internal, isCluster, few of the asserts, etc. are also unused and can be removed.
| assertTrue(fs.isFile(arangorestore), "arangorestore not found!"); | ||
|
|
||
| let addConnectionArgs = function (args) { | ||
| let endpoint = arango.getEndpoint().replace(/\+vpp/, '').replace(/^http:/, 'tcp:').replace(/^https:/, 'ssl:').replace(/^h2:/, 'tcp:'); |
There was a problem hiding this comment.
you should be able to directly use the GLOBAL.instancemanager.endpoint here.
| const cn = 'UnitTestsVectorIndexRestore'; | ||
| const arangorestore = pu.ARANGORESTORE_BIN; | ||
|
|
||
| assertTrue(fs.isFile(arangorestore), "arangorestore not found!"); |
There was a problem hiding this comment.
https://github.com/arangodb/arangodb/blob/devel/js/client/modules/%40arangodb/testutils/client-tools.js#L53
the Config-builder and https://github.com/arangodb/arangodb/blob/devel/js/client/modules/%40arangodb/testutils/client-tools.js#L631 runArangoDumpRestore should be used.
Its usage can be seen in
https://github.com/arangodb/arangodb/blob/devel/js/client/modules/%40arangodb/testsuites/dump.js
There was a problem hiding this comment.
I don't see runArangoDumpRestore being used in the file you shared
There was a problem hiding this comment.
its named arangoDumpRestoreWithConfig through export logics.
| return data; | ||
| } | ||
|
|
||
| function createDumpJsonFile(path, databaseName, id) { |
There was a problem hiding this comment.
I think instead of duplicating functions from tests/js/client/shell/shell-restore-integration.js they rather should be moved out of it to js/client/modules/\@arangodb/test-helper.js
Scope & Purpose
Fix restore with vector index when the feature is disabled. This previously crashed; now the vector indexes are ignored, restoration proceeds, and a message is logged.
Checklist
Related Information
(Please reference tickets / specification / other PRs etc)