Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e4e86fe
[refactor](fe) Add CatalogProvider SPI framework for external datasou…
morningman Mar 23, 2026
73dda7d
[refactor](fe) Implement ES CatalogProvider and wire SPI into Catalog…
morningman Mar 23, 2026
7175cbb
[refactor](fe) Complete ES SPI migration: ExternalCatalog delegation,…
morningman Mar 23, 2026
724fe69
[refactor](fe) Migrate ES source files to fe-catalogs/catalog-es module
morningman Mar 23, 2026
29a957f
[fix](fe) Fix import order for SPI classes in PhysicalPlanTranslator,…
morningman Mar 23, 2026
f133a36
[refactor](fe) Rename fe-catalogs to fe-connectors, catalog-es to con…
morningman Mar 23, 2026
8a7c6dc
[refactor](fe) Add --connector-es build option and update plugin dire…
morningman Mar 23, 2026
0e0cb54
[refactor](fe) Add --no-connector-es flag to exclude ES connector fro…
morningman Mar 23, 2026
33641a5
[fix](fe) Fix compile errors: add missing ExternalCatalog import and …
morningman Mar 23, 2026
e2c5bc7
[fix](fe) Remove leftover fe-connector-spi dependency from connector-…
morningman Mar 23, 2026
21f5db2
[fix](fe) Add lombok provided dependency to connector-es module
morningman Mar 23, 2026
023c5b6
[fix](fe) Move connector output to output/fe/lib/connectors/
morningman Mar 23, 2026
d44580b
[fix](fe) Add license header to SPI service file
morningman Mar 23, 2026
e88a9a1
fix test
morningman Mar 23, 2026
4f455da
[refactor](fe) Remove ES external catalog classes from fe-core and ma…
morningman Mar 23, 2026
2b3b6a6
[fix](fe) Exclude JAR signature files from connector-es shaded JAR
morningman Mar 23, 2026
f7b656b
[fix](fe) Support internal EsTable via reflection from connector plugin
morningman Mar 24, 2026
4d4998f
[fix](fe) Fix compilation: add PlanNodeId/ScanContext imports, remove…
morningman Mar 24, 2026
d180864
refactor spi
morningman Mar 24, 2026
d8a1ca1
fix test
morningman Mar 24, 2026
0715996
format
morningman Mar 24, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ Usage: $0 <options>
--be-java-extensions build Backend java extensions. Default ON.
--be-cdc-client build Cdc Client for backend. Default ON.
--be-extension-ignore build be-java-extensions package, choose which modules to ignore. Multiple modules separated by commas.
--connector-es build Elasticsearch connector plugin. Default ON.
--no-connector-es exclude Elasticsearch connector from build.
--enable-dynamic-arch enable dynamic CPU detection in OpenBLAS. Default ON.
--disable-dynamic-arch disable dynamic CPU detection in OpenBLAS.
--clean clean and build target
Expand Down Expand Up @@ -200,6 +202,8 @@ if ! OPTS="$(getopt \
-l 'be-java-extensions' \
-l 'be-cdc-client' \
-l 'be-extension-ignore:' \
-l 'connector-es' \
-l 'no-connector-es' \
-l 'enable-dynamic-arch' \
-l 'disable-dynamic-arch' \
-l 'clean' \
Expand Down Expand Up @@ -228,6 +232,7 @@ BUILD_BE_CDC_CLIENT=0
BUILD_OBS_DEPENDENCIES=1
BUILD_COS_DEPENDENCIES=1
BUILD_HIVE_UDF=0
BUILD_CONNECTOR_ES=1
ENABLE_DYNAMIC_ARCH='ON'
CLEAN=0
HELP=0
Expand All @@ -249,6 +254,7 @@ if [[ "$#" == 1 ]]; then
BUILD_INDEX_TOOL='OFF'
BUILD_BENCHMARK='OFF'
BUILD_HIVE_UDF=1
BUILD_CONNECTOR_ES=1
BUILD_BE_JAVA_EXTENSIONS=1
BUILD_BE_CDC_CLIENT=1
CLEAN=0
Expand Down Expand Up @@ -313,6 +319,14 @@ else
--be-cdc-client)
BUILD_BE_CDC_CLIENT=1
shift
;;
--connector-es)
BUILD_CONNECTOR_ES=1
shift
;;
--no-connector-es)
BUILD_CONNECTOR_ES=0
shift
;;
--exclude-obs-dependencies)
BUILD_OBS_DEPENDENCIES=0
Expand Down Expand Up @@ -380,6 +394,7 @@ else
BUILD_INDEX_TOOL='ON'
BUILD_TASK_EXECUTOR_SIMULATOR='OFF'
BUILD_HIVE_UDF=1
BUILD_CONNECTOR_ES=1
BUILD_BE_JAVA_EXTENSIONS=1
BUILD_BE_CDC_CLIENT=1
CLEAN=0
Expand Down Expand Up @@ -600,6 +615,7 @@ echo "Get params:
BUILD_BE_JAVA_EXTENSIONS -- ${BUILD_BE_JAVA_EXTENSIONS}
BUILD_BE_CDC_CLIENT -- ${BUILD_BE_CDC_CLIENT}
BUILD_HIVE_UDF -- ${BUILD_HIVE_UDF}
BUILD_CONNECTOR_ES -- ${BUILD_CONNECTOR_ES}
BUILD_JUICEFS -- ${BUILD_JUICEFS}
PARALLEL -- ${PARALLEL}
CLEAN -- ${CLEAN}
Expand Down Expand Up @@ -645,6 +661,9 @@ if [[ "${BUILD_FE}" -eq 1 ]]; then
modules+=("fe-${WITH_TDE_DIR}")
fi
fi
if [[ "${BUILD_CONNECTOR_ES}" -eq 1 ]]; then
modules+=("fe-connectors/connector-es")
fi
if [[ "${BUILD_HIVE_UDF}" -eq 1 ]]; then
modules+=("hive-udf")
fi
Expand Down Expand Up @@ -948,6 +967,12 @@ if [[ "${BUILD_FE}" -eq 1 ]]; then
mkdir -p "${DORIS_OUTPUT}/fe/conf/ssl"
mkdir -p "${DORIS_OUTPUT}/fe/plugins/jdbc_drivers/"
mkdir -p "${DORIS_OUTPUT}/fe/plugins/java_udf/"
mkdir -p "${DORIS_OUTPUT}/fe/lib/connectors/"
if [[ "${BUILD_CONNECTOR_ES}" -eq 1 ]]; then
mkdir -p "${DORIS_OUTPUT}/fe/lib/connectors/es/"
cp -r -p "${DORIS_HOME}/fe/fe-connectors/connector-es/target/doris-connector-es.jar" \
"${DORIS_OUTPUT}/fe/lib/connectors/es/"
fi
mkdir -p "${DORIS_OUTPUT}/fe/plugins/connectors/"
mkdir -p "${DORIS_OUTPUT}/fe/plugins/hadoop_conf/"
mkdir -p "${DORIS_OUTPUT}/fe/plugins/java_extensions/"
Expand Down
8 changes: 8 additions & 0 deletions docker/thirdparties/run-thirdparties-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,14 @@ prepare_juicefs_meta_for_hive() {
return 0
fi

# Clean stale bucket data before formatting. When meta is not formatted,
# any leftover data in the bucket directory is orphaned from a previous run
# and will cause "juicefs format" to fail with "Storage ... is not empty".
if [[ -d "${bucket_dir}" ]]; then
echo "Cleaning stale JuiceFS bucket directory: ${bucket_dir}"
sudo rm -rf "${bucket_dir:?}"/*
fi

if ! run_juicefs_cli \
format --storage file --bucket "${bucket_dir}" "${jfs_meta}" "${jfs_cluster_name}"; then
# If format reports conflict on rerun, verify by status and continue.
Expand Down
Loading
Loading