Merge pull request cockroachdb#24293 from mjibson/schema-gc

sql: fail schema changes on GC threshold errors
nvanbenschoten · Apr 2, 2018 · 9ba6a6b · 9ba6a6b
2 parents 1012ed4 + ce14f05
commit 9ba6a6b
Show file tree

Hide file tree

Showing 7 changed files with 555 additions and 215 deletions.
diff --git a/pkg/roachpb/api.pb.go b/pkg/roachpb/api.pb.go
diff --git a/pkg/roachpb/errors.go b/pkg/roachpb/errors.go
@@ -647,3 +647,13 @@ func (e *MixedSuccessError) message(_ *Error) string {
 }
 
 var _ ErrorDetailInterface = &MixedSuccessError{}
+
+func (e *BatchTimestampBeforeGCError) Error() string {
+	return e.message(nil)
+}
+
+func (e *BatchTimestampBeforeGCError) message(_ *Error) string {
+	return fmt.Sprintf("batch timestamp %v must be after GC threshold %v", e.Timestamp, e.Threshold)
+}
+
+var _ ErrorDetailInterface = &BatchTimestampBeforeGCError{}