HIVE-20897 : TestJdbcDriver2#testSelectExecAsync2 fails with result set not present error

service-rpc/if/TCLIService.thrift

@@ -539,7 +539,7 @@ struct TOperationHandle {
   // does not generate a result set, and calling
   // GetResultSetMetadata or FetchResults against
   // this OperationHandle will generate an error.
-  3: required bool hasResultSet
+  3: optional bool hasResultSet
 
   // For operations that don't generate result sets,
   // modifiedRowCount is either:

service/src/java/org/apache/hive/service/cli/OperationHandle.java

@@ -24,7 +24,7 @@ public class OperationHandle extends Handle {
 
   private final OperationType opType;
   private final TProtocolVersion protocol;
-  private boolean hasResultSet = false;
+  private Boolean hasResultSet = null;
 
   public OperationHandle(OperationType opType, TProtocolVersion protocol) {
     super();
@@ -40,7 +40,7 @@ public OperationHandle(TOperationHandle tOperationHandle) {
   public OperationHandle(TOperationHandle tOperationHandle, TProtocolVersion protocol) {
     super(tOperationHandle.getOperationId());
     this.opType = OperationType.getOperationType(tOperationHandle.getOperationType());
-    this.hasResultSet = tOperationHandle.isHasResultSet();
+    this.hasResultSet = tOperationHandle.isSetHasResultSet() ? tOperationHandle.isHasResultSet() : null;
     this.protocol = protocol;
   }
 
@@ -53,14 +53,21 @@ public void setHasResultSet(boolean hasResultSet) {
   }
 
   public boolean hasResultSet() {
-    return hasResultSet;
+    // null check to retain the old behavior
+    return hasResultSet == null ? false : hasResultSet;
+  }
+
+  public boolean isHasResultSetIsSet() {
+    return hasResultSet != null;
   }
 
   public TOperationHandle toTOperationHandle() {
     TOperationHandle tOperationHandle = new TOperationHandle();
     tOperationHandle.setOperationId(getHandleIdentifier().toTHandleIdentifier());
     tOperationHandle.setOperationType(opType.toTOperationType());
-    tOperationHandle.setHasResultSet(hasResultSet);
+    if (hasResultSet != null) {
+      tOperationHandle.setHasResultSet(hasResultSet);
+    }
     return tOperationHandle;
   }
 

service/src/java/org/apache/hive/service/cli/OperationStatus.java

@@ -28,17 +28,18 @@ public class OperationStatus {
   private final String taskStatus;
   private final long operationStarted;
   private final long operationCompleted;
-  private final boolean hasResultSet;
+  private final Boolean hasResultSet;
   private final HiveSQLException operationException;
   private JobProgressUpdate jobProgressUpdate;
   private long numModifiedRows;
 
-  public OperationStatus(OperationState state, String taskStatus, long operationStarted, long operationCompleted, boolean hasResultSet, HiveSQLException operationException) {
+  public OperationStatus(OperationState state, String taskStatus, long operationStarted, long operationCompleted,
+                         boolean hasResultSet, HiveSQLException operationException, boolean hasResultSetIsSet) {
     this.state = state;
     this.taskStatus = taskStatus;
     this.operationStarted = operationStarted;
     this.operationCompleted = operationCompleted;
-    this.hasResultSet = hasResultSet;
+    this.hasResultSet = hasResultSetIsSet ? hasResultSet : null;
     this.operationException = operationException;
   }
 
@@ -59,7 +60,7 @@ public long getOperationCompleted() {
   }
 
   public boolean getHasResultSet() {
-    return hasResultSet;
+    return hasResultSet == null ? false : hasResultSet;
   }
 
   public HiveSQLException getOperationException() {
@@ -81,4 +82,8 @@ public long getNumModifiedRows() {
   void setNumModifiedRows(long numRows) {
     this.numModifiedRows = numRows;
   }
+
+  public boolean isHasResultSetIsSet() {
+    return hasResultSet != null;
+  }
 }

service/src/java/org/apache/hive/service/cli/operation/Operation.java

@@ -61,7 +61,7 @@ public abstract class Operation {
   private final OperationHandle opHandle;
   public static final FetchOrientation DEFAULT_FETCH_ORIENTATION = FetchOrientation.FETCH_NEXT;
   public static final Logger LOG = LoggerFactory.getLogger(Operation.class.getName());
-  protected boolean hasResultSet;
+  protected Boolean hasResultSet = null;
   protected volatile HiveSQLException operationException;
   protected volatile Future<?> backgroundHandle;
   protected OperationLog operationLog;
@@ -139,11 +139,12 @@ public OperationStatus getStatus() {
     } catch (HiveSQLException sqlException) {
       LOG.error("Error getting task status for " + opHandle.toString(), sqlException);
     }
-    return new OperationStatus(state, taskStatus, operationStart, operationComplete, hasResultSet, operationException);
+    return new OperationStatus(state, taskStatus, operationStart, operationComplete, hasResultSet(),
+            operationException, hasResultSet != null);
   }
 
   public boolean hasResultSet() {
-    return hasResultSet;
+    return hasResultSet == null ? false : hasResultSet;
   }
 
   protected void setHasResultSet(boolean hasResultSet) {

service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIService.java

@@ -706,7 +706,9 @@ public TGetOperationStatusResp GetOperationStatus(TGetOperationStatusReq req) th
       resp.setTaskStatus(operationStatus.getTaskStatus());
       resp.setOperationStarted(operationStatus.getOperationStarted());
       resp.setOperationCompleted(operationStatus.getOperationCompleted());
-      resp.setHasResultSet(operationStatus.getHasResultSet());
+      if (operationStatus.isHasResultSetIsSet()) {
+        resp.setHasResultSet(operationStatus.getHasResultSet());
+      }
       JobProgressUpdate progressUpdate = operationStatus.jobProgressUpdate();
       ProgressMonitorStatusMapper mapper = ProgressMonitorStatusMapper.DEFAULT;
       if ("tez".equals(hiveConf.getVar(ConfVars.HIVE_EXECUTION_ENGINE))) {

service/src/java/org/apache/hive/service/cli/thrift/ThriftCLIServiceClient.java

@@ -384,7 +384,7 @@ public OperationStatus getOperationStatus(OperationHandle opHandle, boolean getP
         opException = new HiveSQLException(resp.getErrorMessage(), resp.getSqlState(), resp.getErrorCode());
       }
       return new OperationStatus(opState, resp.getTaskStatus(), resp.getOperationStarted(),
-        resp.getOperationCompleted(), resp.isHasResultSet(), opException);
+        resp.getOperationCompleted(), resp.isHasResultSet(), opException, resp.isSetHasResultSet());
     } catch (HiveSQLException e) {
       throw e;
     } catch (Exception e) {