Merge remote-tracking branch 'origin/fix_tls_block' into fix_tls_block

TuGraph-family · Jan 22, 2024 · 6eb8493 · 6eb8493
2 parents 9021f53 + b352c5d
commit 6eb8493
Show file tree

Hide file tree

Showing 49 changed files with 664 additions and 264 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,9 +56,6 @@ if (BUILD_PROCEDURE)
 endif (BUILD_PROCEDURE)
 
 # unit_test
-add_subdirectory(test)
-set(LGRAPH_TOOLKITS lgraph_import lgraph_backup lgraph_warmup lgraph_peek lgraph_export lgraph_binlog lgraph_peer)
-add_dependencies(unit_test ${LGRAPH_TOOLKITS} lgraph_server)
-
-set_target_properties(unit_test PROPERTIES EXCLUDE_FROM_ALL TRUE)
-set_target_properties(fma_unit_test PROPERTIES EXCLUDE_FROM_ALL TRUE)
+if (WITH_TESTS)
+    add_subdirectory(test)
+endif (WITH_TESTS)
diff --git a/Options.cmake b/Options.cmake
@@ -91,6 +91,11 @@ if (BUILD_PROCEDURE)
     message("Build procedures.")
 endif (BUILD_PROCEDURE)
 
+option(WITH_TESTS "build with tests" ON)
+if (WITH_TESTS)
+    message("Build with tests.")
+endif (WITH_TESTS)
+
 # disable krb5
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DOPENSSL_NO_KRB5=1")
 
@@ -189,4 +194,3 @@ if (ENABLE_PREDOWNLOAD_DEPENDS_PACKAGE)
     execute_process(COMMAND /bin/sh install.sh
             WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/python/FMA_shell/pkg)
 endif ()
-
diff --git a/ci/build_export.sh b/ci/build_export.sh
@@ -18,9 +18,9 @@ mkdir build && cd build
 # build cpp
 if [[ "$ASAN" == "asan" ]]; then
 echo 'build with asan ...'
-cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DBUILD_PROCEDURE=$WITH_PROCEDURE
+cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DBUILD_PROCEDURE=$WITH_PROCEDURE -DWITH_TEST=OFF
 else
-cmake .. -DCMAKE_BUILD_TYPE=Coverage -DBUILD_PROCEDURE=$WITH_PROCEDURE
+cmake .. -DCMAKE_BUILD_TYPE=Coverage -DBUILD_PROCEDURE=$WITH_PROCEDURE -DWITH_TEST=OFF
 fi
 
 make -j6

diff --git a/ci/build_release.sh b/ci/build_release.sh
@@ -23,5 +23,4 @@ else
 cmake .. -DCMAKE_BUILD_TYPE=Release
 fi
 
-make -j6
-
+make -j6 package
diff --git a/ci/github_ci.sh b/ci/github_ci.sh
@@ -23,11 +23,9 @@ cmake .. -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DBUILD_PROCEDURE=$WITH_PROCE
 else
 cmake .. -DCMAKE_BUILD_TYPE=Coverage -DBUILD_PROCEDURE=$WITH_PROCEDURE
 fi
-make -j2
+make -j2 package
 
 if [[ "$TEST" == "ut" ]]; then
-  make unit_test fma_unit_test -j2
-
   # build tugraph db management
   cd $WORKSPACE/deps/tugraph-db-management/
   sh local_build.sh

diff --git a/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile b/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile
@@ -50,7 +50,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/Python-3.6
     && tar xf Python-3.6.9.tgz && cd Python-3.6.9 && ./configure --prefix=/usr/local \
     && make -j4 && make install \
     && python3 -m pip install --upgrade pip -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
-    && python3 -m pip install pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
+    && python3 -m pip install nest_asyncio pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
     && rm -rf /Python*
     # dgl==1.0.0 :Could not find a version that satisfies the requirement dgl
 
@@ -228,6 +228,19 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/rocksdb-v7
   && tar zxf rocksdb-v7.8.3.tar.gz && cd rocksdb-7.8.3 && cmake -DCMAKE_BUILD_TYPE=Release -DPORTABLE=ON -DFORCE_SSE42=OFF -DWITH_JEMALLOC=ON \
   && make -j6 && make install && rm -rf /rocksdb*
 
