Skip to content

Commit 1b49fe0

Browse files
zhjwpkuzhjwpku
committed
fix: remove ternary conditional operator
1 parent 73e71b8 commit 1b49fe0

File tree

7 files changed

+38
-49
lines changed

7 files changed

+38
-49
lines changed

‎src/iceberg/test/delete_file_index_test.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ class DeleteFileIndexTest : public testing::TestWithParam<int> {
167167

168168
auto writer_result = ManifestWriter::MakeWriter(
169169
format_version, snapshot_id, manifest_path, file_io_, spec, schema_,
170-
ManifestContent::kDeletes,
171-
format_version >= 3 ? std::optional<int64_t>(std::nullopt) : std::nullopt);
170+
ManifestContent::kDeletes, /*first_row_id=*/std::nullopt);
172171

173172
EXPECT_THAT(writer_result, IsOk());
174173
auto writer = std::move(writer_result.value());

‎src/iceberg/test/manifest_group_test.cc‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ class ManifestGroupTest : public testing::TestWithParam<int> {
135135
std::shared_ptr<PartitionSpec> spec) {
136136
const std::string manifest_path = MakeManifestPath();
137137

138-
auto writer_result = ManifestWriter::MakeWriter(
139-
format_version, snapshot_id, manifest_path, file_io_, spec, schema_,
140-
ManifestContent::kData,
141-
/*first_row_id=*/format_version >= 3 ? std::optional<int64_t>(0L) : std::nullopt);
138+
auto writer_result =
139+
ManifestWriter::MakeWriter(format_version, snapshot_id, manifest_path, file_io_,
140+
spec, schema_, ManifestContent::kData,
141+
/*first_row_id=*/0L);
142142
EXPECT_THAT(writer_result, IsOk());
143143
auto writer = std::move(writer_result.value());
144144

@@ -157,11 +157,10 @@ class ManifestGroupTest : public testing::TestWithParam<int> {
157157
std::shared_ptr<PartitionSpec> spec) {
158158
const std::string manifest_path = MakeManifestPath();
159159

160-
auto writer_result = ManifestWriter::MakeWriter(
161-
format_version, snapshot_id, manifest_path, file_io_, spec, schema_,
162-
ManifestContent::kDeletes,
163-
/*first_row_id=*/format_version >= 3 ? std::optional<int64_t>(std::nullopt)
164-
: std::nullopt);
160+
auto writer_result =
161+
ManifestWriter::MakeWriter(format_version, snapshot_id, manifest_path, file_io_,
162+
spec, schema_, ManifestContent::kDeletes,
163+
/*first_row_id=*/std::nullopt);
165164
EXPECT_THAT(writer_result, IsOk());
166165
auto writer = std::move(writer_result.value());
167166

@@ -197,8 +196,7 @@ class ManifestGroupTest : public testing::TestWithParam<int> {
197196

198197
auto writer_result = ManifestListWriter::MakeWriter(
199198
format_version, snapshot_id, kParentSnapshotId, manifest_list_path, file_io_,
200-
format_version >= 2 ? std::optional<int64_t>(sequence_number) : std::nullopt,
201-
format_version >= 3 ? std::optional<int64_t>(kSnapshotFirstRowId) : std::nullopt);
199+
sequence_number, kSnapshotFirstRowId);
202200
EXPECT_THAT(writer_result, IsOk());
203201
auto writer = std::move(writer_result.value());
204202
EXPECT_THAT(writer->Add(manifest), IsOk());

‎src/iceberg/test/manifest_list_versions_test.cc‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ class TestManifestListVersions : public ::testing::Test {
110110

111111
auto writer_result = ManifestListWriter::MakeWriter(
112112
format_version, kSnapshotId, kParentSnapshotId, manifest_list_path, file_io_,
113-
format_version >= 2 ? std::optional<int64_t>(kSeqNum) : std::nullopt,
114-
format_version >= 3 ? std::optional<int64_t>(kSnapshotFirstRowId) : std::nullopt);
113+
kSeqNum, kSnapshotFirstRowId);
115114
EXPECT_THAT(writer_result, IsOk());
116115
auto writer = std::move(writer_result.value());
117116

@@ -192,8 +191,8 @@ TEST_F(TestManifestListVersions, TestV1WriteDeleteManifest) {
192191
const std::string manifest_list_path = CreateManifestListPath();
193192

194193
ICEBERG_UNWRAP_OR_FAIL(auto writer,
195-
ManifestListWriter::MakeWriter(1, kSnapshotId, kSnapshotId - 1,
196-
manifest_list_path, file_io_));
194+
ManifestListWriter::MakeV1Writer(kSnapshotId, kSnapshotId - 1,
195+
manifest_list_path, file_io_));
197196
auto status = writer->Add(kDeleteManifest);
198197

199198
EXPECT_THAT(status, IsError(ErrorKind::kInvalidManifestList));

‎src/iceberg/test/manifest_reader_stats_test.cc‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ class TestManifestReaderStats : public testing::TestWithParam<int> {
9191

9292
auto writer_result = ManifestWriter::MakeWriter(
9393
format_version, /*snapshot_id=*/1000L, manifest_path, file_io_, spec_, schema_,
94-
ManifestContent::kData,
95-
format_version >= 3 ? std::optional<int64_t>(0L) : std::nullopt);
94+
ManifestContent::kData, /*first_row_id=*/0L);
9695
EXPECT_THAT(writer_result, IsOk());
9796
auto writer = std::move(writer_result.value());
9897

‎src/iceberg/test/manifest_reader_test.cc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ class TestManifestReader : public testing::TestWithParam<int> {
8282
const std::vector<ManifestEntry>& entries) {
8383
const std::string manifest_path = MakeManifestPath();
8484

85-
auto writer_result = ManifestWriter::MakeWriter(
86-
format_version, snapshot_id, manifest_path, file_io_, spec_, schema_,
87-
ManifestContent::kData,
88-
format_version >= 3 ? std::optional<int64_t>(0L) : std::nullopt);
85+
auto writer_result =
86+
ManifestWriter::MakeWriter(format_version, snapshot_id, manifest_path, file_io_,
87+
spec_, schema_, ManifestContent::kData,
88+
/*first_row_id=*/0L);
8989

9090
EXPECT_THAT(writer_result, IsOk());
9191
auto writer = std::move(writer_result.value());
@@ -138,10 +138,10 @@ class TestManifestReader : public testing::TestWithParam<int> {
138138
std::vector<ManifestEntry> entries) {
139139
const std::string manifest_path = MakeManifestPath();
140140

141-
auto writer_result = ManifestWriter::MakeWriter(
142-
format_version, snapshot_id, manifest_path, file_io_, spec_, schema_,
143-
ManifestContent::kDeletes,
144-
format_version >= 3 ? std::optional<int64_t>(std::nullopt) : std::nullopt);
141+
auto writer_result =
142+
ManifestWriter::MakeWriter(format_version, snapshot_id, manifest_path, file_io_,
143+
spec_, schema_, ManifestContent::kDeletes,
144+
/*first_row_id=*/std::nullopt);
145145

146146
EXPECT_THAT(writer_result, IsOk());
147147
auto writer = std::move(writer_result.value());

‎src/iceberg/test/manifest_writer_versions_test.cc‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,7 @@ class ManifestWriterVersionsTest : public ::testing::Test {
163163

164164
auto writer_result = ManifestListWriter::MakeWriter(
165165
format_version, kSnapshotId, kParentSnapshotId, manifest_list_path, file_io_,
166-
format_version >= 2 ? std::optional<int64_t>(kSequenceNumber) : std::nullopt,
167-
format_version >= 3 ? std::optional<int64_t>(kFirstRowId) : std::nullopt);
166+
kSequenceNumber, kFirstRowId);
168167
EXPECT_THAT(writer_result, IsOk());
169168
auto writer = std::move(writer_result.value());
170169

@@ -199,10 +198,9 @@ class ManifestWriterVersionsTest : public ::testing::Test {
199198
std::vector<std::shared_ptr<DataFile>> data_files) {
200199
const std::string manifest_path = CreateManifestPath();
201200

202-
auto writer_result = ManifestWriter::MakeWriter(
203-
format_version, kSnapshotId, manifest_path, file_io_, spec_, schema_,
204-
ManifestContent::kData,
205-
format_version >= 3 ? std::optional<int64_t>(kFirstRowId) : std::nullopt);
201+
auto writer_result =
202+
ManifestWriter::MakeWriter(format_version, kSnapshotId, manifest_path, file_io_,
203+
spec_, schema_, ManifestContent::kData, kFirstRowId);
206204
EXPECT_THAT(writer_result, IsOk());
207205
auto writer = std::move(writer_result.value());
208206

@@ -235,8 +233,7 @@ class ManifestWriterVersionsTest : public ::testing::Test {
235233

236234
auto writer_result = ManifestWriter::MakeWriter(
237235
format_version, kSnapshotId, manifest_path, file_io_, spec_, schema_,
238-
ManifestContent::kDeletes,
239-
format_version >= 3 ? std::optional<int64_t>(kFirstRowId) : std::nullopt);
236+
ManifestContent::kDeletes, kFirstRowId);
240237

241238
EXPECT_THAT(writer_result, IsOk());
242239
auto writer = std::move(writer_result.value());
@@ -256,10 +253,9 @@ class ManifestWriterVersionsTest : public ::testing::Test {
256253

257254
const std::string manifest_path = CreateManifestPath();
258255

259-
auto writer_result = ManifestWriter::MakeWriter(
260-
format_version, kSnapshotId, manifest_path, file_io_, spec_, schema_,
261-
old_manifest.content,
262-
format_version >= 3 ? std::optional<int64_t>(kFirstRowId) : std::nullopt);
256+
auto writer_result =
257+
ManifestWriter::MakeWriter(format_version, kSnapshotId, manifest_path, file_io_,
258+
spec_, schema_, old_manifest.content, kFirstRowId);
263259
EXPECT_THAT(writer_result, IsOk());
264260
auto writer = std::move(writer_result.value());
265261

@@ -426,8 +422,8 @@ TEST_F(ManifestWriterVersionsTest, TestV1Write) {
426422
TEST_F(ManifestWriterVersionsTest, TestV1WriteDelete) {
427423
const std::string manifest_path = CreateManifestPath();
428424
ICEBERG_UNWRAP_OR_FAIL(
429-
auto writer, ManifestWriter::MakeWriter(1, kSnapshotId, manifest_path, file_io_,
430-
spec_, schema_));
425+
auto writer,
426+
ManifestWriter::MakeV1Writer(kSnapshotId, manifest_path, file_io_, spec_, schema_));
431427

432428
ManifestEntry entry;
433429
entry.snapshot_id = kSnapshotId;

‎src/iceberg/test/rolling_manifest_writer_test.cc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,21 +109,19 @@ class RollingManifestWriterTest : public ::testing::TestWithParam<int32_t> {
109109
int32_t format_version) {
110110
return [this, format_version]() -> Result<std::unique_ptr<ManifestWriter>> {
111111
const std::string manifest_path = CreateManifestPath();
112-
return ManifestWriter::MakeWriter(
113-
format_version, kSnapshotId, manifest_path, file_io_, spec_, schema_,
114-
ManifestContent::kData,
115-
format_version >= 3 ? std::optional<int64_t>(kFirstRowId) : std::nullopt);
112+
return ManifestWriter::MakeWriter(format_version, kSnapshotId, manifest_path,
113+
file_io_, spec_, schema_, ManifestContent::kData,
114+
kFirstRowId);
116115
};
117116
}
118117

119118
RollingManifestWriter::ManifestWriterFactory NewRollingWriteDeleteManifestFactory(
120119
int32_t format_version) {
121120
return [this, format_version]() -> Result<std::unique_ptr<ManifestWriter>> {
122121
const std::string manifest_path = CreateManifestPath();
123-
return ManifestWriter::MakeWriter(
124-
format_version, kSnapshotId, manifest_path, file_io_, spec_, schema_,
125-
ManifestContent::kDeletes,
126-
format_version >= 3 ? std::optional<int64_t>(kFirstRowId) : std::nullopt);
122+
return ManifestWriter::MakeWriter(format_version, kSnapshotId, manifest_path,
123+
file_io_, spec_, schema_,
124+
ManifestContent::kDeletes, kFirstRowId);
127125
};
128126
}
129127

0 commit comments

Comments
 (0)