Convert ParquetStatusException with OutOfMemory code to OutOfMemory e…

…xception
G-Research · Jul 2, 2024 · 4837cd1 · 4837cd1
1 parent 7a83fdc
commit 4837cd1
Showing 1 changed file with 26 additions and 19 deletions.
diff --git a/cpp/ExceptionInfo.h b/cpp/ExceptionInfo.h
@@ -3,6 +3,8 @@
 #include <exception>
 #include <string>
 
+#include <parquet/exception.h>
+
 struct ExceptionInfo final
 {
 	ExceptionInfo(const char* type, const char* message);
@@ -14,23 +16,28 @@ struct ExceptionInfo final
 };
 
 #define SINGLE_ARG(...) __VA_ARGS__
-#define TRYCATCH(expression)												\
-	try																		\
-	{																		\
-		expression															\
-		return nullptr;														\
-	}																		\
-	catch (const std::bad_alloc& exception)									\
-	{																		\
-		return new ExceptionInfo("OutOfMemoryException", exception.what()); \
-	}																		\
-	catch (const std::exception& exception)									\
-	{																		\
-		return new ExceptionInfo(exception);								\
-	}																		\
-	catch (...)																\
-	{																		\
-		return new ExceptionInfo("unkown", "uncaught exception");			\
-	}																		\
-
+#define TRYCATCH(expression)                                             \
+	try                                                                    \
+	{                                                                      \
+		expression                                                           \
+		return nullptr;                                                      \
+	}                                                                      \
+	catch (const std::bad_alloc& exception)                                \
+	{                                                                      \
+		return new ExceptionInfo("OutOfMemoryException", exception.what());  \
+	}                                                                      \
+	catch (const parquet::ParquetStatusException& exception)               \
+	{                                                                      \
+		return exception.status().IsOutOfMemory()                            \
+			? new ExceptionInfo("OutOfMemoryException", exception.what())      \
+			: new ExceptionInfo(exception);                                    \
+	}                                                                      \
+	catch (const std::exception& exception)                                \
+	{                                                                      \
+		return new ExceptionInfo(exception);                                 \
+	}                                                                      \
+	catch (...)                                                            \
+	{                                                                      \
+		return new ExceptionInfo("unknown", "uncaught exception");           \
+	}                                                                      \