simplify status code

Signed-off-by: Junwang Zhao <[email protected]>

Author: zhjwpku

api/iceberg/status.h

@@ -15,14 +15,15 @@
 #pragma once
 
 #include <cstring>
+#include <format>
 #include <iosfwd>
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "util/compare.h"
 #include "util/macros.h"
-#include "util/string_builder.h"
+#include "util/to_string_ostreamable.h"
 #include "util/visibility.h"
 
 #ifdef ICEBERG_EXTRA_ERROR_CONTEXT
@@ -86,16 +87,10 @@ namespace iceberg {
 enum class StatusCode : char {
   OK = 0,
   OutOfMemory = 1,
-  KeyError = 2,
-  TypeError = 3,
-  Invalid = 4,
-  IOError = 5,
-  CapacityError = 6,
-  IndexError = 7,
-  Cancelled = 8,
-  NotImplemented = 9,
-  SerializationError = 10,
-  AlreadyExists = 11,
+  TypeError = 2,
+  Invalid = 3,
+  IOError = 4,
+  NotImplemented = 5,
   UnknownError = 127
 };
 
@@ -160,14 +155,14 @@ class ICEBERG_EXPORT [[nodiscard]] Status : public util::EqualityComparable<Stat
   static Status OK() { return Status(); }
 
   template <typename... Args>
-  static Status FromArgs(StatusCode code, Args&&... args) {
-    return Status(code, util::StringBuilder(std::forward<Args>(args)...));
+  static Status FromArgs(StatusCode code, std::string_view fmt, Args&&... args) {
+    return Status(code, std::vformat(fmt, std::make_format_args(args...)));
   }
 
   template <typename... Args>
   static Status FromDetailAndArgs(StatusCode code, std::shared_ptr<StatusDetail> detail,
-                                  Args&&... args) {
-    return Status(code, util::StringBuilder(std::forward<Args>(args)...),
+                                  std::string_view fmt, Args&&... args) {
+    return Status(code, std::vformat(fmt, std::make_format_args(args...)),
                   std::move(detail));
   }
 
@@ -177,12 +172,6 @@ class ICEBERG_EXPORT [[nodiscard]] Status : public util::EqualityComparable<Stat
     return Status::FromArgs(StatusCode::OutOfMemory, std::forward<Args>(args)...);
   }
 
-  /// Return an error status for failed key lookups (e.g. column name in a table)
-  template <typename... Args>
-  static Status KeyError(Args&&... args) {
-    return Status::FromArgs(StatusCode::KeyError, std::forward<Args>(args)...);
-  }
-
   /// Return an error status for type errors (such as mismatching data types)
   template <typename... Args>
   static Status TypeError(Args&&... args) {
@@ -201,43 +190,13 @@ class ICEBERG_EXPORT [[nodiscard]] Status : public util::EqualityComparable<Stat
     return Status::FromArgs(StatusCode::IOError, std::forward<Args>(args)...);
   }
 
-  /// Return an error status when a container's capacity would exceed its limits
-  template <typename... Args>
-  static Status CapacityError(Args&&... args) {
-    return Status::FromArgs(StatusCode::CapacityError, std::forward<Args>(args)...);
-  }
-
-  /// Return an error status when an index is out of bounds
-  template <typename... Args>
-  static Status IndexError(Args&&... args) {
-    return Status::FromArgs(StatusCode::IndexError, std::forward<Args>(args)...);
-  }
-
-  /// Return an error status for cancelled operation
-  template <typename... Args>
-  static Status Cancelled(Args&&... args) {
-    return Status::FromArgs(StatusCode::Cancelled, std::forward<Args>(args)...);
-  }
-
   /// Return an error status when an operation or a combination of operation and
   /// data types is unimplemented
   template <typename... Args>
   static Status NotImplemented(Args&&... args) {
     return Status::FromArgs(StatusCode::NotImplemented, std::forward<Args>(args)...);
   }
 
-  /// Return an error status when some (de)serialization operation failed
-  template <typename... Args>
-  static Status SerializationError(Args&&... args) {
-    return Status::FromArgs(StatusCode::SerializationError, std::forward<Args>(args)...);
-  }
-
-  /// Return an error status for already exists errors
-  template <typename... Args>
-  static Status AlreadyExists(Args&&... args) {
-    return Status::FromArgs(StatusCode::AlreadyExists, std::forward<Args>(args)...);
-  }
-
   /// Return an error status for unknown errors
   template <typename... Args>
   static Status UnknownError(Args&&... args) {
@@ -249,27 +208,14 @@ class ICEBERG_EXPORT [[nodiscard]] Status : public util::EqualityComparable<Stat
 
   /// Return true iff the status indicates an out-of-memory error.
   constexpr bool IsOutOfMemory() const { return code() == StatusCode::OutOfMemory; }
-  /// Return true iff the status indicates a key lookup error.
-  constexpr bool IsKeyError() const { return code() == StatusCode::KeyError; }
   /// Return true iff the status indicates a type error.
   constexpr bool IsTypeError() const { return code() == StatusCode::TypeError; }
   /// Return true iff the status indicates invalid data.
   constexpr bool IsInvalid() const { return code() == StatusCode::Invalid; }
   /// Return true iff the status indicates an IO-related failure.
   constexpr bool IsIOError() const { return code() == StatusCode::IOError; }
-  /// Return true iff the status indicates a container reaching capacity limits.
-  constexpr bool IsCapacityError() const { return code() == StatusCode::CapacityError; }
-  /// Return true iff the status indicates an out of bounds index.
-  constexpr bool IsIndexError() const { return code() == StatusCode::IndexError; }
-  /// Return true iff the status indicates a cancelled operation.
-  constexpr bool IsCancelled() const { return code() == StatusCode::Cancelled; }
   /// Return true iff the status indicates an unimplemented operation.
   constexpr bool IsNotImplemented() const { return code() == StatusCode::NotImplemented; }
-  /// Return true iff the status indicates a (de)serialization failure
-  constexpr bool IsSerializationError() const {
-    return code() == StatusCode::SerializationError;
-  }
-  constexpr bool IsAlreadyExists() const { return code() == StatusCode::AlreadyExists; }
   /// Return true iff the status indicates an unknown error.
   constexpr bool IsUnknownError() const { return code() == StatusCode::UnknownError; }
 
@@ -278,12 +224,6 @@ class ICEBERG_EXPORT [[nodiscard]] Status : public util::EqualityComparable<Stat
   /// The string "OK" is returned for success.
   std::string ToString() const;
 
-  /// \brief Return a string representation of this status without
-  /// context lines suitable for printing.
-  ///
-  /// The string "OK" is returned for success.
-  std::string ToStringWithoutContextLines() const;
-
   /// \brief Return a string representation of the status code, without the message
   /// text or POSIX code information.
   std::string CodeAsString() const;
@@ -320,9 +260,6 @@ class ICEBERG_EXPORT [[nodiscard]] Status : public util::EqualityComparable<Stat
   void Warn() const;
   void Warn(const std::string& message) const;
 
-  [[noreturn]] void Abort() const;
-  [[noreturn]] void Abort(const std::string& message) const;
-
 #ifdef ICEBERG_EXTRA_ERROR_CONTEXT
   void AddContextLine(const char* filename, int line, const char* expr);
 #endif

api/iceberg/util/macros.h

@@ -178,16 +178,6 @@
 #  define ICEBERG_DISABLE_UBSAN(feature)
 #endif
 
-// ----------------------------------------------------------------------
-// Machine information
-
-#if INTPTR_MAX == INT64_MAX
-#  define ICEBERG_BITNESS 64
-#elif INTPTR_MAX == INT32_MAX
-#  define ICEBERG_BITNESS 32
-#else
-#  error Unexpected INTPTR_MAX
-#endif
 
 // ----------------------------------------------------------------------
 // From googletest

api/iceberg/util/string_builder.h renamed to api/iceberg/util/to_string_ostreamable.h

@@ -28,40 +28,6 @@ namespace iceberg {
 
 namespace util {
 
-namespace detail {
-
-class ICEBERG_EXPORT StringStreamWrapper {
- public:
-  StringStreamWrapper();
-  ~StringStreamWrapper();
-
-  std::ostream& stream() { return ostream_; }
-  std::string str();
-
- protected:
-  std::unique_ptr<std::ostringstream> sstream_;
-  std::ostream& ostream_;
-};
-}  // namespace detail
-
-/// Variadic templates
-template <typename Head>
-void StringBuilderRecursive(std::ostream& os, Head&& head) {
-  os << head;
-}
-template <typename Head, typename... Tail>
-void StringBuilderRecursive(std::ostream& os, Head&& head, Tail&&... tail) {
-  StringBuilderRecursive(os, std::forward<Head>(head));
-  StringBuilderRecursive(os, std::forward<Tail>(tail)...);
-}
-
-template <typename... Args>
-std::string StringBuilder(Args&&... args) {
-  detail::StringStreamWrapper ss;
-  StringBuilderRecursive(ss.stream(), std::forward<Args>(args)...);
-  return ss.str();
-}
-
 /// CRTP helper for declaring string representaion. Defines operator<<
 template <typename T>
 class ToStringOstreamable {

src/CMakeLists.txt

@@ -15,6 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_subdirectory(common)
 add_subdirectory(core)
 add_subdirectory(puffin)

src/common/CMakeLists.txt

@@ -15,19 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set(ICEBERG_CORE_SOURCES demo_table.cc)
+set(ICEBERG_CORE_SOURCES demo_table.cc status.cc)
 set(ICEBERG_CORE_INCLUDES "${ICEBERG_API_DIR}")
-set(ICEBERG_CORE_STATIC_LINK_LIBS iceberg_common_static)
-set(ICEBERG_CORE_SHARED_LINK_LIBS iceberg_common_shared)
 
 add_iceberg_lib(iceberg_core
                 CMAKE_PACKAGE_NAME
                 iceberg
                 SOURCES
                 ${ICEBERG_CORE_SOURCES}
-                STATIC_LINK_LIBS
-                ${ICEBERG_CORE_STATIC_LINK_LIBS}
-                SHARED_LINK_LIBS
-                ${ICEBERG_CORE_SHARED_LINK_LIBS}
                 PRIVATE_INCLUDES
                 ${ICEBERG_CORE_INCLUDES})

src/common/util/string_builder.cc

@@ -59,9 +59,6 @@ std::string Status::CodeAsString(StatusCode code) {
     case StatusCode::OutOfMemory:
       type = "Out of memory";
       break;
-    case StatusCode::KeyError:
-      type = "Key error";
-      break;
     case StatusCode::TypeError:
       type = "Type error";
       break;
@@ -71,24 +68,9 @@ std::string Status::CodeAsString(StatusCode code) {
     case StatusCode::IOError:
       type = "IOError";
       break;
-    case StatusCode::CapacityError:
-      type = "Capacity error";
-      break;
-    case StatusCode::IndexError:
-      type = "Index error";
-      break;
-    case StatusCode::Cancelled:
-      type = "Cancelled";
-      break;
     case StatusCode::NotImplemented:
       type = "NotImplemented";
       break;
-    case StatusCode::SerializationError:
-      type = "Serialization error";
-      break;
-    case StatusCode::AlreadyExists:
-      type = "Already Exists";
-      break;
     case StatusCode::UnknownError:
       type = "Unknown error";
       break;
@@ -114,34 +96,6 @@ std::string Status::ToString() const {
   return result;
 }
 
-std::string Status::ToStringWithoutContextLines() const {
-  auto message = ToString();
-#ifdef ICEBERG_EXTRA_ERROR_CONTEXT
-  while (true) {
-    auto last_new_line_position = message.rfind("\n");
-    if (last_new_line_position == std::string::npos) {
-      break;
-    }
-    if (message.find(":", last_new_line_position) == std::string::npos) {
-      break;
-    }
-    message = message.substr(0, last_new_line_position);
-  }
-#endif
-  return message;
-}
-
-void Status::Abort() const { Abort(std::string()); }
-
-void Status::Abort(const std::string& message) const {
-  std::cerr << "-- Iceberg Fatal Error --\n";
-  if (!message.empty()) {
-    std::cerr << message << "\n";
-  }
-  std::cerr << ToString() << std::endl;
-  std::abort();
-}
-
 void Status::Warn() const { std::cerr << ToString(); }
 
 void Status::Warn(const std::string& message) const {

src/core/CMakeLists.txt

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-add_subdirectory(common)
+add_subdirectory(core)