save

Author: levkk

pgdog/src/backend/pool/connection/buffer.rs

@@ -4,9 +4,7 @@ use std::{cmp::Ordering, collections::VecDeque};
 
 use crate::{
     frontend::router::parser::{Aggregate, AggregateTarget, OrderBy},
-    net::messages::{
-        data_row::Column, DataRow, Datum, FromBytes, Message, Protocol, RowDescription, ToBytes,
-    },
+    net::messages::{DataRow, Datum, FromBytes, Message, Protocol, RowDescription, ToBytes},
 };
 
 /// Sort and aggregate rows received from multiple shards.

pgdog/src/backend/server.rs

@@ -349,7 +349,7 @@ impl Server {
         let error = messages.iter().find(|m| m.code() == 'E');
         if let Some(error) = error {
             let error = ErrorResponse::from_bytes(error.to_bytes()?)?;
-            return Err(Error::ExecutionError(error));
+            Err(Error::ExecutionError(error))
         } else {
             Ok(messages)
         }

pgdog/src/frontend/router/parser/aggregate.rs

@@ -22,36 +22,21 @@ impl Aggregate {
         let mut aggs = vec![];
 
         for (idx, node) in stmt.target_list.iter().enumerate() {
-            match &node.node {
-                Some(NodeEnum::ResTarget(ref res)) => match &res.val {
-                    Some(node) => match &node.node {
-                        Some(NodeEnum::FuncCall(func)) => {
-                            if let Some(name) = func.funcname.first() {
-                                if let Some(NodeEnum::String(protobuf::String { sval })) =
-                                    &name.node
+            if let Some(NodeEnum::ResTarget(ref res)) = &node.node {
+                if let Some(node) = &res.val {
+                    if let Some(NodeEnum::FuncCall(func)) = &node.node {
+                        if let Some(name) = func.funcname.first() {
+                            if let Some(NodeEnum::String(protobuf::String { sval })) = &name.node {
+                                if sval.as_str() == "count"
+                                    && func.args.is_empty()
+                                    && stmt.group_clause.is_empty()
                                 {
-                                    match sval.as_str() {
-                                        "count" => {
-                                            if func.args.is_empty() && stmt.group_clause.is_empty()
-                                            {
-                                                aggs.push(Aggregate::Count(AggregateTarget::Star(
-                                                    idx,
-                                                )));
-                                            }
-                                        }
-
-                                        _ => (),
-                                    }
+                                    aggs.push(Aggregate::Count(AggregateTarget::Star(idx)));
                                 }
                             }
                         }
-
-                        _ => (),
-                    },
-
-                    _ => (),
-                },
-                _ => (),
+                    }
+                }
             }
         }