Merge pull request #9520 from bdarnell/sql-log

sql: Log statements to event log earlier
cockroachdb · Sep 24, 2016 · 2fc8d2f · 2fc8d2f
2 parents 061d197 + e11034b
commit 2fc8d2f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/sql/executor.go b/sql/executor.go
@@ -881,6 +881,9 @@ func (e *Executor) execStmtInOpenTxn(
 	planMaker.evalCtx.SetTxnTimestamp(txnState.sqlTimestamp)
 	planMaker.evalCtx.SetStmtTimestamp(e.cfg.Clock.PhysicalTime())
 
+	session := planMaker.session
+	log.Event(session.context, stmt.String())
+
 	// TODO(cdo): Figure out how to not double count on retries.
 	e.updateStmtCounts(stmt)
 	switch s := stmt.(type) {
@@ -980,9 +983,6 @@ func (e *Executor) execStmtInOpenTxn(
 		return Result{PGTag: s.StatementTag()}, nil
 	}
 
-	session := planMaker.session
-	log.Event(session.context, stmt.String())
-
 	result, err := e.execStmt(stmt, planMaker, implicitTxn /* autoCommit */)
 	if err != nil {
 		if traceSQL {