+# set maven mirror
+RUN mkdir -p ~/.m2 \
+    && echo '<settings>' > ~/.m2/settings.xml \
+    && echo '  <mirrors>' >> ~/.m2/settings.xml \
+    && echo '    <mirror>' >> ~/.m2/settings.xml \
+    && echo '      <id>alimaven</id>' >> ~/.m2/settings.xml \
+    && echo '      <mirrorOf>central</mirrorOf>' >> ~/.m2/settings.xml \
+    && echo '      <url>https://maven.aliyun.com/nexus/content/groups/public/</url>' >> ~/.m2/settings.xml \
+    && echo '    </mirror>' >> ~/.m2/settings.xml \
+    && echo '  </mirrors>' >> ~/.m2/settings.xml \
+    && echo '</settings>' >> ~/.m2/settings.xml \
+    && cat ~/.m2/settings.xml
+
 # install antlr4-4.13.0
 # if it is not accessible, replace it with the link below
 # https://github.com/antlr/antlr4/archive/refs/tags/4.13.0.tar.gz

diff --git a/ci/images/tugraph-compile-centos7-Dockerfile b/ci/images/tugraph-compile-centos7-Dockerfile
@@ -55,7 +55,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/Python-3.6
     && tar xf Python-3.6.9.tgz && cd Python-3.6.9 && ./configure --prefix=/usr/local \
     && make ${JFLAG} && make install \
     && python3 -m pip install --upgrade pip ${PYPI} \
-    && python3 -m pip install pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 ${PYPI} \
+    && python3 -m pip install nest_asyncio pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 ${PYPI} \
     && rm -rf /Python*
 
 # install cmake
@@ -234,6 +234,19 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/rocksdb-v7
   && tar zxf rocksdb-v7.8.3.tar.gz && cd rocksdb-7.8.3 && cmake -DCMAKE_BUILD_TYPE=Release -DPORTABLE=ON -DFORCE_SSE42=ON -DWITH_JEMALLOC=ON \
   && make ${JFLAG} && make install && rm -rf /rocksdb*
 
+# set maven mirror
+RUN mkdir -p ~/.m2 \
+    && echo '<settings>' > ~/.m2/settings.xml \
+    && echo '  <mirrors>' >> ~/.m2/settings.xml \
+    && echo '    <mirror>' >> ~/.m2/settings.xml \
+    && echo '      <id>alimaven</id>' >> ~/.m2/settings.xml \
+    && echo '      <mirrorOf>central</mirrorOf>' >> ~/.m2/settings.xml \
+    && echo '      <url>https://maven.aliyun.com/nexus/content/groups/public/</url>' >> ~/.m2/settings.xml \
+    && echo '    </mirror>' >> ~/.m2/settings.xml \
+    && echo '  </mirrors>' >> ~/.m2/settings.xml \
+    && echo '</settings>' >> ~/.m2/settings.xml \
+    && cat ~/.m2/settings.xml
+
 # install antlr4-4.13.0
 # if it is not accessible, replace it with the link below
 # https://github.com/antlr/antlr4/archive/refs/tags/4.13.0.tar.gz

diff --git a/ci/images/tugraph-compile-centos8-Dockerfile b/ci/images/tugraph-compile-centos8-Dockerfile
@@ -58,7 +58,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/Python-3.6
     && tar xf Python-3.6.9.tgz && cd Python-3.6.9 && ./configure --prefix=/usr/local \
     && make ${JFLAG} && make install \
     && python3 -m pip install --upgrade pip ${PYPI} \
-    && python3 -m pip install pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 ${PYPI} \
+    && python3 -m pip install nest_asyncio pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 ${PYPI} \
     && rm -rf /Python*
 
 # install cmake

diff --git a/ci/images/tugraph-compile-ubuntu18.04-Dockerfile b/ci/images/tugraph-compile-ubuntu18.04-Dockerfile
@@ -60,7 +60,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/Python-3.6
     && tar xf Python-3.6.9.tgz && cd Python-3.6.9 && ./configure --prefix=/usr/local \
     && make ${JFLAG} && make install \
     && python3 -m pip install --upgrade pip ${PYPI} \
-    && python3 -m pip install pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 ${PYPI} \
+    && python3 -m pip install nest_asyncio pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 ${PYPI} \
     && rm -rf /Python*
 
 # install cmake

diff --git a/ci/images/tugraph-runtime-arm64v8-centos7-Dockerfile b/ci/images/tugraph-runtime-arm64v8-centos7-Dockerfile
@@ -33,7 +33,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/Python-3.6
     && tar xf Python-3.6.9.tgz && cd Python-3.6.9 && ./configure --prefix=/usr/local \
     && make -j4 && make install \
     && python3 -m pip install --upgrade pip -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
-    && python3 -m pip install pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
+    && python3 -m pip install nest_asyncio pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
     && rm -rf /Python*
     # dgl==1.0.0
 

diff --git a/ci/images/tugraph-runtime-centos7-Dockerfile b/ci/images/tugraph-runtime-centos7-Dockerfile
@@ -10,6 +10,7 @@ RUN yum -x filesystem update -y && yum install -y \
     make \
     wget \
     bzip2 \
