@cubejs-backend/hive-driver 0.30.73 → 0.31.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.31.0](https://github.com/cube-js/cube.js/compare/v0.30.75...v0.31.0) (2022-10-03)
+
+
+### Features
+
+* multiple data source ([#5326](https://github.com/cube-js/cube.js/issues/5326)) ([334af8c](https://github.com/cube-js/cube.js/commit/334af8c56cd02ae551844e9d1e9ab5e107fb1555))
+
+
+
+
+
 ## [0.30.73](https://github.com/cube-js/cube.js/compare/v0.30.72...v0.30.73) (2022-09-19)
 
 **Note:** Version bump only for package @cubejs-backend/hive-driver

package/driver/HiveDriver.js

@@ -2,6 +2,7 @@ const jshs2 = require('jshs2');
 const SqlString = require('sqlstring');
 const genericPool = require('generic-pool');
 const { BaseDriver } = require('@cubejs-backend/base-driver');
+const { getEnv, assertDataSource } = require('@cubejs-backend/shared');
 
 const {
   HS2Util, IDLContainer, HiveConnection, Configuration
@@ -36,6 +37,9 @@ IDLFactory.extractConfig = (config) => {
 
 const TSaslTransport = require('./TSaslTransport');
 
+/**
+ * Hive driver class.
+ */
 class HiveDriver extends BaseDriver {
   /**
    * Returns default concurrency value.
@@ -44,24 +48,36 @@ class HiveDriver extends BaseDriver {
     return 2;
   }
 
+  /**
+   * Class constructor.
+   */
   constructor(config = {}) {
     super();
+
+    const dataSource =
+      config.dataSource ||
+      assertDataSource('default');
+
     this.config = {
       auth: 'PLAIN',
-      host: process.env.CUBEJS_DB_HOST,
-      port: process.env.CUBEJS_DB_PORT,
-      dbName: process.env.CUBEJS_DB_NAME || 'default',
+      host: getEnv('dbHost', { dataSource }),
+      port: getEnv('dbPort', { dataSource }),
+      dbName: getEnv('dbName', { dataSource }) || 'default',
       timeout: 10000,
-      username: process.env.CUBEJS_DB_USER,
-      password: process.env.CUBEJS_DB_PASS,
-      hiveType: process.env.CUBEJS_DB_HIVE_TYPE === 'CDH' ? HS2Util.HIVE_TYPE.CDH : HS2Util.HIVE_TYPE.HIVE,
-      hiveVer: process.env.CUBEJS_DB_HIVE_VER || '2.1.1',
-      thriftVer: process.env.CUBEJS_DB_HIVE_THRIFT_VER || '0.9.3',
-      cdhVer: process.env.CUBEJS_DB_HIVE_CDH_VER,
+      username: getEnv('dbUser', { dataSource }),
+      password: getEnv('dbPass', { dataSource }),
+      hiveType: getEnv('hiveType', { dataSource }) === 'CDH'
+        ? HS2Util.HIVE_TYPE.CDH
+        : HS2Util.HIVE_TYPE.HIVE,
+      hiveVer: getEnv('hiveVer', { dataSource }) || '2.1.1',
+      thriftVer: getEnv('hiveThriftVer', { dataSource }) || '0.9.3',
+      cdhVer: getEnv('hiveCdhVer', { dataSource }),
       authZid: 'cube.js',
       ...config
     };
+
     const configuration = new Configuration(this.config);
+    
     this.pool = genericPool.createPool({
       create: async () => {
         const idl = new IDLContainer();
@@ -102,7 +118,10 @@ class HiveDriver extends BaseDriver {
       destroy: (connection) => connection.close()
     }, {
       min: 0,
-      max: this.config.maxPoolSize || 8,
+      max:
+        config.maxPoolSize ||
+        getEnv('dbMaxPoolSize', { dataSource }) ||
+        8,
       evictionRunIntervalMillis: 10000,
       softIdleTimeoutMillis: 30000,
       idleTimeoutMillis: 30000,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/hive-driver",
   "description": "Cube.js Hive database driver",
   "author": "Cube Dev, Inc.",
-  "version": "0.30.73",
+  "version": "0.31.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.js.git",
@@ -13,7 +13,7 @@
   },
   "main": "driver/HiveDriver.js",
   "dependencies": {
-    "@cubejs-backend/base-driver": "^0.30.73",
+    "@cubejs-backend/base-driver": "^0.31.0",
     "generic-pool": "^3.6.0",
     "jshs2": "^0.4.4",
     "sasl-plain": "^0.1.0",
@@ -25,5 +25,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d47987e8eab041fd9b5113feb3ab8f35afe38e16"
+  "gitHead": "8cdec759f298fb20c48194254ccc04b6fdad46bf"
 }