[DB-Cleaner] fixing find_deleted_objects to hit index

Signed-off-by: jackyalbo <jacky.albo@gmail.com>
(cherry picked from commit a0cc040)

Author: jackyalbo

src/server/object_services/md_store.js

@@ -720,7 +720,7 @@ class MDStore {
         limit,
         return_results = false,
     }) {
-        const params = [new Date()];
+        const params = [new Date().toISOString()];
         const sql_conditions = [];
         if (key) {
             params.push(key.source);
@@ -1110,20 +1110,21 @@ class MDStore {
         return buckets;
     }
 
+    /**
+     * Find deleted objects that were deleted before max_delete_time and are reclaimed.
+     *
+     * @param {number} max_delete_time - timestamp in milliseconds
+     * @param {number} limit
+     * @returns {Promise<nb.ID[]>}
+     */
     async find_deleted_objects(max_delete_time, limit) {
-        const objects = await this._objects.find({
-            deleted: {
-                $lt: new Date(max_delete_time),
-                $exists: true // This forces the index to be used
-            },
-        }, {
-            limit: Math.min(limit, 1000),
-            projection: {
-                _id: 1,
-                deleted: 1
-            }
-        });
-        return db_client.instance().uniq_ids(objects, '_id');
+        const query_limit = limit || 1000;
+        const query = `SELECT _id 
+        FROM ${this._objects.name}
+        WHERE (to_ts(data->>'deleted')<to_ts($1) and data ? 'deleted' and data ? 'reclaimed') 
+        LIMIT ${query_limit};`;
+        const result = await this._objects.executeSQL(query, [new Date(max_delete_time).toISOString()]);
+        return db_client.instance().uniq_ids(result.rows, '_id');
     }
 
     async db_delete_objects(object_ids) {

src/test/integration_tests/db/test_md_store.js

@@ -1,4 +1,5 @@
 /* Copyright (C) 2016 NooBaa */
+/* eslint max-lines-per-function: ["error", 2000]*/
 'use strict';
 
 // setup coretest first to prepare the env
@@ -50,23 +51,22 @@ mocha.describe('md_store', function() {
             assert_equal(res.obj.num_parts, 88);
         });
 
-        const date_now = Date.now();
-        const now = new Date(date_now);
+        const now = new Date();
         const info1 = {
             _id: md_store.make_md_id(),
             system: system_id,
             bucket: bucket_id,
-            key: 'lala_1' + date_now.toString(36),
+            key: 'lala_1' + now.getTime().toString(36),
             create_time: now,
-            content_type: 'lulu_' + date_now.toString(36),
+            content_type: 'lulu_' + now.getTime().toString(36),
         };
         const info2 = {
             _id: md_store.make_md_id(),
             system: system_id,
             bucket: bucket_id,
-            key: 'lala_2' + date_now.toString(36),
+            key: 'lala_2' + now.getTime().toString(36),
             create_time: now,
-            content_type: 'lulu_' + date_now.toString(36),
+            content_type: 'lulu_' + now.getTime().toString(36),
         };
         const max_create_time = now.getTime() / 1000 - 60; // 1 minute ago
 
@@ -197,6 +197,27 @@ mocha.describe('md_store', function() {
             return md_store.aggregate_objects_by_delete_dates(from_time, till_time);
         });
 
+         mocha.it('find_deleted_objects returns deleted and reclaimed objects', async function() {
+            if (config.DB_TYPE !== 'postgres') this.skip(); // eslint-disable-line no-invalid-this
+            for (let i = 0; i < 50; i++) { // create 50 objects
+                info1._id = md_store.make_md_id();
+                info1.key = `lala_${i}_${now.getTime().toString(36)}`;
+                await md_store.insert_object(info1);
+            }
+            // mark all 50 objects as deleted
+            const deleted_objects = await md_store.delete_objects_by_query({
+                key: /^lala_/,
+                bucket_id: bucket_id,
+                limit: 50,
+                return_results: true,
+            });
+            // mark all 50 deleted objects as reclaimed
+            await md_store.update_objects_by_ids(deleted_objects.map(obj => obj._id), { reclaimed: new Date() });
+            // find 25 objects that are deleted and reclaimed
+            const objects = await md_store.find_deleted_objects(now.getTime() + 60 * 1000, 25);
+            assert_equal(objects.length, 25);
+        });
+
     });