apache · morningman · Aug 24, 2020 · Aug 17, 2020 · Aug 17, 2020 · Aug 17, 2020
diff --git 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
diff --git 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:
+be/src/util/murmur_hash3.h
+be/src/util/murmur_hash3.cpp
 
-  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.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.
 
 --------------------------------------------------------------------------------
 
@@ -655,53 +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.
-
@@ -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/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
@@ -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);
 }

diff --git 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"(
   <head>
     <title>Doris</title>
     <meta charset='utf-8'/>
-    <link href='/bootstrap/css/bootstrap.min.css' rel='stylesheet' media='screen' />
-    <link href='/bootstrap/css/bootstrap-table.min.css' rel='stylesheet' media='screen' />
-    <script src='/jquery-3.2.1.min.js' defer></script>
-    <script src='/bootstrap/js/bootstrap.min.js' defer></script>
-    <script src='/bootstrap/js/bootstrap-table.min.js' defer></script>
+    <link href='/Bootstrap-3.3.7/css/bootstrap.min.css' rel='stylesheet' media='screen' />
+    <link href='/Bootstrap-3.3.7/css/bootstrap-table.min.css' rel='stylesheet' media='screen' />
+    <script src='/jQuery-3.3.1/jquery-3.3.1.min.js' defer></script>
+    <script src='/Bootstrap-3.3.7/js/bootstrap.min.js' defer></script>
+    <script src='/Bootstrap-3.3.7/js/bootstrap-table.min.js' defer></script>
     <script src='/doris.js' defer></script>
     <link href='/doris.css' rel='stylesheet' />
   </head>

diff --git 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 <gtest/gtest.h>
 #include <cctz/time_zone.h>
 #include <sstream>
@@ -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(); 
-}
+}
diff --git a/build.sh b/build.sh
@@ -52,16 +52,10 @@ Usage: $0 <options>
      --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=ON
-WITH_LZO=ON
 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
@@ -223,14 +214,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 +238,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/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