add back parser support of label

Author: fuyufjh

sqllogictest/src/parser.rs

@@ -95,6 +95,7 @@ pub enum QueryExpect<T: ColumnType> {
         types: Vec<T>,
         sort_mode: Option<SortMode>,
         result_mode: Option<ResultMode>,
+        label: Option<String>,
         results: Vec<String>,
     },
     /// Query should fail with the given error message.
@@ -108,6 +109,7 @@ impl<T: ColumnType> QueryExpect<T> {
             types: Vec::new(),
             sort_mode: None,
             result_mode: None,
+            label: None,
             results: Vec::new(),
         }
     }
@@ -255,12 +257,18 @@ impl<T: ColumnType> std::fmt::Display for Record<T> {
                 write!(f, "query ")?;
                 match expected {
                     QueryExpect::Results {
-                        types, sort_mode, ..
+                        types,
+                        sort_mode,
+                        label,
+                        ..
                     } => {
                         write!(f, "{}", types.iter().map(|c| c.to_char()).join(""))?;
                         if let Some(sort_mode) = sort_mode {
                             write!(f, " {}", sort_mode.as_str())?;
                         }
+                        if let Some(label) = label {
+                            write!(f, " {label}")?;
+                        }
                     }
                     QueryExpect::Error(err) => err.fmt_inline(f)?,
                 }
@@ -281,6 +289,8 @@ impl<T: ColumnType> std::fmt::Display for Record<T> {
                         for result in results {
                             write!(f, "\n{result}")?;
                         }
+
+                        // query always ends with a blank line
                         writeln!(f)?
                     }
                     QueryExpect::Error(err) => err.fmt_multiline(f)?,
@@ -807,24 +817,38 @@ fn parse_inner<T: ColumnType>(loc: &Location, script: &str) -> Result<Vec<Record
                         (QueryExpect::Error(error), &[][..])
                     }
                     [type_str, res @ ..] => {
+                        // query <type-string> [<sort-mode>] [<label>] [retry <attempts> backoff <backoff>]
                         let types = type_str
                             .chars()
                             .map(|ch| {
                                 T::from_char(ch)
                                     .ok_or_else(|| ParseErrorKind::InvalidType(ch).at(loc.clone()))
                             })
                             .try_collect()?;
-                        let sort_mode = res.first().and_then(|&s| SortMode::try_from_str(s).ok()); // Could be `retry`
+                        let sort_mode = res.first().and_then(|&s| SortMode::try_from_str(s).ok()); // Could be `retry` or label
+
+                        // To support `retry`, we assume the label must *not* be "retry"
+                        let label_start = if sort_mode.is_some() { 1 } else { 0 };
+                        let res = &res[label_start..];
+                        let label = res.first().and_then(|&s| {
+                            if s != "retry" {
+                                Some(s.to_owned())
+                            } else {
+                                None // `retry` is not a valid label
+                            }
+                        });
 
-                        let retry_start = if sort_mode.is_some() { 1 } else { 0 };
+                        let retry_start = if label.is_some() { 1 } else { 0 };
+                        let res = &res[retry_start..];
                         (
                             QueryExpect::Results {
                                 types,
                                 sort_mode,
                                 result_mode: None,
+                                label,
                                 results: Vec::new(),
                             },
-                            &res[retry_start..],
+                            res,
                         )
                     }
                     [] => (QueryExpect::empty_results(), &[][..]),

sqllogictest/src/runner.rs

@@ -1640,20 +1640,22 @@ pub fn update_record_with_output<T: ColumnType>(
                     expected: match expected {
                         QueryExpect::Results {
                             sort_mode,
-
+                            label,
                             result_mode,
                             ..
                         } => QueryExpect::Results {
                             results,
                             types,
                             sort_mode,
                             result_mode,
+                            label,
                         },
                         QueryExpect::Error(_) => QueryExpect::Results {
                             results,
                             types,
                             sort_mode: None,
                             result_mode: None,
+                            label: None,
                         },
                     },
                     retry,

tests/retry/query_retry.slt

@@ -1,3 +1,4 @@
+# SYNTAX: query <type-string> [<sort-mode>] [<label>] [retry <attempts> backoff <backoff>]
 query I retry 3 backoff 5s
 SELECT id FROM test;
 ----
@@ -13,4 +14,34 @@ SELECT id FROM test ORDER BY random();
 query I retry 1 backoff 500ms
 SELECT id FROM test;
 ----
-1 
+1 
+
+query I my_label retry 1 backoff 500ms
+SELECT id FROM test;
+----
+1 
+
+query I rowsort my_label retry 1 backoff 500ms
+SELECT id FROM test;
+----
+1 
+
+query I rowsort my_label
+SELECT id FROM test;
+----
+1 
+
+query I rowsort
+SELECT id FROM test;
+----
+1 
+
+query I my_label
+SELECT id FROM test;
+----
+1 
+
+query I
+SELECT id FROM test;
+----
+1