Skip to content

fix(connectors): unify extract_column_value into single free function #3199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atharvalade wants to merge 1 commit into
base: master
Choose a base branch
from
+127 −118
Open

fix(connectors): unify extract_column_value into single free function #3199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions core/connectors/sources/postgres_source/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ cdc_pg_replicate = []
[dependencies]
async-trait = { workspace = true }
base64 = { workspace = true }
chrono = { workspace = true }
dashmap = { workspace = true }
futures = { workspace = true }
humantime = { workspace = true }
Expand Down
243 changes: 125 additions & 118 deletions core/connectors/sources/postgres_source/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ impl PostgresSource {
continue;
}

let value = self.extract_column_value(&row, i)?;
let value = extract_column_value(&row, i)?;
data.insert(column_name.clone(), value.clone());

if column.name() == tracking_column {
Expand Down Expand Up @@ -885,124 +885,131 @@ impl PostgresSource {
}
}
}
}

fn extract_column_value(
&self,
row: &sqlx::postgres::PgRow,
column_index: usize,
) -> Result<serde_json::Value, Error> {
let column = &row.columns()[column_index];
let type_name = column.type_info().name();

match type_name {
"BOOL" => {
let value: Option<bool> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::Bool)
.unwrap_or(serde_json::Value::Null))
}
"INT2" => {
let value: Option<i16> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|v| serde_json::Value::from(v as i64))
.unwrap_or(serde_json::Value::Null))
}
"INT4" => {
let value: Option<i32> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|v| serde_json::Value::from(v as i64))
.unwrap_or(serde_json::Value::Null))
}
"INT8" => {
let value: Option<i64> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::from)
.unwrap_or(serde_json::Value::Null))
}
"FLOAT4" => {
let value: Option<f32> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|v| serde_json::Value::from(v as f64))
.unwrap_or(serde_json::Value::Null))
}
"FLOAT8" => {
let value: Option<f64> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::from)
.unwrap_or(serde_json::Value::Null))
}
"NUMERIC" => {
let value: Option<String> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.and_then(|s| s.parse::<f64>().ok())
.map(serde_json::Value::from)
.unwrap_or(serde_json::Value::Null))
}
"VARCHAR" | "TEXT" | "CHAR" => {
let value: Option<String> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::String)
.unwrap_or(serde_json::Value::Null))
}
"TIMESTAMP" | "TIMESTAMPTZ" => {
let value: Option<DateTime<Utc>> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|dt| serde_json::Value::String(dt.to_rfc3339()))
.unwrap_or(serde_json::Value::Null))
}
"UUID" => {
let value: Option<Uuid> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|u| serde_json::Value::String(u.to_string()))
.unwrap_or(serde_json::Value::Null))
}
"JSON" | "JSONB" => {
let value: Option<serde_json::Value> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value.unwrap_or(serde_json::Value::Null))
}
"BYTEA" => {
let value: Option<Vec<u8>> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|bytes| {
use base64::Engine;
serde_json::Value::String(
base64::engine::general_purpose::STANDARD.encode(&bytes),
)
})
.unwrap_or(serde_json::Value::Null))
}
_ => {
let value: Option<String> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::String)
.unwrap_or(serde_json::Value::Null))
}
fn extract_column_value(
row: &sqlx::postgres::PgRow,
column_index: usize,
) -> Result<serde_json::Value, Error> {
let column = &row.columns()[column_index];
let type_name = column.type_info().name();

match type_name {
"BOOL" => {
let value: Option<bool> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::Bool)
.unwrap_or(serde_json::Value::Null))
}
"INT2" => {
let value: Option<i16> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|v| serde_json::Value::from(v as i64))
.unwrap_or(serde_json::Value::Null))
}
"INT4" => {
let value: Option<i32> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|v| serde_json::Value::from(v as i64))
.unwrap_or(serde_json::Value::Null))
}
"INT8" => {
let value: Option<i64> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::from)
.unwrap_or(serde_json::Value::Null))
}
"FLOAT4" => {
let value: Option<f32> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|v| serde_json::Value::from(v as f64))
.unwrap_or(serde_json::Value::Null))
}
"FLOAT8" => {
let value: Option<f64> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::from)
.unwrap_or(serde_json::Value::Null))
}
"NUMERIC" => {
let value: Option<String> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.and_then(|s| s.parse::<f64>().ok())
.map(serde_json::Value::from)
.unwrap_or(serde_json::Value::Null))
}
"DATE" => {
let value: Option<chrono::NaiveDate> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|d| serde_json::Value::String(d.to_string()))
.unwrap_or(serde_json::Value::Null))
}
"VARCHAR" | "TEXT" | "CHAR" | "BPCHAR" => {
let value: Option<String> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::String)
.unwrap_or(serde_json::Value::Null))
}
"TIMESTAMP" | "TIMESTAMPTZ" => {
let value: Option<DateTime<Utc>> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|dt| serde_json::Value::String(dt.to_rfc3339()))
.unwrap_or(serde_json::Value::Null))
}
"UUID" => {
let value: Option<Uuid> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|u| serde_json::Value::String(u.to_string()))
.unwrap_or(serde_json::Value::Null))
}
"JSON" | "JSONB" => {
let value: Option<serde_json::Value> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value.unwrap_or(serde_json::Value::Null))
}
"BYTEA" => {
let value: Option<Vec<u8>> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(|bytes| {
use base64::Engine;
serde_json::Value::String(
base64::engine::general_purpose::STANDARD.encode(&bytes),
)
})
.unwrap_or(serde_json::Value::Null))
}
_ => {
let value: Option<String> = row
.try_get(column_index)
.map_err(|_| Error::InvalidRecord)?;
Ok(value
.map(serde_json::Value::String)
.unwrap_or(serde_json::Value::Null))
}
}
}
Expand Down
Loading