Skip to content

Commit 1ca9b0c

Browse files
author
xiao.dong
committed
change some func into static
1 parent 8d4b744 commit 1ca9b0c

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

src/iceberg/manifest_adapter.h

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ class ICEBERG_EXPORT ManifestAdapter {
4848
virtual std::shared_ptr<Schema> schema() const = 0;
4949

5050
protected:
51-
Status AppendField(ArrowArray* arrowArray, int64_t value);
52-
Status AppendField(ArrowArray* arrowArray, uint64_t value);
53-
Status AppendField(ArrowArray* arrowArray, double value);
54-
Status AppendField(ArrowArray* arrowArray, std::string_view value);
55-
Status AppendField(ArrowArray* arrowArray, const std::vector<uint8_t>& value);
51+
static Status AppendField(ArrowArray* arrowArray, int64_t value);
52+
static Status AppendField(ArrowArray* arrowArray, uint64_t value);
53+
static Status AppendField(ArrowArray* arrowArray, double value);
54+
static Status AppendField(ArrowArray* arrowArray, std::string_view value);
55+
static Status AppendField(ArrowArray* arrowArray, const std::vector<uint8_t>& value);
5656

5757
protected:
5858
bool is_initialized_ = false;
@@ -82,14 +82,17 @@ class ICEBERG_EXPORT ManifestEntryAdapter : public ManifestAdapter {
8282
Status AppendDataFile(ArrowArray* arrow_array,
8383
const std::shared_ptr<StructType>& data_file_type,
8484
const std::shared_ptr<DataFile>& file);
85-
Status AppendPartitions(ArrowArray* arrow_array,
86-
const std::shared_ptr<StructType>& partition_type,
87-
const std::vector<Literal>& partitions);
88-
Status AppendList(ArrowArray* arrow_array, const std::vector<int32_t>& list_value);
89-
Status AppendList(ArrowArray* arrow_array, const std::vector<int64_t>& list_value);
90-
Status AppendMap(ArrowArray* arrow_array, const std::map<int32_t, int64_t>& map_value);
91-
Status AppendMap(ArrowArray* arrow_array,
92-
const std::map<int32_t, std::vector<uint8_t>>& map_value);
85+
static Status AppendPartitions(ArrowArray* arrow_array,
86+
const std::shared_ptr<StructType>& partition_type,
87+
const std::vector<Literal>& partitions);
88+
static Status AppendList(ArrowArray* arrow_array,
89+
const std::vector<int32_t>& list_value);
90+
static Status AppendList(ArrowArray* arrow_array,
91+
const std::vector<int64_t>& list_value);
92+
static Status AppendMap(ArrowArray* arrow_array,
93+
const std::map<int32_t, int64_t>& map_value);
94+
static Status AppendMap(ArrowArray* arrow_array,
95+
const std::map<int32_t, std::vector<uint8_t>>& map_value);
9396

9497
virtual Result<std::optional<int64_t>> GetWrappedSequenceNumber(
9598
const ManifestEntry& entry);
@@ -123,9 +126,9 @@ class ICEBERG_EXPORT ManifestFileAdapter : public ManifestAdapter {
123126
protected:
124127
Status InitSchema(const std::unordered_set<int32_t>& fields_ids);
125128
Status AppendInternal(const ManifestFile& file);
126-
Status AppendPartitions(ArrowArray* arrow_array,
127-
const std::shared_ptr<ListType>& partition_type,
128-
const std::vector<PartitionFieldSummary>& partitions);
129+
static Status AppendPartitions(ArrowArray* arrow_array,
130+
const std::shared_ptr<ListType>& partition_type,
131+
const std::vector<PartitionFieldSummary>& partitions);
129132

130133
virtual Result<int64_t> GetWrappedSequenceNumber(const ManifestFile& file);
131134
virtual Result<int64_t> GetWrappedMinSequenceNumber(const ManifestFile& file);

src/iceberg/v1_metadata.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#include "iceberg/manifest_entry.h"
2323
#include "iceberg/manifest_list.h"
24-
#include "iceberg/partition_spec.h"
2524
#include "iceberg/schema.h"
2625

2726
namespace iceberg {
@@ -46,7 +45,8 @@ Status ManifestEntryAdapterV1::Append(const iceberg::ManifestEntry& entry) {
4645
}
4746

4847
std::shared_ptr<StructType> ManifestEntryAdapterV1::GetManifestEntryStructType() {
49-
// V1 compatible fields. Official suggestions:
48+
// 'block_size_in_bytes' (ID 105) is a deprecated field that is REQUIRED
49+
// in the v1 data_file schema for backward compatibility.
5050
// Deprecated. Always write a default in v1. Do not write in v2 or v3.
5151
static const SchemaField kBlockSizeInBytes = SchemaField::MakeRequired(
5252
105, "block_size_in_bytes", iceberg::int64(), "Block size in bytes");

test/manifest_list_reader_writer_test.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
*/
1919

2020
#include <arrow/filesystem/localfs.h>
21-
#include <avro/GenericDatum.hh>
2221
#include <gtest/gtest.h>
2322

2423
#include "iceberg/arrow/arrow_fs_file_io_internal.h"

test/manifest_reader_writer_test.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include "iceberg/manifest_list.h"
2929
#include "iceberg/manifest_reader.h"
3030
#include "iceberg/manifest_writer.h"
31-
#include "iceberg/partition_spec.h"
3231
#include "iceberg/schema.h"
3332
#include "iceberg/transform.h"
3433
#include "matchers.h"

0 commit comments

Comments
 (0)