diff --git a/Cargo.toml b/Cargo.toml index cb9baf16b..9cfbf9425 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,8 @@ ark-poly = { version = "0.4.0" } ark-serialize = { version = "0.4.0" } ark-std = { version = "0.4.0", default-features = false } arrayvec = { version = "0.7", default-features = false } -arrow = { version = "51.0" } -arrow-csv = { version = "51.0" } +arrow = { version = "53.0.0" } +arrow-csv = { version = "53.0.0" } bit-iter = { version = "1.1.1" } bigdecimal = { version = "0.4.5", default-features = false, features = ["serde"] } blake3 = { version = "1.3.3", default-features = false } diff --git a/crates/proof-of-sql/examples/posql_db/record_batch_accessor.rs b/crates/proof-of-sql/examples/posql_db/record_batch_accessor.rs index 78158e34f..08e25f4fe 100644 --- a/crates/proof-of-sql/examples/posql_db/record_batch_accessor.rs +++ b/crates/proof-of-sql/examples/posql_db/record_batch_accessor.rs @@ -1,10 +1,10 @@ use arrow::record_batch::RecordBatch; use bumpalo::Bump; use indexmap::IndexMap; -use proof_of_sql::base::arrow::arrow_array_to_column_conversion::ArrayRefExt; use proof_of_sql::base::{ - database::{Column, ColumnRef, ColumnType, DataAccessor, MetadataAccessor, SchemaAccessor, - TableRef, + arrow::arrow_array_to_column_conversion::ArrayRefExt, + database::{ + Column, ColumnRef, ColumnType, DataAccessor, MetadataAccessor, SchemaAccessor, TableRef, }, scalar::Scalar, }; diff --git a/crates/proof-of-sql/src/base/arrow/arrow_query_result.rs b/crates/proof-of-sql/src/base/arrow/arrow_query_result.rs index d010f0af4..b18a5d04e 100644 --- a/crates/proof-of-sql/src/base/arrow/arrow_query_result.rs +++ b/crates/proof-of-sql/src/base/arrow/arrow_query_result.rs @@ -1,7 +1,14 @@ -use crate::base::scalar::Scalar; -use crate::sql::proof::QueryData; +use crate::{base::scalar::Scalar, sql::proof::QueryData}; use arrow::{error::ArrowError, record_batch::RecordBatch}; +impl QueryData { + #[cfg(all(test, feature = "arrow"))] + #[must_use] + pub fn into_record_batch(self) -> RecordBatch { + self.try_into().unwrap() + } +} + #[cfg(feature = "arrow")] impl TryFrom> for RecordBatch { type Error = ArrowError; diff --git a/crates/proof-of-sql/src/base/arrow/column_arrow_conversions.rs b/crates/proof-of-sql/src/base/arrow/column_arrow_conversions.rs index d9b7e990f..09446dd40 100644 --- a/crates/proof-of-sql/src/base/arrow/column_arrow_conversions.rs +++ b/crates/proof-of-sql/src/base/arrow/column_arrow_conversions.rs @@ -1,5 +1,7 @@ -use crate::base::database::{ColumnField, ColumnType}; -use crate::base::math::decimal::Precision; +use crate::base::{ + database::{ColumnField, ColumnType}, + math::decimal::Precision, +}; use alloc::sync::Arc; use arrow::datatypes::{DataType, Field, TimeUnit as ArrowTimeUnit}; use proof_of_sql_parser::posql_time::{PoSQLTimeUnit, PoSQLTimeZone}; diff --git a/crates/proof-of-sql/src/base/arrow/final_round_builder_arrow_tests.rs b/crates/proof-of-sql/src/base/arrow/final_round_builder_arrow_tests.rs index 6d1dea758..463f1ec63 100644 --- a/crates/proof-of-sql/src/base/arrow/final_round_builder_arrow_tests.rs +++ b/crates/proof-of-sql/src/base/arrow/final_round_builder_arrow_tests.rs @@ -1,6 +1,10 @@ -use crate::base::database::{Column, ColumnField, ColumnType}; -use crate::base::scalar::Curve25519Scalar; -use crate::sql::proof::ProvableQueryResult; +use crate::{ + base::{ + database::{Column, ColumnField, ColumnType}, + scalar::Curve25519Scalar, + }, + sql::proof::ProvableQueryResult, +}; use alloc::sync::Arc; use arrow::{ array::Int64Array, diff --git a/crates/proof-of-sql/src/base/arrow/mod.rs b/crates/proof-of-sql/src/base/arrow/mod.rs index 98822061e..bedc81bd8 100644 --- a/crates/proof-of-sql/src/base/arrow/mod.rs +++ b/crates/proof-of-sql/src/base/arrow/mod.rs @@ -38,3 +38,9 @@ pub mod arrow_query_result; #[cfg(all(test, feature = "arrow"))] mod final_round_builder_arrow_tests; + +#[cfg(all(test, feature = "arrow"))] +mod provable_query_result_test; + +#[cfg(all(test, feature = "arrow", feature = "test"))] +mod test_accessor_utility; diff --git a/crates/proof-of-sql/src/sql/proof/provable_query_result_test.rs b/crates/proof-of-sql/src/base/arrow/provable_query_result_test.rs similarity index 98% rename from crates/proof-of-sql/src/sql/proof/provable_query_result_test.rs rename to crates/proof-of-sql/src/base/arrow/provable_query_result_test.rs index 3540de040..9fe11ddee 100644 --- a/crates/proof-of-sql/src/sql/proof/provable_query_result_test.rs +++ b/crates/proof-of-sql/src/base/arrow/provable_query_result_test.rs @@ -1,9 +1,11 @@ -use super::{ProvableQueryResult, QueryError}; -use crate::base::{ - database::{Column, ColumnField, ColumnType}, - math::decimal::Precision, - polynomial::compute_evaluation_vector, - scalar::{Curve25519Scalar, Scalar}, +use crate::{ + base::{ + database::{Column, ColumnField, ColumnType}, + math::decimal::Precision, + polynomial::compute_evaluation_vector, + scalar::{Curve25519Scalar, Scalar}, + }, + sql::proof::{ProvableQueryResult, QueryError}, }; use alloc::sync::Arc; use arrow::{ diff --git a/crates/proof-of-sql/src/base/database/test_accessor_utility.rs b/crates/proof-of-sql/src/base/arrow/test_accessor_utility.rs similarity index 100% rename from crates/proof-of-sql/src/base/database/test_accessor_utility.rs rename to crates/proof-of-sql/src/base/arrow/test_accessor_utility.rs diff --git a/crates/proof-of-sql/src/base/database/mod.rs b/crates/proof-of-sql/src/base/database/mod.rs index 32a6571e1..efc0c8511 100644 --- a/crates/proof-of-sql/src/base/database/mod.rs +++ b/crates/proof-of-sql/src/base/database/mod.rs @@ -28,11 +28,6 @@ pub use crate::base::arrow::{ }; pub use table_ref::TableRef; -#[cfg(all(test, feature = "arrow", feature = "test"))] -mod test_accessor_utility; -#[cfg(all(test, feature = "arrow", feature = "test"))] -pub use test_accessor_utility::{make_random_test_accessor_data, RandomTestAccessorDescriptor}; - mod owned_column; pub(crate) use owned_column::compare_indexes_by_owned_columns_with_direction; pub use owned_column::OwnedColumn; diff --git a/crates/proof-of-sql/src/sql/proof/final_round_builder_test.rs b/crates/proof-of-sql/src/sql/proof/final_round_builder_test.rs index 9c2c5230a..28061c0af 100644 --- a/crates/proof-of-sql/src/sql/proof/final_round_builder_test.rs +++ b/crates/proof-of-sql/src/sql/proof/final_round_builder_test.rs @@ -7,7 +7,6 @@ use crate::{ }, sql::proof::SumcheckSubpolynomialType, }; - use curve25519_dalek::RistrettoPoint; use num_traits::{One, Zero}; diff --git a/crates/proof-of-sql/src/sql/proof/mod.rs b/crates/proof-of-sql/src/sql/proof/mod.rs index 48139dc22..cae6adf4b 100644 --- a/crates/proof-of-sql/src/sql/proof/mod.rs +++ b/crates/proof-of-sql/src/sql/proof/mod.rs @@ -25,8 +25,6 @@ pub(crate) use provable_result_column::ProvableResultColumn; mod provable_query_result; pub use provable_query_result::ProvableQueryResult; -#[cfg(all(test, feature = "arrow"))] -mod provable_query_result_test; mod sumcheck_mle_evaluations; pub(crate) use sumcheck_mle_evaluations::SumcheckMleEvaluations; diff --git a/crates/proof-of-sql/src/sql/proof/query_result.rs b/crates/proof-of-sql/src/sql/proof/query_result.rs index 3d51c85fb..647e4ad0b 100644 --- a/crates/proof-of-sql/src/sql/proof/query_result.rs +++ b/crates/proof-of-sql/src/sql/proof/query_result.rs @@ -3,7 +3,6 @@ use crate::base::{ proof::ProofError, scalar::Scalar, }; -use arrow::record_batch::RecordBatch; use snafu::Snafu; /// Verifiable query errors @@ -53,13 +52,5 @@ pub struct QueryData { pub verification_hash: [u8; 32], } -impl QueryData { - #[cfg(all(test, feature = "arrow"))] - #[must_use] - pub fn into_record_batch(self) -> RecordBatch { - self.try_into().unwrap() - } -} - /// The result of a query -- either an error or a table. pub type QueryResult = Result, QueryError>;