Skip to content

Commit f012248

Browse files
fix
1 parent 7c565fe commit f012248

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

ci/scripts/start_minio.sh

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ set -eux
2121

2222
MINIO_ROOT_USER="${MINIO_ROOT_USER:-minio}"
2323
MINIO_ROOT_PASSWORD="${MINIO_ROOT_PASSWORD:-minio123}"
24-
MINIO_IMAGE="${MINIO_IMAGE:-minio/minio:RELEASE.2024-12-18T00-00-00Z}"
24+
MINIO_IMAGE="${MINIO_IMAGE:-minio/minio:latest}"
2525
MINIO_CONTAINER_NAME="${MINIO_CONTAINER_NAME:-iceberg-minio}"
2626
MINIO_PORT="${MINIO_PORT:-9000}"
2727
MINIO_CONSOLE_PORT="${MINIO_CONSOLE_PORT:-9001}"
@@ -64,7 +64,8 @@ start_minio_macos() {
6464
fi
6565

6666
brew install minio
67-
minio server /tmp/minio --console-address ":${MINIO_CONSOLE_PORT}" &
67+
MINIO_ROOT_USER="${MINIO_ROOT_USER}" MINIO_ROOT_PASSWORD="${MINIO_ROOT_PASSWORD}" \
68+
minio server /tmp/minio --console-address ":${MINIO_CONSOLE_PORT}" &
6869
wait_for_minio
6970
}
7071

@@ -84,7 +85,13 @@ download_mc() {
8485
;;
8586
Darwin*)
8687
MC_BIN="${mc_dir}/mc"
87-
curl -sSL "https://dl.min.io/client/mc/release/darwin-amd64/mc" -o "${MC_BIN}"
88+
local arch
89+
arch="$(uname -m)"
90+
if [ "${arch}" = "arm64" ]; then
91+
curl -sSL "https://dl.min.io/client/mc/release/darwin-arm64/mc" -o "${MC_BIN}"
92+
else
93+
curl -sSL "https://dl.min.io/client/mc/release/darwin-amd64/mc" -o "${MC_BIN}"
94+
fi
8895
chmod +x "${MC_BIN}"
8996
;;
9097
MINGW*|MSYS*|CYGWIN*)

src/iceberg/meson.build

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ iceberg_sources = files(
5858
'expression/rewrite_not.cc',
5959
'expression/strict_metrics_evaluator.cc',
6060
'expression/term.cc',
61+
'file_io_registry.cc',
6162
'file_reader.cc',
6263
'file_writer.cc',
6364
'inheritable_metadata.cc',
@@ -185,6 +186,7 @@ install_headers(
185186
'exception.h',
186187
'file_format.h',
187188
'file_io.h',
189+
'file_io_registry.h',
188190
'file_reader.h',
189191
'file_writer.h',
190192
'iceberg_export.h',

0 commit comments

Comments
 (0)