Merge pull request #57 from lenchv/patch/#53-add-orientation-paramter

add orientation parameter to fetchAll to force first phase fetching o…
lenchv · Sep 25, 2023 · fd86564 · fd86564
2 parents ab411e5 + 1d9b835
commit fd86564
Show file tree

Hide file tree

Showing 15 changed files with 75 additions and 24 deletions.
diff --git a/dist/HiveOperation.d.ts b/dist/HiveOperation.d.ts
@@ -1,6 +1,6 @@
 import IOperation from "./contracts/IOperation";
 import HiveDriver from "./hive/HiveDriver";
-import { OperationHandle, TCLIServiceTypes, TableSchema, RowSet } from "./hive/Types";
+import { OperationHandle, TCLIServiceTypes, TableSchema, RowSet, FetchOrientation } from "./hive/Types";
 import Status from "./dto/Status";
 import { GetOperationStatusResponse } from "./hive/Commands/GetOperationStatusCommand";
 export default class HiveOperation implements IOperation {
@@ -20,7 +20,7 @@ export default class HiveOperation implements IOperation {
      * Fetches result and schema from operation
      * @throws {StatusError}
      */
-    fetch(): Promise<Status>;
+    fetch(orientation?: FetchOrientation): Promise<Status>;
     /**
      * Requests operation status
      * @param progress

diff --git a/dist/HiveOperation.js b/dist/HiveOperation.js
diff --git a/dist/HiveOperation.js.map b/dist/HiveOperation.js.map
diff --git a/dist/contracts/IOperation.d.ts b/dist/contracts/IOperation.d.ts
@@ -1,11 +1,11 @@
 import { GetOperationStatusResponse } from "../hive/Commands/GetOperationStatusCommand";
 import Status from "../dto/Status";
-import { TableSchema, RowSet } from "../hive/Types";
+import { TableSchema, RowSet, FetchOrientation } from "../hive/Types";
 export default interface IOperation {
     /**
      * Fetch schema and a portion of data
      */
-    fetch(): Promise<Status>;
+    fetch(orientation?: FetchOrientation): Promise<Status>;
     /**
      * Request status of operation
      *

diff --git a/dist/hive/Types/index.d.ts b/dist/hive/Types/index.d.ts
@@ -226,4 +226,8 @@ export type ProgressUpdateResponse = {
     footerSummary: string;
     startTime: ThriftBuffer;
 };
+export declare enum FetchOrientation {
+    FETCH_FIRST = 0,
+    FETCH_NEXT = 1
+}
 export {};
diff --git a/dist/hive/Types/index.js b/dist/hive/Types/index.js
diff --git a/dist/hive/Types/index.js.map b/dist/hive/Types/index.js.map
diff --git a/dist/utils/HiveUtils.d.ts b/dist/utils/HiveUtils.d.ts
@@ -1,11 +1,11 @@
-import { TCLIServiceTypes, ProgressUpdateResponse } from "../hive/Types";
+import { TCLIServiceTypes, ProgressUpdateResponse, FetchOrientation } from "../hive/Types";
 import IOperation from "../contracts/IOperation";
 import IOperationResult from "../result/IOperationResult";
 export default class HiveUtils {
     private TCLIService_types;
     constructor(TCLIService_types: TCLIServiceTypes);
     waitUntilReady(operation: IOperation, progress?: boolean, callback?: Function): Promise<IOperation>;
     getResult(operation: IOperation, resultHandler?: IOperationResult): IOperationResult;
-    fetchAll(operation: IOperation): Promise<IOperation>;
+    fetchAll(operation: IOperation, orientation?: FetchOrientation): Promise<IOperation>;
     formatProgress(progressUpdate: ProgressUpdateResponse): string;
 }
diff --git a/dist/utils/HiveUtils.js b/dist/utils/HiveUtils.js
diff --git a/dist/utils/HiveUtils.js.map b/dist/utils/HiveUtils.js.map
diff --git a/lib/HiveOperation.ts b/lib/HiveOperation.ts
@@ -1,6 +1,6 @@
 import IOperation from "./contracts/IOperation";
 import HiveDriver from "./hive/HiveDriver";
-import { OperationHandle, TCLIServiceTypes, TableSchema, RowSet, ColumnCode, Column } from "./hive/Types";
+import { OperationHandle, TCLIServiceTypes, TableSchema, RowSet, ColumnCode, Column, FetchOrientation } from "./hive/Types";
 import Status from "./dto/Status";
 import { GetOperationStatusResponse } from "./hive/Commands/GetOperationStatusCommand";
 import { GetResultSetMetadataResponse } from "./hive/Commands/GetResultSetMetadataCommand";
@@ -43,7 +43,7 @@ export default class HiveOperation implements IOperation {
      * Fetches result and schema from operation
      * @throws {StatusError}
      */
-    fetch(): Promise<Status> {
+    fetch(orientation?: FetchOrientation): Promise<Status> {
         if (!this.hasResultSet) {
             return Promise.resolve(
                 this.statusFactory.create({
@@ -63,8 +63,12 @@ export default class HiveOperation implements IOperation {
         if (this.schema === null) {
             return this.initializeSchema().then((schema: TableSchema) => {
                 this.schema = schema;
-
-                return this.firstFetch();
+
+                if (orientation === FetchOrientation.FETCH_NEXT) {
+                    return this.nextFetch();
+                } else {
+                    return this.firstFetch();
+                }
             }).then(
                 response => this.processFetchResponse(response)
             );

diff --git a/lib/contracts/IOperation.ts b/lib/contracts/IOperation.ts
@@ -1,12 +1,12 @@
 import { GetOperationStatusResponse } from "../hive/Commands/GetOperationStatusCommand";
 import Status from "../dto/Status";
-import { TableSchema, RowSet } from "../hive/Types";
+import { TableSchema, RowSet, FetchOrientation } from "../hive/Types";
 
 export default interface IOperation {
     /**
      * Fetch schema and a portion of data
      */
-    fetch(): Promise<Status>;
+    fetch(orientation?: FetchOrientation): Promise<Status>;
 
     /**
      * Request status of operation

diff --git a/lib/hive/Types/index.ts b/lib/hive/Types/index.ts
@@ -240,3 +240,8 @@ export type ProgressUpdateResponse = {
     footerSummary: string,
     startTime: ThriftBuffer
 };
+
+export enum FetchOrientation {
+    FETCH_FIRST,
+    FETCH_NEXT,
+}