update

Author: bingtao.yin

be/CMakeLists.txt

@@ -19,6 +19,8 @@ cmake_minimum_required(VERSION 3.19.2)
 
 project(doris CXX C)
 
+add_compile_options(-Wno-error=attributes)
+
 # Write compile_commands.json
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 # set platforms
@@ -472,7 +474,8 @@ else()
         jvm
     )
     add_library(jvm SHARED IMPORTED)
-    set_target_properties(jvm PROPERTIES IMPORTED_LOCATION ${LIB_JVM})
+    # set_target_properties(jvm PROPERTIES IMPORTED_LOCATION ${LIB_JVM})
+    set_target_properties(jvm PROPERTIES IMPORTED_LOCATION /lib/jvm/java-17-openjdk-amd64/lib/server/libjvm.so)
     include_directories(${DORIS_JAVA_HOME}/include)
     if (NOT OS_MACOSX)
         include_directories(${DORIS_JAVA_HOME}/include/linux)

be/cmake/thirdparty.cmake

@@ -110,7 +110,7 @@ add_thirdparty(arrow_flight_sql LIB64)
 add_thirdparty(parquet LIB64)
 add_thirdparty(brpc LIB64)
 add_thirdparty(rocksdb)
-add_thirdparty(cyrus-sasl LIBNAME "lib/libsasl2.a")
+add_thirdparty(cyrus-sasl WHOLELIBPATH "/lib/x86_64-linux-gnu/libsasl2.so")
 # put this after lz4 to avoid using lz4 lib in librdkafka
 add_thirdparty(rdkafka_cpp LIBNAME "lib/librdkafka++.a")
 add_thirdparty(rdkafka)
@@ -156,11 +156,11 @@ add_thirdparty(idn LIB64)
 add_thirdparty(xml2 LIB64)
 add_thirdparty(lzma LIB64)
 add_thirdparty(gsasl)
-add_thirdparty(krb5support)
-add_thirdparty(krb5)
-add_thirdparty(com_err)
-add_thirdparty(k5crypto)
-add_thirdparty(gssapi_krb5)
+add_thirdparty(krb5support WHOLELIBPATH "/lib/x86_64-linux-gnu/libkrb5support.so")
+add_thirdparty(krb5 WHOLELIBPATH "/lib/x86_64-linux-gnu/libkrb5.so")
+add_thirdparty(com_err WHOLELIBPATH "/lib/x86_64-linux-gnu/libcom_err.so")
+add_thirdparty(k5crypto WHOLELIBPATH "/lib/x86_64-linux-gnu/libk5crypto.so")
+add_thirdparty(gssapi_krb5 WHOLELIBPATH "/lib/x86_64-linux-gnu/libgssapi_krb5.so")
 add_thirdparty(streamvbyte LIB64)
 
 if (OS_MACOSX)

be/src/util/byte_stream_split.cpp

@@ -19,6 +19,7 @@
 
 #include <glog/logging.h>
 
+#include <bit>
 #include <array>
 #include <cstring>
 #include <vector>

bin/start_be.sh

@@ -18,6 +18,12 @@
 
 set -eo pipefail
 
+unset http_proxy
+unset https_proxy
+unset HTTP_PROXY
+unset HTTPS_PROXY
+unset ALL_PROXY
+
 curdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 
 MACHINE_OS=$(uname -s)

bin/start_fe.sh

@@ -18,6 +18,12 @@
 
 set -eo pipefail
 
+unset http_proxy
+unset https_proxy
+unset HTTP_PROXY
+unset HTTPS_PROXY
+unset ALL_PROXY
+
 curdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 
 if [[ "$(uname -s)" == 'Darwin' ]] && command -v brew &>/dev/null; then

build.sh

@@ -151,7 +151,7 @@ fi
 
 eval set -- "${OPTS}"
 
-PARALLEL="$(($(nproc) / 4 + 1))"
+PARALLEL="$(($(nproc)))"
 BUILD_FE=0
 BUILD_BE=0
 BUILD_CLOUD=0

thirdparty/build-thirdparty.sh

@@ -900,10 +900,14 @@ build_librdkafka() {
     # As a result, we use a patch to hard code "--static" into PKG_CONFIG instead.
     # PKG_CONFIG="pkg-config --static"
 
+    # CPPFLAGS="-I${TP_INCLUDE_DIR}" \
+    #     LDFLAGS="-L${TP_LIB_DIR} -lssl -lcrypto -lzstd -lz -lsasl2 \
+    #     -lgssapi_krb5 -lkrb5 -lkrb5support -lk5crypto -lcom_err -lresolv" \
+    #     ./configure --prefix="${TP_INSTALL_DIR}" --enable-static --enable-sasl --disable-c11threads
     CPPFLAGS="-I${TP_INCLUDE_DIR}" \
-        LDFLAGS="-L${TP_LIB_DIR} -lssl -lcrypto -lzstd -lz -lsasl2 \
-        -lgssapi_krb5 -lkrb5 -lkrb5support -lk5crypto -lcom_err -lresolv" \
-        ./configure --prefix="${TP_INSTALL_DIR}" --enable-static --enable-sasl --disable-c11threads
+        LDFLAGS="-L${TP_LIB_DIR} -lssl -lcrypto -lzstd -lz \
+        -lcom_err -lresolv" \
+        ./configure --prefix="${TP_INSTALL_DIR}" --enable-static 
 
     make -j "${PARALLEL}"
     make install

tools/ssb-tools/conf/doris-cluster.conf

@@ -18,9 +18,9 @@
 # Any of FE host
 export FE_HOST='127.0.0.1'
 # http_port in fe.conf
-export FE_HTTP_PORT=8030
+export FE_HTTP_PORT=18030
 # query_port in fe.conf
-export FE_QUERY_PORT=9030
+export FE_QUERY_PORT=19030
 # Doris username
 export USER='root'
 # Doris password

ui/package.json

@@ -39,6 +39,7 @@
     "react": "^16.13.1",
     "react-codemirror2": "^7.1.0",
     "react-dom": "^16.13.1",
+    "react-draggable": "^4.4.5",
     "react-i18next": "^11.7.2",
     "react-resizable": "^1.10.1",
     "react-router": "^5.2.0",