Correctly close (rather than cancel) INSERT statements

yi-yang · Apr 29, 2013 · 0d51bb1 · 0d51bb1
1 parent e4b3285
commit 0d51bb1
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/be/src/runtime/coordinator.cc b/be/src/runtime/coordinator.cc
@@ -284,6 +284,8 @@ Status Coordinator::Exec(
     finalize_params_ = request->finalize_params;
   }
 
+  stmt_type_ = request->stmt_type;
+
   query_id_ = query_id;
   VLOG_QUERY << "Exec() query_id=" << query_id_;
   desc_tbl_ = request->desc_tbl;
@@ -609,7 +611,13 @@ Status Coordinator::Wait() {
 
   // Query finalization is required only for HDFS table sinks
   if (needs_finalization_) {
-    return FinalizeQuery();
+    RETURN_IF_ERROR(FinalizeQuery());
+  }
+
+  if (stmt_type_ == TStmtType::DML) {
+    // For DML queries, when Wait is done, the query is complete.  Report
+    // Aggregate query profiles at this point.
+    ReportQuerySummary();
   }
 
   return Status::OK;

diff --git a/be/src/runtime/coordinator.h b/be/src/runtime/coordinator.h
@@ -183,6 +183,9 @@ class Coordinator {
   TQueryGlobals query_globals_;
   TQueryOptions query_options_;
 
+  // copied from TQueryExecRequest, governs when to call ReportQuerySummary
+  TStmtType::type stmt_type_;
+
   // map from id of a scan node to a specific counter in the node's profile
   typedef std::map<PlanNodeId, RuntimeProfile::Counter*> CounterMap;
 

diff --git a/be/src/service/impala-server.cc b/be/src/service/impala-server.cc
@@ -218,6 +218,11 @@ Status ImpalaServer::QueryExecState::Wait() {
     RETURN_IF_ERROR(UpdateMetastore());
   }
 
+  if (exec_request_.stmt_type == TStmtType::DML) {
+    // DML queries are finished by this point
+    eos_ = true;
+  }
+
   return Status::OK;
 }
 

diff --git a/common/thrift/Frontend.thrift b/common/thrift/Frontend.thrift
@@ -433,6 +433,10 @@ struct TQueryExecRequest {
 
   // The same as the output of 'explain <query>'
   8: optional string query_plan
+
+  // The statement type governs when the coordinator can judge a query to be finished.
+  // DML queries are complete after Wait(), SELECTs may not be.
+  9: required Types.TStmtType stmt_type
 }
 
 enum TDdlType {

diff --git a/fe/src/main/java/com/cloudera/impala/service/Frontend.java b/fe/src/main/java/com/cloudera/impala/service/Frontend.java
@@ -498,6 +498,10 @@ public TExecRequest createExecRequest(
       }
     }
 
+    // Copy the statement type into the TQueryExecRequest so that it
+    // is visible to the coordinator.
+    result.query_exec_request.stmt_type = result.stmt_type;
+
     return result;
   }