Merge pull request #273 from codefori/feature/mapepire

Replace internal API with `mapepire-js`

Author: worksofliam

package-lock.json

@@ -61,6 +61,7 @@
     "webpack-cli": "^4.5.0"
   },
   "dependencies": {
+    "@ibm/mapepire-js": "^0.3.0",
     "chart.js": "^4.4.2",
     "csv": "^6.1.3",
     "json-to-markdown-table": "^1.0.0",

package.json

@@ -2,7 +2,7 @@ import { ExtensionContext, commands, window } from "vscode";
 import { ConnectionStorage } from "./Storage";
 import { getInstance } from "./base";
 import { SQLJobManager } from "./connection/manager";
-import { ServerComponent, UpdateStatus } from "./connection/serverComponent";
+import { ServerComponent } from "./connection/serverComponent";
 import { JobManagerView } from "./views/jobManager/jobManagerView";
 import Configuration from "./configuration";
 import { ConfigManager } from "./views/jobManager/ConfigManager";

src/config.ts

@@ -1,3 +1,4 @@
 
-export const SERVER_VERSION_TAG = `v1.4.9`;
-export const SERVER_VERSION_FILE = `codeforiserver-1.4.9.jar`;
+export const VERSION = `2.1.4`;
+export const SERVER_VERSION_TAG = `v${VERSION}`;
+export const SERVER_VERSION_FILE = `mapepire-server-${VERSION}.jar`;

src/connection/SCVersion.ts

@@ -1,16 +1,16 @@
 
 import { getInstance } from "../base";
-import { Query } from "./query";
 import { ServerComponent, UpdateStatus } from "./serverComponent";
-import { JobStatus, SQLJob } from "./sqlJob";
-import { QueryOptions } from "./types";
+import { OldSQLJob } from "./sqlJob";
 import { askAboutNewJob, onConnectOrServerInstall, osDetail } from "../config";
 import { SelfValue } from "../views/jobManager/selfCodes/nodes";
 import Configuration from "../configuration";
+import { QueryOptions } from "@ibm/mapepire-js/dist/src/types";
+import { Query } from "@ibm/mapepire-js/dist/src/query";
 
 export interface JobInfo {
   name: string;
-  job: SQLJob;
+  job: OldSQLJob;
 }
 
 const NO_SELECTED_JOB = -1;
@@ -23,20 +23,19 @@ export class SQLJobManager {
 
   constructor() { }
 
-  async newJob(predefinedJob?: SQLJob, name?: string) {
+  async newJob(predefinedJob?: OldSQLJob, name?: string) {
     if (ServerComponent.isInstalled()) {
 
       const instance = getInstance();
       const config = instance.getConfig();
 
-      const newJob = predefinedJob || (new SQLJob({
+      const newJob = predefinedJob || (new OldSQLJob({
         libraries: [config.currentLibrary, ...config.libraryList],
         naming: `system`,
         "full open": false,
         "transaction isolation": "none",
         "query optimize goal": "1",
-        "block size": "512",
-        selfcodes: SQLJobManager.getSelfDefault()
+        "block size": "512"
       }));
 
       try {
@@ -72,7 +71,7 @@ export class SQLJobManager {
   }
 
   getRunningJobs() {
-    return this.jobs.filter(info => [JobStatus.Ready, JobStatus.Busy].includes(info.job.getStatus()));
+    return this.jobs.filter(info => ["ready", "busy"].includes(info.job.getStatus()));
   }
 
   async endAll() {
@@ -130,7 +129,7 @@ export class SQLJobManager {
     const rowsToFetch = 2147483647;
 
     const statement = await this.getPagingStatement<T>(query, opts);
-    const results = await statement.run(rowsToFetch);
+    const results = await statement.execute(rowsToFetch);
     statement.close();
     return results.data;
   }