Skip to content

Commit

Permalink
fix int96 to timestamp error
Browse files Browse the repository at this point in the history
  • Loading branch information
zhangli20 committed Dec 19, 2024
1 parent 9061f4b commit 66bb028
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 61 deletions.
68 changes: 34 additions & 34 deletions Cargo.lock
View file

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

38 changes: 19 additions & 19 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,27 +66,27 @@ serde_json = { version = "1.0.96" }

[patch.crates-io]
# datafusion: branch=v42-blaze
datafusion = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "cf0173e29"}
datafusion-common = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "cf0173e29"}
datafusion-expr = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "cf0173e29"}
datafusion-execution = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "cf0173e29"}
datafusion-optimizer = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "cf0173e29"}
datafusion-physical-expr = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "cf0173e29"}
orc-rust = { git = "https://github.com/blaze-init/datafusion-orc.git", rev = "84543ce"}
datafusion = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "8ffbb23b1"}
datafusion-common = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "8ffbb23b1"}
datafusion-expr = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "8ffbb23b1"}
datafusion-execution = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "8ffbb23b1"}
datafusion-optimizer = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "8ffbb23b1"}
datafusion-physical-expr = { git = "https://github.com/blaze-init/arrow-datafusion.git", rev = "8ffbb23b1"}
orc-rust = { git = "https://github.com/blaze-init/datafusion-orc.git", rev = "b6e4de6"}

# arrow: branch=v53-blaze
arrow = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-arith = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-array = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-buffer = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-cast = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-data = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-ord = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-row = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-schema = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-select = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow-string = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
parquet = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "818b5c24bf"}
arrow = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-arith = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-array = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-buffer = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-cast = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-data = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-ord = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-row = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-schema = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-select = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
arrow-string = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}
parquet = { git = "https://github.com/blaze-init/arrow-rs.git", rev = "2ff32f9f72"}

# serde_json: branch=v1.0.96-blaze
serde_json = { git = "https://github.com/blaze-init/json", branch = "v1.0.96-blaze" }
1 change: 0 additions & 1 deletion native-engine/datafusion-ext-commons/src/arrow/cast.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ pub fn cast_impl(
)
}
(&DataType::List(_), DataType::List(to_field)) => {
log::info!("XXX cast list to_field={to_field:?}");
let list = as_list_array(array);
let items = cast_impl(list.values(), to_field.data_type(), match_struct_fields)?;
make_array(
Expand Down
1 change: 0 additions & 1 deletion native-engine/datafusion-ext-plans/src/agg/collect.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ impl<C: AccCollectionColumn> Agg for AggGenericCollect<C> {
) -> Result<()> {
let accs = downcast_any!(accs, mut C).unwrap();
let merging_accs = downcast_any!(merging_accs, mut C).unwrap();

idx_for_zipped! {
((acc_idx, merging_acc_idx) in (acc_idx, merging_acc_idx)) => {
accs.merge_items(acc_idx, merging_accs, merging_acc_idx);
Expand Down
2 changes: 0 additions & 2 deletions native-engine/datafusion-ext-plans/src/parquet_exec.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ impl ParquetExec {
let (projected_schema, projected_statistics, _projected_output_ordering) =
base_config.project();

log::warn!("XXX base_config.file_schema: {:?}", file_schema);
log::warn!("XXX project_schema: {:?}", projected_schema);
Self {
fs_resource_id,
base_config,
Expand Down
4 changes: 0 additions & 4 deletions native-engine/datafusion-ext-plans/src/scan/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,8 @@ fn schema_adapter_cast_column(col: &ArrayRef, data_type: &DataType) -> Result<Ar
},
DataType::List(to_field) => match col.data_type() {
DataType::List(_from_field) => {
log::warn!("XXX col.dt: {:?}", col.data_type());
log::warn!("XXX to_field: {to_field:?}");
log::warn!("XXX from_field: {_from_field:?}");
let col = col.as_list::<i32>();
let from_inner = col.values();
log::warn!("XXX from_inner.dt: {:?}", from_inner.data_type());
let to_inner = schema_adapter_cast_column(from_inner, to_field.data_type())?;
Ok(Arc::new(ListArray::try_new(
to_field.clone(),
Expand Down

0 comments on commit 66bb028

Please sign in to comment.