Merge pull request #678 from nasa/harmony-1971

Harmony 1971 - Improve slow query for jobs+labels in jobs and workflow ui admin endpoints
nasa · Jan 8, 2025 · 20471b6 · 20471b6
2 parents e9b3d3e + 30a0239
commit 20471b6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/services/harmony/app/frontends/jobs.ts b/services/harmony/app/frontends/jobs.ts
@@ -126,7 +126,7 @@ export async function getJobsListing(
     req.context.logger.info(`Get jobs listing for user ${req.user}`);
     const root = getRequestRoot(req);
     const { page, limit } = getPagingParams(req, env.defaultJobListPageSize);
-    const query: JobQuery = { where: {} };
+    const query: JobQuery = { where: {}, orderBy: { field: 'jobs.id', value: 'desc' } };
     query.labels = req.body.label;
 
     if (!req.context.isAdminAccess) {

diff --git a/services/harmony/app/frontends/workflow-ui.ts b/services/harmony/app/frontends/workflow-ui.ts
@@ -260,7 +260,7 @@ function jobRenderingFunctions(logger: Logger, requestQuery: Record<string, any>
  * @returns JobQuery
  */
 function tableQueryToJobQuery(tableQuery: TableQuery, isAdmin: boolean, user: string, jobIDs?: string[]): JobQuery {
-  const jobQuery: JobQuery = { where: {}, whereIn: {} };
+  const jobQuery: JobQuery = { where: {}, whereIn: {}, orderBy: { field: 'jobs.id', value: 'desc' } };
   if (tableQuery.sortGranules) {
     jobQuery.orderBy = {
       field: 'numInputGranules',