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 2022/06/19 11:34:59 UTC
[doris] branch master updated: [TLP](step-1) Remove incubator prefix (#10230)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 67f341f44e [TLP](step-1) Remove incubator prefix (#10230)
67f341f44e is described below
commit 67f341f44e23c43251e6c6469495b86c3f2b1a04
Author: Mingyu Chen <mo...@gmail.com>
AuthorDate: Sun Jun 19 19:34:52 2022 +0800
[TLP](step-1) Remove incubator prefix (#10230)
Remove some `incubator-` prefix in source code.
The document is not modified, will be done in next PR.
---
CONTRIBUTING.md | 20 ++++++++---------
CONTRIBUTING_CN.md | 20 ++++++++---------
DISCLAIMER | 12 ----------
NOTICE.txt | 2 +-
README.md | 26 +++++++++++-----------
be/CMakeLists.txt | 2 +-
be/src/olap/schema_change.cpp | 2 +-
be/src/runtime/thread_context.h | 2 +-
be/src/runtime/threadlocal.h | 2 +-
build.sh | 2 +-
dist/NOTICE-dist.txt | 2 +-
docker/Dockerfile | 10 ++++-----
docker/Dockerfile.gcc10 | 10 ++++-----
docker/Dockerfile.gcc7 | 10 ++++-----
docker/README.md | 14 ++++++------
extension/dbt-doris/README.md | 4 ++--
extension/logstash/README.md | 4 ++--
.../java/org/apache/doris/alter/RollupJobV2.java | 2 +-
.../org/apache/doris/alter/SchemaChangeJobV2.java | 2 +-
.../java/org/apache/doris/analysis/QueryStmt.java | 2 +-
.../org/apache/doris/clone/TabletSchedCtx.java | 2 +-
.../doris/nereids/trees/AbstractTreeNode.java | 3 +--
.../org/apache/doris/planner/BrokerScanNode.java | 2 +-
fe/pom.xml | 8 +++----
fe_plugins/pom.xml | 8 +++----
fs_brokers/apache_hdfs_broker/pom.xml | 8 +++----
regression-test/framework/pom.xml | 8 +++----
samples/stream_load/java/DorisStreamLoad.java | 2 +-
thirdparty/CHANGELOG.md | 2 +-
thirdparty/download-thirdparty.sh | 2 +-
30 files changed, 91 insertions(+), 104 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a37660afa9..b0d049fe13 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -21,7 +21,7 @@ under the License.
Thank you very much for your interest in the Doris project. We welcome your suggestions, comments (including criticisms), comments and contributions to the Doris project.
-Your suggestions, comments and comments on Doris can be made directly through GitHub's [Issues](https://github.com/apache/incubator-doris/issues/new/choose).
+Your suggestions, comments and comments on Doris can be made directly through GitHub's [Issues](https://github.com/apache/doris/issues/new/choose).
There are many ways to participate in and contribute to Doris projects: code implementation, test writing, process tool improvement, document improvement, and so on. Any contribution will be welcomed and you will be added to the list of contributors. Further, with sufficient contributions, you will have the opportunity to become a Commiter of Apache with Apache mailbox and be included in the list of [Apache Commiters](http://people.apache.org/committer-index.html).
@@ -31,7 +31,7 @@ Any questions, you can contact us to get timely answers, including dev mail list
For the first time in Doris community, you can:
-* Follow [Doris Github](https://github.com/apache/incubator-doris)
+* Follow [Doris Github](https://github.com/apache/doris)
* Subscribe to our [mailing list](./docs/en/community/subscribe-mail-list.md);
* Join Doris [Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
@@ -39,15 +39,15 @@ Learn the development trends of Doris project in time and give your opinions on
## Doris's code and documentation
-As you can see from [GitHub](https://github.com/apache/incubator-doris), Apache Doris (incubating) code base mainly consists of three parts: Frontend (FE), Backend (BE) and Broker (to support file reading on external storage systems such as HDFS). Documents are mainly the wiki on Doris website and GitHub, as well as the online help manual when running Doris. Details of these components can be found in the following table:
+As you can see from [GitHub](https://github.com/apache/doris), Apache Doris code base mainly consists of three parts: Frontend (FE), Backend (BE) and Broker (to support file reading on external storage systems such as HDFS). Documents are mainly the wiki on Doris website and GitHub, as well as the online help manual when running Doris. Details of these components can be found in the following table:
| Component Name | Component Description | Related Language |
|-------------------------------------------------------------------|------------------------------------------------------------|------------------|
-| [Frontend daemon (FE)](https://github.com/apache/incubator-doris) | consists of a query coordinator and a metadata manager | Java |
-| [Backend daemon (BE)](https://github.com/apache/incubator-doris) | Responsible for storing data and executing query fragments | C++ |
-| [Broker](https://github.com/apache/incubator-doris) | Read HDFS data to Doris | Java |
-| [Website](https://github.com/apache/incubator-doris-website) | Doris Website | Markdown |
-| [Github Wiki](https://github.com/apache/incubator-doris/wiki) | Doris Github Wiki | Markdown |
+| [Frontend daemon (FE)](https://github.com/apache/doris) | consists of a query coordinator and a metadata manager | Java |
+| [Backend daemon (BE)](https://github.com/apache/doris) | Responsible for storing data and executing query fragments | C++ |
+| [Broker](https://github.com/apache/doris) | Read HDFS data to Doris | Java |
+| [Website](https://github.com/apache/doris-website) | Doris Website | Markdown |
+| [Github Wiki](https://github.com/apache/doris/wiki) | Doris Github Wiki | Markdown |
| Doris Runtime Help Document | Online Help Manual at Doris Runtime | Markdown |
## Improving documentation
@@ -58,11 +58,11 @@ Browse the document, you can deepen your understanding of Doris, can also help y
If you are interested in improving the quality of documents, whether it is revising the address of a page, correcting a link, and writing a better introductory document, we are very welcome!
-Most of our documents are written in markdown format, and you can modify and submit document changes directly through `docs/` in [GitHub](https://github.com/apache/incubator-doris). If you submit code changes, you can refer to [Pull Request](./docs/en/community/how-to-contribute/pull-request.md).
+Most of our documents are written in markdown format, and you can modify and submit document changes directly through `docs/` in [GitHub](https://github.com/apache/doris). If you submit code changes, you can refer to [Pull Request](./docs/en/community/how-to-contribute/pull-request.md).
## If a Bug or problem is found
-If a Bug or problem is found, you can directly raise a new Issue through GitHub's [Issues](https://github.com/apache/incubator-doris/issues/new/choose), and we will have someone deal with it regularly.
+If a Bug or problem is found, you can directly raise a new Issue through GitHub's [Issues](https://github.com/apache/doris/issues/new/choose), and we will have someone deal with it regularly.
You can also fix it yourself by reading the analysis code (of course, it's better to talk to us before that, maybe someone has fixed the same problem) and submit a [Pull Request](./docs/en/community/how-to-contribute/pull-request.md).
diff --git a/CONTRIBUTING_CN.md b/CONTRIBUTING_CN.md
index 951c4da735..451021123b 100644
--- a/CONTRIBUTING_CN.md
+++ b/CONTRIBUTING_CN.md
@@ -21,7 +21,7 @@ under the License.
非常感谢您对 Doris 项目感兴趣，我们非常欢迎您对 Doris 项目的各种建议、意见（包括批评）、评论和贡献。
-您对 Doris 的各种建议、意见、评论可以直接通过 GitHub 的 [Issues](https://github.com/apache/incubator-doris/issues/new/choose) 提出。
+您对 Doris 的各种建议、意见、评论可以直接通过 GitHub 的 [Issues](https://github.com/apache/doris/issues/new/choose) 提出。
参与 Doris 项目并为其作出贡献的方法有很多：代码实现、测试编写、流程工具改进、文档完善等等。任何贡献我们都会非常欢迎，并将您加入贡献者列表，进一步，有了足够的贡献后，您还可以有机会成为 Apache 的 Commiter，拥有 Apache 邮箱，并被收录到 [Apache Commiter 列表中](http://people.apache.org/committer-index.html)。
@@ -31,7 +31,7 @@ under the License.
初次来到 Doris 社区，您可以：
-* 关注 Doris [Github 代码库](https://github.com/apache/incubator-doris)
+* 关注 Doris [Github 代码库](https://github.com/apache/doris)
* 订阅我们的 [邮件列表](./docs/zh-CN/community/subscribe-mail-list.md)；
* 加入 Doris 的 [Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
@@ -39,15 +39,15 @@ under the License.
## Doris 的代码和文档
-正如您在 [GitHub](https://github.com/apache/incubator-doris) 上看到的，Apache Doris (incubating) 的代码库主要包括三部分：Frontend (FE), Backend (BE) 和 Broker (为了支持 HDFS 等外部存储系统上的文件读取)。文档主要是 Doris 网站和 GitHub 上的 wiki，还有运行 Doris 的时候的在线帮助手册。这些组件的详细情况参见下表：
+正如您在 [GitHub](https://github.com/apache/doris) 上看到的，Apache Doris 的代码库主要包括三部分：Frontend (FE), Backend (BE) 和 Broker (为了支持 HDFS 等外部存储系统上的文件读取)。文档主要是 Doris 网站和 GitHub 上的 wiki，还有运行 Doris 的时候的在线帮助手册。这些组件的详细情况参见下表：
| 组件名称 | 组件描述 | 相关语言 |
|--------|----------------------------|----------|
-| [Frontend daemon (FE)](https://github.com/apache/incubator-doris)| 由“查询协调器”和“元数据管理器”组成 | Java|
-| [Backend daemon (BE)](https://github.com/apache/incubator-doris) | 负责存储数据和执行查询片段 | C++|
-| [Broker](https://github.com/apache/incubator-doris) | 读取 HDFS 数据到 Doris | Java |
-| [Website](https://github.com/apache/incubator-doris-website) | Doris 网站 | Markdown |
-| [GitHub Wiki](https://github.com/apache/incubator-doris/wiki) | Doris GitHub Wiki | Markdown |
+| [Frontend daemon (FE)](https://github.com/apache/doris)| 由“查询协调器”和“元数据管理器”组成 | Java|
+| [Backend daemon (BE)](https://github.com/apache/doris) | 负责存储数据和执行查询片段 | C++|
+| [Broker](https://github.com/apache/doris) | 读取 HDFS 数据到 Doris | Java |
+| [Website](https://github.com/apache/doris-website) | Doris 网站 | Markdown |
+| [GitHub Wiki](https://github.com/apache/doris/wiki) | Doris GitHub Wiki | Markdown |
| Doris 运行时 help 文档 | 运行 Doris 的时候的在线帮助手册 | Markdown |
## 改进文档
@@ -58,11 +58,11 @@ under the License.
如果您对改进文档的质量感兴趣，不论是修订一个页面的地址、更正一个链接、以及写一篇更优秀的入门文档，我们都非常欢迎！
-我们的文档大多数是使用 markdown 格式编写的，您可以直接通过在 [GitHub](https://github.com/apache/incubator-doris) 中的 `docs/` 中修改并提交文档变更。如果提交代码变更，可以参阅 [Pull Request](./docs/zh-CN/community/how-to-contribute/pull-request.md)。
+我们的文档大多数是使用 markdown 格式编写的，您可以直接通过在 [GitHub](https://github.com/apache/doris) 中的 `docs/` 中修改并提交文档变更。如果提交代码变更，可以参阅 [Pull Request](./docs/zh-CN/community/how-to-contribute/pull-request.md)。
## 如果发现了一个 Bug 或问题
-如果发现了一个 Bug 或问题，您可以直接通过 GitHub 的 [Issues](https://github.com/apache/incubator-doris/issues/new/choose) 提一个新的 Issue，我们会有人定期处理。
+如果发现了一个 Bug 或问题，您可以直接通过 GitHub 的 [Issues](https://github.com/apache/doris/issues/new/choose) 提一个新的 Issue，我们会有人定期处理。
您也可以通过阅读分析代码自己修复（当然在这之前最好能和我们交流下，或许已经有人在修复同样的问题了），然后提交一个 [Pull Request](./docs/zh-CN/community/how-to-contribute/pull-request.md)。
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index bcae8b923f..0000000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,12 +0,0 @@
-Apache Doris (incubating) is an effort undergoing incubation at The
-Apache Software Foundation (ASF), sponsored by the Apache Incubator PMC.
-
-Incubation is required of all newly accepted
-projects until a further review indicates that the
-infrastructure, communications, and decision making process have
-stabilized in a manner consistent with other successful ASF
-projects.
-
-While incubation status is not necessarily a reflection
-of the completeness or stability of the code, it does indicate
-that the project has yet to be fully endorsed by the ASF.
diff --git a/NOTICE.txt b/NOTICE.txt
index 7f0561b0f5..a14d712816 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -1,4 +1,4 @@
-Apache Doris (incubating)
+Apache Doris
Copyright 2018-2022 The Apache Software Foundation
This product includes software developed at
diff --git a/README.md b/README.md
index b3c0325dcc..d135e0915d 100644
--- a/README.md
+++ b/README.md
@@ -17,10 +17,10 @@ specific language governing permissions and limitations
under the License.
-->
-# Apache Doris (incubating)
+# Apache Doris
[](https://www.apache.org/licenses/LICENSE-2.0.html)
-[](https://github.com/apache/incubator-doris)
-[](https://github.com/apache/incubator-doris/releases)
+[](https://github.com/apache/doris)
+[](https://github.com/apache/doris/releases)
[](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
[](https://gitter.im/apache-doris/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -33,13 +33,13 @@ Its original name was Palo, developed in Baidu. After donated to Apache Software
- Doris provides high availability, reliability, fault tolerance, and scalability.
-The main advantages of Doris are the simplicity (of developing, deploying and using) and meeting many data serving requirements in a single system. For details, refer to [Overview](https://github.com/apache/incubator-doris/wiki/Doris-Overview).
+The main advantages of Doris are the simplicity (of developing, deploying and using) and meeting many data serving requirements in a single system. For details, refer to [Overview](https://github.com/apache/doris/wiki/Doris-Overview).
**Official website: https://doris.apache.org/**
-[](https://www.apiseven.com/en/contributor-graph?chart=contributorMonthlyActivity&repo=apache/incubator-doris)
+[](https://www.apiseven.com/en/contributor-graph?chart=contributorMonthlyActivity&repo=apache/doris)
-[](https://www.apiseven.com/en/contributor-graph?chart=contributorOverTime&repo=apache/incubator-doris)
+[](https://www.apiseven.com/en/contributor-graph?chart=contributorOverTime&repo=apache/doris)
## License
@@ -55,29 +55,29 @@ Doris mainly integrates the technology of [Google Mesa](https://research.google/
## Compile and install
-See [Compilation](https://doris.incubator.apache.org/install/source-install/compilation-with-ldb-toolchain.html)
+See [Compilation](https://doris.apache.org/install/source-install/compilation-with-ldb-toolchain.html)
## Getting start
-See [Basic Usage](https://doris.incubator.apache.org/install/source-install/compilation-with-ldb-toolchain.html)
+See [Basic Usage](https://doris.apache.org/install/source-install/compilation-with-ldb-toolchain.html)
## Doris Connector
Doris provides support for Spark/Flink to read data stored in Doris through Connector, and also supports to write data to Doris through Connector.
-[apache/incubator-doris-flink-connector](https://github.com/apache/incubator-doris-flink-connector)
+[apache/doris-flink-connector](https://github.com/apache/doris-flink-connector)
-[apache/incubator-doris-spark-connector](https://github.com/apache/incubator-doris-spark-connector)
+[apache/doris-spark-connector](https://github.com/apache/doris-spark-connector)
## Doris Manager
Doris provides one-click visual automatic installation and deployment, cluster management and monitoring tools for clusters.
-[apache/incubator-doris-manager](https://github.com/apache/incubator-doris-manager)
+[apache/doris-manager](https://github.com/apache/doris-manager)
## Report issues or submit pull request
-If you find any bugs, feel free to file a [GitHub issue](https://github.com/apache/incubator-doris/issues) or fix it by submitting a [pull request](https://github.com/apache/incubator-doris/pulls).
+If you find any bugs, feel free to file a [GitHub issue](https://github.com/apache/doris/issues) or fix it by submitting a [pull request](https://github.com/apache/doris/pulls).
## Contact Us
@@ -89,6 +89,6 @@ Contact us through the following mailing list.
## Links
-* Doris official site - <https://doris.incubator.apache.org>
+* Doris official site - <https://doris.apache.org>
* Developer Mailing list - <de...@doris.apache.org>. Mail to <de...@doris.apache.org>, follow the reply to subscribe the mail list.
* Slack channel - [Join the Slack](https://join.slack.com/t/apachedoriscommunity/shared_invite/zt-11jb8gesh-7IukzSrdea6mqoG0HB4gZg)
diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt
index 7cc9b2cb3c..08b0a4d70d 100644
--- a/be/CMakeLists.txt
+++ b/be/CMakeLists.txt
@@ -461,7 +461,7 @@ SET(CXX_FLAGS_UBSAN "${CXX_GCC_FLAGS} -O0 -fno-wrapv -fsanitize=undefined")
# Set the flags to the thread sanitizer, also known as "tsan"
# Turn on sanitizer and debug symbols to get stack traces:
# Use -Wno-builtin-declaration-mismatch to mute warnings like "new declaration ‘__tsan_atomic16 __tsan_atomic16_fetch_nand(..."
-# If use -O0 to compile, BE will stack overflow when start. https://github.com/apache/incubator-doris/issues/8868
+# If use -O0 to compile, BE will stack overflow when start. https://github.com/apache/doris/issues/8868
SET(CXX_FLAGS_TSAN "${CXX_GCC_FLAGS} -O1 -fsanitize=thread -DTHREAD_SANITIZER -Wno-missing-declarations")
# Set compile flags based on the build type.
diff --git a/be/src/olap/schema_change.cpp b/be/src/olap/schema_change.cpp
index 68724d29bc..94f20da9d5 100644
--- a/be/src/olap/schema_change.cpp
+++ b/be/src/olap/schema_change.cpp
@@ -230,7 +230,7 @@ ConvertTypeResolver::ConvertTypeResolver() {
add_convert_type_mapping<OLAP_FIELD_TYPE_CHAR, OLAP_FIELD_TYPE_DATE>();
// supported type convert should annotate in doc:
- // https://doris.apache.org/zh-CN/sql-manual/sql-reference/Data-Definition-Statements/Alter/ALTER-TABLE-COLUMN.html#alter-table-column
+ // http://doris.apache.org/master/zh-CN/sql-reference/sql-statements/Data%20Definition/ALTER%20TABLE.html#description
// If type convert is supported here, you should check fe/src/main/java/org/apache/doris/catalog/ColumnType.java to supported it either
// from varchar type
add_convert_type_mapping<OLAP_FIELD_TYPE_VARCHAR, OLAP_FIELD_TYPE_TINYINT>();
diff --git a/be/src/runtime/thread_context.h b/be/src/runtime/thread_context.h
index cff897c2d7..9b8c6aad02 100644
--- a/be/src/runtime/thread_context.h
+++ b/be/src/runtime/thread_context.h
@@ -182,7 +182,7 @@ private:
};
// Using gcc11 compiles thread_local variable on lower versions of GLIBC will report an error,
-// see https://github.com/apache/incubator-doris/pull/7911
+// see https://github.com/apache/doris/pull/7911
//
// If we want to avoid this error,
// 1. For non-trivial variables in thread_local, such as std::string, you need to store them as pointers to
diff --git a/be/src/runtime/threadlocal.h b/be/src/runtime/threadlocal.h
index a202815457..7f59c689bd 100644
--- a/be/src/runtime/threadlocal.h
+++ b/be/src/runtime/threadlocal.h
@@ -17,7 +17,7 @@
// Reference from kudu, Solve the problem of gcc11 compiling
// non-trivial thread_local variables on lower versions of GLIBC.
-// see https://github.com/apache/incubator-doris/pull/7911
+// see https://github.com/apache/doris/pull/7911
//
// Block-scoped static thread local implementation.
//
diff --git a/build.sh b/build.sh
index e03a6dc9f9..7b038d6896 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@
# under the License.
##############################################################
-# This script is used to compile Apache Doris(incubating).
+# This script is used to compile Apache Doris
# Usage:
# sh build.sh --help
#
diff --git a/dist/NOTICE-dist.txt b/dist/NOTICE-dist.txt
index 882fb993ef..ec1b3939e9 100644
--- a/dist/NOTICE-dist.txt
+++ b/dist/NOTICE-dist.txt
@@ -1,4 +1,4 @@
-Apache Doris (incubating)
+Apache Doris
Copyright 2018-2022 The Apache Software Foundation
This product includes software developed at
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 945d4c520e..5ada8feaf2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -57,14 +57,14 @@ ENV REPOSITORY_URL="https://doris-thirdparty-repo.bj.bcebos.com/thirdparty/" \
RUN rm -f /etc/profile.d/ccache.*
# clone lastest source code, download and build third party
-COPY incubator-doris ${DEFAULT_DIR}/incubator-doris
-RUN cd ${DEFAULT_DIR}/incubator-doris && /bin/bash thirdparty/build-thirdparty.sh \
- && rm -rf ${DEFAULT_DIR}/incubator-doris/thirdparty/src \
+COPY doris ${DEFAULT_DIR}/doris
+RUN cd ${DEFAULT_DIR}/doris && /bin/bash thirdparty/build-thirdparty.sh \
+ && rm -rf ${DEFAULT_DIR}/doris/thirdparty/src \
&& rm -rf ${DEFAULT_DIR}/doris-thirdparty.tar.gz \
&& rm -rf ${DEFAULT_DIR}/doris-thirdparty \
&& mkdir -p ${DEFAULT_DIR}/thirdparty \
- && mv ${DEFAULT_DIR}/incubator-doris/thirdparty/installed ${DEFAULT_DIR}/thirdparty/ \
- && rm -rf ${DEFAULT_DIR}/incubator-doris
+ && mv ${DEFAULT_DIR}/doris/thirdparty/installed ${DEFAULT_DIR}/thirdparty/ \
+ && rm -rf ${DEFAULT_DIR}/doris
RUN alternatives --set java java-11-openjdk.x86_64 && alternatives --set javac java-11-openjdk.x86_64
diff --git a/docker/Dockerfile.gcc10 b/docker/Dockerfile.gcc10
index 777c4e0d17..e0026ce5f5 100644
--- a/docker/Dockerfile.gcc10
+++ b/docker/Dockerfile.gcc10
@@ -81,14 +81,14 @@ ENV DEFAULT_DIR=/var/local
ENV JAVA_HOME="/usr/lib/jvm/java-11"
# clone lastest source code, download and build third party
-COPY incubator-doris ${DEFAULT_DIR}/incubator-doris
-RUN cd ${DEFAULT_DIR}/incubator-doris && /bin/bash thirdparty/build-thirdparty.sh \
- && rm -rf ${DEFAULT_DIR}/incubator-doris/thirdparty/src \
+COPY doris ${DEFAULT_DIR}/doris
+RUN cd ${DEFAULT_DIR}/doris && /bin/bash thirdparty/build-thirdparty.sh \
+ && rm -rf ${DEFAULT_DIR}/doris/thirdparty/src \
&& rm -rf ${DEFAULT_DIR}/doris-thirdparty.tar.gz \
&& rm -rf ${DEFAULT_DIR}/doris-thirdparty \
&& mkdir -p ${DEFAULT_DIR}/thirdparty \
- && mv ${DEFAULT_DIR}/incubator-doris/thirdparty/installed ${DEFAULT_DIR}/thirdparty/ \
- && rm -rf ${DEFAULT_DIR}/incubator-doris
+ && mv ${DEFAULT_DIR}/doris/thirdparty/installed ${DEFAULT_DIR}/thirdparty/ \
+ && rm -rf ${DEFAULT_DIR}/doris
RUN alternatives --set java java-11-openjdk.x86_64 && alternatives --set javac java-11-openjdk.x86_64
diff --git a/docker/Dockerfile.gcc7 b/docker/Dockerfile.gcc7
index 2ed3eb4941..7ca1fb321b 100644
--- a/docker/Dockerfile.gcc7
+++ b/docker/Dockerfile.gcc7
@@ -97,14 +97,14 @@ WORKDIR ${DEFAULT_DIR}
ENV REPOSITORY_URL=https://doris-thirdparty-repo.bj.bcebos.com/thirdparty
# clone lastest source code, download and build third party
-COPY incubator-doris ${DEFAULT_DIR}/incubator-doris
-RUN cd ${DEFAULT_DIR}/incubator-doris && /bin/bash thirdparty/build-thirdparty.sh \
- && rm -rf ${DEFAULT_DIR}/incubator-doris/thirdparty/src \
+COPY doris ${DEFAULT_DIR}/doris
+RUN cd ${DEFAULT_DIR}/doris && /bin/bash thirdparty/build-thirdparty.sh \
+ && rm -rf ${DEFAULT_DIR}/doris/thirdparty/src \
&& rm -rf ${DEFAULT_DIR}/doris-thirdparty.tar.gz \
&& rm -rf ${DEFAULT_DIR}/doris-thirdparty \
&& mkdir -p ${DEFAULT_DIR}/thirdparty \
- && mv ${DEFAULT_DIR}/incubator-doris/thirdparty/installed ${DEFAULT_DIR}/thirdparty/ \
- && rm -rf ${DEFAULT_DIR}/incubator-doris
+ && mv ${DEFAULT_DIR}/doris/thirdparty/installed ${DEFAULT_DIR}/thirdparty/ \
+ && rm -rf ${DEFAULT_DIR}/doris
FROM scratch
COPY --from=builder / /
diff --git a/docker/README.md b/docker/README.md
index 93bc1f53a1..bb52cb0d80 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -25,17 +25,17 @@ under the License.
```console
$ cd /to/your/workspace/
- $ git clone https://github.com/apache/incubator-doris.git
+ $ git clone https://github.com/apache/doris.git
```
- You can remove the `.git` dir in `incubator-doris/` to make the dir size smaller.
+ You can remove the `.git` dir in `doris/` to make the dir size smaller.
So that the following generated docker image can be smaller.
2. Copy Dockerfile
```console
$ cd /to/your/workspace/
- $ cp incubator-doris/docker/Dockerfile ./
+ $ cp doris/docker/Dockerfile ./
```
After preparation, your workspace should like this:
@@ -43,7 +43,7 @@ After preparation, your workspace should like this:
```
.
├── Dockerfile
-├── incubator-doris
+├── doris
│ ├── be
│ ├── bin
│ ├── build.sh
@@ -72,14 +72,14 @@ to download it first and map it to the container. (You can just use the one you
used to build this image before)
```console
-$ docker run -it -v /your/local/path/incubator-doris/:/root/incubator-doris/ doris:v1.0
-$ docker run -it -v /your/local/.m2:/root/.m2 -v /your/local/incubator-doris-DORIS-x.x.x-release/:/root/incubator-doris-DORIS-x.x.x-release/ doris:v1.0
+$ docker run -it -v /your/local/path/doris/:/root/doris/ doris:v1.0
+$ docker run -it -v /your/local/.m2:/root/.m2 -v /your/local/doris-DORIS-x.x.x-release/:/root/doris-DORIS-x.x.x-release/ doris:v1.0
```
Then you can build source code inside the container.
```console
-$ cd /root/incubator-doris/
+$ cd /root/doris/
$ sh build.sh
```
diff --git a/extension/dbt-doris/README.md b/extension/dbt-doris/README.md
index 2bb46773cc..79b9dcd76f 100644
--- a/extension/dbt-doris/README.md
+++ b/extension/dbt-doris/README.md
@@ -5,8 +5,8 @@ This is the doris adapter plugin for dbt.
## Install
```shell
-git clone https://github.com/apache/incubator-doris.git
-cd incubator-doris/extension/dbt-doris && pip install .
+git clone https://github.com/apache/doris.git
+cd doris/extension/dbt-doris && pip install .
```
## Configuring your profile
diff --git a/extension/logstash/README.md b/extension/logstash/README.md
index 57e594d797..4125b3bd4e 100644
--- a/extension/logstash/README.md
+++ b/extension/logstash/README.md
@@ -23,6 +23,6 @@ under the License.
2. How to use
- `http://doris.incubator.apache.org/master/en/extending-doris/logstash.html`
- `http://doris.incubator.apache.org/master/zh-CN/extending-doris/logstash.html`
+ `http://doris.incubator.apache.org/zh-CN/docs/ecosystem/logstash.html`
+ `http://doris.incubator.apache.org/en/docs/ecosystem/logstash.html`
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
index ba707233a5..8d9c83046a 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/RollupJobV2.java
@@ -86,7 +86,7 @@ import java.util.concurrent.TimeUnit;
/**
* Version 2 of RollupJob.
* This is for replacing the old RollupJob
- * https://github.com/apache/incubator-doris/issues/1429
+ * https://github.com/apache/doris/issues/1429
*/
public class RollupJobV2 extends AlterJobV2 implements GsonPostProcessable {
private static final Logger LOG = LogManager.getLogger(RollupJobV2.class);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
index cf1dc977a9..10055bdef9 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeJobV2.java
@@ -80,7 +80,7 @@ import java.util.concurrent.TimeUnit;
/*
* Version 2 of SchemaChangeJob.
* This is for replacing the old SchemaChangeJob
- * https://github.com/apache/incubator-doris/issues/1429
+ * https://github.com/apache/doris/issues/1429
*/
public class SchemaChangeJobV2 extends AlterJobV2 {
private static final Logger LOG = LogManager.getLogger(SchemaChangeJobV2.class);
diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java
index 9e79548e6d..a32b93ac3c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/QueryStmt.java
@@ -534,7 +534,7 @@ public abstract class QueryStmt extends StatementBase {
// "left join (select siteid, citycode from tmp) b on a.siteid = b.siteid;";
// tmp in child stmt "(select siteid, citycode from tmp)" do not contain with_Clause
// so need to check is view name by parentViewNameSet.
- // issue link: https://github.com/apache/incubator-doris/issues/4598
+ // issue link: https://github.com/apache/doris/issues/4598
public abstract void getTables(Analyzer analyzer, Map<Long, Table> tables, Set<String> parentViewNameSet)
throws AnalysisException;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
index daff5f1e06..ef9c3dda0e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/clone/TabletSchedCtx.java
@@ -1207,7 +1207,7 @@ public class TabletSchedCtx implements Comparable<TabletSchedCtx> {
public void resetReplicaState() {
if (tablet != null) {
for (Replica replica : tablet.getReplicas()) {
- // To address issue: https://github.com/apache/incubator-doris/issues/9422
+ // To address issue: https://github.com/apache/doris/issues/9422
// the DECOMMISSION state is set in TabletScheduler and not persist to meta.
// So it is reasonable to reset this state if we failed to scheduler this tablet.
// That is, if the TabletScheduler cannot process the tablet, then it should reset
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/AbstractTreeNode.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/AbstractTreeNode.java
index d4f00a3406..52054e1646 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/AbstractTreeNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/AbstractTreeNode.java
@@ -39,10 +39,9 @@ public abstract class AbstractTreeNode<NODE_TYPE extends TreeNode<NODE_TYPE>>
protected final NodeType type;
protected final List<NODE_TYPE> children;
// TODO: Maybe we should use a GroupPlan to avoid TreeNode hold the GroupExpression.
- // https://github.com/apache/incubator-doris/pull/9807#discussion_r884829067
+ // https://github.com/apache/doris/pull/9807#discussion_r884829067
protected final Optional<GroupExpression> groupExpression;
-
public AbstractTreeNode(NodeType type, NODE_TYPE... children) {
this(type, Optional.empty(), children);
}
diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/BrokerScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/BrokerScanNode.java
index f76cdfc425..ad9fad055d 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/planner/BrokerScanNode.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/planner/BrokerScanNode.java
@@ -82,7 +82,7 @@ import java.util.stream.Collectors;
/**
* Broker scan node
*
- * Since https://github.com/apache/incubator-doris/pull/5686, Doris can read data from HDFS without broker by
+ * Since https://github.com/apache/doris/pull/5686, Doris can read data from HDFS without broker by
* broker scan node.
* Broker scan node is more likely a file scan node for now.
* With this feature, we can extend BrokerScanNode to query external table which data is stored in HDFS, such as
diff --git a/fe/pom.xml b/fe/pom.xml
index f1fbc031bf..0a78a457d1 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -39,14 +39,14 @@ under the License.
</license>
</licenses>
<scm>
- <connection>scm:git:https://git@github.com/apache/incubator-doris.git</connection>
- <developerConnection>scm:git:https://git@github.com/apache/incubator-doris.git</developerConnection>
- <url>scm:git:https://git@github.com/apache/incubator-doris.git</url>
+ <connection>scm:git:https://git@github.com/apache/doris.git</connection>
+ <developerConnection>scm:git:https://git@github.com/apache/doris.git</developerConnection>
+ <url>scm:git:https://git@github.com/apache/doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/apache/incubator-doris/issues</url>
+ <url>https://github.com/apache/doris/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
diff --git a/fe_plugins/pom.xml b/fe_plugins/pom.xml
index cbfad648bd..2b387cbec2 100644
--- a/fe_plugins/pom.xml
+++ b/fe_plugins/pom.xml
@@ -39,14 +39,14 @@ under the License.
</license>
</licenses>
<scm>
- <connection>scm:git:https://git@github.com/apache/incubator-doris.git</connection>
- <developerConnection>scm:git:https://git@github.com/apache/incubator-doris.git</developerConnection>
- <url>scm:git:https://git@github.com/apache/incubator-doris.git</url>
+ <connection>scm:git:https://git@github.com/apache/doris.git</connection>
+ <developerConnection>scm:git:https://git@github.com/apache/doris.git</developerConnection>
+ <url>scm:git:https://git@github.com/apache/doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/apache/incubator-doris/issues</url>
+ <url>https://github.com/apache/doris/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
diff --git a/fs_brokers/apache_hdfs_broker/pom.xml b/fs_brokers/apache_hdfs_broker/pom.xml
index c15f5f63ba..c918345a59 100644
--- a/fs_brokers/apache_hdfs_broker/pom.xml
+++ b/fs_brokers/apache_hdfs_broker/pom.xml
@@ -39,14 +39,14 @@ under the License.
</license>
</licenses>
<scm>
- <connection>scm:git:https://git@github.com/apache/incubator-doris.git</connection>
- <developerConnection>scm:git:https://git@github.com/apache/incubator-doris.git</developerConnection>
- <url>scm:git:https://git@github.com/apache/incubator-doris.git</url>
+ <connection>scm:git:https://git@github.com/apache/doris.git</connection>
+ <developerConnection>scm:git:https://git@github.com/apache/doris.git</developerConnection>
+ <url>scm:git:https://git@github.com/apache/doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/apache/incubator-doris/issues</url>
+ <url>https://github.com/apache/doris/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
diff --git a/regression-test/framework/pom.xml b/regression-test/framework/pom.xml
index f90d2a7214..a306b3b8fd 100644
--- a/regression-test/framework/pom.xml
+++ b/regression-test/framework/pom.xml
@@ -41,14 +41,14 @@ under the License.
</license>
</licenses>
<scm>
- <connection>scm:git:https://git@github.com/apache/incubator-doris.git</connection>
- <developerConnection>scm:git:https://git@github.com/apache/incubator-doris.git</developerConnection>
- <url>scm:git:https://git@github.com/apache/incubator-doris.git</url>
+ <connection>scm:git:https://git@github.com/apache/doris.git</connection>
+ <developerConnection>scm:git:https://git@github.com/apache/doris.git</developerConnection>
+ <url>scm:git:https://git@github.com/apache/doris.git</url>
<tag>HEAD</tag>
</scm>
<issueManagement>
<system>GitHub</system>
- <url>https://github.com/apache/incubator-doris/issues</url>
+ <url>https://github.com/apache/doris/issues</url>
</issueManagement>
<mailingLists>
<mailingList>
diff --git a/samples/stream_load/java/DorisStreamLoad.java b/samples/stream_load/java/DorisStreamLoad.java
index 01cea300f3..f44e69ff64 100644
--- a/samples/stream_load/java/DorisStreamLoad.java
+++ b/samples/stream_load/java/DorisStreamLoad.java
@@ -170,7 +170,7 @@ public class DorisStreamLoad {
}
//in doris 0.9 version, you need to comment this line
- //refer to https://github.com/apache/incubator-doris/issues/783
+ //refer to https://github.com/apache/doris/issues/783
stringBuilder.deleteCharAt(stringBuilder.length() - 1);
String loadData = stringBuilder.toString();
diff --git a/thirdparty/CHANGELOG.md b/thirdparty/CHANGELOG.md
index 7e43b74abf..4a936be5fc 100644
--- a/thirdparty/CHANGELOG.md
+++ b/thirdparty/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog
-This file contains version of the third-party dependency libraries in the build-env image. The docker build-env image is apache/incubator-doris, and the tag is `build-env-${version}`
+This file contains version of the third-party dependency libraries in the build-env image. The docker build-env image is apache/doris, and the tag is `build-env-${version}`
## v20220613
- Modified: update libhdfs3 from 2.3.0 to 2.3.1 fix client uuid set error
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
index 60883f2632..c9d82949a3 100755
--- a/thirdparty/download-thirdparty.sh
+++ b/thirdparty/download-thirdparty.sh
@@ -293,7 +293,7 @@ fi
echo "Finished patching $ROCKSDB_SOURCE"
# opentelemetry patch is used to solve the problem that threadlocal depends on GLIBC_2.18
-# see: https://github.com/apache/incubator-doris/pull/7911
+# see: https://github.com/apache/doris/pull/7911
if [ $OPENTELEMETRY_SOURCE == "opentelemetry-cpp-1.4.0" ]; then
rm -rf $TP_SOURCE_DIR/$OPENTELEMETRY_SOURCE/third_party/opentelemetry-proto/*
cp -r $TP_SOURCE_DIR/$OPENTELEMETRY_PROTO_SOURCE/* $TP_SOURCE_DIR/$OPENTELEMETRY_SOURCE/third_party/opentelemetry-proto
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org