Skip to content

mark string array/object union fields as json #76

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

Merged
merged 2 commits into from
Feb 12, 2025
Merged

mark string array/object union fields as json #76

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7d9c8
mark string array/object union fields as json
adriangb Feb 12, 2025
ba419f8
remove lazylock
adriangb Feb 12, 2025
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
16 changes: 13 additions & 3 deletions src/common_union.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::sync::{Arc, OnceLock};
use std::collections::HashMap;
use std::sync::{Arc, LazyLock, OnceLock};

use datafusion::arrow::array::{
Array, ArrayRef, AsArray, BooleanArray, Float64Array, Int64Array, NullArray, StringArray, UnionArray,
Expand Down Expand Up @@ -154,6 +155,9 @@ const TYPE_ID_STR: i8 = 4;
const TYPE_ID_ARRAY: i8 = 5;
const TYPE_ID_OBJECT: i8 = 6;

static JSON_METADATA: LazyLock<HashMap<String, String>> =
LazyLock::new(|| HashMap::from_iter(vec![("is_json".to_string(), "true".to_string())]));

fn union_fields() -> UnionFields {
static FIELDS: OnceLock<UnionFields> = OnceLock::new();
FIELDS
Expand All @@ -164,8 +168,14 @@ fn union_fields() -> UnionFields {
(TYPE_ID_INT, Arc::new(Field::new("int", DataType::Int64, false))),
(TYPE_ID_FLOAT, Arc::new(Field::new("float", DataType::Float64, false))),
(TYPE_ID_STR, Arc::new(Field::new("str", DataType::Utf8, false))),
(TYPE_ID_ARRAY, Arc::new(Field::new("array", DataType::Utf8, false))),
(TYPE_ID_OBJECT, Arc::new(Field::new("object", DataType::Utf8, false))),
(
TYPE_ID_ARRAY,
Arc::new(Field::new("array", DataType::Utf8, false).with_metadata(JSON_METADATA.clone())),
Copy link
Collaborator

@davidhewitt davidhewitt Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this is init inside of a once lock, I think there's not much point having the metadata be in a cached static as well. Otherwise, this is fine.

Copy link
Collaborator Author

@adriangb adriangb Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks I had missed that

),
(
TYPE_ID_OBJECT,
Arc::new(Field::new("object", DataType::Utf8, false).with_metadata(JSON_METADATA.clone())),
),
])
})
.clone()
Expand Down