From c48d8abea78cb99c7c28a71cc8cc997b7771a36a Mon Sep 17 00:00:00 2001 From: WindSoilder Date: Wed, 15 Feb 2023 10:15:53 +0800 Subject: [PATCH 1/2] dependency update: update base64 to 0.21 --- Cargo.toml | 2 +- src/io/parquet/read/schema/metadata.rs | 3 ++- src/io/parquet/write/schema.rs | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6199694e526..28484de1283 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ rand = { version = "0.8", optional = true } itertools = { version = "^0.10", optional = true } -base64 = { version = "0.13.0", optional = true } +base64 = { version = "0.21.0", optional = true } # to write to parquet as a stream futures = { version = "0.3", optional = true } diff --git a/src/io/parquet/read/schema/metadata.rs b/src/io/parquet/read/schema/metadata.rs index 2595083f44e..1df6e7b2af2 100644 --- a/src/io/parquet/read/schema/metadata.rs +++ b/src/io/parquet/read/schema/metadata.rs @@ -1,3 +1,4 @@ +use base64::{engine::general_purpose, Engine as _}; pub use parquet2::metadata::KeyValue; use crate::datatypes::{Metadata, Schema}; @@ -18,7 +19,7 @@ pub fn read_schema_from_metadata(metadata: &mut Metadata) -> Result Result { - let decoded = base64::decode(encoded_meta); + let decoded = general_purpose::STANDARD.decode(encoded_meta); match decoded { Ok(bytes) => { let slice = if bytes[0..4] == [255u8; 4] { diff --git a/src/io/parquet/write/schema.rs b/src/io/parquet/write/schema.rs index 248397d2414..569011db18e 100644 --- a/src/io/parquet/write/schema.rs +++ b/src/io/parquet/write/schema.rs @@ -8,6 +8,7 @@ use parquet2::{ Repetition, }, }; +use base64::{Engine as _, engine::general_purpose}; use crate::{ datatypes::{DataType, Field, Schema, TimeUnit}, @@ -30,7 +31,7 @@ pub fn schema_to_metadata_key(schema: &Schema) -> KeyValue { len_prefix_schema.extend_from_slice(&(schema_len as u32).to_le_bytes()); len_prefix_schema.extend_from_slice(&serialized_schema); - let encoded = base64::encode(&len_prefix_schema); + let encoded = general_purpose::STANDARD.encode(&len_prefix_schema); KeyValue { key: ARROW_SCHEMA_META_KEY.to_string(), From 64ba2fee91b4b0a9e5633da87560289a26e4d97c Mon Sep 17 00:00:00 2001 From: WindSoilder Date: Wed, 15 Feb 2023 17:09:22 +0800 Subject: [PATCH 2/2] fmt code --- src/io/parquet/write/schema.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/io/parquet/write/schema.rs b/src/io/parquet/write/schema.rs index 569011db18e..ee60e98ac13 100644 --- a/src/io/parquet/write/schema.rs +++ b/src/io/parquet/write/schema.rs @@ -1,3 +1,4 @@ +use base64::{engine::general_purpose, Engine as _}; use parquet2::{ metadata::KeyValue, schema::{ @@ -8,7 +9,6 @@ use parquet2::{ Repetition, }, }; -use base64::{Engine as _, engine::general_purpose}; use crate::{ datatypes::{DataType, Field, Schema, TimeUnit},