+    unzip \
     openssl-static \
     java-1.8.0-openjdk* \
     libcurl-devel.x86_64 \
@@ -34,7 +35,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/Python-3.6
     && tar xf Python-3.6.9.tgz && cd Python-3.6.9 && ./configure --prefix=/usr/local \
     && make -j4 && make install \
     && python3 -m pip install --upgrade pip -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
-    && python3 -m pip install pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
+    && python3 -m pip install nest_asyncio pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
     && rm -rf /Python*
 
 # install cmake

diff --git a/ci/images/tugraph-runtime-centos8-Dockerfile b/ci/images/tugraph-runtime-centos8-Dockerfile
@@ -14,6 +14,7 @@ RUN yum update -y && yum install -y \
     make \
     wget \
     bzip2 \
+    unzip \
     openssl-devel.x86_64 \
     java-1.8.0-openjdk* \
     libcurl-devel.x86_64 \
@@ -38,7 +39,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/Python-3.6
     && tar xf Python-3.6.9.tgz && cd Python-3.6.9 && ./configure --prefix=/usr/local \
     && make -j4 && make install \
     && python3 -m pip install --upgrade pip -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
-    && python3 -m pip install pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
+    && python3 -m pip install nest_asyncio pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
     && rm -rf /Python*
 
 # install cmake

diff --git a/ci/images/tugraph-runtime-ubuntu18.04-Dockerfile b/ci/images/tugraph-runtime-ubuntu18.04-Dockerfile
@@ -17,6 +17,7 @@ RUN apt-get update && apt-get install -y \
     make \
     dpkg \
     bzip2 \
+    unzip \
     zlib1g-dev \
     libssl-dev \
     openjdk-8-jdk \
@@ -41,7 +42,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/Python-3.6
     && tar xf Python-3.6.9.tgz && cd Python-3.6.9 && ./configure --prefix=/usr/local \
     && make -j4 && make install \
     && python3 -m pip install --upgrade pip -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
-    && python3 -m pip install pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
+    && python3 -m pip install nest_asyncio pexpect requests pytest httpx cython==3.0.0a11 sphinx myst_parser sphinx_panels sphinx_rtd_theme numpy==1.19.5 torch==1.10.2 dgl==1.0.0 ogb pandas==0.24.2 -i https://pypi.antfin-inc.com/simple/ --trusted-host pypi.antfin-inc.com \
     && rm -rf /Python*
 
 # install cmake

diff --git a/docs/en-US/source/4.user-guide/2.tugraph-browser-legacy.md b/docs/en-US/source/4.user-guide/2.tugraph-browser-legacy.md
@@ -18,7 +18,7 @@ When the user completes the installation of the graph database, you can access i
 
 ### 2. Login
 
-![alt 登录](https://tugraph-web-static.oss-cn-beijing.aliyuncs.com/%E6%96%87%E6%A1%A3/2.Operating/1.tugraph-browser-lpgin.png)
+![alt Login](https://tugraph-web-static.oss-cn-beijing.aliyuncs.com/%E6%96%87%E6%A1%A3/2.Operating/1.tugraph-browser-lpgin.png)
 
 - When the page is opened successfully, the first thing you see is the login page, and the user needs to fill in the account number and password to log in.
 - Default account: admin
@@ -31,11 +31,11 @@ When the user completes the installation of the graph database, you can access i
 
 - When you log in for the first time, the system will create an empty graph by default
 
-  ![alt 快速上手](https://tugraph-web-static.oss-cn-beijing.aliyuncs.com/%E6%96%87%E6%A1%A3/2.Operating/2.tugraph-browser-quickstart-01.png)
+  ![alt quick start](https://tugraph-web-static.oss-cn-beijing.aliyuncs.com/%E6%96%87%E6%A1%A3/2.Operating/2.tugraph-browser-quickstart-01.png)
 
 - The user clicks on the help option and selects Get Started quickly
 
-  ![alt 帮助](https://tugraph-web-static.oss-cn-beijing.aliyuncs.com/%E6%96%87%E6%A1%A3/2.Operating/3.tugraph-browser-quickstart-02.png)
+  ![alt help](https://tugraph-web-static.oss-cn-beijing.aliyuncs.com/%E6%96%87%E6%A1%A3/2.Operating/3.tugraph-browser-quickstart-02.png)
 
 - Then click "One-click Create Model" -- >" One-click Create Data "to complete the construction of the built-in Movie data graph
 
@@ -123,7 +123,8 @@ When the user completes the installation of the graph database, you can access i
 - Select a local CSV file
 - Select the model for the corresponding node or edge
 - Do the data mapping
-  -Complete the data import
+- Complete the data import
+- The maximum supported size for a single file is 2GB.
 
 ##### 3.3.5 plug-in (Stored Procedure)