This is an automated email from the ASF dual-hosted git repository. colinlee pushed a commit to branch colin_fix_config in repository https://gitbox.apache.org/repos/asf/tsfile.git
commit 1b43066eb25fb632280f5bbaded7cf3bad413a3d Author: colin <[email protected]> AuthorDate: Thu Apr 17 20:38:54 2025 +0800 add memory threshold in py writer. --- python/tsfile/tsfile_cpp.pxd | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/tsfile/tsfile_cpp.pxd b/python/tsfile/tsfile_cpp.pxd index e4782672..c726c220 100644 --- a/python/tsfile/tsfile_cpp.pxd +++ b/python/tsfile/tsfile_cpp.pxd @@ -17,7 +17,11 @@ # #cython: language_level=3 +<<<<<<< HEAD from libc.stdint cimport uint32_t, int32_t, int64_t, uint64_t, uint8_t +======= +from libc.stdint cimport uint32_t, int32_t, int64_t, uint64_t +>>>>>>> 0db9e5c1 (add memory threshold in py writer.) ctypedef int32_t ErrorCode
