[FIXUP] Drop console, tune errors

Author: mcheshkov

packages/cubejs-clickhouse-driver/src/ClickHouseDriver.ts

@@ -144,8 +144,6 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
     const port = config.port ?? getEnv('dbPort', { dataSource }) ?? 8123;
     const protocol = config.protocol ?? getEnv('dbSsl', { dataSource }) ? 'https:' : 'http:';
     const url = `${protocol}//${host}:${port}`;
-    // TODO drop this
-    console.log('ClickHouseDriver will use url', url);
 
     const username = getEnv('dbUser', { dataSource });
     const password = getEnv('dbPass', { dataSource });
@@ -181,7 +179,6 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
   }
 
   protected withCancel<T>(fn: (con: ClickHouseClient, queryId: string, signal: AbortSignal) => Promise<T>): Promise<T> {
-    console.log("withCancel call");
     const queryId = uuidv4();
 
     const abortController = new AbortController();
@@ -239,19 +236,13 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
       const response = await this.queryResponse(query, values);
       return this.normaliseResponse(response);
     } catch (e) {
-      const newError = new Error(`Query failed: ${query}`, { cause: e });
-      console.log(newError);
-      throw newError;
+      throw new Error(`Query failed: ${query}`, { cause: e });
     }
   }
 
   protected queryResponse(query: string, values: unknown[]): Promise<ResponseJSON<Record<string, unknown>>> {
-    console.log('ClickHouse queryResponse call', query);
-
     const formattedQuery = sqlstring.format(query, values);
 
-    console.log('ClickHouse queryResponse prepared', formattedQuery);
-
     return this.withCancel(async (connection, queryId, signal) => {
       const format = 'JSON';
 
@@ -262,16 +253,13 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
         clickhouse_settings: this.config.clickhouseSettings,
         abort_signal: signal,
       });
-      console.log("queryResponse resultSet", query, resultSet.query_id, resultSet.response_headers);
 
       if (resultSet.response_headers['x-clickhouse-format'] !== format) {
         throw new Error(`Unexpected x-clickhouse-format in response: expected ${format}, received ${resultSet.response_headers['x-clickhouse-format']}`);
       }
 
       // We used format JSON, so we expect each row to be Record with column names as keys
       const results = await resultSet.json<Record<string, unknown>>();
-      console.log("queryResponse json results", query, results);
-      console.log("queryResponse json results JSON", JSON.stringify(results));
       return results;
     });
   }
@@ -346,16 +334,12 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     { highWaterMark }: StreamOptions
   ): Promise<StreamTableDataWithTypes> {
-    console.log('ClickHouse stream call', query, values);
-
     // Use separate client for this long-living query
     const client = this.createClient(1);
 
     try {
       const formattedQuery = sqlstring.format(query, values);
 
-      console.log('ClickHouse stream prepared', formattedQuery);
-
       const format = 'JSONCompactEachRowWithNamesAndTypes';
 
       const resultSet = await client.query({
@@ -377,7 +361,6 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
       const allRowsIter = (async function* allRowsIter() {
         for await (const rowsBatch of resultSetStream) {
           for (const row of rowsBatch) {
-            console.log('ClickHouse stream got row', formattedQuery, row);
             yield row.json();
           }
         }
@@ -423,8 +406,7 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
       };
     } catch (e) {
       await client.close();
-
-      throw e;
+      throw new Error(`Stream query failed: ${query}`, { cause: e });
     }
   }