chore: handle error returned from resolve_data_source()

src/common/exception/src/exception_code.rs

@@ -307,6 +307,7 @@ build_exceptions! {
     UnknownShareEndpointId(2716),
     UnknownShareTable(2717),
     CannotShareDatabaseCreatedFromShare(2718),
+    ShareStorageError(2719),
 
     // Index error codes.
     CreateIndexWithDropTime(2720),

src/query/sharing/src/share_endpoint.rs

@@ -140,10 +140,24 @@ impl ShareEndpointManager {
         let resp = self.client.send(req).await;
         match resp {
             Ok(resp) => {
+                if !resp.status().is_success() {
+                    return Err(ErrorCode::ShareStorageError(format!(
+                        "share {:?} storage error: HTTP status {:?}",
+                        share_name,
+                        match resp.status().canonical_reason() {
+                            Some(reason) => reason.to_string(),
+                            None => resp.status().to_string(),
+                        }
+                    )));
+                }
                 let bs = resp.into_body().bytes().await?;
-                let table_info_map: TableInfoMap = serde_json::from_slice(&bs)?;
-
-                Ok(table_info_map)
+                match serde_json::from_slice(&bs) {
+                    Ok(table_info_map) => Ok(table_info_map),
+                    Err(e) => Err(ErrorCode::ShareStorageError(format!(
+                        "share {:?} storage error: deser json file error: {:?}",
+                        share_name, e
+                    ))),
+                }
             }
             Err(err) => Err(err.into()),
         }

src/query/sql/src/planner/binder/table.rs

@@ -241,7 +241,7 @@ impl Binder {
             .await
         {
             Ok(table) => table,
-            Err(_) => {
+            Err(e) => {
                 let mut parent = bind_context.parent.as_mut();
                 loop {
                     if parent.is_none() {
@@ -260,10 +260,13 @@ impl Binder {
                     }
                     parent = bind_context.parent.as_mut();
                 }
-                return Err(ErrorCode::UnknownTable(format!(
-                    "Unknown table `{database}`.`{table_name}` in catalog '{catalog}'"
-                ))
-                .set_span(*span));
+                if e.code() == 1025 {
+                    return Err(ErrorCode::UnknownTable(format!(
+                        "Unknown table `{database}`.`{table_name}` in catalog '{catalog}'"
+                    ))
+                    .set_span(*span));
+                }
+                return Err(e);
             }
         };
 

tests/suites/3_stateful_sharing/01_sharing/01_0000_basic_sharing.result

@@ -56,18 +56,7 @@ drop shared database and query data from share
 4
 5
 6
-ERROR 1105 (HY000) at line 1: UnknownTable. Code: 1025, Text = error: 
-  --> SQL:1:15
-  |
-1 | SELECT * FROM shared_db.t2
-  |               ^^^^^^^^^^^^ Unknown table `shared_db`.`t2` in catalog 'default'
+ERROR 1105 (HY000): ShareStorageError. Code: 2719, Text = share "test_share" storage error: HTTP status "Bad Request".
+ERROR 1105 (HY000): ShareStorageError. Code: 2719, Text = share "test_share" storage error: HTTP status "Bad Request".
 
-.
-ERROR 1105 (HY000) at line 1: UnknownTable. Code: 1025, Text = error: 
-  --> SQL:1:15
-  |
-1 | SELECT * FROM shared_db.t2
-  |               ^^^^^^^^^^^^ Unknown table `shared_db`.`t2` in catalog 'default'
-
-.
 all is good