feat: upgrade pgwire to 0.19

GreptimeTeam · Jan 11, 2024 · e2aa80d · e2aa80d
1 parent 312e8e8
commit e2aa80d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/servers/Cargo.toml b/src/servers/Cargo.toml
@@ -58,7 +58,7 @@ openmetrics-parser = "0.4"
 opensrv-mysql = { git = "https://github.com/MichaelScofield/opensrv.git", rev = "1676c1d" }
 opentelemetry-proto.workspace = true
 parking_lot = "0.12"
-pgwire = "0.18"
+pgwire = "0.19"
 pin-project = "1.0"
 postgres-types = { version = "0.2", features = ["with-chrono-0_4"] }
 pprof = { version = "0.13", features = [

diff --git a/src/servers/src/postgres/auth_handler.rs b/src/servers/src/postgres/auth_handler.rs
@@ -184,7 +184,7 @@ impl StartupHandler for PostgresServerHandler {
                 let login_info = LoginInfo::from_client_info(client);
 
                 // do authenticate
-                let auth_result = self.login_verifier.auth(&login_info, pwd.password()).await;
+                let auth_result = self.login_verifier.auth(&login_info, &pwd.password).await;
 
                 if let Ok(Some(user_info)) = auth_result {
                     self.session.set_user_info(user_info);

diff --git a/src/servers/src/postgres/handler.rs b/src/servers/src/postgres/handler.rs
@@ -71,10 +71,7 @@ fn output_to_query_response<'a>(
     field_format: &Format,
 ) -> PgWireResult<Response<'a>> {
     match output {
-        Ok(Output::AffectedRows(rows)) => Ok(Response::Execution(Tag::new_for_execution(
-            "OK",
-            Some(rows),
-        ))),
+        Ok(Output::AffectedRows(rows)) => Ok(Response::Execution(Tag::new("OK").with_rows(rows))),
         Ok(Output::Stream(record_stream)) => {
             let schema = record_stream.schema();
             recordbatches_to_query_response(record_stream, schema, field_format)
@@ -211,7 +208,7 @@ impl ExtendedQueryHandler for PostgresServerHandler {
             .with_label_values(&[crate::metrics::METRIC_POSTGRES_EXTENDED_QUERY, db.as_str()])
             .start_timer();
 
-        let sql_plan = portal.statement().statement();
+        let sql_plan = &portal.statement.statement;
 
         let output = if let Some(plan) = &sql_plan.plan {
             let plan = plan
@@ -230,7 +227,7 @@ impl ExtendedQueryHandler for PostgresServerHandler {
             self.query_handler.do_query(&sql, query_ctx).await.remove(0)
         };
 
-        output_to_query_response(output, portal.result_column_format())
+        output_to_query_response(output, &portal.result_column_format)
     }
 
     async fn do_describe<C>(
@@ -243,7 +240,7 @@ impl ExtendedQueryHandler for PostgresServerHandler {
     {
         let (param_types, sql_plan, format) = match target {
             StatementOrPortal::Statement(stmt) => {
-                let sql_plan = stmt.statement();
+                let sql_plan = &stmt.statement;
                 if let Some(plan) = &sql_plan.plan {
                     let param_types = plan
                         .get_param_types()
@@ -254,14 +251,14 @@ impl ExtendedQueryHandler for PostgresServerHandler {
 
                     (Some(types), sql_plan, &Format::UnifiedBinary)
                 } else {
-                    let param_types = Some(stmt.parameter_types().clone());
+                    let param_types = Some(stmt.parameter_types.clone());
                     (param_types, sql_plan, &Format::UnifiedBinary)
                 }
             }
             StatementOrPortal::Portal(portal) => (
                 None,
-                portal.statement().statement(),
-                portal.result_column_format(),
+                &portal.statement.statement,
+                &portal.result_column_format,
             ),
         };
 

diff --git a/src/servers/src/postgres/types.rs b/src/servers/src/postgres/types.rs
@@ -168,7 +168,7 @@ pub(super) fn type_pg_to_gt(origin: &Type) -> Result<ConcreteDataType> {
 pub(super) fn parameter_to_string(portal: &Portal<SqlPlan>, idx: usize) -> PgWireResult<String> {
     // the index is managed from portal's parameters count so it's safe to
     // unwrap here.
-    let param_type = portal.statement().parameter_types().get(idx).unwrap();
+    let param_type = portal.statement.parameter_types.get(idx).unwrap();
     match param_type {
         &Type::VARCHAR | &Type::TEXT => Ok(format!(
             "'{}'",
@@ -218,7 +218,7 @@ pub(super) fn parameter_to_string(portal: &Portal<SqlPlan>, idx: usize) -> PgWir
 
 pub(super) fn invalid_parameter_error(msg: &str, detail: Option<&str>) -> PgWireError {
     let mut error_info = ErrorInfo::new("ERROR".to_owned(), "22023".to_owned(), msg.to_owned());
-    error_info.set_detail(detail.map(|s| s.to_owned()));
+    error_info.detail = detail.map(|s| s.to_owned());
     PgWireError::UserError(Box::new(error_info))
 }
 
@@ -246,7 +246,7 @@ pub(super) fn parameters_to_scalar_values(
     let param_count = portal.parameter_len();
     let mut results = Vec::with_capacity(param_count);
 
-    let client_param_types = portal.statement().parameter_types();
+    let client_param_types = &portal.statement.parameter_types;
     let param_types = plan
         .get_param_types()
         .map_err(|e| PgWireError::ApiError(Box::new(e)))?;