Skip to content

Commit a27d611

Browse files
fix
1 parent 8a5a08d commit a27d611

3 files changed

Lines changed: 21 additions & 15 deletions

File tree

ci/scripts/start_minio.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,27 @@ create_bucket() {
116116
"${MC_BIN}" mb --ignore-existing "local/${MINIO_BUCKET}"
117117
}
118118

119+
start_minio_windows() {
120+
local minio_dir="${RUNNER_TEMP:-/tmp}"
121+
local minio_bin="${minio_dir}/minio.exe"
122+
curl -sSL "https://dl.min.io/server/minio/release/windows-amd64/minio.exe" -o "${minio_bin}"
123+
MINIO_ROOT_USER="${MINIO_ROOT_USER}" MINIO_ROOT_PASSWORD="${MINIO_ROOT_PASSWORD}" \
124+
"${minio_bin}" server "${minio_dir}/minio-data" --console-address ":${MINIO_CONSOLE_PORT}" &
125+
wait_for_minio
126+
}
127+
119128
case "$(uname -s)" in
120129
Darwin*)
121130
if ! start_minio_docker; then
122131
start_minio_macos
123132
fi
124133
;;
125-
Linux*|MINGW*|MSYS*|CYGWIN*)
134+
MINGW*|MSYS*|CYGWIN*)
135+
if ! start_minio_docker; then
136+
start_minio_windows
137+
fi
138+
;;
139+
Linux*)
126140
start_minio_docker
127141
;;
128142
*)

src/iceberg/file_io_registry.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,8 @@ namespace iceberg {
3939
class ICEBERG_EXPORT FileIORegistry {
4040
public:
4141
/// Well-known implementation names
42-
static constexpr const char* kArrowLocalFileIO =
43-
"org.apache.iceberg.arrow.ArrowFileIO";
44-
static constexpr const char* kArrowS3FileIO =
45-
"org.apache.iceberg.arrow.ArrowS3FileIO";
42+
static constexpr const char* kArrowLocalFileIO = "org.apache.iceberg.arrow.ArrowFileIO";
43+
static constexpr const char* kArrowS3FileIO = "org.apache.iceberg.arrow.ArrowS3FileIO";
4644

4745
/// Factory function type for creating FileIO instances.
4846
using Factory = std::function<Result<std::shared_ptr<FileIO>>(

src/iceberg/test/file_io_registry_test.cc

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@ TEST(FileIoRegistryTest, RegisterAndLoad) {
5050
impl_name,
5151
[](const std::string& /*warehouse*/,
5252
const std::unordered_map<std::string, std::string>& /*properties*/)
53-
-> Result<std::shared_ptr<FileIO>> {
54-
return std::make_shared<MockFileIO>();
55-
});
53+
-> Result<std::shared_ptr<FileIO>> { return std::make_shared<MockFileIO>(); });
5654

5755
auto result = FileIORegistry::Load(impl_name, "/test/warehouse", {});
5856
ASSERT_THAT(result, IsOk());
@@ -78,18 +76,14 @@ TEST(FileIoRegistryTest, OverrideExistingRegistration) {
7876
impl_name,
7977
[](const std::string& /*warehouse*/,
8078
const std::unordered_map<std::string, std::string>& /*properties*/)
81-
-> Result<std::shared_ptr<FileIO>> {
82-
return std::make_shared<MockFileIO>();
83-
});
79+
-> Result<std::shared_ptr<FileIO>> { return std::make_shared<MockFileIO>(); });
8480

8581
// Override with a different factory
8682
FileIORegistry::Register(
8783
impl_name,
8884
[](const std::string& /*warehouse*/,
8985
const std::unordered_map<std::string, std::string>& /*properties*/)
90-
-> Result<std::shared_ptr<FileIO>> {
91-
return std::make_shared<MockFileIO>();
92-
});
86+
-> Result<std::shared_ptr<FileIO>> { return std::make_shared<MockFileIO>(); });
9387

9488
// Should still work (the override replaces the original)
9589
auto result = FileIORegistry::Load(impl_name, "/test/warehouse", {});
@@ -114,7 +108,7 @@ TEST(FileIoRegistryTest, FactoryReceivesWarehouseAndProperties) {
114108
});
115109

116110
std::unordered_map<std::string, std::string> props = {{"key1", "val1"},
117-
{"key2", "val2"}};
111+
{"key2", "val2"}};
118112
auto result = FileIORegistry::Load(impl_name, "s3://my-bucket/warehouse", props);
119113
ASSERT_THAT(result, IsOk());
120114
EXPECT_EQ(captured_warehouse, "s3://my-bucket/warehouse");

0 commit comments

Comments
 (0)