Skip to content

Commit 3989b51

Browse files
obdevfootkahnwyllmm
authored andcommitted
sync github develop code to master
Co-authored-by: footka <672528926@qq.com> Co-authored-by: hnwyllmm <hnwyllmm@126.com>
1 parent 36f014b commit 3989b51

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+323
-8474
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ compile_commands.json
100100
.cproject
101101
.cache
102102
.history/*
103+
.claude
103104
## Intellij files
104105
.idea
105106
cmake-build-debug
@@ -391,3 +392,4 @@ deps/3rd
391392
############# test #############
392393
test/tmp
393394
test/var
395+
.worktrees/

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,9 @@ Edge devices—from mobile to vehicle and industrial terminals—operate with co
426426
</a>
427427
</p>
428428

429-
<p>
430-
Please refer to the [User Guide](docs/user-guide/README.md) for more details.
431-
</p>
429+
<br/>
430+
431+
Please refer to the [User Guide](https://www.oceanbase.ai/docs/seekdb-overview/) for more details.
432432

433433

434434
</div>

README_CN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,9 +382,9 @@ seekdb 继承了 OceanBase 单机存储引擎、执行引擎、事务引擎、
382382
</a>
383383
</p>
384384

385-
<p>
386-
更多详情请参考[用户指南](docs/user-guide/README.md)
387-
</p>
385+
<br/>
386+
387+
更多详情请参考[用户指南](https://www.oceanbase.ai/docs/seekdb-overview/)
388388

389389

390390
</div>

cmake/Env.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ if (OB_USE_CLANG)
254254
else()
255255
set(LD_OPT "-fuse-ld=${DEVTOOLS_DIR}/bin/ld.lld -Wno-unused-command-line-argument")
256256
set(REORDER_COMP_OPT "-ffunction-sections -fdata-sections -fdebug-info-for-profiling")
257-
set(REORDER_LINK_OPT "-Wl,--no-rosegment,--build-id=sha1,--gc-sections ${HOTFUNC_OPT}")
257+
set(REORDER_LINK_OPT "-Wl,--no-rosegment,--build-id=sha1,--gc-sections,--icf=safe ${HOTFUNC_OPT}")
258258
set(OB_LD_BIN "${DEVTOOLS_DIR}/bin/ld.lld")
259259
endif()
260260
endif()

deps/oblib/src/lib/alloc/memory_dump.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,9 +627,7 @@ void ObMemoryDump::handle(void *task)
627627
ma->print_tenant_ctx_memory_usage(tenant_id);
628628
}
629629

630-
#ifdef FATAL_ERROR_HANG
631630
print_malloc_sample_info();
632-
#endif
633631
} else {
634632
int fd = -1;
635633
if (-1 == (fd = ::open(LOG_FILE,

0 commit comments

Comments
 (0)