This is an automated email from the ASF dual-hosted git repository.
morningman pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
from 49fecd2a6d [improvement](log) print info of error replicas (#14220)
add 23a8c7eeb6 (fix)(multi-catalog)(es) Fix error result because not used
fields_context (#14229)
No new revisions were added by this update.
Summary of changes:
.../postgresql-14.env => elasticsearch/es.env} | 4 +-
.../elasticsearch/{elasticsearch.yaml => es.yaml} | 50 +++++++++++++----
.../elasticsearch/scripts/data/data1.json | 6 +++
.../elasticsearch/scripts/data/data2.json | 6 +++
.../elasticsearch/scripts/data/data3.json | 6 +++
.../elasticsearch/scripts/es_init.sh | 57 ++++++++++++++++++++
.../elasticsearch/scripts/index/es6_test1.json | 8 ++-
.../elasticsearch/scripts/index/es6_test2.json | 11 +++-
.../elasticsearch/scripts/index/es7_test1.json | 28 ++++++++++
.../elasticsearch/scripts/index/es7_test2.json | 31 +++++++++++
docker/thirdparties/start-thirdparties-docker.sh | 12 ++++-
docker/thirdparties/stop-thirdparties-docker.sh | 2 +-
.../docs/ecosystem/external-table/multi-catalog.md | 4 +-
.../docs/ecosystem/external-table/multi-catalog.md | 2 +-
.../doris/external/elasticsearch/EsUtil.java | 22 ++++----
.../java/org/apache/doris/planner/EsScanNode.java | 8 ++-
.../doris/external/elasticsearch/EsUtilTest.java | 9 ++--
regression-test/conf/regression-conf.groovy | 7 +++
regression-test/data/es_p0/test_es_query.out | 12 +++++
regression-test/suites/es_p0/test_es_query.groovy | 62 ++++++++++++++++++++++
20 files changed, 313 insertions(+), 34 deletions(-)
copy docker/thirdparties/docker-compose/{postgresql/postgresql-14.env =>
elasticsearch/es.env} (89%)
rename docker/thirdparties/docker-compose/elasticsearch/{elasticsearch.yaml =>
es.yaml} (66%)
create mode 100755
docker/thirdparties/docker-compose/elasticsearch/scripts/data/data1.json
create mode 100755
docker/thirdparties/docker-compose/elasticsearch/scripts/data/data2.json
create mode 100755
docker/thirdparties/docker-compose/elasticsearch/scripts/data/data3.json
create mode 100755
docker/thirdparties/docker-compose/elasticsearch/scripts/es_init.sh
copy fe/fe-core/src/test/resources/data/es/es7_index_mapping.json =>
docker/thirdparties/docker-compose/elasticsearch/scripts/index/es6_test1.json
(79%)
mode change 100644 => 100755
copy fe/fe-core/src/test/resources/data/es/es8_index_mapping.json =>
docker/thirdparties/docker-compose/elasticsearch/scripts/index/es6_test2.json
(74%)
mode change 100644 => 100755
create mode 100755
docker/thirdparties/docker-compose/elasticsearch/scripts/index/es7_test1.json
create mode 100755
docker/thirdparties/docker-compose/elasticsearch/scripts/index/es7_test2.json
create mode 100644 regression-test/data/es_p0/test_es_query.out
create mode 100644 regression-test/suites/es_p0/test_es_query.groovy
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
