Skip to content

Commit 24caf3c

Browse files
fix ci
1 parent fff55ac commit 24caf3c

4 files changed

Lines changed: 2 additions & 59 deletions

File tree

format/orc_proto.proto

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -100,24 +100,12 @@ message ColumnStatistics {
100100
optional CollectionStatistics collectionStatistics = 12;
101101
}
102102

103-
message RowIndexEntry {
104-
repeated uint64 positions = 1 [packed=true];
105-
optional ColumnStatistics statistics = 2;
106-
}
107-
108-
message RowIndex {
109-
repeated RowIndexEntry entry = 1;
110-
}
111-
112103
message BloomFilter {
113104
optional uint32 numHashFunctions = 1;
114105
repeated fixed64 bitset = 2;
115106
optional bytes utf8bitset = 3;
116107
}
117108

118-
message BloomFilterIndex {
119-
repeated BloomFilter bloomFilter = 1;
120-
}
121109

122110
message Stream {
123111
// if you add new index stream kinds, you need to make sure to update
@@ -270,23 +258,12 @@ message Metadata {
270258
repeated StripeStatistics stripeStats = 1;
271259
}
272260

273-
// In ORC v2 (and for encrypted columns in v1), each column has
274-
// their column statistics written separately.
275-
message ColumnarStripeStatistics {
276-
// one value for each stripe in the file
277-
repeated ColumnStatistics colStats = 1;
278-
}
279-
280261
enum EncryptionAlgorithm {
281262
UNKNOWN_ENCRYPTION = 0; // used for detecting future algorithms
282263
AES_CTR_128 = 1;
283264
AES_CTR_256 = 2;
284265
}
285266

286-
message FileStatistics {
287-
repeated ColumnStatistics column = 1;
288-
}
289-
290267
// How was the data masked? This isn't necessary for reading the file, but
291268
// is documentation about how the file was written.
292269
message DataMask {

src/arrow_writer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ mod tests {
350350
)
351351
.unwrap();
352352

353-
let rows = roundtrip(&[batch.clone()]);
353+
let rows = roundtrip(std::slice::from_ref(&batch));
354354
assert_eq!(batch, rows[0]);
355355
}
356356

src/encoding/integer/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ use crate::{
3939

4040
use super::PrimitiveValueDecoder;
4141

42+
#[allow(unused)]
4243
pub mod rle_v1;
4344
pub mod rle_v2;
4445
mod util;

src/proto.rs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,6 @@ pub struct ColumnStatistics {
145145
}
146146
#[allow(clippy::derive_partial_eq_without_eq)]
147147
#[derive(Clone, PartialEq, ::prost::Message)]
148-
pub struct RowIndexEntry {
149-
#[prost(uint64, repeated, tag = "1")]
150-
pub positions: ::prost::alloc::vec::Vec<u64>,
151-
#[prost(message, optional, tag = "2")]
152-
pub statistics: ::core::option::Option<ColumnStatistics>,
153-
}
154-
#[allow(clippy::derive_partial_eq_without_eq)]
155-
#[derive(Clone, PartialEq, ::prost::Message)]
156-
pub struct RowIndex {
157-
#[prost(message, repeated, tag = "1")]
158-
pub entry: ::prost::alloc::vec::Vec<RowIndexEntry>,
159-
}
160-
#[allow(clippy::derive_partial_eq_without_eq)]
161-
#[derive(Clone, PartialEq, ::prost::Message)]
162148
pub struct BloomFilter {
163149
#[prost(uint32, optional, tag = "1")]
164150
pub num_hash_functions: ::core::option::Option<u32>,
@@ -169,12 +155,6 @@ pub struct BloomFilter {
169155
}
170156
#[allow(clippy::derive_partial_eq_without_eq)]
171157
#[derive(Clone, PartialEq, ::prost::Message)]
172-
pub struct BloomFilterIndex {
173-
#[prost(message, repeated, tag = "1")]
174-
pub bloom_filter: ::prost::alloc::vec::Vec<BloomFilter>,
175-
}
176-
#[allow(clippy::derive_partial_eq_without_eq)]
177-
#[derive(Clone, PartialEq, ::prost::Message)]
178158
pub struct Stream {
179159
#[prost(enumeration = "stream::Kind", optional, tag = "1")]
180160
pub kind: ::core::option::Option<i32>,
@@ -499,21 +479,6 @@ pub struct Metadata {
499479
#[prost(message, repeated, tag = "1")]
500480
pub stripe_stats: ::prost::alloc::vec::Vec<StripeStatistics>,
501481
}
502-
/// In ORC v2 (and for encrypted columns in v1), each column has
503-
/// their column statistics written separately.
504-
#[allow(clippy::derive_partial_eq_without_eq)]
505-
#[derive(Clone, PartialEq, ::prost::Message)]
506-
pub struct ColumnarStripeStatistics {
507-
/// one value for each stripe in the file
508-
#[prost(message, repeated, tag = "1")]
509-
pub col_stats: ::prost::alloc::vec::Vec<ColumnStatistics>,
510-
}
511-
#[allow(clippy::derive_partial_eq_without_eq)]
512-
#[derive(Clone, PartialEq, ::prost::Message)]
513-
pub struct FileStatistics {
514-
#[prost(message, repeated, tag = "1")]
515-
pub column: ::prost::alloc::vec::Vec<ColumnStatistics>,
516-
}
517482
/// How was the data masked? This isn't necessary for reading the file, but
518483
/// is documentation about how the file was written.
519484
#[allow(clippy::derive_partial_eq_without_eq)]

0 commit comments

Comments
 (0)