Merge remote-tracking branch 'upstream/main' into fix-out-of-date-last-checkpoint

Author: Nick Lanham

acceptance/src/data.rs

@@ -15,7 +15,7 @@ use crate::{TestCaseInfo, TestResult};
 pub async fn read_golden(path: &Path, _version: Option<&str>) -> DeltaResult<RecordBatch> {
     let expected_root = path.join("expected").join("latest").join("table_content");
     let store = Arc::new(LocalFileSystem::new_with_prefix(&expected_root)?);
-    let files = store.list(None).try_collect::<Vec<_>>().await?;
+    let files: Vec<_> = store.list(None).try_collect().await?;
     let mut batches = vec![];
     let mut schema = None;
     for meta in files.into_iter() {

ffi/src/lib.rs

@@ -328,6 +328,7 @@ pub enum KernelError {
     InvalidStructDataError,
     InternalError,
     InvalidExpression,
+    InvalidLogPath,
 }
 
 impl From<Error> for KernelError {
@@ -374,6 +375,7 @@ impl From<Error> for KernelError {
                 backtrace: _,
             } => Self::from(*source),
             Error::InvalidExpressionEvaluation(_) => KernelError::InvalidExpression,
+            Error::InvalidLogPath(_) => KernelError::InvalidLogPath,
         }
     }
 }

kernel/src/error.rs

@@ -155,6 +155,10 @@ pub enum Error {
     /// Expressions did not parse or evaluate correctly
     #[error("Invalid expression evaluation: {0}")]
     InvalidExpressionEvaluation(String),
+
+    /// Unable to parse the name of a log path
+    #[error("Invalid log path: {0}")]
+    InvalidLogPath(String),
 }
 
 // Convenience constructors for Error types that take a String argument
@@ -203,6 +207,9 @@ impl Error {
     pub fn invalid_expression(msg: impl ToString) -> Self {
         Self::InvalidExpressionEvaluation(msg.to_string())
     }
+    pub(crate) fn invalid_log_path(msg: impl ToString) -> Self {
+        Self::InvalidLogPath(msg.to_string())
+    }
 
     pub fn internal_error(msg: impl ToString) -> Self {
         Self::InternalError(msg.to_string()).with_backtrace()

kernel/src/lib.rs

@@ -63,7 +63,12 @@ pub mod engine_data;
 pub mod error;
 pub mod expressions;
 pub mod features;
+
+#[cfg(feature = "developer-visibility")]
+pub mod path;
+#[cfg(not(feature = "developer-visibility"))]
 pub(crate) mod path;
+
 pub mod scan;
 pub mod schema;
 pub mod snapshot;