Merge #35618

35618: sql: Use current hlc time to check if AS OF SYSTEM TIME is in the future r=vivekmenezes a=vivekmenezes stop usng the statement timestamp which is computed using the physical time as the current time. The physical time can at times jump backwards. fixes #35155 Release note: None Co-authored-by: Vivek Menezes <[email protected]>
cockroachdb · Mar 12, 2019 · 6a9c978 · 6a9c978
2 parents e34c9b5 + f9d734b
commit 6a9c978
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/pkg/sql/exec_util.go b/pkg/sql/exec_util.go
@@ -668,7 +668,15 @@ func checkResultType(typ types.T) error {
 // EvalAsOfTimestamp evaluates and returns the timestamp from an AS OF SYSTEM
 // TIME clause.
 func (p *planner) EvalAsOfTimestamp(asOf tree.AsOfClause) (_ hlc.Timestamp, err error) {
-	return tree.EvalAsOfTimestamp(asOf, &p.semaCtx, p.EvalContext())
+	ts, err := tree.EvalAsOfTimestamp(asOf, &p.semaCtx, p.EvalContext())
+	if err != nil {
+		return hlc.Timestamp{}, err
+	}
+	if now := p.execCfg.Clock.Now(); now.Less(ts) {
+		return hlc.Timestamp{}, errors.Errorf(
+			"AS OF SYSTEM TIME: cannot specify timestamp in the future (%s > %s)", ts, now)
+	}
+	return ts, nil
 }
 
 // ParseHLC parses a string representation of an `hlc.Timestamp`.

diff --git a/pkg/sql/sem/tree/as_of.go b/pkg/sql/sem/tree/as_of.go
@@ -125,9 +125,6 @@ func EvalAsOfTimestamp(
 		return ts, errors.Errorf("AS OF SYSTEM TIME: zero timestamp is invalid")
 	} else if ts.Less(zero) {
 		return ts, errors.Errorf("AS OF SYSTEM TIME: timestamp before 1970-01-01T00:00:00Z is invalid")
-	} else if stmtTimestamp.Before(ts.GoTime()) {
-		return ts, errors.Errorf("AS OF SYSTEM TIME: cannot specify timestamp in the future (%s > %s)",
-			ts.GoTime(), stmtTimestamp)
 	}
 	return ts, nil
 }