Fix/session c exception report (#17571)

* fix cpp session error details for retried exceptions

Preserve and unwrap original retry exceptions so client callers no longer see generic std::exception messages, and avoid exception slicing in insert retry handling.

* add it for session c error

* cpp code format

* fix cpp exception rethrow to preserve detailed errors

Use rethrow semantics that keep original exception type/message so relational query failures return server-side details instead of generic unknown exceptions.

Author: hongzhi-gao

iotdb-client/client-cpp/src/main/Common.cpp

@@ -19,6 +19,31 @@
 
 #include "Common.h"
 #include <boost/date_time/gregorian/gregorian.hpp>
+#include <typeinfo>
+
+std::string extractExceptionMessage(const std::exception& exception) {
+  const char* what = exception.what();
+  if (what != nullptr) {
+    std::string message(what);
+    if (!message.empty() && message != "std::exception") {
+      return message;
+    }
+  }
+  return std::string("Unhandled exception type: ") + typeid(exception).name();
+}
+
+std::string extractExceptionMessage(const std::exception_ptr& exceptionPtr) {
+  if (exceptionPtr == nullptr) {
+    return "Unknown exception";
+  }
+  try {
+    std::rethrow_exception(exceptionPtr);
+  } catch (const std::exception& exception) {
+    return extractExceptionMessage(exception);
+  } catch (...) {
+    return "Unknown non-std exception";
+  }
+}
 
 int32_t parseDateExpressionToInt(const boost::gregorian::date& date) {
   if (date.is_not_a_date()) {

iotdb-client/client-cpp/src/main/Common.h

@@ -296,6 +296,9 @@ class IoTDBException : public std::exception {
   std::string message;
 };
 
+std::string extractExceptionMessage(const std::exception& exception);
+std::string extractExceptionMessage(const std::exception_ptr& exceptionPtr);
+
 class DateTimeParseException : public IoTDBException {
 private:
   std::string parsedString;

iotdb-client/client-cpp/src/main/Session.cpp

@@ -986,7 +986,7 @@ void Session::insertRecord(const string& deviceId, int64_t time, const vector<st
       } catch (RedirectException& e) {
       }
     } else {
-      throw e;
+      throw;
     }
   }
 }
@@ -1014,7 +1014,7 @@ void Session::insertRecord(const string& deviceId, int64_t time, const vector<st
       } catch (RedirectException& e) {
       }
     } else {
-      throw e;
+      throw;
     }
   }
 }
@@ -1040,7 +1040,7 @@ void Session::insertAlignedRecord(const string& deviceId, int64_t time,
       } catch (RedirectException& e) {
       }
     } else {
-      throw e;
+      throw;
     }
   }
 }
@@ -1069,7 +1069,7 @@ void Session::insertAlignedRecord(const string& deviceId, int64_t time,
       } catch (RedirectException& e) {
       }
     } else {
-      throw e;
+      throw;
     }
   }
 }
@@ -1237,7 +1237,7 @@ void Session::insertRecordsOfOneDevice(const string& deviceId, vector<int64_t>&
       } catch (RedirectException& e) {
       }
     } else {
-      throw e;
+      throw;
     }
   }
 }
@@ -1291,7 +1291,7 @@ void Session::insertAlignedRecordsOfOneDevice(const string& deviceId, vector<int
       } catch (RedirectException& e) {
       }
     } else {
-      throw e;
+      throw;
     }
   }
 }
@@ -1343,7 +1343,7 @@ void Session::insertTablet(TSInsertTabletReq request) {
       } catch (RedirectException& e) {
       }
     } else {
-      throw e;
+      throw;
     }
   }
 }
@@ -2019,7 +2019,7 @@ std::unique_ptr<SessionDataSet> Session::executeQueryStatementMayRedirect(const
     }
   } catch (exception& e) {
     log_error("Exception while executing query statement: %s", e.what());
-    throw e;
+    throw;
   }
 }
 

iotdb-client/client-cpp/src/main/Session.h

