refactor: cleanup datafusion-pg-catalog dependencies

Cargo.toml

@@ -130,9 +130,9 @@ datafusion-functions = "49"
 datafusion-functions-aggregate-common = "49"
 datafusion-optimizer = "49"
 datafusion-orc = { git = "https://github.com/GreptimeTeam/datafusion-orc", rev = "a0a5f902158f153119316eaeec868cff3fc8a99d" }
+datafusion-pg-catalog = { git = "https://github.com/datafusion-contrib/datafusion-postgres", rev = "3d1b7c7d5b82dd49bafc2803259365e633f654fa" }
 datafusion-physical-expr = "49"
 datafusion-physical-plan = "49"
-datafusion-postgres = { git = "https://github.com/datafusion-contrib/datafusion-postgres", rev = "412dad6b88ca83d11498338896044319ddac676c" }
 datafusion-sql = "49"
 datafusion-substrait = "49"
 deadpool = "0.12"

src/catalog/Cargo.toml

@@ -35,7 +35,7 @@ common-version.workspace = true
 common-workload.workspace = true
 dashmap.workspace = true
 datafusion.workspace = true
-datafusion-postgres.workspace = true
+datafusion-pg-catalog.workspace = true
 datatypes.workspace = true
 futures.workspace = true
 futures-util.workspace = true

src/catalog/src/system_schema/pg_catalog.rs

@@ -26,9 +26,9 @@ use datafusion::datasource::TableType;
 use datafusion::error::DataFusionError;
 use datafusion::execution::TaskContext;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
-use datafusion_postgres::pg_catalog::catalog_info::CatalogInfo;
-use datafusion_postgres::pg_catalog::{
-    PgCatalogSchemaProvider, PgCatalogStaticTables, PgCatalogTable,
+use datafusion_pg_catalog::pg_catalog::catalog_info::CatalogInfo;
+use datafusion_pg_catalog::pg_catalog::{
+    PG_CATALOG_TABLES, PgCatalogSchemaProvider, PgCatalogStaticTables, PgCatalogTable,
 };
 use snafu::ResultExt;
 use store_api::storage::ScanRequest;
@@ -74,7 +74,7 @@ impl PGCatalogProvider {
 
         let mut table_ids = HashMap::new();
         let mut table_id = PG_CATALOG_TABLE_ID_START;
-        for name in datafusion_postgres::pg_catalog::PG_CATALOG_TABLES {
+        for name in PG_CATALOG_TABLES {
             table_ids.insert(*name, table_id);
             table_id += 1;
         }
@@ -94,7 +94,7 @@ impl PGCatalogProvider {
         // Must follow the same security rules as [`InformationSchemaProvider::build_tables`].
         let mut tables = HashMap::new();
         // It's safe to unwrap here because we are sure that the constants have been handle correctly inside system_table.
-        for name in datafusion_postgres::pg_catalog::PG_CATALOG_TABLES {
+        for name in PG_CATALOG_TABLES {
             if let Some(table) = self.build_table(name) {
                 tables.insert(name.to_string(), table);
             }

src/common/function/Cargo.toml

@@ -36,8 +36,8 @@ datafusion.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
 datafusion-functions-aggregate-common.workspace = true
+datafusion-pg-catalog.workspace = true
 datafusion-physical-expr.workspace = true
-datafusion-postgres.workspace = true
 datatypes.workspace = true
 derive_more = { version = "1", default-features = false, features = ["display"] }
 geo = { version = "0.29", optional = true }

src/common/function/src/system/pg_catalog.rs

@@ -22,7 +22,7 @@ use datafusion::catalog::TableFunction;
 use datafusion::common::ScalarValue;
 use datafusion::common::utils::SingleRowListArrayBuilder;
 use datafusion_expr::{ColumnarValue, ScalarFunctionArgs, Signature, Volatility};
-use datafusion_postgres::pg_catalog::{self, PgCatalogStaticTables};
+use datafusion_pg_catalog::pg_catalog::{self, PgCatalogStaticTables};
 use datatypes::arrow::datatypes::{DataType, Field};
 use derive_more::Display;
 use version::PGVersionFunction;

src/servers/Cargo.toml

@@ -56,7 +56,7 @@ dashmap.workspace = true
 datafusion.workspace = true
 datafusion-common.workspace = true
 datafusion-expr.workspace = true
-datafusion-postgres.workspace = true
+datafusion-pg-catalog.workspace = true
 datatypes.workspace = true
 derive_builder.workspace = true
 futures.workspace = true

src/servers/src/postgres/handler.rs

@@ -21,7 +21,7 @@ use common_recordbatch::RecordBatch;
 use common_recordbatch::error::Result as RecordBatchResult;
 use common_telemetry::{debug, tracing};
 use datafusion_common::ParamValues;
-use datafusion_postgres::sql::PostgresCompatibilityParser;
+use datafusion_pg_catalog::sql::PostgresCompatibilityParser;
 use datatypes::prelude::ConcreteDataType;
 use datatypes::schema::SchemaRef;
 use futures::{Sink, SinkExt, Stream, StreamExt, future, stream};