Skip to content
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.

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

Upgrade to thrift 0.17 and fix issues #3104

Merged
merged 6 commits into from Nov 14, 2022
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion arrow/src/row/dictionary.rs
Expand Up @@ -260,7 +260,7 @@ unsafe fn decode_fixed<T: FixedLengthEncoding + ToByteSlice>(
.add_buffer(buffer.into());

// SAFETY: Buffers correct length
unsafe { builder.build_unchecked() }
builder.build_unchecked()
}

/// Decodes a `PrimitiveArray` from dictionary values
Expand Down
2 changes: 1 addition & 1 deletion parquet/Cargo.toml
Expand Up @@ -41,7 +41,7 @@ arrow-ipc = { version = "27.0.0", path = "../arrow-ipc", default-features = fals

ahash = { version = "0.8", default-features = false, features = ["compile-time-rng"] }
bytes = { version = "1.1", default-features = false, features = ["std"] }
thrift = { version = "0.16", default-features = false }
thrift = { version = "0.17", default-features = false }
snap = { version = "1.0", default-features = false, optional = true }
brotli = { version = "3.3", default-features = false, features = ["std"], optional = true }
flate2 = { version = "1.0", default-features = false, features = ["rust_backend"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/arrow/async_reader.rs
Expand Up @@ -89,7 +89,7 @@ use bytes::{Buf, Bytes};
use futures::future::{BoxFuture, FutureExt};
use futures::ready;
use futures::stream::Stream;
use thrift::protocol::TCompactInputProtocol;
use thrift::protocol::{TCompactInputProtocol, TSerializable};

use tokio::io::{AsyncRead, AsyncReadExt, AsyncSeek, AsyncSeekExt};

Expand Down
2 changes: 1 addition & 1 deletion parquet/src/bloom_filter/mod.rs
Expand Up @@ -25,7 +25,7 @@ use crate::format::{
};
use std::hash::Hasher;
use std::io::{Read, Seek, SeekFrom};
use thrift::protocol::TCompactInputProtocol;
use thrift::protocol::{TCompactInputProtocol, TSerializable};
use twox_hash::XxHash64;

/// Salt as defined in the [spec](https://github.com/apache/parquet-format/blob/master/BloomFilter.md#technical-approach)
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/file/footer.rs
Expand Up @@ -18,7 +18,7 @@
use std::{io::Read, sync::Arc};

use crate::format::{ColumnOrder as TColumnOrder, FileMetaData as TFileMetaData};
use thrift::protocol::TCompactInputProtocol;
use thrift::protocol::{TCompactInputProtocol, TSerializable};

use crate::basic::ColumnOrder;

Expand Down
2 changes: 1 addition & 1 deletion parquet/src/file/page_index/index_reader.rs
Expand Up @@ -23,7 +23,7 @@ use crate::file::page_index::index::{BooleanIndex, ByteArrayIndex, Index, Native
use crate::file::reader::ChunkReader;
use crate::format::{ColumnIndex, OffsetIndex, PageLocation};
use std::io::{Cursor, Read};
use thrift::protocol::TCompactInputProtocol;
use thrift::protocol::{TCompactInputProtocol, TSerializable};

/// Read on row group's all columns indexes and change into [`Index`]
/// If not the format not available return an empty vector.
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/file/serialized_reader.rs
Expand Up @@ -24,7 +24,7 @@ use std::{convert::TryFrom, fs::File, io::Read, path::Path, sync::Arc};

use crate::format::{PageHeader, PageLocation, PageType};
use bytes::{Buf, Bytes};
use thrift::protocol::TCompactInputProtocol;
use thrift::protocol::{TCompactInputProtocol, TSerializable};

use crate::basic::{Encoding, Type};
use crate::column::page::{Page, PageMetadata, PageReader};
Expand Down
2 changes: 1 addition & 1 deletion parquet/src/file/writer.rs
Expand Up @@ -22,7 +22,7 @@ use std::{io::Write, sync::Arc};

use crate::format as parquet;
use crate::format::{ColumnIndex, OffsetIndex, RowGroup};
use thrift::protocol::{TCompactOutputProtocol, TOutputProtocol};
use thrift::protocol::{TCompactOutputProtocol, TOutputProtocol, TSerializable};

use crate::basic::PageType;
use crate::column::writer::{
Expand Down