Revert broad terminal result-set behavior change

Signed-off-by: Vu Anh Phung <vu.phung@databricks.com>

Author: vuanhphung

lib/DBSQLOperation.ts

@@ -147,13 +147,14 @@ export default class DBSQLOperation implements IOperation {
 
   private async fetchChunkInternal(options?: FetchOptions): Promise<Array<object>> {
     await this.failIfClosed();
-    await this.waitUntilReadyThroughBackend(options);
-    await this.failIfClosed();
 
     if (!this.backend.hasResultSet()) {
       return [];
     }
 
+    await this.waitUntilReadyThroughBackend(options);
+    await this.failIfClosed();
+
     const defaultMaxRows = this.context.getConfig().fetchChunkDefaultMaxRows;
     const limit = options?.maxRows ?? defaultMaxRows;
     const result = await this.backend.fetchChunk({
@@ -246,9 +247,10 @@ export default class DBSQLOperation implements IOperation {
         return false;
       }
 
-      await this.waitUntilReadyThroughBackend();
-      if (!this.backend.hasResultSet()) {
-        return false;
+      // Wait for operation to finish before checking for more rows
+      // This ensures metadata can be fetched successfully
+      if (this.backend.hasResultSet()) {
+        await this.waitUntilReadyThroughBackend();
       }
 
       // If we fetched all the data from server - check if there's anything buffered in result handler
@@ -259,12 +261,13 @@ export default class DBSQLOperation implements IOperation {
   public async getSchema(options?: GetSchemaOptions): Promise<TTableSchema | null> {
     return this.withErrorTelemetry(async () => {
       await this.failIfClosed();
-      await this.waitUntilReadyThroughBackend(options);
 
       if (!this.backend.hasResultSet()) {
         return null;
       }
 
+      await this.waitUntilReadyThroughBackend(options);
+
       this.context.getLogger().log(LogLevel.debug, `Fetching schema for operation with id: ${this.id}`);
       if (this.backend instanceof ThriftOperationBackend) {
         const metadata = await this.backend.thriftResultMetadataResponse();

lib/thrift-backend/ThriftOperationBackend.ts

@@ -144,7 +144,7 @@ export default class ThriftOperationBackend implements IOperationBackend {
   }
 
   public hasResultSet(): boolean {
-    return Boolean(this.operationHandle.hasResultSet);
+    return Boolean(this.emptyResultOnNotFound || this.operationHandle.hasResultSet);
   }
 
   public async fetchChunk({

tests/unit/thrift-backend/ThriftPrimaryKeysMetadata.test.ts

@@ -212,34 +212,6 @@ describe('Thrift getPrimaryKeys missing objects', () => {
     await expectEmptyPrimaryKeys(operation);
   });
 
-  for (const delivery of ['direct', 'poll']) {
-    for (const firstCall of ['status', 'getSchema', 'fetchChunk', 'hasMoreRows'] as const) {
-      it(`honors a terminal no-result flag via ${delivery} starting with ${firstCall}`, async () => {
-        const context = createContext();
-        const driver = sinon.spy(context.driver);
-        const status = {
-          status: { statusCode: TStatusCode.SUCCESS_STATUS },
-          operationState: TOperationState.FINISHED_STATE,
-          hasResultSet: false,
-        };
-        if (delivery === 'direct') {
-          context.driver.getPrimaryKeysResp.directResults = { operationStatus: status };
-        } else {
-          context.driver.getOperationStatusResp = status;
-        }
-        const operation = await createSession(context).getPrimaryKeys(request);
-
-        await operation[firstCall]();
-
-        expect(await operation.getSchema()).to.be.null;
-        expect(await operation.fetchAll()).to.deep.equal([]);
-        expect(await operation.hasMoreRows()).to.be.false;
-        expect(driver.getResultSetMetadata.called).to.be.false;
-        expect(driver.fetchResults.called).to.be.false;
-      });
-    }
-  }
-
   it('preserves an unrelated wrapped RPC error without an operation state', async () => {
     const context = createContext();
     const status = {