@@ -1066,19 +1066,19 @@ void Session::insertOnce(std::unordered_map<std::shared_ptr<SessionConnection>,
   auto req = insertGroup.begin()->second;
   try {
     insertConsumer(connection, req);
-  } catch (RedirectException e) {
+  } catch (const RedirectException& e) {
     for (const auto& deviceEndPoint : e.deviceEndPointMap) {
       handleRedirection(deviceEndPoint.first, deviceEndPoint.second);
     }
-  } catch (IoTDBConnectionException e) {
+  } catch (const IoTDBConnectionException& e) {
     if (endPointToSessionConnection.size() > 1) {
       removeBrokenSessionConnection(connection);
       try {
         insertConsumer(defaultSessionConnection_, req);
-      } catch (RedirectException e) {
+      } catch (const RedirectException& e) {
       }
     } else {
-      throw e;
+      throw;
     }
   }
 }

iotdb-client/client-cpp/src/main/SessionConnection.h

@@ -246,11 +246,7 @@ void SessionConnection::callWithRetryAndVerifyWithRedirection(std::function<T()>
   }
 
   if (result.getException()) {
-    try {
-      std::rethrow_exception(result.getException());
-    } catch (const std::exception& e) {
-      throw IoTDBConnectionException(e.what());
-    }
+    throw IoTDBConnectionException(extractExceptionMessage(result.getException()));
   }
 }
 
@@ -265,11 +261,7 @@ void SessionConnection::callWithRetryAndVerifyWithRedirectionForMultipleDevices(
     RpcUtils::verifySuccess(status);
   }
   if (result.getException()) {
-    try {
-      std::rethrow_exception(result.getException());
-    } catch (const std::exception& e) {
-      throw IoTDBConnectionException(e.what());
-    }
+    throw IoTDBConnectionException(extractExceptionMessage(result.getException()));
   }
   result.exception = nullptr;
 }
@@ -280,11 +272,7 @@ SessionConnection::callWithRetryAndVerify(std::function<T()> rpc) {
   auto result = callWithRetry<T>(rpc);
   RpcUtils::verifySuccess(result.getResult());
   if (result.getException()) {
-    try {
-      std::rethrow_exception(result.getException());
-    } catch (const std::exception& e) {
-      throw IoTDBConnectionException(e.what());
-    }
+    throw IoTDBConnectionException(extractExceptionMessage(result.getException()));
   }
   return result;
 }

iotdb-client/client-cpp/src/test/cpp/sessionRelationalIT.cpp

@@ -17,9 +17,9 @@
  * under the License.
  */
 
-#include "catch.hpp"
 #include "TableSession.h"
 #include "TableSessionBuilder.h"
+#include "catch.hpp"
 #include <math.h>
 
 using namespace std;
@@ -140,6 +140,27 @@ TEST_CASE("Test insertRelationalTablet", "[testInsertRelationalTablet]") {
   REQUIRE(cnt == 15);
 }
 
+TEST_CASE("Query non-existent table returns detailed error", "[queryMissingTableError]") {
+  CaseReporter cr("queryMissingTableError");
+  session->executeNonQueryStatement("CREATE DATABASE IF NOT EXISTS db1");
+  session->executeNonQueryStatement("USE db1");
+  session->executeNonQueryStatement("DROP TABLE IF EXISTS table_not_exists_for_query");
+
+  bool caught = false;
+  try {
+    session->executeQueryStatement("SELECT * FROM table_not_exists_for_query");
+  } catch (const std::exception& e) {
+    caught = true;
+    const std::string errorMessage = e.what();
+    INFO("caught error message: " << errorMessage);
+    const bool hasDetailedErrorMessage =
+        errorMessage.size() > 20 && errorMessage.find("std::exception") == std::string::npos;
+    REQUIRE(errorMessage != "std::exception");
+    REQUIRE(hasDetailedErrorMessage);
+  }
+  REQUIRE(caught);
+}
+
 TEST_CASE("Test RelationalTabletTsblockRead", "[testRelationalTabletTsblockRead]") {
   CaseReporter cr("testRelationalTabletTsblockRead");
   session->executeNonQueryStatement("CREATE DATABASE IF NOT EXISTS db1");