Skip to content

Commit

Permalink
bump arrow to 53 and refactor few tests along it's cyclic dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
varshith257 committed Oct 12, 2024
1 parent 4f70b16 commit 844f684
Show file tree
Hide file tree
Showing 12 changed files with 39 additions and 35 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
};
Expand Down
11 changes: 9 additions & 2 deletions crates/proof-of-sql/src/base/arrow/arrow_query_result.rs
Original file line number Diff line number Diff line change
@@ -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<S: Scalar> QueryData<S> {
#[cfg(all(test, feature = "arrow"))]
#[must_use]
pub fn into_record_batch(self) -> RecordBatch {
self.try_into().unwrap()
}
}

#[cfg(feature = "arrow")]
impl<S: Scalar> TryFrom<QueryData<S>> for RecordBatch {
type Error = ArrowError;
Expand Down
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
6 changes: 6 additions & 0 deletions crates/proof-of-sql/src/base/arrow/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Original file line number Diff line number Diff line change
@@ -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::{
Expand Down
5 changes: 0 additions & 5 deletions crates/proof-of-sql/src/base/database/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use crate::{
},
sql::proof::SumcheckSubpolynomialType,
};

use curve25519_dalek::RistrettoPoint;
use num_traits::{One, Zero};

Expand Down
2 changes: 0 additions & 2 deletions crates/proof-of-sql/src/sql/proof/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 0 additions & 9 deletions crates/proof-of-sql/src/sql/proof/query_result.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ use crate::base::{
proof::ProofError,
scalar::Scalar,
};
use arrow::record_batch::RecordBatch;
use snafu::Snafu;

/// Verifiable query errors
Expand Down Expand Up @@ -53,13 +52,5 @@ pub struct QueryData<S: Scalar> {
pub verification_hash: [u8; 32],
}

impl<S: Scalar> QueryData<S> {
#[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<S> = Result<QueryData<S>, QueryError>;

0 comments on commit 844f684

Please sign in to comment.