Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
72acbb85
TDengine
项目概览
taosdata
/
TDengine
大约 1 年 前同步成功
通知
1184
Star
22015
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
72acbb85
编写于
6月 15, 2023
作者:
Y
yihaoDeng
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'enh/optUVSize' into enh/staticLibMain
上级
9a019e41
cd03420b
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
135 addition
and
80 deletion
+135
-80
cmake/cmake.define
cmake/cmake.define
+16
-12
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+22
-2
examples/JDBC/consumer-demo/pom.xml
examples/JDBC/consumer-demo/pom.xml
+1
-1
packaging/deb/makedeb.sh
packaging/deb/makedeb.sh
+6
-6
packaging/rpm/tdengine.spec
packaging/rpm/tdengine.spec
+6
-6
packaging/tools/install.sh
packaging/tools/install.sh
+7
-7
packaging/tools/install_client.sh
packaging/tools/install_client.sh
+7
-7
packaging/tools/make_install.sh
packaging/tools/make_install.sh
+4
-4
packaging/tools/makeclient.sh
packaging/tools/makeclient.sh
+6
-6
packaging/tools/makepkg.sh
packaging/tools/makepkg.sh
+6
-6
packaging/tools/post.sh
packaging/tools/post.sh
+7
-7
source/common/src/tdatablock.c
source/common/src/tdatablock.c
+22
-5
tests/script/tsim/query/sys_tbname.sim
tests/script/tsim/query/sys_tbname.sim
+4
-0
tools/shell/inc/shellInt.h
tools/shell/inc/shellInt.h
+2
-0
tools/shell/src/shellEngine.c
tools/shell/src/shellEngine.c
+19
-11
未找到文件。
cmake/cmake.define
浏览文件 @
72acbb85
...
...
@@ -115,18 +115,6 @@ ELSE ()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
ENDIF ()
IF (${BUILD_SANITIZER})
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
MESSAGE(STATUS "Compile with Address Sanitizer!")
ELSEIF (${BUILD_RELEASE})
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
ELSE ()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g3 -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -g3 -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
ENDIF ()
# disable all assert
IF ((${DISABLE_ASSERT} MATCHES "true") OR (${DISABLE_ASSERTS} MATCHES "true"))
ADD_DEFINITIONS(-DDISABLE_ASSERT)
...
...
@@ -168,4 +156,20 @@ ELSE ()
MESSAGE(STATUS "SIMD instructions (FMA/AVX/AVX2) is ACTIVATED")
ENDIF()
# build mode
SET(CMAKE_C_FLAGS_REL "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
SET(CMAKE_CXX_FLAGS_REL "${CMAKE_CXX_FLAGS} -Werror -Wno-reserved-user-defined-literal -Wno-literal-suffix -Werror=return-type -fPIC -O3 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
IF (${BUILD_SANITIZER})
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -fsanitize=address -fsanitize=undefined -fsanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=shift-base -fno-sanitize=alignment -g3 -Wformat=0")
MESSAGE(STATUS "Compile with Address Sanitizer!")
ELSEIF (${BUILD_RELEASE})
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS_REL}")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_REL}")
ELSE ()
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Werror=return-type -fPIC -g3 -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal -g3 -Wno-literal-suffix -Werror=return-type -fPIC -gdwarf-2 -Wformat=2 -Wno-format-nonliteral -Wno-format-truncation -Wno-format-y2k")
ENDIF ()
ENDIF ()
contrib/CMakeLists.txt
浏览文件 @
72acbb85
...
...
@@ -235,10 +235,23 @@ endif(${BUILD_WITH_LEVELDB})
# rocksdb
# To support rocksdb build on ubuntu: sudo apt-get install libgflags-dev
if
(
${
BUILD_WITH_UV
}
)
if
(
${
TD_LINUX
}
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS_REL
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS_REL
}
"
)
IF
(
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
""
)
SET
(
CMAKE_BUILD_TYPE Release
)
endif
()
endif
(
${
TD_LINUX
}
)
endif
(
${
BUILD_WITH_UV
}
)
IF
(
NOT
${
TD_LINUX
}
)
if
(
${
BUILD_WITH_ROCKSDB
}
)
if
(
${
TD_LINUX
}
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=unused-function -Wno-errno=unused-private-field -Wno-error=unused-result"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS_REL
}
-Wno-error=maybe-uninitialized -Wno-error=unused-but-set-variable -Wno-error=unused-variable -Wno-error=unused-function -Wno-errno=unused-private-field -Wno-error=unused-result"
)
IF
(
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
""
)
SET
(
CMAKE_BUILD_TYPE Release
)
endif
()
endif
(
${
TD_LINUX
}
)
MESSAGE
(
STATUS
"CXXXX STATUS CONFIG: "
${
CMAKE_CXX_FLAGS
}
)
...
...
@@ -262,7 +275,7 @@ if(${BUILD_WITH_ROCKSDB})
endif
(
${
TD_DARWIN
}
)
if
(
${
TD_WINDOWS
}
)
option
(
WITH_JNI
""
OFF
)
option
(
WITH_JNI
""
OFF
)
endif
(
${
TD_WINDOWS
}
)
if
(
${
TD_WINDOWS
}
)
...
...
@@ -495,6 +508,13 @@ endif(${BUILD_ADDR2LINE})
# geos
if
(
${
BUILD_GEOS
}
)
if
(
${
TD_LINUX
}
)
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS_REL
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS_REL
}
"
)
IF
(
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
""
)
SET
(
CMAKE_BUILD_TYPE Release
)
endif
()
endif
(
${
TD_LINUX
}
)
option
(
BUILD_SHARED_LIBS
"Build GEOS with shared libraries"
OFF
)
add_subdirectory
(
geos EXCLUDE_FROM_ALL
)
target_include_directories
(
...
...
examples/JDBC/consumer-demo/pom.xml
浏览文件 @
72acbb85
...
...
@@ -22,7 +22,7 @@
<dependency>
<groupId>
com.google.guava
</groupId>
<artifactId>
guava
</artifactId>
<version>
3
0.1.1
-jre
</version>
<version>
3
2.0.0
-jre
</version>
</dependency>
</dependencies>
...
...
packaging/deb/makedeb.sh
浏览文件 @
72acbb85
...
...
@@ -124,12 +124,12 @@ if [ -f ${compile_dir}/build/bin/jemalloc-config ]; then
cp
${
compile_dir
}
/build/lib/libjemalloc.so.2
${
pkg_dir
}${
install_user_local_path
}
/lib/
ln
-sf
libjemalloc.so.2
${
pkg_dir
}${
install_user_local_path
}
/lib/libjemalloc.so
fi
if
[
-f
${
compile_dir
}
/build/lib/libjemalloc.a
]
;
then
cp
${
compile_dir
}
/build/lib/libjemalloc.a
${
pkg_dir
}${
install_user_local_path
}
/lib/
fi
if
[
-f
${
compile_dir
}
/build/lib/libjemalloc_pic.a
]
;
then
cp
${
compile_dir
}
/build/lib/libjemalloc_pic.a
${
pkg_dir
}${
install_user_local_path
}
/lib/
fi
#
if [ -f ${compile_dir}/build/lib/libjemalloc.a ]; then
#
cp ${compile_dir}/build/lib/libjemalloc.a ${pkg_dir}${install_user_local_path}/lib/
#
fi
#
if [ -f ${compile_dir}/build/lib/libjemalloc_pic.a ]; then
#
cp ${compile_dir}/build/lib/libjemalloc_pic.a ${pkg_dir}${install_user_local_path}/lib/
#
fi
if
[
-f
${
compile_dir
}
/build/lib/pkgconfig/jemalloc.pc
]
;
then
cp
${
compile_dir
}
/build/lib/pkgconfig/jemalloc.pc
${
pkg_dir
}${
install_user_local_path
}
/lib/pkgconfig/
fi
...
...
packaging/rpm/tdengine.spec
浏览文件 @
72acbb85
...
...
@@ -123,12 +123,12 @@ if [ -f %{_compiledir}/build/bin/jemalloc-config ]; then
cp %{_compiledir}/build/lib/libjemalloc.so.2 %{buildroot}%{homepath}/jemalloc/lib
ln -sf libjemalloc.so.2 %{buildroot}%{homepath}/jemalloc/lib/libjemalloc.so
fi
if [ -f %{_compiledir}/build/lib/libjemalloc.a ]; then
cp %{_compiledir}/build/lib/libjemalloc.a %{buildroot}%{homepath}/jemalloc/lib
fi
if [ -f %{_compiledir}/build/lib/libjemalloc_pic.a ]; then
cp %{_compiledir}/build/lib/libjemalloc_pic.a %{buildroot}%{homepath}/jemalloc/lib
fi
#
if [ -f %{_compiledir}/build/lib/libjemalloc.a ]; then
#
cp %{_compiledir}/build/lib/libjemalloc.a %{buildroot}%{homepath}/jemalloc/lib
#
fi
#
if [ -f %{_compiledir}/build/lib/libjemalloc_pic.a ]; then
#
cp %{_compiledir}/build/lib/libjemalloc_pic.a %{buildroot}%{homepath}/jemalloc/lib
#
fi
if [ -f %{_compiledir}/build/lib/pkgconfig/jemalloc.pc ]; then
cp %{_compiledir}/build/lib/pkgconfig/jemalloc.pc %{buildroot}%{homepath}/jemalloc/lib/pkgconfig
fi
...
...
packaging/tools/install.sh
浏览文件 @
72acbb85
...
...
@@ -315,13 +315,13 @@ function install_jemalloc() {
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc.so.2 /usr/local/lib
${
csudo
}
ln
-sf
libjemalloc.so.2 /usr/local/lib/libjemalloc.so
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib
if
[
-f
${
jemalloc_dir
}
/lib/libjemalloc.a
]
;
then
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc.a /usr/local/lib
fi
if
[
-f
${
jemalloc_dir
}
/lib/libjemalloc_pic.a
]
;
then
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc_pic.a /usr/local/lib
fi
if
[
-f
${
jemalloc_dir
}
/lib/
libjemalloc_pic.a
]
;
then
#
if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
#
${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
#
fi
#
if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
#
${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
#
fi
if
[
-f
${
jemalloc_dir
}
/lib/
pkgconfig/jemalloc.pc
]
;
then
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib/pkgconfig
${
csudo
}
/usr/bin/install
-c
-m
644
${
jemalloc_dir
}
/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
fi
...
...
packaging/tools/install_client.sh
浏览文件 @
72acbb85
...
...
@@ -214,13 +214,13 @@ function install_jemalloc() {
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc.so.2 /usr/local/lib
${
csudo
}
ln
-sf
libjemalloc.so.2 /usr/local/lib/libjemalloc.so
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib
if
[
-f
${
jemalloc_dir
}
/lib/libjemalloc.a
]
;
then
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc.a /usr/local/lib
fi
if
[
-f
${
jemalloc_dir
}
/lib/libjemalloc_pic.a
]
;
then
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc_pic.a /usr/local/lib
fi
if
[
-f
${
jemalloc_dir
}
/lib/
libjemalloc_pic.a
]
;
then
#
if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
#
${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
#
fi
#
if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
#
${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
#
fi
if
[
-f
${
jemalloc_dir
}
/lib/
pkgconfig/jemalloc.pc
]
;
then
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib/pkgconfig
${
csudo
}
/usr/bin/install
-c
-m
644
${
jemalloc_dir
}
/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
fi
...
...
packaging/tools/make_install.sh
浏览文件 @
72acbb85
...
...
@@ -241,10 +241,10 @@ function install_jemalloc() {
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc.so.2 /usr/local/lib
${
csudo
}
ln
-sf
libjemalloc.so.2 /usr/local/lib/libjemalloc.so
>
/dev/null 2>&1
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib
[
-f
${
binary_dir
}
/build/lib/libjemalloc.a
]
&&
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc.a /usr/local/lib
[
-f
${
binary_dir
}
/build/lib/libjemalloc_pic.a
]
&&
${
csudo
}
/usr/bin/install
-c
-m
755
${
binary_dir
}
/build/lib/libjemalloc_pic.a /usr/local/lib
#
[ -f ${binary_dir}/build/lib/libjemalloc.a ] &&
#
${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc.a /usr/local/lib
#
[ -f ${binary_dir}/build/lib/libjemalloc_pic.a ] &&
#
${csudo}/usr/bin/install -c -m 755 ${binary_dir}/build/lib/libjemalloc_pic.a /usr/local/lib
if
[
-f
"
${
binary_dir
}
/build/lib/pkgconfig/jemalloc.pc"
]
;
then
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib/pkgconfig
${
csudo
}
/usr/bin/install
-c
-m
644
${
binary_dir
}
/build/lib/pkgconfig/jemalloc.pc
\
...
...
packaging/tools/makeclient.sh
浏览文件 @
72acbb85
...
...
@@ -118,12 +118,12 @@ if [ -f ${build_dir}/bin/jemalloc-config ]; then
cp
${
build_dir
}
/lib/libjemalloc.so.2
${
install_dir
}
/jemalloc/lib
ln
-sf
libjemalloc.so.2
${
install_dir
}
/jemalloc/lib/libjemalloc.so
fi
if
[
-f
${
build_dir
}
/lib/libjemalloc.a
]
;
then
cp
${
build_dir
}
/lib/libjemalloc.a
${
install_dir
}
/jemalloc/lib
fi
if
[
-f
${
build_dir
}
/lib/libjemalloc_pic.a
]
;
then
cp
${
build_dir
}
/lib/libjemalloc_pic.a
${
install_dir
}
/jemalloc/lib
fi
#
if [ -f ${build_dir}/lib/libjemalloc.a ]; then
#
cp ${build_dir}/lib/libjemalloc.a ${install_dir}/jemalloc/lib
#
fi
#
if [ -f ${build_dir}/lib/libjemalloc_pic.a ]; then
#
cp ${build_dir}/lib/libjemalloc_pic.a ${install_dir}/jemalloc/lib
#
fi
if
[
-f
${
build_dir
}
/lib/pkgconfig/jemalloc.pc
]
;
then
cp
${
build_dir
}
/lib/pkgconfig/jemalloc.pc
${
install_dir
}
/jemalloc/lib/pkgconfig
fi
...
...
packaging/tools/makepkg.sh
浏览文件 @
72acbb85
...
...
@@ -217,12 +217,12 @@ if [ -f ${build_dir}/bin/jemalloc-config ]; then
cp
${
build_dir
}
/lib/libjemalloc.so.2
${
install_dir
}
/jemalloc/lib
ln
-sf
libjemalloc.so.2
${
install_dir
}
/jemalloc/lib/libjemalloc.so
fi
if
[
-f
${
build_dir
}
/lib/libjemalloc.a
]
;
then
cp
${
build_dir
}
/lib/libjemalloc.a
${
install_dir
}
/jemalloc/lib
fi
if
[
-f
${
build_dir
}
/lib/libjemalloc_pic.a
]
;
then
cp
${
build_dir
}
/lib/libjemalloc_pic.a
${
install_dir
}
/jemalloc/lib
fi
#
if [ -f ${build_dir}/lib/libjemalloc.a ]; then
#
cp ${build_dir}/lib/libjemalloc.a ${install_dir}/jemalloc/lib
#
fi
#
if [ -f ${build_dir}/lib/libjemalloc_pic.a ]; then
#
cp ${build_dir}/lib/libjemalloc_pic.a ${install_dir}/jemalloc/lib
#
fi
if
[
-f
${
build_dir
}
/lib/pkgconfig/jemalloc.pc
]
;
then
cp
${
build_dir
}
/lib/pkgconfig/jemalloc.pc
${
install_dir
}
/jemalloc/lib/pkgconfig
fi
...
...
packaging/tools/post.sh
浏览文件 @
72acbb85
...
...
@@ -169,13 +169,13 @@ function install_jemalloc() {
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc.so.2 /usr/local/lib
${
csudo
}
ln
-sf
libjemalloc.so.2 /usr/local/lib/libjemalloc.so
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib
if
[
-f
${
jemalloc_dir
}
/lib/libjemalloc.a
]
;
then
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc.a /usr/local/lib
fi
if
[
-f
${
jemalloc_dir
}
/lib/libjemalloc_pic.a
]
;
then
${
csudo
}
/usr/bin/install
-c
-m
755
${
jemalloc_dir
}
/lib/libjemalloc_pic.a /usr/local/lib
fi
if
[
-f
${
jemalloc_dir
}
/lib/
libjemalloc_pic.a
]
;
then
#
if [ -f ${jemalloc_dir}/lib/libjemalloc.a ]; then
#
${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc.a /usr/local/lib
#
fi
#
if [ -f ${jemalloc_dir}/lib/libjemalloc_pic.a ]; then
#
${csudo}/usr/bin/install -c -m 755 ${jemalloc_dir}/lib/libjemalloc_pic.a /usr/local/lib
#
fi
if
[
-f
${
jemalloc_dir
}
/lib/
pkgconfig/jemalloc.pc
]
;
then
${
csudo
}
/usr/bin/install
-c
-d
/usr/local/lib/pkgconfig
${
csudo
}
/usr/bin/install
-c
-m
644
${
jemalloc_dir
}
/lib/pkgconfig/jemalloc.pc /usr/local/lib/pkgconfig
fi
...
...
source/common/src/tdatablock.c
浏览文件 @
72acbb85
...
...
@@ -1590,18 +1590,35 @@ size_t blockDataGetCapacityInRow(const SSDataBlock* pBlock, size_t pageSize, int
int32_t
nRows
=
payloadSize
/
rowSize
;
ASSERT
(
nRows
>=
1
);
// the true value must be less than the value of nRows
int32_t
additional
=
0
;
int32_t
numVarCols
=
0
;
int32_t
numFixCols
=
0
;
for
(
int32_t
i
=
0
;
i
<
numOfCols
;
++
i
)
{
SColumnInfoData
*
pCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
i
);
if
(
IS_VAR_DATA_TYPE
(
pCol
->
info
.
type
))
{
additional
+=
nRows
*
sizeof
(
int32_t
);
++
numVarCols
;
}
else
{
++
numFixCols
;
}
}
// find the data payload whose size is greater than payloadSize
int
result
=
-
1
;
int
start
=
1
;
int
end
=
nRows
;
while
(
start
<=
end
)
{
int
mid
=
start
+
(
end
-
start
)
/
2
;
//data size + var data type columns offset + fixed data type columns bitmap len
int
midSize
=
rowSize
*
mid
+
numVarCols
*
sizeof
(
int32_t
)
*
mid
+
numFixCols
*
BitmapLen
(
mid
);
if
(
midSize
>
payloadSize
)
{
result
=
mid
;
end
=
mid
-
1
;
}
else
{
additional
+=
BitmapLen
(
nRows
)
;
start
=
mid
+
1
;
}
}
int32_t
newRows
=
(
payloadSize
-
additional
)
/
rowSize
;
int32_t
newRows
=
(
result
!=
-
1
)
?
result
-
1
:
nRows
;
// the true value must be less than the value of nRows
ASSERT
(
newRows
<=
nRows
&&
newRows
>=
1
);
return
newRows
;
...
...
tests/script/tsim/query/sys_tbname.sim
浏览文件 @
72acbb85
...
...
@@ -131,4 +131,8 @@ print $rows
if $rows != 9 then
return -1
endi
print =========================== td-24781
sql select DISTINCT (`precision`) from `information_schema`.`ins_databases` PARTITION BY `precision`
#system sh/exec.sh -n dnode1 -s stop -x SIGINT
tools/shell/inc/shellInt.h
浏览文件 @
72acbb85
...
...
@@ -45,6 +45,8 @@
#define SHELL_MAX_PKG_NUM 1 * 1024 * 1024
#define SHELL_MIN_PKG_NUM 1
#define SHELL_DEF_PKG_NUM 100
#define SHELL_FLOAT_WIDTH 20
#define SHELL_DOUBLE_WIDTH 25
typedef
struct
{
char
*
hist
[
SHELL_MAX_HISTORY_SIZE
];
...
...
tools/shell/src/shellEngine.c
浏览文件 @
72acbb85
...
...
@@ -326,6 +326,7 @@ void shellDumpFieldToFile(TdFilePtr pFile, const char *val, TAOS_FIELD *field, i
char
quotationStr
[
2
];
quotationStr
[
0
]
=
'\"'
;
quotationStr
[
1
]
=
0
;
int32_t
width
;
int
n
;
char
buf
[
TSDB_MAX_BYTES_PER_ROW
];
...
...
@@ -358,20 +359,27 @@ void shellDumpFieldToFile(TdFilePtr pFile, const char *val, TAOS_FIELD *field, i
taosFprintfFile
(
pFile
,
"%"
PRIu64
,
*
((
uint64_t
*
)
val
));
break
;
case
TSDB_DATA_TYPE_FLOAT
:
width
=
SHELL_FLOAT_WIDTH
;
if
(
tsEnableScience
)
{
taosFprintfFile
(
pFile
,
"%
e"
,
GET_FLOAT_VAL
(
val
));
taosFprintfFile
(
pFile
,
"%
*e"
,
width
,
GET_FLOAT_VAL
(
val
));
}
else
{
taosFprintfFile
(
pFile
,
"%.5f"
,
GET_FLOAT_VAL
(
val
));
n
=
snprintf
(
buf
,
TSDB_MAX_BYTES_PER_ROW
,
"%*.5f"
,
width
,
GET_FLOAT_VAL
(
val
));
if
(
n
>
SHELL_FLOAT_WIDTH
)
{
taosFprintfFile
(
pFile
,
"%*e"
,
width
,
GET_FLOAT_VAL
(
val
));
}
else
{
taosFprintfFile
(
pFile
,
"%s"
,
buf
);
}
}
break
;
case
TSDB_DATA_TYPE_DOUBLE
:
width
=
SHELL_DOUBLE_WIDTH
;
if
(
tsEnableScience
)
{
snprintf
(
buf
,
TSDB_MAX_BYTES_PER_ROW
,
"%
*.9e"
,
23
,
GET_DOUBLE_VAL
(
val
));
taosFprintfFile
(
pFile
,
"%
s"
,
buf
);
snprintf
(
buf
,
TSDB_MAX_BYTES_PER_ROW
,
"%
.9e"
,
GET_DOUBLE_VAL
(
val
));
taosFprintfFile
(
pFile
,
"%
*s"
,
width
,
buf
);
}
else
{
n
=
snprintf
(
buf
,
TSDB_MAX_BYTES_PER_ROW
,
"%*.9f"
,
leng
th
,
GET_DOUBLE_VAL
(
val
));
if
(
n
>
TMAX
(
25
,
length
)
)
{
taosFprintfFile
(
pFile
,
"%*.15e"
,
leng
th
,
GET_DOUBLE_VAL
(
val
));
n
=
snprintf
(
buf
,
TSDB_MAX_BYTES_PER_ROW
,
"%*.9f"
,
wid
th
,
GET_DOUBLE_VAL
(
val
));
if
(
n
>
SHELL_DOUBLE_WIDTH
)
{
taosFprintfFile
(
pFile
,
"%*.15e"
,
wid
th
,
GET_DOUBLE_VAL
(
val
));
}
else
{
taosFprintfFile
(
pFile
,
"%s"
,
buf
);
}
...
...
@@ -607,7 +615,7 @@ void shellPrintField(const char *val, TAOS_FIELD *field, int32_t width, int32_t
printf
(
"%*e"
,
width
,
GET_FLOAT_VAL
(
val
));
}
else
{
n
=
snprintf
(
buf
,
TSDB_MAX_BYTES_PER_ROW
,
"%*.5f"
,
width
,
GET_FLOAT_VAL
(
val
));
if
(
n
>
TMAX
(
20
,
width
)
)
{
if
(
n
>
SHELL_FLOAT_WIDTH
)
{
printf
(
"%*e"
,
width
,
GET_FLOAT_VAL
(
val
));
}
else
{
printf
(
"%s"
,
buf
);
...
...
@@ -620,7 +628,7 @@ void shellPrintField(const char *val, TAOS_FIELD *field, int32_t width, int32_t
printf
(
"%*s"
,
width
,
buf
);
}
else
{
n
=
snprintf
(
buf
,
TSDB_MAX_BYTES_PER_ROW
,
"%*.9f"
,
width
,
GET_DOUBLE_VAL
(
val
));
if
(
n
>
TMAX
(
25
,
width
)
)
{
if
(
n
>
SHELL_DOUBLE_WIDTH
)
{
printf
(
"%*.15e"
,
width
,
GET_DOUBLE_VAL
(
val
));
}
else
{
printf
(
"%s"
,
buf
);
...
...
@@ -757,10 +765,10 @@ int32_t shellCalcColWidth(TAOS_FIELD *field, int32_t precision) {
return
TMAX
(
21
,
width
);
// '-9223372036854775807'
case
TSDB_DATA_TYPE_FLOAT
:
return
TMAX
(
20
,
width
);
return
TMAX
(
SHELL_FLOAT_WIDTH
,
width
);
case
TSDB_DATA_TYPE_DOUBLE
:
return
TMAX
(
25
,
width
);
return
TMAX
(
SHELL_DOUBLE_WIDTH
,
width
);
case
TSDB_DATA_TYPE_BINARY
:
case
TSDB_DATA_TYPE_GEOMETRY
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录