reverse order

Signed-off-by: Ruihang Xia <waynestxia@gmail.com>
GreptimeTeam · Jul 1, 2024 · fa3f5de · fa3f5de
1 parent e808dbd
commit fa3f5de
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/common/function/src/scalars/matches.rs b/src/common/function/src/scalars/matches.rs
@@ -242,8 +242,8 @@ impl ParserContext {
         );
 
         // conjoin them together
-        let mut builder = PatternAstBuilder::from_existing(self.stack.remove(0));
-        for ast in self.stack {
+        let mut builder = PatternAstBuilder::from_existing(self.stack.pop().unwrap());
+        while let Some(ast) = self.stack.pop() {
             builder.or(ast);
         }
 
@@ -289,7 +289,7 @@ impl ParserContext {
             }
         }
 
-        for operand in operator_stack.into_iter() {
+        while let Some(operand) = operator_stack.pop() {
             if operand == Token::OpenParen {
                 return InvalidFuncArgsSnafu {
                     err_msg: "Unmatched parentheses",
@@ -695,8 +695,8 @@ mod test {
                 PatternAst::Binary {
                     lhs: Box::new(PatternAst::Binary {
                         lhs: Box::new(PatternAst::Literal {
-                            op: UnaryOp::Negative,
-                            pattern: "c".to_string(),
+                            op: UnaryOp::Optional,
+                            pattern: "a".to_string(),
                         }),
                         op: BinaryOp::Or,
                         rhs: Box::new(PatternAst::Literal {
@@ -706,8 +706,8 @@ mod test {
                     }),
                     op: BinaryOp::Or,
                     rhs: Box::new(PatternAst::Literal {
-                        op: UnaryOp::Optional,
-                        pattern: "a".to_string(),
+                        op: UnaryOp::Negative,
+                        pattern: "c".to_string(),
                     }),
                 },
             ),
@@ -716,8 +716,8 @@ mod test {
                 PatternAst::Binary {
                     lhs: Box::new(PatternAst::Binary {
                         lhs: Box::new(PatternAst::Literal {
-                            op: UnaryOp::Optional,
-                            pattern: "c".to_string(),
+                            op: UnaryOp::Must,
+                            pattern: "a".to_string(),
                         }),
                         op: BinaryOp::Or,
                         rhs: Box::new(PatternAst::Literal {
@@ -727,8 +727,8 @@ mod test {
                     }),
                     op: BinaryOp::Or,
                     rhs: Box::new(PatternAst::Literal {
-                        op: UnaryOp::Must,
-                        pattern: "a".to_string(),
+                        op: UnaryOp::Optional,
+                        pattern: "c".to_string(),
                     }),
                 },
             ),