Major performance boost for fetching schemas

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/connection/manager.ts

@@ -119,9 +119,17 @@ export class SQLJobManager {
     // 2147483647 is NOT arbitrary. On the server side, this is processed as a Java
     // int. This is the largest number available without overflow (Integer.MAX_VALUE)
 
+    // const s = performance.now()
+    // console.log(`Running statement: ${query.padEnd(40).substring(0, 40)}`);
+
     const statement = await this.getPagingStatement<T>(query, opts);
     const results = await statement.execute(rowsToFetch);
     statement.close();
+
+    // const e = performance.now()
+    // console.log(`Statement executed in ${e - s} ms. ${results.data.length} rows returned.`);
+    // console.log(`\t${query.padEnd(40).substring(0, 40)}`)
+
     return results.data;
   }
 

src/database/schemas.ts

@@ -207,10 +207,11 @@ export default class Schemas {
         case `schemas`:
           selects.push(
             [
-              `select '${type}' as OBJ_TYPE, '' as TABLE_TYPE, SCHEMA_NAME as NAME, SCHEMA_TEXT as TEXT, SYSTEM_SCHEMA_NAME as SYS_NAME, '' as SYS_SCHEMA, '' as SPECNAME, '' as BASE_SCHEMA, '' as BASE_OBJ`,
-              `from QSYS2.SYSSCHEMAS`,
+              ``,
+              `SELECT '${type}' as OBJ_TYPE, '' as TABLE_TYPE, OBJLONGNAME AS NAME, '' as TEXT, OBJNAME AS SYS_NAME, '' as SYS_SCHEMA, '' as SPECNAME, '' as BASE_SCHEMA, '' as BASE_OBJ`,
+              `FROM TABLE(QSYS2.OBJECT_STATISTICS('*ALLSIMPLE', 'LIB')) Z`,
               details.filter
-                ? `where UPPER(SCHEMA_NAME) = ? or UPPER(SYSTEM_SCHEMA_NAME) = ?`
+                ? `where UPPER(OBJLONGNAME) = ? or UPPER(OBJNAME) = ?`
                 : ``,
             ].join(` `)
           );

src/language/providers/completionProvider.ts

@@ -331,7 +331,11 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
 
   const curClause = currentStatement.getClauseForOffset(offset);
   const tokenAtOffset = currentStatement.getTokenByOffset(offset);
-
+  
+    // Get all the schemas
+    if (objectRefs.length === 0 && cteList.length === 0) {
+      completionItems.push(...(await getCachedSchemas()));
+    }
   // Set the default schema for all references without one
   for (let ref of objectRefs) {
     if (!ref.object.schema) {
@@ -430,12 +434,6 @@ async function getCompletionItemsForRefs(currentStatement: LanguageStatement.def
     }
   }
 
-  if (completionItems.length === 0) {
-    // Get all the schemas
-    // TODO: very very slow
-    // completionItems.push(...(await getCachedSchemas()));
-  }
-
   return completionItems;
 }