Skip to content

Commit

Permalink
Cherry pick 3.4 (0101-0129) (#5280)
Browse files Browse the repository at this point in the history
* optimize match node label (#5176)

* revert strange return (#5183)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix stderr  save error log (#5188)

* fix processor_test timeout (#5180)

* fix processor_test timeout

* ...

Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>
Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix error code (#5186)

* rename the "test" space to "ngdata". (#5197)

* rename the "test" space to "ngdata".

* add ngdata

* Revise the usages of FATAL, DFATAL, LOG, DLOG. (#5181)

* Revise the usages of FATAL, DFATAL, LOG, DLOG.

* fix.

* revise dfatal.

* Meta upgrade (#5174)

* Meta upgrade
remove all fulltext index when upgrade from V3 to V3_4 because of refacting of
fulltext index

* fix bug

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Fix pattern expression with same edge variable (#5192)

* Fix pattern expression with same edge variable

add tck

fmt

* add tck

* Fix memory leak, remove toss gflag (#5204)

* remove toss gflag

* fix memory leak

* loose wait job finish time

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Add max_sessions_per_ip_per_user to default config file (#5207)

* minor bug for adminTaskManager (#5195)

* modify jobmanager ut (#5175)

* modify jobmanager ut

* add expired ut

* avoid recover expired job

* add ut

* address review

* move status

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Add more match test cases on paths. (#5189)

* improve memtracker, add missed check & remove unnecessary thenError&tryCatch check (#5199)

* [memtracker] check code run with memoery check on all works

refine code

all code memory checked

fix lint

refine code & fix build with gcc+sanitize

* fix build break

* fix lint

* refine code

* remove debug code

* fix test fail build with debug

* fix test fail build with debug

* restore commented test

* minor

* minor

* fix bug (#5214)

* fix bug

* fix bug

Co-authored-by: Doodle <13706157+critical27@users.noreply.github.com>

* handle rpc error task status (#5212)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* chore: community badges refined (#5202)

* chore: community badges refined

* Update README-CN.md

* Update README-CN.md

* Update README-CN.md

remove sifou and zhihu as aligned with the team

* update linkedin URL

Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>

* Fix extend whtie space char. (#5213)

* Fix extend whtie space char.

* Format.

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Add lack tests of no role user. (#5196)

Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>

* remove memtracker DLOG (#5224)

* Add tck cases for DDL (#5220)

* more TCK tests for variable pattern match clause (#5215)

* cleanup

* same src/dst for variable length pattern

* variable pattern in where clause

* variable scope tests in path pattern

* More tests

* More tests

Co-authored-by: jimingquan <mingquan.ji@vesoft.com>

* Resumed the evaluation fo vertices in AttributeExpression (UTs included) (#5229)

* add memtracker flags to conf (#5231)

* add memtracker flags to conf

* typo

* refine

* refine

* add balance job type to filter when create backup (#5228)

* add more job type to filter when create backup

* log add job

* add log before acquire snapshot lock

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Fix update sessions when leader change happens (#5225)

* Fix udpate sessions when leader change happens

* Handle errors on the graph side

* Address comments

* Address comments

* fix match step range (#5216)

* use smart pointer change raw pointer

* fix error

* fix test error

* address comment

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Update response message when adding schema historically existed (#5227)

* update the error code and message for checking history schemas

* update tck

* update comment

* change to log error

* fix ddl tck

* increase wait time in schema.feature

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix error code (#5233)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* print memory stats default to false (#5234)

* print memory stats default to false

* update conf

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix bug of extract prop expr visitor (#5238)

* forbid invalid prop expr used in cypher (#5242)

* Fix mistake push down limit with skip. (#5241)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix delete fulltext index (#5239)

* fix delete fulltext index

* fix es delete error
1. remove get Rowreader if op is delete
2. delete es data when value is null

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Change the default value of session_reclaim_interval_secs to 60 seconds (#5246)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Enhance attribute-accessing expression to ensure self-consistency (#5230)

* Revert "Remove all UNKNOWN_PROP as a type of null. (#4907)" (#5149)

This reverts commit aa62416.

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Enhance attribute-accessing expression to ensure self-consistency

Fix tck

Fix parser

small delete

Fix tck

tck fmt

fix ut

fix ut

Fix ut

Fix tck

Delete v.tag.prop check

Fix tck

Skip some tck cases related ngdata

add test case

Co-authored-by: Cheng Xuntao <7731943+xtcyclist@users.noreply.github.com>
Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix ft index of fixed string (#5251)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Add tck test (#5253)

* add allpath test

* add shortest path test case

* add subgraph test case

* add go test case

* add go test case

* Add more session tests (#5256)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Revert "do not check term for leader info by default para" (#5266)

This reverts commit 593bffc.

* modify ft index default limit size (#5260)

* modify ft index default limit size

* fix test

Co-authored-by: Doodle <13706157+critical27@users.noreply.github.com>

* Test/yield (#5267)

* Add some tests about yield.

* Add more tests.

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* Add another cert to test CA don't match. (#5247)

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix baton miss reset in StorageJobExecutor (#5269)

* Report errors on where clauses in optional match queries. (#5273)

* [test case] Check DML cases (#5264)

* Check DML cases

* Add chinses char tests

Add more tests

Add mero delete edge tests

* Revert cases

* fix third party version in package.sh (#5281)

The dump_syms tool path should be match with third party version.

* Test/user (#5139)

* Add some tests about user management.

* Add tests about user roles.

* Format.

* Fix tck fixture name.

* Fix step name.

* Change step name.

---------

Co-authored-by: Sophie <84560950+Sophie-Xie@users.noreply.github.com>

* fix https (#5283)

* fix memtracker bugs during stress test on graphd and storaged (#5276)

* fix memtracker bugs during stress test on graphd and storaged

* fix lint

* fix RocksEngine memory leak of raw pointer iter

* add ENABLE_MEMORY_TRACKER build option & support adaptive limit for MemoryTracker

* delete debug log

* refine log

* refine log

* fix build

* refine error log

* print warning if memtracker is off

* fix rocksdb leak by turn off memcheck

* refine synamic-self-adaptive

* fix cmake check

* minor

* minor

* minor

* minor

* minor

* refine double equel compare

---------

Co-authored-by: jimingquan <mingquan.ji@vesoft.com>
Co-authored-by: jie.wang <38901892+jievince@users.noreply.github.com>
Co-authored-by: Harris.Chu <1726587+HarrisChu@users.noreply.github.com>
Co-authored-by: Doodle <13706157+critical27@users.noreply.github.com>
Co-authored-by: Yee <2520865+yixinglu@users.noreply.github.com>
Co-authored-by: canon <87342612+caton-hpg@users.noreply.github.com>
Co-authored-by: Cheng Xuntao <7731943+xtcyclist@users.noreply.github.com>
Co-authored-by: hs.zhang <22708345+cangfengzhs@users.noreply.github.com>
Co-authored-by: kyle.cao <kyle.cao@vesoft.com>
Co-authored-by: Yichen Wang <18348405+Aiee@users.noreply.github.com>
Co-authored-by: liwenhui-soul <38217397+liwenhui-soul@users.noreply.github.com>
Co-authored-by: Alex Xing <90179377+SuperYoko@users.noreply.github.com>
Co-authored-by: codesigner <codesigner.huang@vesoft.com>
Co-authored-by: Wey Gu <weyl.gu@gmail.com>
Co-authored-by: shylock <33566796+Shylock-Hg@users.noreply.github.com>
Co-authored-by: pengwei.song <90180021+pengweisong@users.noreply.github.com>
Co-authored-by: haowen <19355821+wenhaocs@users.noreply.github.com>
Co-authored-by: George <58841610+Shinji-IkariG@users.noreply.github.com>
  • Loading branch information
19 people authored Jan 29, 2023
1 parent 7047fb7 commit c48cbd1
Show file tree
Hide file tree
Showing 328 changed files with 7,061 additions and 2,905 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ jobs:
-DCMAKE_CXX_COMPILER=$TOOLSET_CLANG_DIR/bin/clang++ \
-DCMAKE_C_COMPILER=$TOOLSET_CLANG_DIR/bin/clang \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DENABLE_MEMORY_TRACKER=off \
-DENABLE_ASAN=on \
-DENABLE_TESTING=on \
-GNinja \
Expand Down
15 changes: 15 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,21 @@ if (ENABLE_NATIVE)
add_compile_options(-fPIC)
endif()

if(ENABLE_MEMORY_TRACKER)
if(ENABLE_JEMALLOC)
if(NOT ENABLE_ASAN)
add_definitions(-DENABLE_MEMORY_TRACKER)
message(STATUS "MemoryTracker is ENABLED")
else()
message(FATAL_ERROR "MemoryTracker need -DENABLE_ASAN=off")
endif()
else()
message(FATAL_ERROR "MemoryTracker need -DENABLE_JEMALLOC=on")
endif()
else()
message(WARNING "MemoryTracker is DISABLED")
endif()

include_directories(AFTER ${CMAKE_SOURCE_DIR}/src)
include_directories(AFTER ${CMAKE_CURRENT_BINARY_DIR}/src)

Expand Down
22 changes: 11 additions & 11 deletions README-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,16 @@
<a href="https://user-images.githubusercontent.com/38887077/67449282-4362b300-f64c-11e9-878f-7efc373e5e55.jpg">
<img src="https://img.shields.io/badge/WeChat-%E5%BE%AE%E4%BF%A1-brightgreen" alt="WeiXin">
</a>
<a href="https://www.zhihu.com/org/nebulagraph/activities">
<img src="https://img.shields.io/badge/Zhihu-%E7%9F%A5%E4%B9%8E-blue" alt="Zhihu">
</a>
<a href="https://segmentfault.com/t/nebula">
<img src="https://img.shields.io/badge/SegmentFault-%E6%80%9D%E5%90%A6-green" alt="SegmentFault">
</a>
<a href="https://weibo.com/p/1006067122684542/home?from=page_100606&mod=TAB#place">
<img src="https://img.shields.io/badge/Weibo-%E5%BE%AE%E5%8D%9A-red" alt="Sina Weibo">
</a>
<a href="https://github.com/vesoft-inc/nebula/stargazers">
<img src="http://githubbadges.com/star.svg?user=vesoft-inc&repo=nebula&style=default" alt="nebula star"/>
<img src="https://img.shields.io/github/stars/vesoft-inc/nebula" alt="GitHub stars" />
</a>
<a href="https://github.com/vesoft-inc/nebula/network/members">
<img src="http://githubbadges.com/fork.svg?user=vesoft-inc&repo=nebula&style=default" alt="nebula fork"/>
<img src="https://img.shields.io/github/forks/vesoft-inc/nebula" alt="GitHub forks" />
</a>

</p>

# NebulaGraph 是什么?
Expand Down Expand Up @@ -108,13 +103,18 @@ NebulaGraph内核 1.x 与 2.x 数据格式、通信协议、客户端等均双
* 访问[官网](http://nebula-graph.com.cn/)
* [![WeiXin](https://img.shields.io/badge/WeChat-%E5%BE%AE%E4%BF%A1-brightgreen)](https://user-images.githubusercontent.com/38887077/67449282-4362b300-f64c-11e9-878f-7efc373e5e55.jpg)
* [![Sina Weibo](https://img.shields.io/badge/Weibo-%E5%BE%AE%E5%8D%9A-red)](https://weibo.com/p/1006067122684542/home?from=page_100606&mod=TAB#place)
* [知乎](https://www.zhihu.com/org/nebulagraph/activities)
* [SegmentFault](https://segmentfault.com/t/nebula)
* Email: info@vesoft.com

## 加入 NebulaGraph 社区

[![Discussions](https://img.shields.io/badge/GitHub_Discussion-000000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/vesoft-inc/nebula/discussions) [![Discourse](https://img.shields.io/badge/中文论坛-4285F4?style=for-the-badge&logo=discourse&logoColor=white)](https://discuss.nebula-graph.com.cn/) [![Slack](https://img.shields.io/badge/Slack-9F2B68?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/nebulagraph/shared_invite/zt-7ybejuqa-NCZBroh~PCh66d9kOQj45g) [![Tencent_Meeting](https://img.shields.io/badge/腾讯会议-2D8CFF?style=for-the-badge&logo=googlemeet&logoColor=white)](https://meeting.tencent.com/dm/F8NX1aRZ8PQv) [![Google Calendar](https://img.shields.io/badge/Calander-4285F4?style=for-the-badge&logo=google&logoColor=white)](https://calendar.google.com/calendar/u/0?cid=Z29mbGttamM3ZTVlZ2hpazI2cmNlNXVnZThAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ) [![Meetup](https://img.shields.io/badge/Meetup-FF0000?style=for-the-badge&logo=meetup&logoColor=white)](https://www.meetup.com/nebulagraph/events/287180186?utm_medium=referral&utm_campaign=share-btn_savedevents_share_modal&utm_source=link) [![Meeting Archive](https://img.shields.io/badge/Community_wiki-808080?style=for-the-badge&logo=readthedocs&logoColor=white)](https://github.com/vesoft-inc/nebula-community/wiki)


| 加入 NebulaGraph 社区 | 加入方式 |
| ----------------------- | ------------------------------------------------------------ |
| 微信群 | [![WeChat Group](https://img.shields.io/badge/微信群-000000?style=for-the-badge&logo=wechat)](https://wj.qq.com/s2/8321168/8e2f/) |
| 提问 | [![Discourse](https://img.shields.io/badge/中文论坛-4285F4?style=for-the-badge&logo=discourse&logoColor=white)](https://discuss.nebula-graph.com.cn/) [![Stack Overflow](https://img.shields.io/badge/Stack%20Overflow-nebula--graph-orange?style=for-the-badge&logo=stack-overflow&logoColor=white)](https://stackoverflow.com/questions/tagged/nebula-graph) [![Discussions](https://img.shields.io/badge/GitHub_Discussion-000000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/vesoft-inc/nebula/discussions) |
| 聊天 | [![Chat History](https://img.shields.io/badge/Community%20Chat-000000?style=for-the-badge&logo=discord&logoColor=white)](https://community-chat.nebula-graph.io/) [![Slack](https://img.shields.io/badge/Slack-9F2B68?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/nebulagraph/shared_invite/zt-7ybejuqa-NCZBroh~PCh66d9kOQj45g) |
| NebulaGraph Meetup 活动 | [![Tencent_Meeting](https://img.shields.io/badge/腾讯会议-2D8CFF?style=for-the-badge&logo=googlemeet&logoColor=white)](https://meeting.tencent.com/dm/F8NX1aRZ8PQv) [![Google Calendar](https://img.shields.io/badge/Calander-4285F4?style=for-the-badge&logo=google&logoColor=white)](https://calendar.google.com/calendar/u/0?cid=Z29mbGttamM3ZTVlZ2hpazI2cmNlNXVnZThAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ) [![Zoom](https://img.shields.io/badge/Zoom-2D8CFF?style=for-the-badge&logo=zoom&logoColor=white)](https://us02web.zoom.us/meeting/register/tZ0rcuypqDMvGdLuIm4VprTlx96wrEf062SH) [![Meetup](https://img.shields.io/badge/Meetup-FF0000?style=for-the-badge&logo=meetup&logoColor=white)](https://www.meetup.com/nebulagraph/events/) [![Meeting Archive](https://img.shields.io/badge/Meeting_Archive-808080?style=for-the-badge&logo=readthedocs&logoColor=white)](https://github.com/vesoft-inc/nebula-community/wiki) |

<br />

Expand Down
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<br>A distributed, scalable, lightning-fast graph database<br>
</p>
<p align="center">
<a href="https://stackoverflow.com/questions/tagged/nebula-graph">
<img src="https://img.shields.io/badge/Stack%20Overflow-nebula--graph-orange" alt="Stack Overflow" />
</a>
<a href="https://app.codecov.io/gh/vesoft-inc/nebula">
<img src="https://codecov.io/github/vesoft-inc/nebula/coverage.svg?branch=master" alt="code coverage"/>
</a>
Expand Down Expand Up @@ -107,15 +110,21 @@ You can also freely deploy **NebulaGraph** as a back-end service to support your

## Contact

* [Community Chat](https://community-chat.nebula-graph.io/)
* [Slack Channel](https://join.slack.com/t/nebulagraph/shared_invite/zt-7ybejuqa-NCZBroh~PCh66d9kOQj45g)
* [Stack Overflow](https://stackoverflow.com/questions/tagged/nebulagraph)
* [Stack Overflow](https://stackoverflow.com/questions/tagged/nebula-graph)
* Twitter: [@NebulaGraph](https://twitter.com/NebulaGraph)
* [LinkedIn Page](https://www.linkedin.com/company/vesoft-nebula-graph)
* [LinkedIn Page](https://www.linkedin.com/company/nebula-graph/)
* Email: info@vesoft.com

## Community

[![Discussions](https://img.shields.io/badge/GitHub_Discussion-000000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/vesoft-inc/nebula/discussions) [![Slack](https://img.shields.io/badge/Slack-9F2B68?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/nebulagraph/shared_invite/zt-7ybejuqa-NCZBroh~PCh66d9kOQj45g) [![Zoom](https://img.shields.io/badge/Zoom-2D8CFF?style=for-the-badge&logo=zoom&logoColor=white)](https://us02web.zoom.us/meeting/register/tZ0rcuypqDMvGdLuIm4VprTlx96wrEf062SH) [![Google Calendar](https://img.shields.io/badge/Calander-4285F4?style=for-the-badge&logo=google&logoColor=white)](https://calendar.google.com/calendar/u/0?cid=Z29mbGttamM3ZTVlZ2hpazI2cmNlNXVnZThAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ) [![Meetup](https://img.shields.io/badge/Meetup-FF0000?style=for-the-badge&logo=meetup&logoColor=white)](https://www.meetup.com/nebulagraph/events/287180186?utm_medium=referral&utm_campaign=share-btn_savedevents_share_modal&utm_source=link) [![Meeting Archive](https://img.shields.io/badge/Community_wiki-808080?style=for-the-badge&logo=readthedocs&logoColor=white)](https://github.com/vesoft-inc/nebula-community/wiki) [![Discourse](https://img.shields.io/badge/中文论坛-4285F4?style=for-the-badge&logo=discourse&logoColor=white)](https://discuss.nebula-graph.com.cn/) [![Tencent_Meeting](https://img.shields.io/badge/腾讯会议-2D8CFF?style=for-the-badge&logo=googlemeet&logoColor=white)](https://meeting.tencent.com/dm/F8NX1aRZ8PQv)
| Join NebulaGraph Community | Where to Find us |
| ----------------------------------- | ------------------------------------------------------------ |
| Asking Questions | [![Stack Overflow](https://img.shields.io/badge/Stack%20Overflow-nebula--graph-orange?style=for-the-badge&logo=stack-overflow&logoColor=white)](https://stackoverflow.com/questions/tagged/nebula-graph) [![Discussions](https://img.shields.io/badge/GitHub_Discussion-000000?style=for-the-badge&logo=github&logoColor=white)](https://github.com/vesoft-inc/nebula/discussions) |
| Chat with Community Members | [![Chat History](https://img.shields.io/badge/Community%20Chat-000000?style=for-the-badge&logo=discord&logoColor=white)](https://community-chat.nebula-graph.io/) [![Slack](https://img.shields.io/badge/Slack-9F2B68?style=for-the-badge&logo=slack&logoColor=white)](https://join.slack.com/t/nebulagraph/shared_invite/zt-7ybejuqa-NCZBroh~PCh66d9kOQj45g) |
| NebulaGraph Meetup | [![Google Calendar](https://img.shields.io/badge/Calander-4285F4?style=for-the-badge&logo=google&logoColor=white)](https://calendar.google.com/calendar/u/0?cid=Z29mbGttamM3ZTVlZ2hpazI2cmNlNXVnZThAZ3JvdXAuY2FsZW5kYXIuZ29vZ2xlLmNvbQ) [![Zoom](https://img.shields.io/badge/Zoom-2D8CFF?style=for-the-badge&logo=zoom&logoColor=white)](https://us02web.zoom.us/meeting/register/tZ0rcuypqDMvGdLuIm4VprTlx96wrEf062SH) [![Meetup](https://img.shields.io/badge/Meetup-FF0000?style=for-the-badge&logo=meetup&logoColor=white)](https://www.meetup.com/nebulagraph/events/) [![Meeting Archive](https://img.shields.io/badge/Meeting_Archive-808080?style=for-the-badge&logo=readthedocs&logoColor=white)](https://github.com/vesoft-inc/nebula-community/wiki) |
| Chat, Asking, or Meeting in Chinese | [![WeChat Group](https://img.shields.io/badge/WeChat_Group-000000?style=for-the-badge&logo=wechat)](https://wj.qq.com/s2/8321168/8e2f/) [![Tencent_Meeting](https://img.shields.io/badge/腾讯会议-2D8CFF?style=for-the-badge&logo=googlemeet&logoColor=white)](https://meeting.tencent.com/dm/F8NX1aRZ8PQv) [![Discourse](https://img.shields.io/badge/中文论坛-4285F4?style=for-the-badge&logo=discourse&logoColor=white)](https://discuss.nebula-graph.com.cn/) |

<br />

Expand Down
1 change: 1 addition & 0 deletions cmake/nebula/GeneralCMakeOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ option(ENABLE_GDB_SCRIPT_SECTION "Add .debug_gdb_scripts section" OFF)
option(DISABLE_CXX11_ABI "Whether to disable cxx11 abi" OFF)
option(ENABLE_BREAKPAD "Whether to enable breakpad" OFF)
option(ENABLE_STANDALONE_VERSION "Enable standalone version build" OFF)
option(ENABLE_MEMORY_TRACKER "Enable memory tracker" ON)

get_cmake_property(variable_list VARIABLES)
foreach(_varname ${variable_list})
Expand Down
1 change: 1 addition & 0 deletions cmake/nebula/SanitizerConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ if(ENABLE_ASAN)
add_compile_options(-fsanitize=address)
add_compile_options(-g)
add_compile_options(-fno-omit-frame-pointer)
add_definitions(-DENABLE_ASAN)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
endif()

Expand Down
22 changes: 21 additions & 1 deletion conf/nebula-graphd.conf.default
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
--stdout_log_file=graphd-stdout.log
--stderr_log_file=graphd-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3
# wether logging files' name contain time stamp.
--timestamp_in_logfile_name=true
########## query ##########
Expand Down Expand Up @@ -93,3 +93,23 @@

# if use balance data feature, only work if enable_experimental_feature is true
--enable_data_balance=true

########## session ##########
# Maximum number of sessions that can be created per IP and per user
--max_sessions_per_ip_per_user=300

########## memory tracker ##########
# trackable memory ratio (trackable_memory / (total_memory - untracked_reserved_memory) )
--memory_tracker_limit_ratio=0.8
# untracked reserved memory in Mib
--memory_tracker_untracked_reserved_memory_mb=50

# enable log memory tracker stats periodically
--memory_tracker_detail_log=false
# log memory tacker stats interval in milliseconds
--memory_tracker_detail_log_interval_ms=60000

# enable memory background purge (if jemalloc is used)
--memory_purge_enabled=true
# memory background purge interval in seconds
--memory_purge_interval_seconds=10
18 changes: 17 additions & 1 deletion conf/nebula-graphd.conf.production
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
--stdout_log_file=graphd-stdout.log
--stderr_log_file=graphd-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3
# wether logging files' name contain timestamp
--timestamp_in_logfile_name=true

Expand Down Expand Up @@ -96,3 +96,19 @@
########## session ##########
# Maximum number of sessions that can be created per IP and per user
--max_sessions_per_ip_per_user=300

########## memory tracker ##########
# trackable memory ratio (trackable_memory / (total_memory - untracked_reserved_memory) )
--memory_tracker_limit_ratio=0.8
# untracked reserved memory in Mib
--memory_tracker_untracked_reserved_memory_mb=50

# enable log memory tracker stats periodically
--memory_tracker_detail_log=false
# log memory tacker stats interval in milliseconds
--memory_tracker_detail_log_interval_ms=60000

# enable memory background purge (if jemalloc is used)
--memory_purge_enabled=true
# memory background purge interval in seconds
--memory_purge_interval_seconds=10
2 changes: 1 addition & 1 deletion conf/nebula-metad.conf.default
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
--stdout_log_file=metad-stdout.log
--stderr_log_file=metad-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3
# wether logging files' name contain time stamp, If Using logrotate to rotate logging files, than should set it to true.
--timestamp_in_logfile_name=true

Expand Down
2 changes: 1 addition & 1 deletion conf/nebula-metad.conf.production
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
--stdout_log_file=metad-stdout.log
--stderr_log_file=metad-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3
# wether logging files' name contain time stamp.
--timestamp_in_logfile_name=true

Expand Down
2 changes: 1 addition & 1 deletion conf/nebula-standalone.conf.default
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
--stdout_log_file=standalone-stdout.log
--stderr_log_file=standalone-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3

########## query ##########
# Whether to treat partial success as an error.
Expand Down
2 changes: 1 addition & 1 deletion conf/nebula-storaged-listener.conf.default
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
--stdout_log_file=storaged-listener-stdout.log
--stderr_log_file=storaged-listener-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3
# Wether logging files' name contain timestamp.
--timestamp_in_logfile_name=true

Expand Down
2 changes: 1 addition & 1 deletion conf/nebula-storaged-listener.conf.production
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
--stdout_log_file=storaged-listener-stdout.log
--stderr_log_file=storaged-listener-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3
# Wether logging files' name contain timestamp.
--timestamp_in_logfile_name=true

Expand Down
18 changes: 17 additions & 1 deletion conf/nebula-storaged.conf.default
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
--stdout_log_file=storaged-stdout.log
--stderr_log_file=storaged-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3
# Wether logging files' name contain time stamp.
--timestamp_in_logfile_name=true

Expand Down Expand Up @@ -122,3 +122,19 @@
--rebuild_index_part_rate_limit=4194304
# The amount of data sent in each batch when leader synchronizes rebuilding index
--rebuild_index_batch_size=1048576

########## memory tracker ##########
# trackable memory ratio (trackable_memory / (total_memory - untracked_reserved_memory) )
--memory_tracker_limit_ratio=0.8
# untracked reserved memory in Mib
--memory_tracker_untracked_reserved_memory_mb=50

# enable log memory tracker stats periodically
--memory_tracker_detail_log=false
# log memory tacker stats interval in milliseconds
--memory_tracker_detail_log_interval_ms=60000

# enable memory background purge (if jemalloc is used)
--memory_purge_enabled=true
# memory background purge interval in seconds
--memory_purge_interval_seconds=10
18 changes: 17 additions & 1 deletion conf/nebula-storaged.conf.production
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
--stdout_log_file=storaged-listener-stdout.log
--stderr_log_file=storaged-listener-stderr.log
# Copy log messages at or above this level to stderr in addition to logfiles. The numbers of severity levels INFO, WARNING, ERROR, and FATAL are 0, 1, 2, and 3, respectively.
--stderrthreshold=2
--stderrthreshold=3
# Wether logging files' name contain timestamp.
--timestamp_in_logfile_name=true

Expand Down Expand Up @@ -123,3 +123,19 @@
--rebuild_index_part_rate_limit=4194304
# The amount of data sent in each batch when leader synchronizes rebuilding index
--rebuild_index_batch_size=1048576

########## memory tracker ##########
# trackable memory ratio (trackable_memory / (total_memory - untracked_reserved_memory) )
--memory_tracker_limit_ratio=0.8
# untracked reserved memory in Mib
--memory_tracker_untracked_reserved_memory_mb=50

# enable log memory tracker stats periodically
--memory_tracker_detail_log=false
# log memory tacker stats interval in milliseconds
--memory_tracker_detail_log_interval_ms=60000

# enable memory background purge (if jemalloc is used)
--memory_purge_enabled=true
# memory background purge interval in seconds
--memory_purge_interval_seconds=10
4 changes: 2 additions & 2 deletions package/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ function package {
function _find_dump_syms_tool {
if [[ -x ${build_dir}/third-party/install/bin/dump_syms ]]; then
dump_syms_tool_dir=${build_dir}/third-party/install/bin
elif [[ -x /opt/vesoft/third-party/2.0/bin/dump_syms ]]; then
dump_syms_tool_dir=/opt/vesoft/third-party/2.0/bin
elif [[ -x /opt/vesoft/third-party/3.3/bin/dump_syms ]]; then
dump_syms_tool_dir=/opt/vesoft/third-party/3.3/bin
else
echo ">>> Failed to find the dump_syms tool <<<"
exit 1
Expand Down
Loading

0 comments on commit c48cbd1

Please sign in to comment.