You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2020/06/26 09:46:56 UTC
[incubator-doris] branch master updated (be5fc76 -> a894b1e)
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/incubator-doris.git.
from be5fc76 [Doris On ES][Optimization] Ignore _total node for efficiency (#3932)
add a894b1e [Doris On ES] Split /_cluster/state to [indexName/_mappings, indexName/_search_shards] (#3454)
No new revisions were added by this update.
Summary of changes:
docs/en/extending-doris/doris-on-es.md | 4 +-
docs/zh-CN/extending-doris/doris-on-es.md | 2 +-
.../java/org/apache/doris/catalog/Catalog.java | 16 +-
.../java/org/apache/doris/catalog/Database.java | 2 +-
.../java/org/apache/doris/catalog/EsTable.java | 54 +++-
.../doris/common/proc/EsPartitionsProcDir.java | 22 +-
.../apache/doris/common/proc/EsShardProcDir.java | 8 +-
.../doris/external/elasticsearch/EsFieldInfos.java | 190 ++++++++++++++
.../doris/external/elasticsearch/EsRepository.java | 101 ++++++++
.../doris/external/elasticsearch/EsRestClient.java | 117 ++++-----
.../{EsIndexState.java => EsShardPartitions.java} | 111 ++++----
.../external/elasticsearch/EsShardRouting.java | 6 +-
.../doris/external/elasticsearch/EsStateStore.java | 282 ---------------------
.../external/elasticsearch/EsTablePartitions.java | 172 +++++++++++++
.../doris/external/elasticsearch/EsTableState.java | 105 --------
.../doris/external/elasticsearch/EsUtil.java | 21 +-
.../java/org/apache/doris/planner/EsScanNode.java | 24 +-
.../org/apache/doris/catalog/CatalogTestUtil.java | 63 +----
.../external/elasticsearch/EsRepositoryTest.java | 128 ++++++++++
fe/src/test/resources/data/es/es7_mappings.json | 23 ++
fe/src/test/resources/data/es/mappings.json | 25 ++
fe/src/test/resources/data/es/search_shards.json | 213 ++++++++++++++++
22 files changed, 1057 insertions(+), 632 deletions(-)
create mode 100644 fe/src/main/java/org/apache/doris/external/elasticsearch/EsFieldInfos.java
create mode 100644 fe/src/main/java/org/apache/doris/external/elasticsearch/EsRepository.java
rename fe/src/main/java/org/apache/doris/external/elasticsearch/{EsIndexState.java => EsShardPartitions.java} (57%)
delete mode 100644 fe/src/main/java/org/apache/doris/external/elasticsearch/EsStateStore.java
create mode 100644 fe/src/main/java/org/apache/doris/external/elasticsearch/EsTablePartitions.java
delete mode 100644 fe/src/main/java/org/apache/doris/external/elasticsearch/EsTableState.java
create mode 100644 fe/src/test/java/org/apache/doris/external/elasticsearch/EsRepositoryTest.java
create mode 100644 fe/src/test/resources/data/es/es7_mappings.json
create mode 100644 fe/src/test/resources/data/es/mappings.json
create mode 100644 fe/src/test/resources/data/es/search_shards.json
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org