updates

Author: lidavidm

src/iceberg/type.cc

@@ -91,12 +91,16 @@ bool DateType::Equals(const Type& other) const {
   return other.type_id() == TypeId::kDate;
 }
 
+bool TimestampType::is_zoned() const { return false; }
+TimeUnit TimestampType::time_unit() const { return TimeUnit::kMicrosecond; }
 TypeId TimestampType::type_id() const { return TypeId::kTimestamp; }
 std::string TimestampType::ToString() const { return "timestamp"; }
 bool TimestampType::Equals(const Type& other) const {
   return other.type_id() == TypeId::kTimestamp;
 }
 
+bool TimestampTzType::is_zoned() const { return true; }
+TimeUnit TimestampTzType::time_unit() const { return TimeUnit::kMicrosecond; }
 TypeId TimestampTzType::type_id() const { return TypeId::kTimestampTz; }
 std::string TimestampTzType::ToString() const { return "timestamptz"; }
 bool TimestampTzType::Equals(const Type& other) const {
@@ -226,7 +230,7 @@ std::optional<std::reference_wrapper<const SchemaField>> MapType::GetFieldById(
   return std::nullopt;
 }
 std::optional<std::reference_wrapper<const SchemaField>> MapType::GetFieldByIndex(
-    int index) const {
+    int32_t index) const {
   if (index == 0) {
     return key();
   } else if (index == 0) {
@@ -282,7 +286,7 @@ std::optional<std::reference_wrapper<const SchemaField>> StructType::GetFieldByI
   return fields_[it->second];
 }
 std::optional<std::reference_wrapper<const SchemaField>> StructType::GetFieldByIndex(
-    int index) const {
+    int32_t index) const {
   if (index < 0 || index >= static_cast<int>(fields_.size())) {
     return std::nullopt;
   }

src/iceberg/type.h

@@ -83,7 +83,7 @@ class ICEBERG_EXPORT NestedType : public Type {
   GetFieldById(int32_t field_id) const = 0;
   /// \brief Get a field by index.
   [[nodiscard]] virtual std::optional<std::reference_wrapper<const SchemaField>>
-  GetFieldByIndex(int i) const = 0;
+  GetFieldByIndex(int32_t index) const = 0;
   /// \brief Get a field by name.
   [[nodiscard]] virtual std::optional<std::reference_wrapper<const SchemaField>>
   GetFieldByName(std::string_view name) const = 0;
@@ -212,27 +212,43 @@ class ICEBERG_EXPORT TimeType : public PrimitiveType {
   bool Equals(const Type& other) const override;
 };
 
+/// \brief A base class for any timestamp time (irrespective of unit or
+///   timezone).
+class ICEBERG_EXPORT TimestampBase : public PrimitiveType {
+ public:
+  /// \brief Is this type zoned or naive?
+  [[nodiscard]] virtual bool is_zoned() const = 0;
+  /// \brief The time resolution.
+  [[nodiscard]] virtual TimeUnit time_unit() const = 0;
+};
+
 /// \brief A data type representing a timestamp in microseconds without
 ///   reference to a timezone.
-class ICEBERG_EXPORT TimestampType : public PrimitiveType {
+class ICEBERG_EXPORT TimestampType : public TimestampBase {
  public:
   TimestampType() = default;
   ~TimestampType() = default;
 
+  bool is_zoned() const override;
+  TimeUnit time_unit() const override;
+
   TypeId type_id() const override;
   std::string ToString() const override;
 
  protected:
   bool Equals(const Type& other) const override;
 };
 
-/// \brief A data type representing a timestamp in microseconds in a
-///   particular timezone.
-class ICEBERG_EXPORT TimestampTzType : public PrimitiveType {
+/// \brief A data type representing a timestamp as microseconds since the
+///   epoch in UTC.
+class ICEBERG_EXPORT TimestampTzType : public TimestampBase {
  public:
   TimestampTzType() = default;
   ~TimestampTzType() = default;
 
+  bool is_zoned() const override;
+  TimeUnit time_unit() const override;
+
   TypeId type_id() const override;
   std::string ToString() const override;
 
@@ -325,7 +341,7 @@ class ICEBERG_EXPORT ListType : public NestedType {
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldById(
       int32_t field_id) const override;
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldByIndex(
-      int i) const override;
+      int32_t index) const override;
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldByName(
       std::string_view name) const override;
 
@@ -356,7 +372,7 @@ class ICEBERG_EXPORT MapType : public NestedType {
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldById(
       int32_t field_id) const override;
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldByIndex(
-      int i) const override;
+      int32_t index) const override;
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldByName(
       std::string_view name) const override;
 
@@ -379,7 +395,7 @@ class ICEBERG_EXPORT StructType : public NestedType {
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldById(
       int32_t field_id) const override;
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldByIndex(
-      int i) const override;
+      int32_t index) const override;
   std::optional<std::reference_wrapper<const SchemaField>> GetFieldByName(
       std::string_view name) const override;
 

src/iceberg/type_fwd.h

@@ -52,6 +52,11 @@ enum class TypeId {
   kMap,
 };
 
+/// \brief The time unit.  In Iceberg V3 nanoseconds are also supported.
+enum class TimeUnit {
+  kMicrosecond,
+};
+
 class BooleanType;
 class SchemaField;
 class NestedType;