[FE-10910] Update Thrift bindings with rename (#179)

* Update Thrift * First naive pass at updating mapd.thrift.js -> OmniSci.js and mapd_types.js -> omnisci_types.js (w/ updated Browser 0.13.0 bindings) * Pull in 0.10.0-built browser bindings instead Co-authored-by: mapd-bot <machines@mapd.com>
heavyai · Apr 8, 2020 · 845dfda · 845dfda
1 parent 1d0b4da
commit 845dfda
Show file tree

Hide file tree

Showing 16 changed files with 4,419 additions and 3,319 deletions.
diff --git a/dist/browser-connector.js b/dist/browser-connector.js
diff --git a/dist/node-connector.js b/dist/node-connector.js
diff --git a/scripts/fix-thrift-globals.js b/scripts/fix-thrift-globals.js
@@ -16,17 +16,17 @@ const filePathsBrowser = [
   "thrift/browser/completion_hints_types.js",
   "thrift/browser/common_types.js",
   "thrift/browser/serialized_result_set_types.js",
-  "thrift/browser/mapd_types.js",
-  "thrift/browser/mapd.thrift.js",
+  "thrift/browser/omnisci_types.js",
+  "thrift/browser/OmniSci.js",
   "thrift/browser/thrift.js"
 ]
 const filePathsNode = [
   "thrift/node/completion_hints_types.js",
   "thrift/node/common_types.js",
   "thrift/node/extension_functions_types.js",
   "thrift/node/serialized_result_set_types.js",
-  "thrift/node/mapd_types.js",
-  "thrift/node/mapd.thrift.js"
+  "thrift/node/omnisci_types.js",
+  "thrift/node/OmniSci.js"
 ]
 filePathsBrowser.forEach(declareWith("window."))
 filePathsNode.forEach(declareWith("var "))

diff --git a/src/mapd-client-v2.js b/src/mapd-client-v2.js
@@ -1,6 +1,6 @@
 const MapDClient =
-  (typeof window !== "undefined" && window.MapDClient) ||
-  require("../build/thrift/node/mapd.thrift.js").Client // eslint-disable-line global-require
+  (typeof window !== "undefined" && window.OmniSciClient) ||
+  require("../build/thrift/node/OmniSci.js").Client // eslint-disable-line global-require
 
 import { wrapWithErrorHandling } from "./wrap-with-error-handling"
 

diff --git a/src/mapd-con-es6.js b/src/mapd-con-es6.js
@@ -2,10 +2,10 @@
 
 const { TDatumType, TEncodingType } =
   (isNodeRuntime() && require("../build/thrift/node/common_types.js")) || window // eslint-disable-line global-require
-const { TPixel, TMapDException } =
-  (isNodeRuntime() && require("../build/thrift/node/mapd_types.js")) || window // eslint-disable-line global-require
+const { TPixel, TOmniSciException } =
+  (isNodeRuntime() && require("../build/thrift/node/omnisci_types.js")) || window // eslint-disable-line global-require
 const MapDThrift =
-  isNodeRuntime() && require("../build/thrift/node/mapd.thrift.js") // eslint-disable-line global-require
+  isNodeRuntime() && require("../build/thrift/node/OmniSci.js") // eslint-disable-line global-require
 let Thrift = (isNodeRuntime() && require("thrift")) || window.Thrift // eslint-disable-line global-require
 const thriftWrapper = Thrift
 const parseUrl = isNodeRuntime() && require("url").parse // eslint-disable-line global-require
@@ -1936,7 +1936,7 @@ class MapdCon {
 
   isTimeoutError(result) {
     return (
-      result instanceof TMapDException &&
+      result instanceof TOmniSciException &&
       (String(result.error_msg).indexOf("Session not valid.") !== -1 ||
         String(result.error_msg).indexOf("User should re-authenticate.") !== -1)
     )

diff --git a/src/wrap-with-error-handling.js b/src/wrap-with-error-handling.js
@@ -1,9 +1,9 @@
 const MapDClient =
-  (typeof window !== "undefined" && window.MapDClient) ||
-  require("../build/thrift/node/mapd.thrift.js").Client // eslint-disable-line global-require
+  (typeof window !== "undefined" && window.OmniSciClient) ||
+  require("../build/thrift/node/OmniSci.js").Client // eslint-disable-line global-require
 const TMapDException =
-  (typeof window !== "undefined" && window.TMapDException) ||
-  require("../build/thrift/node/mapd_types.js").TMapDException // eslint-disable-line global-require
+  (typeof window !== "undefined" && window.TOmniSciException) ||
+  require("../build/thrift/node/omnisci_types.js").TOmniSciException // eslint-disable-line global-require
 const Thrift =
   (typeof window !== "undefined" && window.Thrift) || require("thrift").Thrift // eslint-disable-line global-require
 

diff --git a/test/setup.js b/test/setup.js
@@ -4,8 +4,8 @@ import jsdom from "jsdom"
 const scripts = `
   <script>
     ${fs.readFileSync("./thrift/browser/thrift.js", "utf-8")}
-    ${fs.readFileSync("./thrift/browser/mapd.thrift.js", "utf-8")}
-    ${fs.readFileSync("./thrift/browser/mapd_types.js", "utf-8")}
+    ${fs.readFileSync("./thrift/browser/OmniSci.js", "utf-8")}
+    ${fs.readFileSync("./thrift/browser/omnisci_types.js", "utf-8")}
   </script>
 `
 const doc = jsdom.jsdom(`<!doctype html><html>${scripts}<body></body></html>`)

diff --git a/test/wrap-with-error-handling.unit.spec.js b/test/wrap-with-error-handling.unit.spec.js
@@ -1,8 +1,8 @@
 import { expect } from "chai"
 import {
   CREATE_LINK_ERROR_STRING,
-  isResultError,
-  isCreateLinkError
+  isCreateLinkError,
+  isResultError
 } from "../src/wrap-with-error-handling"
 
 describe("wrapWithErrorHandling", () => {
@@ -13,8 +13,8 @@ describe("wrapWithErrorHandling", () => {
     it("should return true when result is instance of a Thrift.TException", () => {
       expect(isResultError(new Thrift.TException())).to.equal(true)
     })
-    it("should return true when result is instance of a TMapDException", () => {
-      expect(isResultError(new TMapDException())).to.equal(true)
+    it("should return true when result is instance of a TOmniSciException", () => {
+      expect(isResultError(new TOmniSciException())).to.equal(true)
     })
     it("should return false when result is a string", () => {
       expect(isResultError("ERROR")).to.equal(false)