From 5c51e26b8dff4de88be9586d80fbd9876f6f8a3b Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 17 Aug 2020 13:15:37 +0800 Subject: [PATCH 1/9] [License] Organize and modify the license of the code 1. Disable the MySQL client and LZO library by default when building the Doris. MySQL client library is used for MySQL external table feature. This feature will be replaced by the new ODBC external table soon. LZO library is used to compress/decompress data of some old data format of Doris, which is no longer used anymore. 2. Add missing license to some files. 3. For all non-Apache-License code, all are explained in NOTICE file and the corresponding license is declared. --- .rat-excludes | 2 +- DISCLAIMER-WIP | 18 -- LICENSE.txt | 156 +++++++++++++----- .../olap/timestamped_version_tracker_test.cpp | 19 ++- build.sh | 4 +- docs/en/README.md | 20 +++ docs/en/downloads/downloads.md | 19 +++ docs/zh-CN/README.md | 19 +++ .../apache/doris/load/DeleteHandlerTest.java | 17 ++ .../load/loadv2/SparkRepositoryTest.java | 17 ++ .../BatchModifyPartitionsInfoTest.java | 17 ++ .../auditloader/src/main/assembly/plugin.conf | 17 ++ .../apache_hdfs_broker/conf/log4j.properties | 17 ++ tools/row_to_column/README | 11 -- tools/row_to_column/README.md | 37 +++++ tools/row_to_column/conf | 17 ++ tools/show_segment_status/conf | 17 ++ 17 files changed, 353 insertions(+), 71 deletions(-) delete mode 100644 DISCLAIMER-WIP delete mode 100644 tools/row_to_column/README create mode 100644 tools/row_to_column/README.md diff --git a/.rat-excludes b/.rat-excludes index 377bcf0825cae1..7f52e13679ebb3 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -7,7 +7,6 @@ .gitattributes .gitignore .rat-excludes -.travis.yml DISCLAIMER-WIP LICENSE NOTICE @@ -17,3 +16,4 @@ patches/* test_data/* test.zip test.zip.md5 +webroot/* diff --git a/DISCLAIMER-WIP b/DISCLAIMER-WIP deleted file mode 100644 index d287dbfbea5a52..00000000000000 --- a/DISCLAIMER-WIP +++ /dev/null @@ -1,18 +0,0 @@ -Apache Doris is an effort undergoing incubation at The Apache Software Foundation (ASF), -sponsored by the Apache Incubator. 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. - -Some of the incubating project's releases may not be fully compliant with ASF policy. For -example, releases may have incomplete or un-reviewed licensing conditions. What follows is -a list of known issues the project is currently aware of (note that this list, by definition, -is likely to be incomplete): - - * Releases may have incomplete licensing conditions - -If you are planning to incorporate this work into your product/project, please be aware that -you will need to conduct a thorough licensing review to determine the overall implications of -including this work. For the current status of this project through the Apache Incubator -visit: https://incubator.apache.org/projects/doris.html diff --git a/LICENSE.txt b/LICENSE.txt index 08dc4b53d95189..d245714c70d6bc 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -391,13 +391,6 @@ be/src/util/coding.*: this code is licensed under both GPLv2 and Apache 2.0 Lice -------------------------------------------------------------------------------- be/src/olap/lru_cache.h : BSD-style license - - Copyright (c) 2011 The LevelDB Authors. All rights reserved. - Use of this source code is governed by a BSD-style license that can be - found in the LICENSE file. See the AUTHORS file for names of contributors. - --------------------------------------------------------------------------------- - be/src/olap/lru_cache.cpp : BSD-style license Copyright (c) 2011 The LevelDB Authors. All rights reserved. @@ -414,14 +407,10 @@ be/src/olap/skiplist.h : BSD-style license -------------------------------------------------------------------------------- -be/src/util/murmur_hash3.h : licensed under the following terms: - - MurmurHash3 was written by Austin Appleby, and is placed in the public - domain. The author hereby disclaims copyright to this source code. - --------------------------------------------------------------------------------- +be/src/util/murmur_hash3.h +be/src/util/murmur_hash3.cpp -be/src/util/murmur_hash3.cpp : licensed under the following terms: + licensed under the following terms: MurmurHash3 was written by Austin Appleby, and is placed in the public domain. The author hereby disclaims copyright to this source code. @@ -505,11 +494,14 @@ webroot/static/jquery.dataTables.js and webroot/static/datatables*: MIT license -------------------------------------------------------------------------------- -webroot/static/bootstrap.css: MIT license +webroot/be/bootstrap/css/bootstrap.min.css +webroot/be/bootstrap/js/bootstrap.min.js +webroot/static/bootstrap-theme.css +webroot/static/bootstrap.css The MIT License (MIT) - Copyright (c) 2011-2015 Twitter, Inc. + Copyright (c) 2011-2016 Twitter, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software @@ -554,7 +546,7 @@ SOFTWARE. -------------------------------------------------------------------------------- -fe/src/test/java/org/apache/doris/common/jmockit/*: MIT license +fe/fe-common/src/test/java/org/apache/doris/common/jmockit/*: MIT license Copyright (c) 2006 JMockit developers @@ -601,27 +593,27 @@ be/src/util/minizip/* : Condition of use and distribution are the same than zli be/src/util/utf8_check.cpp: MIT license -MIT License - -Copyright (c) 2019 Yibo Cai - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + MIT License + + Copyright (c) 2019 Yibo Cai + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. -------------------------------------------------------------------------------- @@ -705,3 +697,91 @@ webroot/be/bootstrap/css/bootstrap.min.css and webroot/be/bootstrap/js/bootstrap OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +-------------------------------------------------------------------------------- + +webroot/be/d3.v2.js + + Copyright 2019 Mike Bostock. + + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, this list + of conditions and the following disclaimer in the documentation and/or other + materials provided with the distribution. + + * Neither the name of Google Inc. nor the names of its contributors may be used to + endorse or promote products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY + EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL + THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +-------------------------------------------------------------------------------- + +webroot/be/epoch.0.5.2.min.css and webroot/be/epoch.0.5.2.min.js + + The MIT License (MIT) + + Copyright (c) 2014 Fastly, Inc. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +-------------------------------------------------------------------------------- + +webroot/be/jquery-3.2.1.min.js + +-------------------------------------------------------------------------------- + +webroot/be/bootstrap/css/bootstrap-table.min.css +webroot/be/bootstrap/js/bootstrap-table.min.js + + The MIT License + + Copyright (c) 2012-2019 Zhixin Wen + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + diff --git a/be/test/olap/timestamped_version_tracker_test.cpp b/be/test/olap/timestamped_version_tracker_test.cpp index 51357f68671f9f..9b4ce966483b3b 100644 --- a/be/test/olap/timestamped_version_tracker_test.cpp +++ b/be/test/olap/timestamped_version_tracker_test.cpp @@ -1,3 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + #include #include #include @@ -835,4 +852,4 @@ TEST_F(TestTimestampedVersionTracker, get_stale_version_path_json_doc_empty) { int main(int argc, char** argv) { testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS(); -} \ No newline at end of file +} diff --git a/build.sh b/build.sh index 693691cecd41d1..6a1ece60997e07 100755 --- a/build.sh +++ b/build.sh @@ -95,8 +95,8 @@ BUILD_FE= BUILD_SPARK_DPP= CLEAN= RUN_UT= -WITH_MYSQL=ON -WITH_LZO=ON +WITH_MYSQL=OFF +WITH_LZO=OFF HELP=0 if [ $# == 1 ] ; then # default diff --git a/docs/en/README.md b/docs/en/README.md index 49b47e8cf02484..637a804ab1d5ac 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -74,3 +74,23 @@ cases: actionText: Quick Start → actionLink: /en/installing/compilation --- + + + diff --git a/docs/en/downloads/downloads.md b/docs/en/downloads/downloads.md index e05591bf243f38..92ff79ef286748 100644 --- a/docs/en/downloads/downloads.md +++ b/docs/en/downloads/downloads.md @@ -5,6 +5,25 @@ } --- + + # Downloads You can download source code from following links, then compile and install Doris. diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index bfbc1e8e7e950e..e9ba48626a9023 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -1,3 +1,22 @@ + + --- home: true heroImage: /images/home/banner-stats.png diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/DeleteHandlerTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/DeleteHandlerTest.java index aebabf62e23d42..581bb44521235e 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/DeleteHandlerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/DeleteHandlerTest.java @@ -1,3 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + package org.apache.doris.load; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkRepositoryTest.java b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkRepositoryTest.java index 2bba7c745bf7b4..5352a5797b8b9f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkRepositoryTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/load/loadv2/SparkRepositoryTest.java @@ -1,3 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + package org.apache.doris.load.loadv2; import mockit.Expectations; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java index e2b8c187f5a26e..84a4812e1b2176 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/BatchModifyPartitionsInfoTest.java @@ -1,3 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + package org.apache.doris.persist; import org.apache.doris.catalog.DataProperty; diff --git a/fe_plugins/auditloader/src/main/assembly/plugin.conf b/fe_plugins/auditloader/src/main/assembly/plugin.conf index 3f2e90cad10e80..53b9a7c2a57080 100755 --- a/fe_plugins/auditloader/src/main/assembly/plugin.conf +++ b/fe_plugins/auditloader/src/main/assembly/plugin.conf @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + ### plugin configuration # The max size of a batch, default is 50MB diff --git a/fs_brokers/apache_hdfs_broker/conf/log4j.properties b/fs_brokers/apache_hdfs_broker/conf/log4j.properties index cf9616e99fc34a..ee72e870db4567 100644 --- a/fs_brokers/apache_hdfs_broker/conf/log4j.properties +++ b/fs_brokers/apache_hdfs_broker/conf/log4j.properties @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + log4j.rootLogger = debug,stdout,D log4j.appender.stdout = org.apache.log4j.ConsoleAppender diff --git a/tools/row_to_column/README b/tools/row_to_column/README deleted file mode 100644 index 34a53f8f5ff1ab..00000000000000 --- a/tools/row_to_column/README +++ /dev/null @@ -1,11 +0,0 @@ -行存转列存步骤 -1. conf中修改相应的集群配置 -2. 运行python convert_row_to_column.py生成所有行存转列存的命令。 -3. 如果脚本运行没有任何结果，说明集群中不存在行存表，可以进行升级。 -4. 如果脚本中有表的信息获取失败。 - 请在集群中用show create table去看表的storage_type，如果是行存，请手动进行转换。 -5. schema change完成行存转列存之后，旧有的schema需要在10分钟后才删除。 - 请等待一段时间，确定旧有schema的数据已被删除，再进行升级。 - 否则，be进程启动时自动检测时会报错退出。 -6. 再次运行python convert_row_to_column.py验证确实没有行存表再进行升级。 - diff --git a/tools/row_to_column/README.md b/tools/row_to_column/README.md new file mode 100644 index 00000000000000..23990702959ae1 --- /dev/null +++ b/tools/row_to_column/README.md @@ -0,0 +1,37 @@ + + +Steps of row-to-column conversion: + +1. Modify the corresponding cluster configuration in `conf`. + +2. Run `python convert_row_to_column.py` to generate all row storage to column storage commands. + +3. If the script runs without any results, it means that there is no row storage table in the cluster, so nothing need to be done. + +4. If there is a table in the script that fails to obtain information. + + Please use `show create table` in the cluster to see the `storage_type` of the table. If it is row storage, please manually convert it. + +5. After the schema change is completed, the old schema needs to be deleted after 10 minutes. + + Please wait for a while to make sure that the data of the old schema has been deleted, and then upgrade. + Otherwise, the BE process will exit with an error when it is automatically detected when it starts. + +6. Run `python convert_row_to_column.py` again to verify that there are no rows in the table before upgrading. diff --git a/tools/row_to_column/conf b/tools/row_to_column/conf index efde1cd25cf074..3fd26b8aab8680 100644 --- a/tools/row_to_column/conf +++ b/tools/row_to_column/conf @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + [cluster] fe_host = port = diff --git a/tools/show_segment_status/conf b/tools/show_segment_status/conf index 24cf36f437b5bc..b6d4d1be233fd4 100644 --- a/tools/show_segment_status/conf +++ b/tools/show_segment_status/conf @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + [cluster] fe_host = query_port = From 035ba73d868eb783619c13092025b34eeb6d909c Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 17 Aug 2020 17:03:44 +0800 Subject: [PATCH 2/9] remove js and css --- be/CMakeLists.txt | 4 - be/src/http/web_page_handler.cpp | 8 +- build.sh | 10 +- .../http/action/StaticResourceAction.java | 2 +- .../doris/http/action/WebBaseAction.java | 12 +- thirdparty/build-thirdparty.sh | 17 + thirdparty/vars.sh | 28 +- .../be/bootstrap/css/bootstrap-table.min.css | 7 - webroot/be/bootstrap/css/bootstrap.min.css | 6 - .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../be/bootstrap/js/bootstrap-table.min.js | 9 - webroot/be/bootstrap/js/bootstrap.min.js | 7 - webroot/be/d3.v2.js | 7034 ------- webroot/be/epoch.0.5.2.min.css | 1 - webroot/be/epoch.0.5.2.min.js | 92 - webroot/be/jquery-3.2.1.min.js | 4 - webroot/static/bootstrap-theme.css | 587 - webroot/static/bootstrap-theme.css.map | 1 - webroot/static/bootstrap.css | 6757 ------- webroot/static/bootstrap.css.map | 1 - webroot/static/datatables_bootstrap.css | 185 - webroot/static/datatables_bootstrap.js | 182 - .../static/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../static/glyphicons-halflings-regular.svg | 288 - .../static/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../static/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../static/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes webroot/static/jquery.dataTables.js | 15278 ---------------- webroot/static/jquery.js | 10337 ----------- 29 files changed, 62 insertions(+), 40795 deletions(-) delete mode 100644 webroot/be/bootstrap/css/bootstrap-table.min.css delete mode 100644 webroot/be/bootstrap/css/bootstrap.min.css delete mode 100644 webroot/be/bootstrap/fonts/glyphicons-halflings-regular.woff delete mode 100644 webroot/be/bootstrap/js/bootstrap-table.min.js delete mode 100644 webroot/be/bootstrap/js/bootstrap.min.js delete mode 100644 webroot/be/d3.v2.js delete mode 100644 webroot/be/epoch.0.5.2.min.css delete mode 100644 webroot/be/epoch.0.5.2.min.js delete mode 100644 webroot/be/jquery-3.2.1.min.js delete mode 100644 webroot/static/bootstrap-theme.css delete mode 100644 webroot/static/bootstrap-theme.css.map delete mode 100644 webroot/static/bootstrap.css delete mode 100644 webroot/static/bootstrap.css.map delete mode 100644 webroot/static/datatables_bootstrap.css delete mode 100755 webroot/static/datatables_bootstrap.js delete mode 100644 webroot/static/glyphicons-halflings-regular.eot delete mode 100644 webroot/static/glyphicons-halflings-regular.svg delete mode 100644 webroot/static/glyphicons-halflings-regular.ttf delete mode 100644 webroot/static/glyphicons-halflings-regular.woff delete mode 100644 webroot/static/glyphicons-halflings-regular.woff2 delete mode 100644 webroot/static/jquery.dataTables.js delete mode 100755 webroot/static/jquery.js diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt index d56da2a7e15a04..50546ee881fd9a 100644 --- a/be/CMakeLists.txt +++ b/be/CMakeLists.txt @@ -573,7 +573,3 @@ install(FILES ${BASE_DIR}/../conf/be.conf DESTINATION ${OUTPUT_DIR}/conf) -install(DIRECTORY - ${BASE_DIR}/../webroot/be/ - DESTINATION ${OUTPUT_DIR}/www) - diff --git a/be/src/http/web_page_handler.cpp b/be/src/http/web_page_handler.cpp index f9a44279837a7c..da2fc91b12e971 100644 --- a/be/src/http/web_page_handler.cpp +++ b/be/src/http/web_page_handler.cpp @@ -125,11 +125,11 @@ static const std::string kMainTemplate = R"( Doris - - + + - - + + diff --git a/build.sh b/build.sh index 6a1ece60997e07..14ad262aebc56c 100755 --- a/build.sh +++ b/build.sh @@ -223,14 +223,17 @@ if [ ${BUILD_FE} -eq 1 -o ${BUILD_SPARK_DPP} -eq 1 ]; then cp -r -p ${DORIS_HOME}/fe/fe-core/target/lib/* ${DORIS_OUTPUT}/fe/lib/ cp -r -p ${DORIS_HOME}/fe/fe-core/target/palo-fe.jar ${DORIS_OUTPUT}/fe/lib/ cp -r -p ${DORIS_HOME}/docs/build/help-resource.zip ${DORIS_OUTPUT}/fe/lib/ - cp -r -p ${DORIS_HOME}/webroot/* ${DORIS_OUTPUT}/fe/webroot/ + cp -r -p ${DORIS_HOME}/webroot/static ${DORIS_OUTPUT}/fe/webroot/ cp -r -p ${DORIS_HOME}/fe/spark-dpp/target/spark-dpp-*-jar-with-dependencies.jar ${DORIS_OUTPUT}/fe/spark-dpp/ + cp -r -p ${DORIS_THIRDPARTY}/installed/webroot/* ${DORIS_OUTPUT}/fe/webroot/static/ + elif [ ${BUILD_SPARK_DPP} -eq 1 ]; then install -d ${DORIS_OUTPUT}/fe/spark-dpp/ rm -rf ${DORIS_OUTPUT}/fe/spark-dpp/* cp -r -p ${DORIS_HOME}/fe/spark-dpp/target/spark-dpp-*-jar-with-dependencies.jar ${DORIS_OUTPUT}/fe/spark-dpp/ fi + fi if [ ${BUILD_BE} -eq 1 ]; then @@ -244,9 +247,12 @@ if [ ${BUILD_BE} -eq 1 ]; then cp -r -p ${DORIS_HOME}/be/output/bin/* ${DORIS_OUTPUT}/be/bin/ cp -r -p ${DORIS_HOME}/be/output/conf/* ${DORIS_OUTPUT}/be/conf/ cp -r -p ${DORIS_HOME}/be/output/lib/* ${DORIS_OUTPUT}/be/lib/ - cp -r -p ${DORIS_HOME}/be/output/www/* ${DORIS_OUTPUT}/be/www/ cp -r -p ${DORIS_HOME}/be/output/udf/*.a ${DORIS_OUTPUT}/udf/lib/ cp -r -p ${DORIS_HOME}/be/output/udf/include/* ${DORIS_OUTPUT}/udf/include/ + cp -r -p ${DORIS_HOME}/webroot/be/* ${DORIS_OUTPUT}/be/www/ + + cp -r -p ${DORIS_THIRDPARTY}/installed/webroot/* ${DORIS_OUTPUT}/be/www/ + fi echo "***************************************" diff --git a/fe/fe-core/src/main/java/org/apache/doris/http/action/StaticResourceAction.java b/fe/fe-core/src/main/java/org/apache/doris/http/action/StaticResourceAction.java index a73c19c7e1f739..cbd540d29a4827 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/http/action/StaticResourceAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/http/action/StaticResourceAction.java @@ -124,7 +124,7 @@ public static void registerAction(ActionController controller) throws IllegalArg controller.registerHandler(HttpMethod.GET, "/static", action); controller.registerHandler(HttpMethod.GET, "/static/resource", action); controller.registerHandler(HttpMethod.GET, "/static/images", action); - controller.registerHandler(HttpMethod.GET, "/static/fonts", action); + controller.registerHandler(HttpMethod.GET, "/static/Bootstrap-3.3.7/fonts/", action); StaticResourceAction action2 = new StaticResourceAction(controller, "webroot"); controller.registerHandler(HttpMethod.GET, "/static_test", action2); diff --git a/fe/fe-core/src/main/java/org/apache/doris/http/action/WebBaseAction.java b/fe/fe-core/src/main/java/org/apache/doris/http/action/WebBaseAction.java index 6124fed300030b..4a3f3ffccc3197 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/http/action/WebBaseAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/http/action/WebBaseAction.java @@ -63,16 +63,16 @@ public class WebBaseAction extends BaseAction { + " Apache Doris(Incubating)" + " " + " " - + " " - + " " - + " " - + " " - + " " - + " " + + " " + + " " + + " " + " + diff --git a/fe/fe-core/src/main/java/org/apache/doris/http/action/WebBaseAction.java b/fe/fe-core/src/main/java/org/apache/doris/http/action/WebBaseAction.java index 4a3f3ffccc3197..8029e7103dae27 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/http/action/WebBaseAction.java +++ b/fe/fe-core/src/main/java/org/apache/doris/http/action/WebBaseAction.java @@ -70,7 +70,7 @@ public class WebBaseAction extends BaseAction { + " " - + " " + + " " + " " + " " From 0658784010d203b1e223ef6537b61ee87a933112 Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 17 Aug 2020 18:59:06 +0800 Subject: [PATCH 4/9] fix jquery download --- thirdparty/build-thirdparty.sh | 16 +++++++--------- thirdparty/vars.sh | 20 +++++++------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index 8b119a8cb47f38..a5392a759b5fd5 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -700,17 +700,15 @@ build_cctz() { # all js and csss related build_js_and_css() { - check_if_source_exist $DT_SOURCE - check_if_source_exist Bootstrap-3.3.7 - check_if_source_exist jQuery-1.12.4 - check_if_source_exist jQuery-3.2.1 + echo $DATATABLES_SOURCE + check_if_source_exist $DATATABLES_SOURCE + check_if_source_exist Bootstrap-3.3.7/ + check_if_source_exist jQuery-3.3.1/ - mkdir -p $TP_INSTALL_DIR/webroot/jQuery-3.2.1 cd $TP_SOURCE_DIR/ - cp -r $DT_SOURCE $TP_INSTALL_DIR/webroot/ + cp -r $DATATABLES_SOURCE $TP_INSTALL_DIR/webroot/ cp -r Bootstrap-3.3.7 $TP_INSTALL_DIR/webroot/ - cp -r jQuery-1.12.4 $TP_INSTALL_DIR/webroot/ - cp -r jquery-3.2.1.min.js $TP_INSTALL_DIR/webroot/jQuery-3.2.1/ + cp -r jQuery-3.3.1 $TP_INSTALL_DIR/webroot/ cp -r bootstrap-table.min.* $TP_INSTALL_DIR/webroot/ } @@ -751,6 +749,6 @@ build_bitshuffle build_croaringbitmap build_orc build_cctz -build_datatables +build_js_and_css echo "Finihsed to build all thirdparties" diff --git a/thirdparty/vars.sh b/thirdparty/vars.sh index d8394a58b6fd9b..323f7e084844c6 100644 --- a/thirdparty/vars.sh +++ b/thirdparty/vars.sh @@ -266,10 +266,10 @@ CROARINGBITMAP_NAME=CRoaring-0.2.60.tar.gz CROARINGBITMAP_SOURCE=CRoaring-0.2.60 CROARINGBITMAP_MD5SUM="29602918e6890ffdeed84cb171857046" # ORC -ORC_DOWNLOAD="https://github.com/apache/orc/archive/rel/release-1.5.8.tar.gz" +ORC_DOWNLOAD="https://archive.apache.org/dist/orc/orc-1.5.8/orc-1.5.8.tar.gz" ORC_NAME=orc-1.5.8.tar.gz -ORC_SOURCE=orc-rel-release-1.5.8 -ORC_MD5SUM="49eb9ce94060b26d4bc3595b2f1efb4c" +ORC_SOURCE=orc-1.5.8 +ORC_MD5SUM="2318b0a8233c8833b3a6cfd771c60883" # jemalloc JEMALLOC_DOWNLOAD="https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2" @@ -283,17 +283,11 @@ CCTZ_NAME="cctz-2.3.tar.gz" CCTZ_SOURCE="cctz-2.3" CCTZ_MD5SUM="209348e50b24dbbdec6d961059c2fc92" -# datatables, bootstrap 3 and jQuery 1 -DATATABLES_DOWNLOAD="https://datatables.net/download/builder?bs-3.3.7/jqc-1.12.4/dt-1.10.21" +# datatables, bootstrap 3 and jQuery 3 +DATATABLES_DOWNLOAD="https://datatables.net/download/builder?bs-3.3.7/jq-3.3.1/dt-1.10.21" DATATABLES_NAME="DataTables.zip" DATATABLES_SOURCE="DataTables-1.10.21" -DATATABLES_MD5SUM="58fecb10cd7e3e0dbe00f16ee67e0218" - -# jQuery 3 -JQUERY_DOWNLOAD="https://code.jquery.com/jquery-3.2.1.min.js" -JQUERY_NAME="jquery-3.2.1.min.js" -JQUERY_FILE="jquery-3.2.1.min.js" -JQUERY_MD5SUM="c9f5aeeca3ad37bf2aa006139b935f0a" +DATATABLES_MD5SUM="85b71d690bf7f4ed3f77f184212d5ac0" # bootstrap table js BOOTSTRAP_TABLE_JS_DOWNLOAD="https://unpkg.com/bootstrap-table@1.17.1/dist/bootstrap-table.min.js" @@ -308,5 +302,5 @@ BOOTSTRAP_TABLE_CSS_FILE="bootstrap-table.min.css" BOOTSTRAP_TABLE_CSS_MD5SUM="23389d4456da412e36bae30c469a766a" # all thirdparties which need to be downloaded is set in array TP_ARCHIVES -export TP_ARCHIVES="LIBEVENT OPENSSL THRIFT LLVM CLANG COMPILER_RT PROTOBUF GFLAGS GLOG GTEST RAPIDJSON SNAPPY GPERFTOOLS ZLIB LZ4 BZIP LZO2 CURL RE2 BOOST MYSQL BOOST_FOR_MYSQL ODBC LEVELDB BRPC ROCKSDB LIBRDKAFKA FLATBUFFERS ARROW BROTLI DOUBLE_CONVERSION ZSTD S2 BITSHUFFLE CROARINGBITMAP ORC JEMALLOC CCTZ DATATABLES JQUERY BOOTSTRAP_TABLE_JS BOOTSTRAP_TABLE_CSS" +export TP_ARCHIVES="LIBEVENT OPENSSL THRIFT LLVM CLANG COMPILER_RT PROTOBUF GFLAGS GLOG GTEST RAPIDJSON SNAPPY GPERFTOOLS ZLIB LZ4 BZIP LZO2 CURL RE2 BOOST MYSQL BOOST_FOR_MYSQL ODBC LEVELDB BRPC ROCKSDB LIBRDKAFKA FLATBUFFERS ARROW BROTLI DOUBLE_CONVERSION ZSTD S2 BITSHUFFLE CROARINGBITMAP ORC JEMALLOC CCTZ DATATABLES BOOTSTRAP_TABLE_JS BOOTSTRAP_TABLE_CSS" From ffac6025f0bbe2b21667682c67bde6afd52cc251 Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 17 Aug 2020 19:18:26 +0800 Subject: [PATCH 5/9] fix build tp --- thirdparty/build-thirdparty.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/thirdparty/build-thirdparty.sh b/thirdparty/build-thirdparty.sh index a5392a759b5fd5..0202cca3c26710 100755 --- a/thirdparty/build-thirdparty.sh +++ b/thirdparty/build-thirdparty.sh @@ -700,16 +700,17 @@ build_cctz() { # all js and csss related build_js_and_css() { - echo $DATATABLES_SOURCE check_if_source_exist $DATATABLES_SOURCE check_if_source_exist Bootstrap-3.3.7/ check_if_source_exist jQuery-3.3.1/ + mkdir $TP_INSTALL_DIR/webroot/ cd $TP_SOURCE_DIR/ cp -r $DATATABLES_SOURCE $TP_INSTALL_DIR/webroot/ - cp -r Bootstrap-3.3.7 $TP_INSTALL_DIR/webroot/ - cp -r jQuery-3.3.1 $TP_INSTALL_DIR/webroot/ - cp -r bootstrap-table.min.* $TP_INSTALL_DIR/webroot/ + cp -r Bootstrap-3.3.7/ $TP_INSTALL_DIR/webroot/ + cp -r jQuery-3.3.1/ $TP_INSTALL_DIR/webroot/ + cp bootstrap-table.min.js $TP_INSTALL_DIR/webroot/Bootstrap-3.3.7/js + cp bootstrap-table.min.css $TP_INSTALL_DIR/webroot/Bootstrap-3.3.7/css } # See https://github.com/apache/incubator-doris/issues/2910 From ce74de7037becac47ec5b1797720d42daa578d4f Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 17 Aug 2020 19:44:28 +0800 Subject: [PATCH 6/9] fix bugs --- LICENSE.txt | 138 --------------------- be/src/http/action/tablets_info_action.cpp | 4 +- be/src/http/default_path_handlers.cpp | 2 +- 3 files changed, 3 insertions(+), 141 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index d245714c70d6bc..bd0770bbc7874d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -647,141 +647,3 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- - -webroot/be/bootstrap/css/bootstrap-table.min.css and webroot/be/bootstrap/js/bootstrap-table.min.js MIT license - - The MIT License (MIT) - - Copyright (c) 2018 zhixin wen - - Permission is hereby granted, free of charge, to any person obtaining a copy of this - software and associated documentation files (the "Software"), to deal in the Software - without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be included in all copies or - substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - --------------------------------------------------------------------------------- - -webroot/be/bootstrap/css/bootstrap.min.css and webroot/be/bootstrap/js/bootstrap.min.js MIT license - - The MIT License (MIT) - - Copyright (c) 2011-2016 Twitter, Inc. - - Permission is hereby granted, free of charge, to any person obtaining a copy of this - software and associated documentation files (the "Software"), to deal in the Software - without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be included in all copies or - substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - --------------------------------------------------------------------------------- - -webroot/be/d3.v2.js - - Copyright 2019 Mike Bostock. - - Redistribution and use in source and binary forms, with or without modification, are - permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, this list - of conditions and the following disclaimer in the documentation and/or other - materials provided with the distribution. - - * Neither the name of Google Inc. nor the names of its contributors may be used to - endorse or promote products derived from this software without specific prior - written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - --------------------------------------------------------------------------------- - -webroot/be/epoch.0.5.2.min.css and webroot/be/epoch.0.5.2.min.js - - The MIT License (MIT) - - Copyright (c) 2014 Fastly, Inc. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - --------------------------------------------------------------------------------- - -webroot/be/jquery-3.2.1.min.js - --------------------------------------------------------------------------------- - -webroot/be/bootstrap/css/bootstrap-table.min.css -webroot/be/bootstrap/js/bootstrap-table.min.js - - The MIT License - - Copyright (c) 2012-2019 Zhixin Wen - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - diff --git a/be/src/http/action/tablets_info_action.cpp b/be/src/http/action/tablets_info_action.cpp index ff0306e487bd15..2efe02f2d98069 100644 --- a/be/src/http/action/tablets_info_action.cpp +++ b/be/src/http/action/tablets_info_action.cpp @@ -49,8 +49,8 @@ EasyJson TabletsInfoAction::get_tablets_info(string tablet_num_to_return) { int64_t number; std::string msg; if (tablet_num_to_return == "") { - number = 0; - msg = "Parameter Missing"; + number = 1000; // default + msg = "OK"; } else if (tablet_num_to_return == "all") { number = tablets_info.size(); msg = "OK"; diff --git a/be/src/http/default_path_handlers.cpp b/be/src/http/default_path_handlers.cpp index 65ebfd30ff3cc3..413ffa9247bf8f 100644 --- a/be/src/http/default_path_handlers.cpp +++ b/be/src/http/default_path_handlers.cpp @@ -108,7 +108,7 @@ void display_tablets_callback(const WebPageHandler::ArgumentMap& args, EasyJson* if (it != args.end()) { tablet_num_to_return = it->second; } else { - tablet_num_to_return = ""; + tablet_num_to_return = "1000"; // default } (*ej) = tablet_info_action.get_tablets_info(tablet_num_to_return); } From 9fc7f4df526dc173a7da0d0d2a068ff010a40747 Mon Sep 17 00:00:00 2001 From: morningman Date: Thu, 20 Aug 2020 23:30:39 +0800 Subject: [PATCH 7/9] add doc --- build.sh | 23 +++++++---------------- docs/en/installing/compilation.md | 19 +++++++++++++++++++ docs/zh-CN/installing/compilation.md | 21 ++++++++++++++++++++- 3 files changed, 46 insertions(+), 17 deletions(-) diff --git a/build.sh b/build.sh index 14ad262aebc56c..20f74c503f51da 100755 --- a/build.sh +++ b/build.sh @@ -52,16 +52,10 @@ Usage: $0 --fe build Frontend and Spark Dpp application --spark-dpp build Spark DPP application --clean clean and build target - --with-mysql enable MySQL support(default) - --without-mysql disable MySQL support - --with-lzo enable LZO compress support(default) - --without-lzo disable LZO compress support Eg. $0 build all $0 --be build Backend without clean - $0 --be --without-mysql build Backend with MySQL disable - $0 --be --without-mysql --without-lzo build Backend with both MySQL and LZO disable $0 --fe --clean clean and build Frontend and Spark Dpp application $0 --fe --be --clean clean and build Frontend, Spark Dpp application and Backend $0 --spark-dpp build Spark DPP application alone @@ -77,10 +71,6 @@ OPTS=$(getopt \ -l 'fe' \ -l 'spark-dpp' \ -l 'clean' \ - -l 'with-mysql' \ - -l 'without-mysql' \ - -l 'with-lzo' \ - -l 'without-lzo' \ -l 'help' \ -- "$@") @@ -95,8 +85,6 @@ BUILD_FE= BUILD_SPARK_DPP= CLEAN= RUN_UT= -WITH_MYSQL=OFF -WITH_LZO=OFF HELP=0 if [ $# == 1 ] ; then # default @@ -118,10 +106,6 @@ else --spark-dpp) BUILD_SPARK_DPP=1 ; shift ;; --clean) CLEAN=1 ; shift ;; --ut) RUN_UT=1 ; shift ;; - --with-mysql) WITH_MYSQL=ON; shift ;; - --without-mysql) WITH_MYSQL=OFF; shift ;; - --with-lzo) WITH_LZO=ON; shift ;; - --without-lzo) WITH_LZO=OFF; shift ;; -h) HELP=1; shift ;; --help) HELP=1; shift ;; --) shift ; break ;; @@ -140,6 +124,13 @@ if [ ${CLEAN} -eq 1 -a ${BUILD_BE} -eq 0 -a ${BUILD_FE} -eq 0 -a ${BUILD_SPARK_D exit 1 fi +if [[ -z ${WITH_MYSQL} ]]; then + WITH_MYSQL=OFF +fi +if [[ -z ${WITH_LZO} ]]; then + WITH_LZO=OFF +fi + echo "Get params: BUILD_BE -- $BUILD_BE BUILD_FE -- $BUILD_FE diff --git a/docs/en/installing/compilation.md b/docs/en/installing/compilation.md index 22222edf5f004a..172a52fce54cc6 100644 --- a/docs/en/installing/compilation.md +++ b/docs/en/installing/compilation.md @@ -105,3 +105,22 @@ You can try to compile Doris directly in your own Linux environment. $ sh build.sh ``` After compilation, the output file is in the `output/` directory. + +## Special statement + +Starting from version 0.13, the dependency on the two third-party libraries [1] and [2] will be removed in the default compiled output. These two third-party libraries are under [GNU General Public License V3](https://www.gnu.org/licenses/gpl-3.0.en.html). This license is incompatible with [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0), so it should not appear in the Apache release by default. + +Remove library [1] will result in the inability to access MySQL external tables. The feature of accessing MySQL external tables will be implemented through `UnixODBC` in future release version. + +Remove library [2] will cause some data written in earlier versions (before version 0.8) to be unable to read. Because the data in the earlier version was compressed using the LZO algorithm, in later versions, it has been changed to the LZ4 compression algorithm. We will provide tools to detect and convert this part of the data in the future. + +If required, users can continue to use these two dependent libraries. If you want to use it, you need to add the following options when compiling: + +``` +WITH_MYSQL=1 WITH_LZO=1 sh build.sh +``` + +Note that when users rely on these two third-party libraries, Doris is not used under the Apache License 2.0 by default. Please pay attention to the GPL related agreements. + +* [1] mysql-5.7.18 +* [2] lzo-2.10 \ No newline at end of file diff --git a/docs/zh-CN/installing/compilation.md b/docs/zh-CN/installing/compilation.md index 94209a4e5b179b..f69483cfaca36e 100644 --- a/docs/zh-CN/installing/compilation.md +++ b/docs/zh-CN/installing/compilation.md @@ -79,7 +79,7 @@ under the License. ``` 编译完成后，产出文件在 `output/` 目录中。 - + ### 自行编译开发环境镜像 你也可以自己创建一个 Doris 开发环境镜像，具体可参阅 `docker/README.md` 文件。 @@ -106,3 +106,22 @@ under the License. ``` 编译完成后，产出文件在 `output/` 目录中。 + +## 特别声明 + +自 0.13 版本开始，默认的编译产出中将取消对 [1] 和 [2] 两个第三方库的依赖。这两个第三方库为 [GNU General Public License V3](https://www.gnu.org/licenses/gpl-3.0.en.html) 协议。该协议与 [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) 协议不兼容，因此默认不出现在 Apache 发布版本中。 + +依赖库 [1] 会导致无法访问 MySQL 外部表。访问 MySQL 外部表的功能会在后续版本中通过 UnixODBC 实现。 + +依赖库 [2] 会导致在无法读取部分早期版本（0.8版本之前）写入的部分数据。因为早期版本中的数据是使用 LZO 算法压缩的，在之后的版本中，已经更改为 LZ4 压缩算法。后续我们会提供工具用于检测和转换这部分数据。 + +如果有需求，用户可以继续使用这两个依赖库。如需使用，需要在编译时添加如下选项： + +``` +WITH_MYSQL=1 WITH_LZO=1 sh build.sh +``` + +注意，当用户依赖这两个第三方库时，则默认不在 Apache License 2.0 协议框架下使用 Doris。请注意 GPL 相关协议约束。 + +* [1] mysql-5.7.18 +* [2] lzo-2.10 From 21baf5575b0fd57b6b6b204909de4002d25f7078 Mon Sep 17 00:00:00 2001 From: morningman Date: Fri, 21 Aug 2020 11:08:47 +0800 Subject: [PATCH 8/9] fix by review --- docs/zh-CN/installing/compilation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh-CN/installing/compilation.md b/docs/zh-CN/installing/compilation.md index f69483cfaca36e..4dfc571b7d6605 100644 --- a/docs/zh-CN/installing/compilation.md +++ b/docs/zh-CN/installing/compilation.md @@ -111,9 +111,9 @@ under the License. 自 0.13 版本开始，默认的编译产出中将取消对 [1] 和 [2] 两个第三方库的依赖。这两个第三方库为 [GNU General Public License V3](https://www.gnu.org/licenses/gpl-3.0.en.html) 协议。该协议与 [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) 协议不兼容，因此默认不出现在 Apache 发布版本中。 -依赖库 [1] 会导致无法访问 MySQL 外部表。访问 MySQL 外部表的功能会在后续版本中通过 UnixODBC 实现。 +移除依赖库 [1] 会导致无法访问 MySQL 外部表。访问 MySQL 外部表的功能会在后续版本中通过 UnixODBC 实现。 -依赖库 [2] 会导致在无法读取部分早期版本（0.8版本之前）写入的部分数据。因为早期版本中的数据是使用 LZO 算法压缩的，在之后的版本中，已经更改为 LZ4 压缩算法。后续我们会提供工具用于检测和转换这部分数据。 +移除依赖库 [2] 会导致在无法读取部分早期版本（0.8版本之前）写入的部分数据。因为早期版本中的数据是使用 LZO 算法压缩的，在之后的版本中，已经更改为 LZ4 压缩算法。后续我们会提供工具用于检测和转换这部分数据。 如果有需求，用户可以继续使用这两个依赖库。如需使用，需要在编译时添加如下选项： From 7437ee65421c14c761547e304532b3910568bf6c Mon Sep 17 00:00:00 2001 From: morningman Date: Fri, 21 Aug 2020 11:32:02 +0800 Subject: [PATCH 9/9] add license header in README.md --- docs/en/README.md | 37 +++++++++++++++++-------------------- docs/zh-CN/README.md | 36 +++++++++++++++++------------------- 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/docs/en/README.md b/docs/en/README.md index 637a804ab1d5ac..2be596fb1d7e35 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -1,4 +1,21 @@ --- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + home: true heroImage: /images/home/banner-stats.png heroBgImage: /images/home/hero-bg.png @@ -74,23 +91,3 @@ cases: actionText: Quick Start → actionLink: /en/installing/compilation --- - - - diff --git a/docs/zh-CN/README.md b/docs/zh-CN/README.md index e9ba48626a9023..95611e43f3aad0 100644 --- a/docs/zh-CN/README.md +++ b/docs/zh-CN/README.md @@ -1,23 +1,21 @@ - - --- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + home: true heroImage: /images/home/banner-stats.png heroBgImage: /images/home/hero-bg.png