From 1c4edd1075fceb04f6dfc498247d7d58a7a0c606 Mon Sep 17 00:00:00 2001 From: lipanpan03 <41904587+lipanpan03@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:43:47 +0800 Subject: [PATCH] add lgraph_peer and tabulate oss link (#635) * add lgraph_peer and tabulate oss link * add datax doc link --- ci/images/tugraph-compile-arm64v8-centos7-Dockerfile | 2 +- ci/images/tugraph-compile-centos7-Dockerfile | 2 +- ci/images/tugraph-compile-centos8-Dockerfile | 2 +- ci/images/tugraph-compile-ubuntu18.04-Dockerfile | 2 +- docs/zh-CN/source/development_guide.md | 5 +++-- toolkits/CMakeLists.txt | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile b/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile index 81a6442be0..a614664712 100644 --- a/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile +++ b/ci/images/tugraph-compile-arm64v8-centos7-Dockerfile @@ -330,7 +330,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/graphar/Gr # if it is not accessible, replace it with the link below # https://github.com/p-ranav/tabulate/archive/refs/tags/v1.5.tar.gz RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/tabulate-d553e5.tar.gz \ - && tar zxf tabulate-1.5.tar.gz && cp -rf tabulate-1.5/include/tabulate /usr/local/include \ + && tar zxf tabulate-d553e5.tar.gz && cp -rf tabulate-d553e5/include/tabulate /usr/local/include \ && rm -rf /tabulate* RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec diff --git a/ci/images/tugraph-compile-centos7-Dockerfile b/ci/images/tugraph-compile-centos7-Dockerfile index f8f8ce968b..3afce9ed7c 100644 --- a/ci/images/tugraph-compile-centos7-Dockerfile +++ b/ci/images/tugraph-compile-centos7-Dockerfile @@ -340,7 +340,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/graphar/Gr # if it is not accessible, replace it with the link below # https://github.com/p-ranav/tabulate/archive/refs/tags/v1.5.tar.gz RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/tabulate-d553e5.tar.gz \ - && tar zxf tabulate-1.5.tar.gz && cp -rf tabulate-1.5/include/tabulate /usr/local/include \ + && tar zxf tabulate-d553e5.tar.gz && cp -rf tabulate-d553e5/include/tabulate /usr/local/include \ && rm -rf /tabulate* RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec diff --git a/ci/images/tugraph-compile-centos8-Dockerfile b/ci/images/tugraph-compile-centos8-Dockerfile index 2e739836d6..72622543ba 100644 --- a/ci/images/tugraph-compile-centos8-Dockerfile +++ b/ci/images/tugraph-compile-centos8-Dockerfile @@ -328,7 +328,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/graphar/Gr # if it is not accessible, replace it with the link below # https://github.com/p-ranav/tabulate/archive/refs/tags/v1.5.tar.gz RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/tabulate-d553e5.tar.gz \ - && tar zxf tabulate-1.5.tar.gz && cp -rf tabulate-1.5/include/tabulate /usr/local/include \ + && tar zxf tabulate-d553e5.tar.gz && cp -rf tabulate-d553e5/include/tabulate /usr/local/include \ && rm -rf /tabulate* RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec diff --git a/ci/images/tugraph-compile-ubuntu18.04-Dockerfile b/ci/images/tugraph-compile-ubuntu18.04-Dockerfile index 6f4bcdd3e9..70ec9f68c3 100644 --- a/ci/images/tugraph-compile-ubuntu18.04-Dockerfile +++ b/ci/images/tugraph-compile-ubuntu18.04-Dockerfile @@ -326,7 +326,7 @@ RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/graphar/Gr # if it is not accessible, replace it with the link below # https://github.com/p-ranav/tabulate/archive/refs/tags/v1.5.tar.gz RUN wget https://tugraph-web.oss-cn-beijing.aliyuncs.com/tugraph/deps/tabulate-d553e5.tar.gz \ - && tar zxf tabulate-1.5.tar.gz && cp -rf tabulate-1.5/include/tabulate /usr/local/include \ + && tar zxf tabulate-d553e5.tar.gz && cp -rf tabulate-d553e5/include/tabulate /usr/local/include \ && rm -rf /tabulate* RUN sed -i '3 s/-lgomp/-l:libgomp.a/' /usr/local/lib64/libgomp.spec diff --git a/docs/zh-CN/source/development_guide.md b/docs/zh-CN/source/development_guide.md index 2b812d1473..dbf50e44a0 100644 --- a/docs/zh-CN/source/development_guide.md +++ b/docs/zh-CN/source/development_guide.md @@ -250,8 +250,9 @@ CALL db.upsertEdge('edge1',{type:'node1',key:'node1_id'}, {type:'node2',key:'nod https://github.com/ljcui/DataX/tree/bolt 自行编译。 -这个DataX实现的 tugraph writer 内部调用的是上面描述的`db.upsertVertex`和`db.upsertEdge`。 -这个DataX实现的 tugraph reader 内部调用的是TuGraph 的 bolt client，支持流式读取 +这个DataX实现的 tugraph writer 内部调用的是上面描述的`db.upsertVertex`和`db.upsertEdge`， +tugraph reader 内部调用的是TuGraph 的 bolt client，支持流式读取， +具体使用方式见[TuGraph-DataX 使用介绍](./6.utility-tools/7.tugraph-datax.md) ### 离线脱机导入数据 如果你有子图的schema以及子图里面所有的点边数据（csv或者json格式），可以利用`lgraph_import`工具离线将这些数据生成图数据。 diff --git a/toolkits/CMakeLists.txt b/toolkits/CMakeLists.txt index 10a8e274e0..f21862c42c 100644 --- a/toolkits/CMakeLists.txt +++ b/toolkits/CMakeLists.txt @@ -107,7 +107,7 @@ add_executable(${TARGET_MDB_STAT} ${LGRAPH_ROOT_DIR}/src/core/lmdb/mdb_stat.c target_link_libraries(${TARGET_MDB_STAT} pthread) set(LGRAPH_TOOLKITS ${TARGET_LGRAPH_IMPORT} ${TARGET_LGRAPH_BACKUP} ${TARGET_LGRAPH_EXPORT} - ${TARGET_MDB_STAT} ${TARGET_LGRAPH_CLI}) + ${TARGET_MDB_STAT} ${TARGET_LGRAPH_CLI} ${TARGET_LGRAPH_PEER}) # install install(TARGETS ${LGRAPH_TOOLKITS}