Rebase Shopify patches onto upstream libsql 0.10.0

bottomless-cli/src/replicator_extras.rs

@@ -382,9 +382,8 @@ impl Replicator {
             let frame = tokio::fs::File::open(&obj).await?;
             let frame_buf_reader = BufReader::new(frame);
 
-            let mut frameno = first_frame_no;
             let mut reader = bottomless::read::BatchReader::new(
-                frameno,
+                first_frame_no,
                 frame_buf_reader,
                 page_size as usize,
                 compression_kind,
@@ -411,7 +410,6 @@ impl Replicator {
                     );
                     pending_pages.flush(db).await?;
                 }
-                frameno += 1;
                 last_received_frame_no += 1;
             }
             db.flush().await?;

libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c

@@ -214930,7 +214930,7 @@ static int vectorParseSqliteText(
       continue;
     }
     if( this != ',' && this != ']' ){
-      if( iBuf > MAX_FLOAT_CHAR_SZ ){
+      if( iBuf >= MAX_FLOAT_CHAR_SZ ){
         *pzErrMsg = sqlite3_mprintf("vector: float string length exceeded %d characters: '%s'", MAX_FLOAT_CHAR_SZ, valueBuf);
         goto error;
       }

libsql-ffi/bundled/src/sqlite3.c

@@ -214930,7 +214930,7 @@ static int vectorParseSqliteText(
       continue;
     }
     if( this != ',' && this != ']' ){
-      if( iBuf > MAX_FLOAT_CHAR_SZ ){
+      if( iBuf >= MAX_FLOAT_CHAR_SZ ){
         *pzErrMsg = sqlite3_mprintf("vector: float string length exceeded %d characters: '%s'", MAX_FLOAT_CHAR_SZ, valueBuf);
         goto error;
       }

libsql-server/src/connection/config.rs

@@ -65,9 +65,11 @@ impl Default for DatabaseConfig {
     }
 }
 
-impl From<&metadata::DatabaseConfig> for DatabaseConfig {
-    fn from(value: &metadata::DatabaseConfig) -> Self {
-        DatabaseConfig {
+impl TryFrom<&metadata::DatabaseConfig> for DatabaseConfig {
+    type Error = crate::Error;
+
+    fn try_from(value: &metadata::DatabaseConfig) -> Result<Self, Self::Error> {
+        Ok(DatabaseConfig {
             block_reads: value.block_reads,
             block_writes: value.block_writes,
             block_reason: value.block_reason.clone(),
@@ -79,16 +81,16 @@ impl From<&metadata::DatabaseConfig> for DatabaseConfig {
             allow_attach: value.allow_attach,
             max_row_size: value.max_row_size.unwrap_or_else(default_max_row_size),
             is_shared_schema: value.shared_schema.unwrap_or(false),
-            // namespace name is coming from primary, we assume it's valid
             shared_schema_name: value
                 .shared_schema_name
-                .clone()
-                .map(NamespaceName::new_unchecked),
+                .as_ref()
+                .map(|name| NamespaceName::from_string(name.clone()))
+                .transpose()?,
             durability_mode: match value.durability_mode {
                 None => DurabilityMode::default(),
                 Some(m) => DurabilityMode::from(metadata::DurabilityMode::try_from(m)),
             },
-        }
+        })
     }
 }
 
@@ -112,6 +114,22 @@ impl From<&DatabaseConfig> for metadata::DatabaseConfig {
     }
 }
 
+#[cfg(test)]
+mod namespace_tests {
+    use super::*;
+
+    #[test]
+    fn shared_schema_names_are_checked_in_replication_and_json() {
+        let wire = metadata::DatabaseConfig {
+            shared_schema_name: Some("../outside".into()),
+            ..metadata::DatabaseConfig::from(&DatabaseConfig::default())
+        };
+        assert!(DatabaseConfig::try_from(&wire).is_err());
+        let json = r#"{"block_reads":false,"block_writes":false,"block_reason":null,"max_db_pages":100,"heartbeat_url":null,"bottomless_db_id":null,"shared_schema_name":"../outside"}"#;
+        assert!(serde_json::from_str::<DatabaseConfig>(json).is_err());
+    }
+}
+
 /// Durability mode specifies the `PRAGMA SYNCHRONOUS` setting for the connection
 #[derive(PartialEq, Clone, Copy, Debug, Deserialize, Serialize, Default)]
 #[serde(rename_all = "lowercase")]

libsql-server/src/error.rs

@@ -102,6 +102,8 @@ pub enum Error {
     UrlParseError(#[from] url::ParseError),
     #[error("Namespace store has shutdown")]
     NamespaceStoreShutdown,
+    #[error("Namespace `{0}` is temporarily unavailable")]
+    NamespaceUnavailable(String),
     #[error("Unable to update metastore: {0}")]
     MetaStoreUpdateFailure(Box<dyn std::error::Error + Send + Sync>),
     // This is for errors returned by moka
@@ -131,9 +133,10 @@ pub enum Error {
 }
 
 impl AsRef<Self> for Error {
+    /// The error behind any number of `Ref` wrappers, like `into_response`.
     fn as_ref(&self) -> &Self {
         match self {
-            Self::Ref(this) => this.as_ref(),
+            Self::Ref(this) => <Error as AsRef<Error>>::as_ref(this),
             _ => self,
         }
     }
@@ -212,6 +215,7 @@ impl IntoResponse for &Error {
             PrimaryStreamInterupted => self.format_err(StatusCode::INTERNAL_SERVER_ERROR),
             UrlParseError(_) => self.format_err(StatusCode::BAD_REQUEST),
             NamespaceStoreShutdown => self.format_err(StatusCode::SERVICE_UNAVAILABLE),
+            NamespaceUnavailable(_) => self.format_err(StatusCode::SERVICE_UNAVAILABLE),
             MetaStoreUpdateFailure(_) => self.format_err(StatusCode::INTERNAL_SERVER_ERROR),
             Ref(this) => this.as_ref().into_response(),
             ProstDecode(_) => self.format_err(StatusCode::INTERNAL_SERVER_ERROR),