Skip to content

Commit f820aa2

Browse files
committed
use type factory method
1 parent 9e0fac3 commit f820aa2

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

src/iceberg/transform_function.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Result<std::shared_ptr<Type>> BucketTransform::ResultType() const {
6464
case TypeId::kUuid:
6565
case TypeId::kFixed:
6666
case TypeId::kBinary:
67-
return std::make_shared<IntType>();
67+
return iceberg::int32();
6868
default:
6969
return NotSupported("{} is not a valid input type for bucket transform",
7070
src_type->ToString());
@@ -113,7 +113,7 @@ Result<std::shared_ptr<Type>> YearTransform::ResultType() const {
113113
case TypeId::kDate:
114114
case TypeId::kTimestamp:
115115
case TypeId::kTimestampTz:
116-
return std::make_shared<IntType>();
116+
return iceberg::int32();
117117
default:
118118
return NotSupported("{} is not a valid input type for year transform",
119119
src_type->ToString());
@@ -136,7 +136,7 @@ Result<std::shared_ptr<Type>> MonthTransform::ResultType() const {
136136
case TypeId::kDate:
137137
case TypeId::kTimestamp:
138138
case TypeId::kTimestampTz:
139-
return std::make_shared<IntType>();
139+
return iceberg::int32();
140140
default:
141141
return NotSupported("{} is not a valid input type for month transform",
142142
src_type->ToString());
@@ -159,7 +159,7 @@ Result<std::shared_ptr<Type>> DayTransform::ResultType() const {
159159
case TypeId::kDate:
160160
case TypeId::kTimestamp:
161161
case TypeId::kTimestampTz:
162-
return std::make_shared<DateType>();
162+
return iceberg::date();
163163
default:
164164
return NotSupported("{} is not a valid input type for day transform",
165165
src_type->ToString());
@@ -181,7 +181,7 @@ Result<std::shared_ptr<Type>> HourTransform::ResultType() const {
181181
switch (src_type->type_id()) {
182182
case TypeId::kTimestamp:
183183
case TypeId::kTimestampTz:
184-
return std::make_shared<IntType>();
184+
return iceberg::int32();
185185
default:
186186
return NotSupported("{} is not a valid input type for hour transform",
187187
src_type->ToString());

test/transform_test.cc

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -126,29 +126,29 @@ TEST(TransformResultTypeTest, PositiveCases) {
126126

127127
const std::vector<Case> cases = {
128128
{.str = "identity",
129-
.source_type = std::make_shared<StringType>(),
130-
.expected_result_type = std::make_shared<StringType>()},
129+
.source_type = iceberg::string(),
130+
.expected_result_type = iceberg::string()},
131131
{.str = "year",
132-
.source_type = std::make_shared<TimestampType>(),
133-
.expected_result_type = std::make_shared<IntType>()},
132+
.source_type = iceberg::timestamp(),
133+
.expected_result_type = iceberg::int32()},
134134
{.str = "month",
135-
.source_type = std::make_shared<TimestampType>(),
136-
.expected_result_type = std::make_shared<IntType>()},
135+
.source_type = iceberg::timestamp(),
136+
.expected_result_type = iceberg::int32()},
137137
{.str = "day",
138-
.source_type = std::make_shared<TimestampType>(),
139-
.expected_result_type = std::make_shared<DateType>()},
138+
.source_type = iceberg::timestamp(),
139+
.expected_result_type = iceberg::date()},
140140
{.str = "hour",
141-
.source_type = std::make_shared<TimestampType>(),
142-
.expected_result_type = std::make_shared<IntType>()},
141+
.source_type = iceberg::timestamp(),
142+
.expected_result_type = iceberg::int32()},
143143
{.str = "void",
144-
.source_type = std::make_shared<StringType>(),
145-
.expected_result_type = std::make_shared<StringType>()},
144+
.source_type = iceberg::string(),
145+
.expected_result_type = iceberg::string()},
146146
{.str = "bucket[16]",
147-
.source_type = std::make_shared<StringType>(),
148-
.expected_result_type = std::make_shared<IntType>()},
147+
.source_type = iceberg::string(),
148+
.expected_result_type = iceberg::int32()},
149149
{.str = "truncate[32]",
150-
.source_type = std::make_shared<StringType>(),
151-
.expected_result_type = std::make_shared<StringType>()},
150+
.source_type = iceberg::string(),
151+
.expected_result_type = iceberg::string()},
152152
};
153153

154154
for (const auto& c : cases) {
@@ -174,13 +174,13 @@ TEST(TransformResultTypeTest, NegativeCases) {
174174

175175
const std::vector<Case> cases = {
176176
{.str = "identity", .source_type = nullptr},
177-
{.str = "year", .source_type = std::make_shared<StringType>()},
178-
{.str = "month", .source_type = std::make_shared<StringType>()},
179-
{.str = "day", .source_type = std::make_shared<StringType>()},
180-
{.str = "hour", .source_type = std::make_shared<StringType>()},
177+
{.str = "year", .source_type = iceberg::string()},
178+
{.str = "month", .source_type = iceberg::string()},
179+
{.str = "day", .source_type = iceberg::string()},
180+
{.str = "hour", .source_type = iceberg::string()},
181181
{.str = "void", .source_type = nullptr},
182-
{.str = "bucket[16]", .source_type = std::make_shared<FloatType>()},
183-
{.str = "truncate[32]", .source_type = std::make_shared<DoubleType>()}};
182+
{.str = "bucket[16]", .source_type = iceberg::float32()},
183+
{.str = "truncate[32]", .source_type = iceberg::float64()}};
184184

185185
for (const auto& c : cases) {
186186
auto result = TransformFromString(c.str);

0 commit comments

Comments
 (0)