This is an automated email from the ASF dual-hosted git repository.
morningman pushed a change to branch branch-1.2-unstable
in repository https://gitbox.apache.org/repos/asf/doris.git
discard 5ebb5fbecd [temp](statistics) disable statistic tables
add 23a8c7eeb6 (fix)(multi-catalog)(es) Fix error result because not used
fields_context (#14229)
add 594e3b8224 [feature](Nereids) add circle detector and avoid overlap
(#14164)
new 8579043085 [temp](statistics) disable statistic tables
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (5ebb5fbecd)
\
N -- N -- N refs/heads/branch-1.2-unstable (8579043085)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
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 ++-
.../joinreorder/hypergraph/CircleDetector.java | 159 ++++++++++++++++
.../nereids/rules/joinreorder/hypergraph/Edge.java | 16 +-
.../joinreorder/hypergraph/GraphSimplifier.java | 207 ++++++++++++++-------
.../rules/joinreorder/hypergraph/HyperGraph.java | 8 +-
.../nereids/rules/joinreorder/hypergraph/Node.java | 11 +-
.../java/org/apache/doris/planner/EsScanNode.java | 8 +-
.../doris/external/elasticsearch/EsUtilTest.java | 9 +-
.../joinreorder/hypergraph/CircleDetectorTest.java | 44 +++++
.../hypergraph/GraphSimplifierTest.java | 132 ++++++++++---
.../joinreorder/hypergraph/HyperGraphTest.java | 6 +-
.../doris/nereids/util/HyperGraphBuilder.java | 6 +-
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 ++++++
29 files changed, 785 insertions(+), 151 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
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/joinreorder/hypergraph/CircleDetector.java
create mode 100644
fe/fe-core/src/test/java/org/apache/doris/nereids/rules/joinreorder/hypergraph/CircleDetectorTest.java
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
