Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 061aea7

Browse files
aspandeyaspandey
committedNov 27, 2024·
Implement ObjectID to replace mongodb
We need to remove code related to mongodb as we are using postgrace. This is to be done in steps and first step is to implement ObjectId class and replace mongodb.ObjectId calls with that class. Signed-off-by: Ashish Pandey <aspandey@redhat.com>
1 parent e5e6a35 commit 061aea7

27 files changed

+320
-129
lines changed
 

‎src/agent/block_store_speed.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
// const _ = require('lodash');
55
const argv = require('minimist')(process.argv);
66
const cluster = require('cluster');
7-
const mongodb = require('mongodb');
87

98
const api = require('../api');
109
const config = require('../../config');
1110
const dotenv = require('../util/dotenv');
1211
const Speedometer = require('../util/speedometer');
1312
const { RPC_BUFFERS } = require('../rpc');
1413

14+
const ObjectID = require('../util/objectid');
1515
dotenv.load();
1616

1717
argv.email = argv.email || 'demo@noobaa.com';
@@ -60,7 +60,7 @@ async function worker(client) {
6060
}
6161

6262
async function write_block(client) {
63-
const block_id = new mongodb.ObjectId();
63+
const block_id = new ObjectID(null);
6464
return client.block_store.write_block({
6565
[RPC_BUFFERS]: { data: Buffer.allocUnsafe(argv.size) },
6666
block_md: {

‎src/cmd/manage_nsfs.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const nb_native = require('../util/nb_native');
1111
const { ConfigFS } = require('../sdk/config_fs');
1212
const cloud_utils = require('../util/cloud_utils');
1313
const native_fs_utils = require('../util/native_fs_utils');
14-
const mongo_utils = require('../util/mongo_utils');
14+
const ObjectID = require('../util/objectid');
1515
const SensitiveString = require('../util/sensitive_string');
1616
const { account_id_cache } = require('../sdk/accountspace_fs');
1717
const ManageCLIError = require('../manage_nsfs/manage_nsfs_cli_errors').ManageCLIError;
@@ -169,7 +169,7 @@ async function merge_new_and_existing_config_data(user_input_bucket_data) {
169169
* @returns { Promise<{ code: ManageCLIResponse.BucketCreated, detail: Object, event_arg: Object }>}
170170
*/
171171
async function add_bucket(data) {
172-
data._id = mongo_utils.mongoObjectId();
172+
data._id = new ObjectID(null);
173173
const parsed_bucket_data = await config_fs.create_bucket_config_file(data);
174174
await set_bucker_owner(parsed_bucket_data);
175175
return { code: ManageCLIResponse.BucketCreated, detail: parsed_bucket_data, event_arg: { bucket: data.name }};
@@ -413,7 +413,7 @@ async function fetch_existing_account_data(action, target, decrypt_secret_key) {
413413
* @returns { Promise<{ code: typeof ManageCLIResponse.AccountCreated, detail: Object, event_arg: Object }>}
414414
*/
415415
async function add_account(data) {
416-
data._id = mongo_utils.mongoObjectId();
416+
data._id = new ObjectID(null);
417417
await config_fs.create_account_config_file(data);
418418
return { code: ManageCLIResponse.AccountCreated, detail: data, event_arg: { account: data.name } };
419419
}

‎src/nc/nc_utils.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/* Copyright (C) 2024 NooBaa */
22
'use strict';
33

4-
const mongo_utils = require('../util/mongo_utils');
5-
4+
const objectid = require('../util/objectid');
65
/**
76
* generate_id will generate an id that we use to identify entities (such as account, bucket, etc.).
87
*/
@@ -11,7 +10,7 @@ const mongo_utils = require('../util/mongo_utils');
1110
// - this function implantation should be db_client.new_object_id(),
1211
// but to align with manage nsfs we won't change it now
1312
function generate_id() {
14-
return mongo_utils.mongoObjectId();
13+
return objectid();
1514
}
1615

1716
/**

‎src/sdk/bucketspace_fs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* Copyright (C) 2020 NooBaa */
22
'use strict';
33

4+
const objectid = require('../util/objectid');
45
const _ = require('lodash');
56
const util = require('util');
67
const path = require('path');
@@ -9,7 +10,6 @@ const config = require('../../config');
910
const RpcError = require('../rpc/rpc_error');
1011
const js_utils = require('../util/js_utils');
1112
const nb_native = require('../util/nb_native');
12-
const mongo_utils = require('../util/mongo_utils');
1313
const KeysSemaphore = require('../util/keys_semaphore');
1414
const {
1515
get_umasked_mode,
@@ -314,7 +314,7 @@ class BucketSpaceFS extends BucketSpaceSimpleFS {
314314

315315
new_bucket_defaults(account, { name, tag, lock_enabled, force_md5_etag }, create_uls, bucket_storage_path) {
316316
return {
317-
_id: mongo_utils.mongoObjectId(),
317+
_id: objectid(),
318318
name,
319319
tag: js_utils.default_value(tag, undefined),
320320
owner_account: account._id,

‎src/sdk/nb.d.ts

+9-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ import * as mongodb from 'mongodb';
55
import { EventEmitter } from 'events';
66
import { Readable, Writable } from 'stream';
77
import { IncomingMessage, ServerResponse } from 'http';
8-
import { ObjectPart, Checksum} from '@aws-sdk/client-s3';
8+
import { ObjectPart, Checksum } from '@aws-sdk/client-s3';
9+
10+
import ObjectID = require("../util/objectid");
911

1012
type Semaphore = import('../util/semaphore');
1113
type KeysSemaphore = import('../util/keys_semaphore');
@@ -39,14 +41,16 @@ type ReplicationLogCandidates = Record<string, { action: ReplicationLogAction, t
3941

4042
type BucketDiffKeysDiff = { [key: string]: Array<object> };
4143

44+
45+
4246
interface MapByID<T> { [id: string]: T }
4347

4448
interface Base {
4549
toJSON?(): object | string;
4650
toString?(): string;
4751
}
4852

49-
type ID = mongodb.ObjectID;
53+
type ID = ObjectID;
5054
type DBBuffer = mongodb.Binary | Buffer;
5155

5256
interface System extends Base {
@@ -720,8 +724,8 @@ interface DBClient {
720724
populate(docs: object[] | object, doc_path: string, collection: DBCollection, fields: object): Promise<object[] | object>;
721725
resolve_object_ids_recursive(idmap: object, item: object): object;
722726
resolve_object_ids_paths(idmap: object, item: object, paths: string[], allow_missing: boolean): object;
723-
new_object_id(): mongodb.ObjectId;
724-
parse_object_id(id_str: string): mongodb.ObjectId;
727+
new_object_id(): ObjectID;
728+
parse_object_id(id_str: string): ObjectID;
725729
fix_id_type(doc: object[] | object): object[] | object;
726730
is_object_id(id: object[] | object): boolean;
727731
is_err_duplicate_key(err: object): boolean;
@@ -1150,4 +1154,4 @@ interface GetObjectAttributesParts {
11501154
MaxParts?: number;
11511155
IsTruncated?: boolean;
11521156
Parts?: ObjectPart[];
1153-
}
1157+
}

‎src/sdk/objectid.d.ts

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* Copyright (C) 2016 NooBaa */
2+
3+
/**
4+
* Represents a BSON ObjectID type.
5+
*/
6+
declare interface ObjectID {
7+
readonly id: string | Buffer;
8+
readonly str: string;
9+
10+
toHexString(): string;
11+
equals(other: ObjectID | string): boolean;
12+
getTimestamp(): Date;
13+
generate(time?: number): string;
14+
toJSON(): string;
15+
toString(): string;
16+
}
17+
18+
/**
19+
* Constructor and utility functions for the ObjectID type.
20+
*/
21+
declare interface ObjectIDConstructor {
22+
new(id?: string | number | Buffer): ObjectID;
23+
isValid(id: string | Buffer | ObjectID): boolean;
24+
(id?: string | number | Buffer): ObjectID;
25+
}
26+
27+
/**
28+
* The ObjectID constructor and utilities.
29+
*/
30+
declare const ObjectID: ObjectIDConstructor;
31+
32+
export = ObjectID;

‎src/server/analytic_services/activity_log_store.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* Copyright (C) 2016 NooBaa */
22
'use strict';
33

4-
const mongodb = require('mongodb');
54
const _ = require('lodash');
65

76
const db_client = require('../../util/db_client');
7+
const ObjectID = require('../../util/objectid');
88
const P = require('../../util/promise');
99
const activity_log_schema = require('./activity_log_schema');
1010
const activity_log_indexes = require('./activity_log_indexes');
@@ -25,7 +25,7 @@ class ActivityLogStore {
2525
}
2626

2727
make_activity_log_id(id_str) {
28-
return new mongodb.ObjectID(id_str);
28+
return new ObjectID(id_str);
2929
}
3030

3131

‎src/server/analytic_services/history_data_store.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/* Copyright (C) 2016 NooBaa */
22
'use strict';
33

4-
const mongodb = require('mongodb');
5-
64
// const dbg = require('../../util/debug_module')(__filename);
75
const config = require('../../../config.js');
86
// const pkg = require('../../../package.json');
@@ -11,6 +9,7 @@ const P = require('../../util/promise');
119
const db_client = require('../../util/db_client');
1210
const system_history_schema = require('../analytic_services/system_history_schema');
1311

12+
const ObjectID = require('../../util/objectid');
1413
class HistoryDataStore {
1514

1615
constructor() {
@@ -30,7 +29,7 @@ class HistoryDataStore {
3029
const time_stamp = new Date();
3130
const record_expiration_date = new Date(time_stamp.getTime() - config.STATISTICS_COLLECTOR_EXPIRATION);
3231
const record = {
33-
_id: new mongodb.ObjectId(),
32+
_id: new ObjectID(null),
3433
time_stamp,
3534
system_snapshot: item,
3635
history_type: 'SYSTEM'

‎src/server/func_services/func_stats_store.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
'use strict';
33

44
// const _ = require('lodash');
5-
const mongodb = require('mongodb');
6-
5+
const ObjectID = require('../../util/objectid');
76
// const dbg = require('../../util/debug_module')(__filename);
87
const db_client = require('../../util/db_client');
98

@@ -26,7 +25,7 @@ class FuncStatsStore {
2625
}
2726

2827
make_func_stat_id(id_str) {
29-
return new mongodb.ObjectId(id_str);
28+
return new ObjectID(id_str);
3029
}
3130

3231
async create_func_stat(stat) {

‎src/server/func_services/func_store.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
/* Copyright (C) 2016 NooBaa */
22
'use strict';
33

4-
const mongodb = require('mongodb');
5-
64
const db_client = require('../../util/db_client');
75

86
const func_schema = require('./func_schema');
97
const func_indexes = require('./func_indexes');
10-
8+
const ObjectID = require('../../util/objectid');
119
class FuncStore {
1210

1311
constructor() {
@@ -24,7 +22,7 @@ class FuncStore {
2422
}
2523

2624
make_func_id(id_str) {
27-
return new mongodb.ObjectId(id_str);
25+
return new ObjectID(id_str);
2826
}
2927

3028
async create_func(func) {

‎src/server/node_services/nodes_store.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
'use strict';
33

44
const _ = require('lodash');
5-
const mongodb = require('mongodb');
65

76
const dbg = require('../../util/debug_module')(__filename);
87
const node_schema = require('./node_schema');
98
const db_client = require('../../util/db_client');
109
const P = require('../../util/promise');
11-
10+
const ObjectID = require('../../util/objectid');
1211
class NodesStore {
1312

1413
constructor(test_suffix = '') {
@@ -24,7 +23,7 @@ class NodesStore {
2423
}
2524

2625
make_node_id(id_str) {
27-
return new mongodb.ObjectId(id_str);
26+
return new ObjectID(id_str);
2827
}
2928

3029
is_connected() {

‎src/server/notifications/alerts_log_store.js

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
/* Copyright (C) 2016 NooBaa */
22
'use strict';
33

4-
const mongodb = require('mongodb');
54
const _ = require('lodash');
65
const P = require('../../util/promise');
76
const db_client = require('../../util/db_client');
87

98
const alerts_log_schema = require('./alerts_log_schema');
109

10+
// @ts-ignore
11+
const ObjectID = require('../../util/objectid');
12+
1113
class AlertsLogStore {
1214

1315
constructor() {
@@ -22,8 +24,8 @@ class AlertsLogStore {
2224
return AlertsLogStore._instance;
2325
}
2426

25-
make_alert_log_id(id_str) {
26-
return new mongodb.ObjectID(id_str);
27+
make_alert_log_id() {
28+
return new ObjectID(null);
2729
}
2830

2931
create(alert_log) {
@@ -94,12 +96,12 @@ class AlertsLogStore {
9496

9597
let _id;
9698
if (ids) {
97-
const obj_ids = ids.map(id => new mongodb.ObjectID(id));
99+
const obj_ids = ids.map(id => new ObjectID(id));
98100
_id = { $in: obj_ids };
99101
} else if (till) {
100-
_id = { $lt: new mongodb.ObjectID(till) };
102+
_id = { $lt: new ObjectID(till) };
101103
} else if (since) {
102-
_id = { $gt: new mongodb.ObjectID(since) };
104+
_id = { $gt: new ObjectID(since) };
103105
}
104106

105107
return _.omitBy({

‎src/server/object_services/md_store.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
const _ = require('lodash');
77
const assert = require('assert');
88
const moment = require('moment');
9-
const mongodb = require('mongodb');
109
const mime = require('mime');
11-
10+
const ObjectID = require('../../util/objectid');
1211
const P = require('../../util/promise');
1312
const dbg = require('../../util/debug_module')(__filename);
1413
const db_client = require('../../util/db_client');
@@ -80,18 +79,18 @@ class MDStore {
8079
if (zero_suffix) {
8180
suffix = '0'.repeat(16);
8281
} else {
83-
suffix = String(new mongodb.ObjectId()).slice(8, 24);
82+
suffix = String(new ObjectID(null)).slice(8, 24);
8483
}
8584
const hex_id = padded_hex_time + suffix;
8685
assert(padded_hex_time.length === 8);
8786
assert(suffix.length === 16);
8887
assert(hex_id.length === 24);
8988
assert(parseInt(padded_hex_time, 16) === Math.floor(time / 1000));
90-
return new mongodb.ObjectId(hex_id);
89+
return new ObjectID(hex_id);
9190
}
9291

9392
is_valid_md_id(id_str) {
94-
return mongodb.ObjectId.isValid(id_str);
93+
return ObjectID.isValid(id_str);
9594
}
9695

9796
/////////////
@@ -1869,7 +1868,7 @@ function sort_list_uploads_with_delimiter(a, b) {
18691868
* @returns {nb.ID}
18701869
*/
18711870
function make_md_id(id_str) {
1872-
return new mongodb.ObjectId(id_str);
1871+
return new ObjectID(id_str);
18731872
}
18741873

18751874

‎src/server/system_services/config_file_store.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
const _ = require('lodash');
55
const dbg = require('../../util/debug_module')(__filename);
66
const db_client = require('../../util/db_client');
7-
const mongodb = require('mongodb');
87
const config_file_schema = require('./schemas/config_file_schema');
98
const config_file_indexes = require('./schemas/config_file_indexes');
10-
9+
const ObjectID = require('../../util/objectid');
1110
class ConfigFileStore {
1211

1312
constructor() {
@@ -26,7 +25,7 @@ class ConfigFileStore {
2625
async insert(item) {
2726
dbg.log0(`insert`, item);
2827
_.defaults(item, {
29-
_id: new mongodb.ObjectId()
28+
_id: new ObjectID(null)
3029
});
3130
// There shouldn't be more than one record, this is being on the safe side
3231
this._config_files.validate(item);

0 commit comments

Comments
 (0)
Please sign in to comment.