@push.rocks/smartdb 2.1.1 → 2.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_rust/rustdb_linux_amd64 +0 -0
- package/dist_rust/rustdb_linux_arm64 +0 -0
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +3 -1
- package/dist_ts/ts_local/classes.localsmartdb.js +5 -1
- package/dist_ts/ts_migration/classes.storagemigrator.d.ts +24 -0
- package/dist_ts/ts_migration/classes.storagemigrator.js +75 -0
- package/dist_ts/ts_migration/index.d.ts +1 -0
- package/dist_ts/ts_migration/index.js +2 -0
- package/dist_ts/ts_migration/migrators/v0_to_v1.d.ts +9 -0
- package/dist_ts/ts_migration/migrators/v0_to_v1.js +225 -0
- package/dist_ts/ts_smartdb/server/SmartdbServer.js +7 -1
- package/dist_ts_debugserver/bundled.js +1 -1
- package/package.json +3 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/index.ts +3 -0
- package/ts/ts_local/classes.localsmartdb.ts +5 -0
- package/ts/ts_migration/classes.storagemigrator.ts +93 -0
- package/ts/ts_migration/index.ts +1 -0
- package/ts/ts_migration/migrators/v0_to_v1.ts +253 -0
- package/ts/ts_smartdb/server/SmartdbServer.ts +7 -0
|
Binary file
|
|
Binary file
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@push.rocks/smartdb',
|
|
6
|
-
version: '2.
|
|
6
|
+
version: '2.3.0',
|
|
7
7
|
description: 'A MongoDB-compatible embedded database server with wire protocol support, backed by a high-performance Rust engine.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSxxQkFBcUI7SUFDM0IsT0FBTyxFQUFFLE9BQU87SUFDaEIsV0FBVyxFQUFFLHFIQUFxSDtDQUNuSSxDQUFBIn0=
|
package/dist_ts/index.d.ts
CHANGED
|
@@ -2,5 +2,6 @@ import { commitinfo } from './00_commitinfo_data.js';
|
|
|
2
2
|
export * from './ts_smartdb/index.js';
|
|
3
3
|
export { LocalSmartDb } from './ts_local/index.js';
|
|
4
4
|
export type { ILocalSmartDbOptions, ILocalSmartDbConnectionInfo } from './ts_local/index.js';
|
|
5
|
+
export { StorageMigrator } from './ts_migration/index.js';
|
|
5
6
|
export { commitinfo };
|
|
6
7
|
export type { IOpLogEntry, IOpLogResult, IOpLogStats, IRevertResult, ICollectionInfo, IDocumentsResult, ISmartDbMetrics, } from './ts_smartdb/index.js';
|
package/dist_ts/index.js
CHANGED
|
@@ -3,6 +3,8 @@ import { commitinfo } from './00_commitinfo_data.js';
|
|
|
3
3
|
export * from './ts_smartdb/index.js';
|
|
4
4
|
// Export LocalSmartDb
|
|
5
5
|
export { LocalSmartDb } from './ts_local/index.js';
|
|
6
|
+
// Export migration
|
|
7
|
+
export { StorageMigrator } from './ts_migration/index.js';
|
|
6
8
|
// Export commitinfo
|
|
7
9
|
export { commitinfo };
|
|
8
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0seUJBQXlCLENBQUM7QUFFckQsNkJBQTZCO0FBQzdCLGNBQWMsdUJBQXVCLENBQUM7QUFFdEMsc0JBQXNCO0FBQ3RCLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxxQkFBcUIsQ0FBQztBQUduRCxtQkFBbUI7QUFDbkIsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBRTFELG9CQUFvQjtBQUNwQixPQUFPLEVBQUUsVUFBVSxFQUFFLENBQUMifQ==
|
|
@@ -2,6 +2,7 @@ import * as crypto from 'crypto';
|
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import * as os from 'os';
|
|
4
4
|
import { SmartdbServer } from '../ts_smartdb/index.js';
|
|
5
|
+
import { StorageMigrator } from '../ts_migration/index.js';
|
|
5
6
|
/**
|
|
6
7
|
* LocalSmartDb - Lightweight local MongoDB-compatible database using Unix sockets
|
|
7
8
|
*
|
|
@@ -50,6 +51,9 @@ export class LocalSmartDb {
|
|
|
50
51
|
if (this.server) {
|
|
51
52
|
throw new Error('LocalSmartDb is already running');
|
|
52
53
|
}
|
|
54
|
+
// Run storage migration before starting the Rust engine
|
|
55
|
+
const migrator = new StorageMigrator(this.options.folderPath);
|
|
56
|
+
await migrator.run();
|
|
53
57
|
// Use provided socket path or generate one
|
|
54
58
|
this.generatedSocketPath = this.options.socketPath ?? this.generateSocketPath();
|
|
55
59
|
this.server = new SmartdbServer({
|
|
@@ -110,4 +114,4 @@ export class LocalSmartDb {
|
|
|
110
114
|
}
|
|
111
115
|
}
|
|
112
116
|
}
|
|
113
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5sb2NhbHNtYXJ0ZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy90c19sb2NhbC9jbGFzc2VzLmxvY2Fsc21hcnRkYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxNQUFNLFFBQVEsQ0FBQztBQUNqQyxPQUFPLEtBQUssSUFBSSxNQUFNLE1BQU0sQ0FBQztBQUM3QixPQUFPLEtBQUssRUFBRSxNQUFNLElBQUksQ0FBQztBQUN6QixPQUFPLEVBQUUsYUFBYSxFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDBCQUEwQixDQUFDO0FBbUIzRDs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0dBMkJHO0FBQ0gsTUFBTSxPQUFPLFlBQVk7SUFLdkIsWUFBWSxPQUE2QjtRQUhqQyxXQUFNLEdBQXlCLElBQUksQ0FBQztRQUNwQyx3QkFBbUIsR0FBa0IsSUFBSSxDQUFDO1FBR2hELElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDO0lBQ3pCLENBQUM7SUFFRDs7T0FFRztJQUNLLGtCQUFrQjtRQUN4QixNQUFNLFFBQVEsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUN2RCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLE1BQU0sRUFBRSxFQUFFLFdBQVcsUUFBUSxPQUFPLENBQUMsQ0FBQztJQUM1RCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLLENBQUMsS0FBSztRQUNULElBQUksSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2hCLE1BQU0sSUFBSSxLQUFLLENBQUMsaUNBQWlDLENBQUMsQ0FBQztRQUNyRCxDQUFDO1FBRUQsd0RBQXdEO1FBQ3hELE1BQU0sUUFBUSxHQUFHLElBQUksZUFBZSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7UUFDOUQsTUFBTSxRQUFRLENBQUMsR0FBRyxFQUFFLENBQUM7UUFFckIsMkNBQTJDO1FBQzNDLElBQUksQ0FBQyxtQkFBbUIsR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsSUFBSSxJQUFJLENBQUMsa0JBQWtCLEVBQUUsQ0FBQztRQUVoRixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksYUFBYSxDQUFDO1lBQzlCLFVBQVUsRUFBRSxJQUFJLENBQUMsbUJBQW1CO1lBQ3BDLE9BQU8sRUFBRSxNQUFNO1lBQ2YsV0FBVyxFQUFFLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVTtTQUNyQyxDQUFDLENBQUM7UUFDSCxNQUFNLElBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUM7UUFFMUIsT0FBTztZQUNMLFVBQVUsRUFBRSxJQUFJLENBQUMsbUJBQW1CO1lBQ3BDLGFBQWEsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixFQUFFO1NBQzlDLENBQUM7SUFDSixDQUFDO0lBRUQ7O09BRUc7SUFDSCxpQkFBaUI7UUFDZixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1lBQzlDLE1BQU0sSUFBSSxLQUFLLENBQUMsa0RBQWtELENBQUMsQ0FBQztRQUN0RSxDQUFDO1FBQ0QsT0FBTztZQUNMLFVBQVUsRUFBRSxJQUFJLENBQUMsbUJBQW1CO1lBQ3BDLGFBQWEsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixFQUFFO1NBQzlDLENBQUM7SUFDSixDQUFDO0lBRUQ7O09BRUc7SUFDSCxTQUFTO1FBQ1AsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQztZQUNqQixNQUFNLElBQUksS0FBSyxDQUFDLGtEQUFrRCxDQUFDLENBQUM7UUFDdEUsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUNyQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxnQkFBZ0I7UUFDZCxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2pCLE1BQU0sSUFBSSxLQUFLLENBQUMsa0RBQWtELENBQUMsQ0FBQztRQUN0RSxDQUFDO1FBQ0QsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLGdCQUFnQixFQUFFLENBQUM7SUFDeEMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsSUFBSSxPQUFPO1FBQ1QsT0FBTyxJQUFJLENBQUMsTUFBTSxLQUFLLElBQUksSUFBSSxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQztJQUNyRCxDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLLENBQUMsSUFBSTtRQUNSLElBQUksSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2hCLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsQ0FBQztZQUN6QixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQztZQUNuQixJQUFJLENBQUMsbUJBQW1CLEdBQUcsSUFBSSxDQUFDO1FBQ2xDLENBQUM7SUFDSCxDQUFDO0NBQ0YifQ==
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* StorageMigrator — runs before the Rust engine starts.
|
|
3
|
+
*
|
|
4
|
+
* Detects the current storage format version and runs the appropriate
|
|
5
|
+
* migration chain. The Rust engine only knows the current format (v1).
|
|
6
|
+
*
|
|
7
|
+
* Migration is safe: original files are never modified or deleted.
|
|
8
|
+
* On success, a console hint is printed about which old files can be removed.
|
|
9
|
+
*/
|
|
10
|
+
export declare class StorageMigrator {
|
|
11
|
+
private storagePath;
|
|
12
|
+
constructor(storagePath: string);
|
|
13
|
+
/**
|
|
14
|
+
* Run any needed migrations. Safe to call even if storage is already current.
|
|
15
|
+
*/
|
|
16
|
+
run(): Promise<void>;
|
|
17
|
+
/**
|
|
18
|
+
* Detect the storage format version by inspecting the directory structure.
|
|
19
|
+
*
|
|
20
|
+
* v0: {db}/{coll}.json files exist
|
|
21
|
+
* v1: {db}/{coll}/data.rdb directories exist
|
|
22
|
+
*/
|
|
23
|
+
private detectVersion;
|
|
24
|
+
}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import * as fs from 'fs';
|
|
2
|
+
import * as path from 'path';
|
|
3
|
+
import { migrateV0ToV1 } from './migrators/v0_to_v1.js';
|
|
4
|
+
/**
|
|
5
|
+
* StorageMigrator — runs before the Rust engine starts.
|
|
6
|
+
*
|
|
7
|
+
* Detects the current storage format version and runs the appropriate
|
|
8
|
+
* migration chain. The Rust engine only knows the current format (v1).
|
|
9
|
+
*
|
|
10
|
+
* Migration is safe: original files are never modified or deleted.
|
|
11
|
+
* On success, a console hint is printed about which old files can be removed.
|
|
12
|
+
*/
|
|
13
|
+
export class StorageMigrator {
|
|
14
|
+
constructor(storagePath) {
|
|
15
|
+
this.storagePath = storagePath;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* Run any needed migrations. Safe to call even if storage is already current.
|
|
19
|
+
*/
|
|
20
|
+
async run() {
|
|
21
|
+
if (!fs.existsSync(this.storagePath)) {
|
|
22
|
+
return; // No data yet — nothing to migrate
|
|
23
|
+
}
|
|
24
|
+
const version = this.detectVersion();
|
|
25
|
+
if (version === 1) {
|
|
26
|
+
return; // Already current
|
|
27
|
+
}
|
|
28
|
+
if (version === 0) {
|
|
29
|
+
console.log(`[smartdb] Detected v0 (JSON) storage format at ${this.storagePath}`);
|
|
30
|
+
console.log(`[smartdb] Running migration v0 → v1 (Bitcask binary format)...`);
|
|
31
|
+
const deletableFiles = await migrateV0ToV1(this.storagePath);
|
|
32
|
+
if (deletableFiles.length > 0) {
|
|
33
|
+
console.log(`[smartdb] Migration v0 → v1 complete.`);
|
|
34
|
+
console.log(`[smartdb] The following old files can be safely deleted:`);
|
|
35
|
+
for (const f of deletableFiles) {
|
|
36
|
+
console.log(`[smartdb] ${f}`);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
console.log(`[smartdb] Migration v0 → v1 complete. No old files to clean up.`);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Detect the storage format version by inspecting the directory structure.
|
|
46
|
+
*
|
|
47
|
+
* v0: {db}/{coll}.json files exist
|
|
48
|
+
* v1: {db}/{coll}/data.rdb directories exist
|
|
49
|
+
*/
|
|
50
|
+
detectVersion() {
|
|
51
|
+
const entries = fs.readdirSync(this.storagePath, { withFileTypes: true });
|
|
52
|
+
for (const entry of entries) {
|
|
53
|
+
if (!entry.isDirectory())
|
|
54
|
+
continue;
|
|
55
|
+
const dbDir = path.join(this.storagePath, entry.name);
|
|
56
|
+
const dbEntries = fs.readdirSync(dbDir, { withFileTypes: true });
|
|
57
|
+
for (const dbEntry of dbEntries) {
|
|
58
|
+
// v1: subdirectory with data.rdb
|
|
59
|
+
if (dbEntry.isDirectory()) {
|
|
60
|
+
const dataRdb = path.join(dbDir, dbEntry.name, 'data.rdb');
|
|
61
|
+
if (fs.existsSync(dataRdb)) {
|
|
62
|
+
return 1;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
// v0: .json file (not .indexes.json)
|
|
66
|
+
if (dbEntry.isFile() && dbEntry.name.endsWith('.json') && !dbEntry.name.endsWith('.indexes.json')) {
|
|
67
|
+
return 0;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
// Empty or unrecognized — treat as v1 (fresh start)
|
|
72
|
+
return 1;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3Nlcy5zdG9yYWdlbWlncmF0b3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy90c19taWdyYXRpb24vY2xhc3Nlcy5zdG9yYWdlbWlncmF0b3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxLQUFLLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFDekIsT0FBTyxLQUFLLElBQUksTUFBTSxNQUFNLENBQUM7QUFDN0IsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLHlCQUF5QixDQUFDO0FBU3hEOzs7Ozs7OztHQVFHO0FBQ0gsTUFBTSxPQUFPLGVBQWU7SUFHMUIsWUFBWSxXQUFtQjtRQUM3QixJQUFJLENBQUMsV0FBVyxHQUFHLFdBQVcsQ0FBQztJQUNqQyxDQUFDO0lBRUQ7O09BRUc7SUFDSCxLQUFLLENBQUMsR0FBRztRQUNQLElBQUksQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO1lBQ3JDLE9BQU8sQ0FBQyxtQ0FBbUM7UUFDN0MsQ0FBQztRQUVELE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztRQUVyQyxJQUFJLE9BQU8sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNsQixPQUFPLENBQUMsa0JBQWtCO1FBQzVCLENBQUM7UUFFRCxJQUFJLE9BQU8sS0FBSyxDQUFDLEVBQUUsQ0FBQztZQUNsQixPQUFPLENBQUMsR0FBRyxDQUFDLGtEQUFrRCxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUMsQ0FBQztZQUNsRixPQUFPLENBQUMsR0FBRyxDQUFDLGdFQUFnRSxDQUFDLENBQUM7WUFFOUUsTUFBTSxjQUFjLEdBQUcsTUFBTSxhQUFhLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDO1lBRTdELElBQUksY0FBYyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUUsQ0FBQztnQkFDOUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyx1Q0FBdUMsQ0FBQyxDQUFDO2dCQUNyRCxPQUFPLENBQUMsR0FBRyxDQUFDLDBEQUEwRCxDQUFDLENBQUM7Z0JBQ3hFLEtBQUssTUFBTSxDQUFDLElBQUksY0FBYyxFQUFFLENBQUM7b0JBQy9CLE9BQU8sQ0FBQyxHQUFHLENBQUMsZUFBZSxDQUFDLEVBQUUsQ0FBQyxDQUFDO2dCQUNsQyxDQUFDO1lBQ0gsQ0FBQztpQkFBTSxDQUFDO2dCQUNOLE9BQU8sQ0FBQyxHQUFHLENBQUMsaUVBQWlFLENBQUMsQ0FBQztZQUNqRixDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7SUFFRDs7Ozs7T0FLRztJQUNLLGFBQWE7UUFDbkIsTUFBTSxPQUFPLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsV0FBVyxFQUFFLEVBQUUsYUFBYSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7UUFFMUUsS0FBSyxNQUFNLEtBQUssSUFBSSxPQUFPLEVBQUUsQ0FBQztZQUM1QixJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsRUFBRTtnQkFBRSxTQUFTO1lBRW5DLE1BQU0sS0FBSyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7WUFDdEQsTUFBTSxTQUFTLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxLQUFLLEVBQUUsRUFBRSxhQUFhLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztZQUVqRSxLQUFLLE1BQU0sT0FBTyxJQUFJLFNBQVMsRUFBRSxDQUFDO2dCQUNoQyxpQ0FBaUM7Z0JBQ2pDLElBQUksT0FBTyxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUM7b0JBQzFCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsVUFBVSxDQUFDLENBQUM7b0JBQzNELElBQUksRUFBRSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO3dCQUMzQixPQUFPLENBQUMsQ0FBQztvQkFDWCxDQUFDO2dCQUNILENBQUM7Z0JBQ0QscUNBQXFDO2dCQUNyQyxJQUFJLE9BQU8sQ0FBQyxNQUFNLEVBQUUsSUFBSSxPQUFPLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLGVBQWUsQ0FBQyxFQUFFLENBQUM7b0JBQ2xHLE9BQU8sQ0FBQyxDQUFDO2dCQUNYLENBQUM7WUFDSCxDQUFDO1FBQ0gsQ0FBQztRQUVELG9EQUFvRDtRQUNwRCxPQUFPLENBQUMsQ0FBQztJQUNYLENBQUM7Q0FDRiJ9
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { StorageMigrator } from './classes.storagemigrator.js';
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export { StorageMigrator } from './classes.storagemigrator.js';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi90cy90c19taWdyYXRpb24vaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLDhCQUE4QixDQUFDIn0=
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Migrate a storage directory from v0 (JSON-per-collection) to v1 (Bitcask binary).
|
|
3
|
+
*
|
|
4
|
+
* - Original .json files are NOT modified or deleted.
|
|
5
|
+
* - New v1 files are written into {db}/{coll}/ subdirectories.
|
|
6
|
+
* - Returns a list of old files that can be safely deleted.
|
|
7
|
+
* - On failure, cleans up any partial new files and throws.
|
|
8
|
+
*/
|
|
9
|
+
export declare function migrateV0ToV1(storagePath: string): Promise<string[]>;
|
|
@@ -0,0 +1,225 @@
|
|
|
1
|
+
import * as fs from 'fs';
|
|
2
|
+
import * as path from 'path';
|
|
3
|
+
import * as crypto from 'crypto';
|
|
4
|
+
import { BSON } from 'bson';
|
|
5
|
+
// ---------------------------------------------------------------------------
|
|
6
|
+
// Binary format constants (must match Rust: record.rs)
|
|
7
|
+
// ---------------------------------------------------------------------------
|
|
8
|
+
/** File-level magic: "SMARTDB\0" */
|
|
9
|
+
const FILE_MAGIC = Buffer.from('SMARTDB\0', 'ascii');
|
|
10
|
+
/** Current format version */
|
|
11
|
+
const FORMAT_VERSION = 1;
|
|
12
|
+
/** File type tags */
|
|
13
|
+
const FILE_TYPE_DATA = 1;
|
|
14
|
+
const FILE_TYPE_HINT = 3;
|
|
15
|
+
/** File header total size */
|
|
16
|
+
const FILE_HEADER_SIZE = 64;
|
|
17
|
+
/** Per-record magic */
|
|
18
|
+
const RECORD_MAGIC = 0xDB01;
|
|
19
|
+
/** Per-record header size */
|
|
20
|
+
const RECORD_HEADER_SIZE = 22; // 2 + 8 + 4 + 4 + 4
|
|
21
|
+
// ---------------------------------------------------------------------------
|
|
22
|
+
// Binary encoding helpers
|
|
23
|
+
// ---------------------------------------------------------------------------
|
|
24
|
+
function writeFileHeader(fileType) {
|
|
25
|
+
const buf = Buffer.alloc(FILE_HEADER_SIZE, 0);
|
|
26
|
+
FILE_MAGIC.copy(buf, 0);
|
|
27
|
+
buf.writeUInt16LE(FORMAT_VERSION, 8);
|
|
28
|
+
buf.writeUInt8(fileType, 10);
|
|
29
|
+
buf.writeUInt32LE(0, 11); // flags
|
|
30
|
+
const now = BigInt(Date.now());
|
|
31
|
+
buf.writeBigUInt64LE(now, 15);
|
|
32
|
+
// bytes 23..64 are reserved (zeros)
|
|
33
|
+
return buf;
|
|
34
|
+
}
|
|
35
|
+
function encodeDataRecord(timestamp, key, value) {
|
|
36
|
+
const keyLen = key.length;
|
|
37
|
+
const valLen = value.length;
|
|
38
|
+
const totalSize = RECORD_HEADER_SIZE + keyLen + valLen;
|
|
39
|
+
const buf = Buffer.alloc(totalSize);
|
|
40
|
+
// Write header fields (without CRC)
|
|
41
|
+
buf.writeUInt16LE(RECORD_MAGIC, 0);
|
|
42
|
+
buf.writeBigUInt64LE(timestamp, 2);
|
|
43
|
+
buf.writeUInt32LE(keyLen, 10);
|
|
44
|
+
buf.writeUInt32LE(valLen, 14);
|
|
45
|
+
// CRC placeholder at offset 18..22 (will fill below)
|
|
46
|
+
key.copy(buf, RECORD_HEADER_SIZE);
|
|
47
|
+
value.copy(buf, RECORD_HEADER_SIZE + keyLen);
|
|
48
|
+
// CRC32 covers everything except the CRC field itself:
|
|
49
|
+
// bytes [0..18] + bytes [22..]
|
|
50
|
+
const crc = crc32(Buffer.concat([
|
|
51
|
+
buf.subarray(0, 18),
|
|
52
|
+
buf.subarray(22),
|
|
53
|
+
]));
|
|
54
|
+
buf.writeUInt32LE(crc, 18);
|
|
55
|
+
return buf;
|
|
56
|
+
}
|
|
57
|
+
function encodeHintEntry(key, offset, recordLen, valueLen, timestamp) {
|
|
58
|
+
const keyBuf = Buffer.from(key, 'utf-8');
|
|
59
|
+
const buf = Buffer.alloc(4 + keyBuf.length + 8 + 4 + 4 + 8);
|
|
60
|
+
let pos = 0;
|
|
61
|
+
buf.writeUInt32LE(keyBuf.length, pos);
|
|
62
|
+
pos += 4;
|
|
63
|
+
keyBuf.copy(buf, pos);
|
|
64
|
+
pos += keyBuf.length;
|
|
65
|
+
buf.writeBigUInt64LE(offset, pos);
|
|
66
|
+
pos += 8;
|
|
67
|
+
buf.writeUInt32LE(recordLen, pos);
|
|
68
|
+
pos += 4;
|
|
69
|
+
buf.writeUInt32LE(valueLen, pos);
|
|
70
|
+
pos += 4;
|
|
71
|
+
buf.writeBigUInt64LE(timestamp, pos);
|
|
72
|
+
return buf;
|
|
73
|
+
}
|
|
74
|
+
// ---------------------------------------------------------------------------
|
|
75
|
+
// CRC32 (matching crc32fast in Rust)
|
|
76
|
+
// ---------------------------------------------------------------------------
|
|
77
|
+
const CRC32_TABLE = (() => {
|
|
78
|
+
const table = new Uint32Array(256);
|
|
79
|
+
for (let i = 0; i < 256; i++) {
|
|
80
|
+
let crc = i;
|
|
81
|
+
for (let j = 0; j < 8; j++) {
|
|
82
|
+
crc = (crc & 1) ? (0xEDB88320 ^ (crc >>> 1)) : (crc >>> 1);
|
|
83
|
+
}
|
|
84
|
+
table[i] = crc;
|
|
85
|
+
}
|
|
86
|
+
return table;
|
|
87
|
+
})();
|
|
88
|
+
function crc32(data) {
|
|
89
|
+
let crc = 0xFFFFFFFF;
|
|
90
|
+
for (let i = 0; i < data.length; i++) {
|
|
91
|
+
crc = CRC32_TABLE[(crc ^ data[i]) & 0xFF] ^ (crc >>> 8);
|
|
92
|
+
}
|
|
93
|
+
return (crc ^ 0xFFFFFFFF) >>> 0;
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* Migrate a storage directory from v0 (JSON-per-collection) to v1 (Bitcask binary).
|
|
97
|
+
*
|
|
98
|
+
* - Original .json files are NOT modified or deleted.
|
|
99
|
+
* - New v1 files are written into {db}/{coll}/ subdirectories.
|
|
100
|
+
* - Returns a list of old files that can be safely deleted.
|
|
101
|
+
* - On failure, cleans up any partial new files and throws.
|
|
102
|
+
*/
|
|
103
|
+
export async function migrateV0ToV1(storagePath) {
|
|
104
|
+
const deletableFiles = [];
|
|
105
|
+
const createdDirs = [];
|
|
106
|
+
try {
|
|
107
|
+
const dbEntries = fs.readdirSync(storagePath, { withFileTypes: true });
|
|
108
|
+
for (const dbEntry of dbEntries) {
|
|
109
|
+
if (!dbEntry.isDirectory())
|
|
110
|
+
continue;
|
|
111
|
+
const dbDir = path.join(storagePath, dbEntry.name);
|
|
112
|
+
const collFiles = fs.readdirSync(dbDir, { withFileTypes: true });
|
|
113
|
+
for (const collFile of collFiles) {
|
|
114
|
+
if (!collFile.isFile())
|
|
115
|
+
continue;
|
|
116
|
+
if (!collFile.name.endsWith('.json'))
|
|
117
|
+
continue;
|
|
118
|
+
if (collFile.name.endsWith('.indexes.json'))
|
|
119
|
+
continue;
|
|
120
|
+
const collName = collFile.name.replace(/\.json$/, '');
|
|
121
|
+
const jsonPath = path.join(dbDir, collFile.name);
|
|
122
|
+
const indexJsonPath = path.join(dbDir, `${collName}.indexes.json`);
|
|
123
|
+
// Target directory
|
|
124
|
+
const collDir = path.join(dbDir, collName);
|
|
125
|
+
if (fs.existsSync(collDir)) {
|
|
126
|
+
// Already migrated
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
console.log(`[smartdb] Migrating ${dbEntry.name}.${collName}...`);
|
|
130
|
+
// Read the JSON collection
|
|
131
|
+
const jsonData = fs.readFileSync(jsonPath, 'utf-8');
|
|
132
|
+
const docs = JSON.parse(jsonData);
|
|
133
|
+
// Create collection directory
|
|
134
|
+
fs.mkdirSync(collDir, { recursive: true });
|
|
135
|
+
createdDirs.push(collDir);
|
|
136
|
+
// Write data.rdb
|
|
137
|
+
const dataPath = path.join(collDir, 'data.rdb');
|
|
138
|
+
const fd = fs.openSync(dataPath, 'w');
|
|
139
|
+
try {
|
|
140
|
+
// File header
|
|
141
|
+
const headerBuf = writeFileHeader(FILE_TYPE_DATA);
|
|
142
|
+
fs.writeSync(fd, headerBuf);
|
|
143
|
+
let currentOffset = BigInt(FILE_HEADER_SIZE);
|
|
144
|
+
const keydir = new Map();
|
|
145
|
+
const ts = BigInt(Date.now());
|
|
146
|
+
for (const doc of docs) {
|
|
147
|
+
// Extract _id
|
|
148
|
+
let idHex;
|
|
149
|
+
if (doc._id && doc._id.$oid) {
|
|
150
|
+
idHex = doc._id.$oid;
|
|
151
|
+
}
|
|
152
|
+
else if (typeof doc._id === 'string') {
|
|
153
|
+
idHex = doc._id;
|
|
154
|
+
}
|
|
155
|
+
else if (doc._id) {
|
|
156
|
+
idHex = String(doc._id);
|
|
157
|
+
}
|
|
158
|
+
else {
|
|
159
|
+
// Generate a new ObjectId
|
|
160
|
+
idHex = crypto.randomBytes(12).toString('hex');
|
|
161
|
+
doc._id = { $oid: idHex };
|
|
162
|
+
}
|
|
163
|
+
// Serialize to BSON
|
|
164
|
+
const bsonBytes = BSON.serialize(doc);
|
|
165
|
+
const keyBuf = Buffer.from(idHex, 'utf-8');
|
|
166
|
+
const valueBuf = Buffer.from(bsonBytes);
|
|
167
|
+
const record = encodeDataRecord(ts, keyBuf, valueBuf);
|
|
168
|
+
fs.writeSync(fd, record);
|
|
169
|
+
keydir.set(idHex, {
|
|
170
|
+
offset: currentOffset,
|
|
171
|
+
recordLen: record.length,
|
|
172
|
+
valueLen: valueBuf.length,
|
|
173
|
+
timestamp: ts,
|
|
174
|
+
});
|
|
175
|
+
currentOffset += BigInt(record.length);
|
|
176
|
+
}
|
|
177
|
+
fs.fsyncSync(fd);
|
|
178
|
+
fs.closeSync(fd);
|
|
179
|
+
// Write keydir.hint
|
|
180
|
+
const hintPath = path.join(collDir, 'keydir.hint');
|
|
181
|
+
const hintFd = fs.openSync(hintPath, 'w');
|
|
182
|
+
fs.writeSync(hintFd, writeFileHeader(FILE_TYPE_HINT));
|
|
183
|
+
for (const [key, entry] of keydir) {
|
|
184
|
+
fs.writeSync(hintFd, encodeHintEntry(key, entry.offset, entry.recordLen, entry.valueLen, entry.timestamp));
|
|
185
|
+
}
|
|
186
|
+
fs.fsyncSync(hintFd);
|
|
187
|
+
fs.closeSync(hintFd);
|
|
188
|
+
}
|
|
189
|
+
catch (writeErr) {
|
|
190
|
+
// Clean up on write failure
|
|
191
|
+
try {
|
|
192
|
+
fs.closeSync(fd);
|
|
193
|
+
}
|
|
194
|
+
catch { }
|
|
195
|
+
throw writeErr;
|
|
196
|
+
}
|
|
197
|
+
// Copy indexes.json if it exists
|
|
198
|
+
if (fs.existsSync(indexJsonPath)) {
|
|
199
|
+
const destIndexPath = path.join(collDir, 'indexes.json');
|
|
200
|
+
fs.copyFileSync(indexJsonPath, destIndexPath);
|
|
201
|
+
deletableFiles.push(indexJsonPath);
|
|
202
|
+
}
|
|
203
|
+
else {
|
|
204
|
+
// Write default _id index
|
|
205
|
+
const destIndexPath = path.join(collDir, 'indexes.json');
|
|
206
|
+
fs.writeFileSync(destIndexPath, JSON.stringify([{ name: '_id_', key: { _id: 1 } }], null, 2));
|
|
207
|
+
}
|
|
208
|
+
deletableFiles.push(jsonPath);
|
|
209
|
+
console.log(`[smartdb] Migrated ${dbEntry.name}.${collName}: ${docs.length} documents`);
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
catch (err) {
|
|
214
|
+
// Clean up any partially created directories
|
|
215
|
+
for (const dir of createdDirs) {
|
|
216
|
+
try {
|
|
217
|
+
fs.rmSync(dir, { recursive: true, force: true });
|
|
218
|
+
}
|
|
219
|
+
catch { }
|
|
220
|
+
}
|
|
221
|
+
throw err;
|
|
222
|
+
}
|
|
223
|
+
return deletableFiles;
|
|
224
|
+
}
|
|
225
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"v0_to_v1.js","sourceRoot":"","sources":["../../../ts/ts_migration/migrators/v0_to_v1.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { RustDbBridge } from '../rust-db-bridge.js';
|
|
2
|
+
import { StorageMigrator } from '../../ts_migration/index.js';
|
|
2
3
|
/**
|
|
3
4
|
* SmartdbServer - Wire protocol compatible database server backed by Rust
|
|
4
5
|
*
|
|
@@ -40,6 +41,11 @@ export class SmartdbServer {
|
|
|
40
41
|
if (this.isRunning) {
|
|
41
42
|
throw new Error('Server is already running');
|
|
42
43
|
}
|
|
44
|
+
// Run storage migration for file-based storage before starting Rust engine
|
|
45
|
+
if (this.options.storage === 'file' && this.options.storagePath) {
|
|
46
|
+
const migrator = new StorageMigrator(this.options.storagePath);
|
|
47
|
+
await migrator.run();
|
|
48
|
+
}
|
|
43
49
|
const spawned = await this.bridge.spawn();
|
|
44
50
|
if (!spawned) {
|
|
45
51
|
throw new Error('smartdb Rust binary not found. Set SMARTDB_RUST_BINARY env var, ' +
|
|
@@ -157,4 +163,4 @@ export class SmartdbServer {
|
|
|
157
163
|
return this.bridge.getMetrics();
|
|
158
164
|
}
|
|
159
165
|
}
|
|
160
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
166
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU21hcnRkYlNlcnZlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3RzL3RzX3NtYXJ0ZGIvc2VydmVyL1NtYXJ0ZGJTZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLHNCQUFzQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQStCOUQ7Ozs7Ozs7Ozs7Ozs7Ozs7OztHQWtCRztBQUNILE1BQU0sT0FBTyxhQUFhO0lBTXhCLFlBQVksVUFBaUMsRUFBRTtRQUh2QyxjQUFTLEdBQUcsS0FBSyxDQUFDO1FBQ2xCLDBCQUFxQixHQUFHLEVBQUUsQ0FBQztRQUdqQyxJQUFJLENBQUMsT0FBTyxHQUFHO1lBQ2IsSUFBSSxFQUFFLE9BQU8sQ0FBQyxJQUFJLElBQUksS0FBSztZQUMzQixJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksSUFBSSxXQUFXO1lBQ2pDLFVBQVUsRUFBRSxPQUFPLENBQUMsVUFBVTtZQUM5QixPQUFPLEVBQUUsT0FBTyxDQUFDLE9BQU8sSUFBSSxRQUFRO1lBQ3BDLFdBQVcsRUFBRSxPQUFPLENBQUMsV0FBVyxJQUFJLFFBQVE7WUFDNUMsV0FBVyxFQUFFLE9BQU8sQ0FBQyxXQUFXO1lBQ2hDLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxpQkFBaUIsSUFBSSxLQUFLO1NBQ3RELENBQUM7UUFDRixJQUFJLENBQUMsTUFBTSxHQUFHLElBQUksWUFBWSxFQUFFLENBQUM7SUFDbkMsQ0FBQztJQUVEOztPQUVHO0lBQ0gsS0FBSyxDQUFDLEtBQUs7UUFDVCxJQUFJLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUNuQixNQUFNLElBQUksS0FBSyxDQUFDLDJCQUEyQixDQUFDLENBQUM7UUFDL0MsQ0FBQztRQUVELDJFQUEyRTtRQUMzRSxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxLQUFLLE1BQU0sSUFBSSxJQUFJ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
|