Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
ee52870b
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
ee52870b
编写于
1月 24, 2022
作者:
D
dapan1121
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/3.0' into feature/qnode
上级
54e59090
802f0622
变更
137
展开全部
隐藏空白更改
内联
并排
Showing
137 changed file
with
3394 addition
and
3270 deletion
+3394
-3270
2.0/src/query/tests/astTest.cpp
2.0/src/query/tests/astTest.cpp
+3
-1
2.0/src/query/tests/cSortTest.cpp
2.0/src/query/tests/cSortTest.cpp
+4
-1
2.0/src/query/tests/histogramTest.cpp
2.0/src/query/tests/histogramTest.cpp
+3
-0
2.0/src/query/tests/patternMatchTest.cpp
2.0/src/query/tests/patternMatchTest.cpp
+3
-0
2.0/src/query/tests/percentileTest.cpp
2.0/src/query/tests/percentileTest.cpp
+3
-0
2.0/src/query/tests/rangeMergeTest.cpp
2.0/src/query/tests/rangeMergeTest.cpp
+3
-0
2.0/src/query/tests/resultBufferTest.cpp
2.0/src/query/tests/resultBufferTest.cpp
+3
-0
2.0/src/query/tests/tsBufTest.cpp
2.0/src/query/tests/tsBufTest.cpp
+3
-0
2.0/src/query/tests/unitTest.cpp
2.0/src/query/tests/unitTest.cpp
+2
-0
CMakeLists.txt
CMakeLists.txt
+2
-2
contrib/test/traft/CMakeLists.txt
contrib/test/traft/CMakeLists.txt
+1
-2
contrib/test/traft/cluster/Makefile.2
contrib/test/traft/cluster/Makefile.2
+16
-0
contrib/test/traft/cluster/clear.sh
contrib/test/traft/cluster/clear.sh
+0
-0
contrib/test/traft/cluster/node10000.c
contrib/test/traft/cluster/node10000.c
+117
-0
contrib/test/traft/cluster/node10000_restart.c
contrib/test/traft/cluster/node10000_restart.c
+113
-0
contrib/test/traft/cluster/node10001.c
contrib/test/traft/cluster/node10001.c
+117
-0
contrib/test/traft/cluster/node10001_restart.c
contrib/test/traft/cluster/node10001_restart.c
+113
-0
contrib/test/traft/cluster/node10002.c
contrib/test/traft/cluster/node10002.c
+117
-0
contrib/test/traft/cluster/node10002_restart.c
contrib/test/traft/cluster/node10002_restart.c
+113
-0
contrib/test/traft/join_into_vgroup/Makefile.2
contrib/test/traft/join_into_vgroup/Makefile.2
+10
-0
contrib/test/traft/join_into_vgroup/clear.sh
contrib/test/traft/join_into_vgroup/clear.sh
+0
-0
contrib/test/traft/join_into_vgroup/node_follower10000.c
contrib/test/traft/join_into_vgroup/node_follower10000.c
+113
-0
contrib/test/traft/join_into_vgroup/node_follower10001.c
contrib/test/traft/join_into_vgroup/node_follower10001.c
+113
-0
contrib/test/traft/join_into_vgroup/node_leader10002.c
contrib/test/traft/join_into_vgroup/node_leader10002.c
+144
-0
contrib/test/traft/make_cluster/CMakeLists.txt
contrib/test/traft/make_cluster/CMakeLists.txt
+0
-11
contrib/test/traft/make_cluster/common.h
contrib/test/traft/make_cluster/common.h
+0
-23
contrib/test/traft/make_cluster/config.c
contrib/test/traft/make_cluster/config.c
+0
-64
contrib/test/traft/make_cluster/config.h
contrib/test/traft/make_cluster/config.h
+0
-31
contrib/test/traft/make_cluster/console.c
contrib/test/traft/make_cluster/console.c
+0
-202
contrib/test/traft/make_cluster/console.h
contrib/test/traft/make_cluster/console.h
+0
-19
contrib/test/traft/make_cluster/raftMain.c
contrib/test/traft/make_cluster/raftMain.c
+0
-81
contrib/test/traft/make_cluster/raftServer.c
contrib/test/traft/make_cluster/raftServer.c
+0
-286
contrib/test/traft/make_cluster/raftServer.h
contrib/test/traft/make_cluster/raftServer.h
+0
-66
contrib/test/traft/make_cluster/simpleHash.c
contrib/test/traft/make_cluster/simpleHash.c
+0
-218
contrib/test/traft/make_cluster/simpleHash.h
contrib/test/traft/make_cluster/simpleHash.h
+0
-61
contrib/test/traft/make_cluster/util.c
contrib/test/traft/make_cluster/util.c
+0
-45
contrib/test/traft/make_cluster/util.h
contrib/test/traft/make_cluster/util.h
+0
-17
contrib/test/traft/rebalance_leader/CMakeLists.txt
contrib/test/traft/rebalance_leader/CMakeLists.txt
+0
-7
contrib/test/traft/rebalance_leader/common.h
contrib/test/traft/rebalance_leader/common.h
+0
-36
contrib/test/traft/rebalance_leader/raftMain.c
contrib/test/traft/rebalance_leader/raftMain.c
+0
-678
contrib/test/traft/rebalance_leader/raftServer.c
contrib/test/traft/rebalance_leader/raftServer.c
+0
-224
contrib/test/traft/rebalance_leader/raftServer.h
contrib/test/traft/rebalance_leader/raftServer.h
+0
-70
contrib/test/traft/single_node/CMakeLists.txt
contrib/test/traft/single_node/CMakeLists.txt
+6
-0
contrib/test/traft/single_node/clear.sh
contrib/test/traft/single_node/clear.sh
+4
-0
contrib/test/traft/single_node/cmd
contrib/test/traft/single_node/cmd
+6
-0
contrib/test/traft/single_node/singleNode.c
contrib/test/traft/single_node/singleNode.c
+111
-0
include/common/tmsg.h
include/common/tmsg.h
+58
-23
include/libs/executor/executor.h
include/libs/executor/executor.h
+27
-18
include/libs/function/function.h
include/libs/function/function.h
+1
-0
include/libs/planner/planner.h
include/libs/planner/planner.h
+1
-1
include/libs/planner/plannerOp.h
include/libs/planner/plannerOp.h
+2
-0
include/libs/qcom/query.h
include/libs/qcom/query.h
+60
-1
include/libs/transport/trpc.h
include/libs/transport/trpc.h
+0
-50
include/util/compare.h
include/util/compare.h
+33
-35
include/util/tcoding.h
include/util/tcoding.h
+10
-5
source/client/inc/clientInt.h
source/client/inc/clientInt.h
+1
-0
source/client/src/clientEnv.c
source/client/src/clientEnv.c
+5
-1
source/client/src/clientImpl.c
source/client/src/clientImpl.c
+38
-37
source/client/src/clientMsgHandler.c
source/client/src/clientMsgHandler.c
+13
-9
source/client/test/clientTests.cpp
source/client/test/clientTests.cpp
+101
-92
source/common/src/tglobal.c
source/common/src/tglobal.c
+1
-1
source/common/src/ttime.c
source/common/src/ttime.c
+4
-4
source/common/test/commonTests.cpp
source/common/test/commonTests.cpp
+4
-1
source/dnode/mgmt/impl/src/dndMnode.c
source/dnode/mgmt/impl/src/dndMnode.c
+2
-0
source/dnode/mgmt/impl/src/dndTransport.c
source/dnode/mgmt/impl/src/dndTransport.c
+17
-16
source/dnode/mgmt/impl/test/sut/src/client.cpp
source/dnode/mgmt/impl/test/sut/src/client.cpp
+3
-3
source/dnode/mnode/impl/inc/mndDef.h
source/dnode/mnode/impl/inc/mndDef.h
+12
-7
source/dnode/mnode/impl/src/mndAuth.c
source/dnode/mnode/impl/src/mndAuth.c
+29
-3
source/dnode/mnode/impl/src/mndSubscribe.c
source/dnode/mnode/impl/src/mndSubscribe.c
+19
-14
source/dnode/mnode/impl/src/mndTopic.c
source/dnode/mnode/impl/src/mndTopic.c
+1
-1
source/dnode/mnode/impl/src/mndUser.c
source/dnode/mnode/impl/src/mndUser.c
+6
-5
source/dnode/mnode/sdb/src/sdbHash.c
source/dnode/mnode/sdb/src/sdbHash.c
+1
-0
source/dnode/vnode/CMakeLists.txt
source/dnode/vnode/CMakeLists.txt
+1
-0
source/dnode/vnode/inc/tq.h
source/dnode/vnode/inc/tq.h
+10
-41
source/dnode/vnode/inc/vnode.h
source/dnode/vnode/inc/vnode.h
+36
-1
source/dnode/vnode/src/inc/tqInt.h
source/dnode/vnode/src/inc/tqInt.h
+1
-0
source/dnode/vnode/src/inc/vnd.h
source/dnode/vnode/src/inc/vnd.h
+1
-0
source/dnode/vnode/src/meta/metaTbCfg.c
source/dnode/vnode/src/meta/metaTbCfg.c
+1
-1
source/dnode/vnode/src/tq/tq.c
source/dnode/vnode/src/tq/tq.c
+91
-63
source/dnode/vnode/src/vnd/vnodeMain.c
source/dnode/vnode/src/vnd/vnodeMain.c
+1
-1
source/dnode/vnode/src/vnd/vnodeQuery.c
source/dnode/vnode/src/vnd/vnodeQuery.c
+17
-6
source/dnode/vnode/src/vnd/vnodeWrite.c
source/dnode/vnode/src/vnd/vnodeWrite.c
+4
-1
source/libs/catalog/test/catalogTests.cpp
source/libs/catalog/test/catalogTests.cpp
+205
-236
source/libs/executor/inc/executorimpl.h
source/libs/executor/inc/executorimpl.h
+11
-9
source/libs/executor/src/executor.c
source/libs/executor/src/executor.c
+79
-1
source/libs/executor/src/executorMain.c
source/libs/executor/src/executorMain.c
+5
-14
source/libs/executor/src/executorimpl.c
source/libs/executor/src/executorimpl.c
+184
-62
source/libs/executor/test/executorTests.cpp
source/libs/executor/test/executorTests.cpp
+5
-2
source/libs/parser/src/dCDAstProcess.c
source/libs/parser/src/dCDAstProcess.c
+9
-7
source/libs/parser/src/parser.c
source/libs/parser/src/parser.c
+16
-10
source/libs/parser/src/parserUtil.c
source/libs/parser/src/parserUtil.c
+1
-1
source/libs/parser/test/mockCatalog.cpp
source/libs/parser/test/mockCatalog.cpp
+6
-0
source/libs/parser/test/parserTests.cpp
source/libs/parser/test/parserTests.cpp
+5
-2
source/libs/parser/test/plannerTest.cpp
source/libs/parser/test/plannerTest.cpp
+5
-2
source/libs/parser/test/tokenizerTest.cpp
source/libs/parser/test/tokenizerTest.cpp
+3
-1
source/libs/planner/inc/plannerInt.h
source/libs/planner/inc/plannerInt.h
+15
-14
source/libs/planner/src/logicPlan.c
source/libs/planner/src/logicPlan.c
+8
-3
source/libs/planner/src/physicalPlan.c
source/libs/planner/src/physicalPlan.c
+22
-8
source/libs/planner/src/physicalPlanJson.c
source/libs/planner/src/physicalPlanJson.c
+1
-0
source/libs/planner/src/planner.c
source/libs/planner/src/planner.c
+18
-2
source/libs/planner/test/phyPlanTests.cpp
source/libs/planner/test/phyPlanTests.cpp
+3
-3
source/libs/planner/test/plannerTests.cpp
source/libs/planner/test/plannerTests.cpp
+4
-2
source/libs/qcom/src/querymsg.c
source/libs/qcom/src/querymsg.c
+4
-4
source/libs/qcom/test/queryTest.cpp
source/libs/qcom/test/queryTest.cpp
+4
-1
source/libs/qworker/inc/qworkerInt.h
source/libs/qworker/inc/qworkerInt.h
+10
-11
source/libs/qworker/src/qworker.c
source/libs/qworker/src/qworker.c
+3
-3
source/libs/qworker/test/qworkerTests.cpp
source/libs/qworker/test/qworkerTests.cpp
+8
-3
source/libs/scheduler/inc/schedulerInt.h
source/libs/scheduler/inc/schedulerInt.h
+9
-6
source/libs/scheduler/src/scheduler.c
source/libs/scheduler/src/scheduler.c
+9
-18
source/libs/scheduler/test/schedulerTests.cpp
source/libs/scheduler/test/schedulerTests.cpp
+11
-7
source/libs/sync/src/raft_handle_vote_message.c
source/libs/sync/src/raft_handle_vote_message.c
+1
-1
source/libs/sync/src/sync.c
source/libs/sync/src/sync.c
+8
-8
source/libs/tfs/src/tfs.c
source/libs/tfs/src/tfs.c
+6
-2
source/libs/tfs/src/tfsTier.c
source/libs/tfs/src/tfsTier.c
+1
-1
source/libs/tfs/test/tfsTest.cpp
source/libs/tfs/test/tfsTest.cpp
+418
-5
source/libs/transport/src/rpcMain.c
source/libs/transport/src/rpcMain.c
+3
-3
source/libs/transport/src/trans.c
source/libs/transport/src/trans.c
+1
-0
source/libs/transport/src/transCli.c
source/libs/transport/src/transCli.c
+153
-95
source/libs/transport/src/transSrv.c
source/libs/transport/src/transSrv.c
+172
-76
source/libs/transport/test/rclient.c
source/libs/transport/test/rclient.c
+5
-3
source/libs/transport/test/rserver.c
source/libs/transport/test/rserver.c
+1
-1
source/util/src/compare.c
source/util/src/compare.c
+8
-8
source/util/src/tskiplist.c
source/util/src/tskiplist.c
+10
-2
source/util/test/encodeTest.cpp
source/util/test/encodeTest.cpp
+11
-4
tests/script/jenkins/basic.txt
tests/script/jenkins/basic.txt
+6
-6
tests/script/sh/deploy.sh
tests/script/sh/deploy.sh
+4
-0
tests/script/sh/massiveTable/setupDnodes.sh
tests/script/sh/massiveTable/setupDnodes.sh
+1
-1
tests/script/tmp/prepare.sim
tests/script/tmp/prepare.sim
+38
-4
tests/script/tsim/db/basic1.sim
tests/script/tsim/db/basic1.sim
+0
-0
tests/script/tsim/db/basic6.sim
tests/script/tsim/db/basic6.sim
+0
-0
tests/script/tsim/db/error1.sim
tests/script/tsim/db/error1.sim
+0
-0
tests/script/tsim/dnode/basic1.sim
tests/script/tsim/dnode/basic1.sim
+0
-0
tests/script/tsim/table/basic1.sim
tests/script/tsim/table/basic1.sim
+0
-0
tests/script/tsim/user/basic1.sim
tests/script/tsim/user/basic1.sim
+0
-0
tests/test/c/create_table.c
tests/test/c/create_table.c
+25
-29
tests/tsim/src/simSystem.c
tests/tsim/src/simSystem.c
+2
-1
tools/shell/src/backup/tnettest.c
tools/shell/src/backup/tnettest.c
+2
-2
未找到文件。
2.0/src/query/tests/astTest.cpp
浏览文件 @
ee52870b
...
...
@@ -632,4 +632,6 @@ void exprSerializeTest2() {
TEST(testCase, astTest) {
// exprSerializeTest2();
}
#endif
\ No newline at end of file
#endif
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/cSortTest.cpp
浏览文件 @
ee52870b
...
...
@@ -5,6 +5,7 @@
#include "tsdb.h"
#include "qExtbuffer.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -121,4 +122,6 @@ TEST(testCase, columnsort_test) {
printf
(
"
\n
"
);
destroyColumnModel
(
pModel
);
}
\ No newline at end of file
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/histogramTest.cpp
浏览文件 @
ee52870b
...
...
@@ -6,6 +6,7 @@
#include "taos.h"
#include "qHistogram.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -140,3 +141,5 @@ TEST(testCase, heapsort) {
//
// free(pEntry);
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/patternMatchTest.cpp
浏览文件 @
ee52870b
...
...
@@ -6,6 +6,7 @@
#include "qAggMain.h"
#include "tcompare.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -84,3 +85,5 @@ TEST(testCase, patternMatchTest) {
ret
=
patternMatch
(
"%9"
,
str
,
2
,
&
info
);
EXPECT_EQ
(
ret
,
TSDB_PATTERN_MATCH
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/percentileTest.cpp
浏览文件 @
ee52870b
...
...
@@ -7,6 +7,7 @@
#include "qPercentile.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -255,3 +256,5 @@ TEST(testCase, percentileTest) {
unsignedDataTest
();
largeDataTest
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/rangeMergeTest.cpp
浏览文件 @
ee52870b
...
...
@@ -7,6 +7,7 @@
#include "qFilter.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -365,3 +366,5 @@ TEST(testCase, rangeMergeTest) {
intDataTest
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/resultBufferTest.cpp
浏览文件 @
ee52870b
...
...
@@ -6,6 +6,7 @@
#include "taos.h"
#include "tsdb.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -161,3 +162,5 @@ TEST(testCase, resultBufferTest) {
writeDownTest
();
recyclePageTest
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/tsBufTest.cpp
浏览文件 @
ee52870b
...
...
@@ -9,6 +9,7 @@
#include "ttoken.h"
#include "tutil.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
...
...
@@ -513,3 +514,5 @@ TEST(testCase, tsBufTest) {
mergeDiffVnodeBufferTest
();
mergeIdenticalVnodeBufferTest
();
}
#pragma GCC diagnostic pop
\ No newline at end of file
2.0/src/query/tests/unitTest.cpp
浏览文件 @
ee52870b
...
...
@@ -4,6 +4,7 @@
#include "taos.h"
#include "tsdb.h"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
...
...
@@ -910,3 +911,4 @@ TEST(testCase, getTempFilePath_test) {
printf
(
"%s
\n
"
,
path
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
CMakeLists.txt
浏览文件 @
ee52870b
...
...
@@ -10,8 +10,8 @@ set(CMAKE_SUPPORT_DIR "${CMAKE_SOURCE_DIR}/cmake")
set
(
CMAKE_CONTRIB_DIR
"
${
CMAKE_SOURCE_DIR
}
/contrib"
)
include
(
${
CMAKE_SUPPORT_DIR
}
/cmake.options
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-fPIC -gdwarf-2 -msse4.2 -mfma -g3"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-fPIC -gdwarf-2 -msse4.2 -mfma -g3"
)
SET
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
-
Werror -
fPIC -gdwarf-2 -msse4.2 -mfma -g3"
)
SET
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-
Werror -
fPIC -gdwarf-2 -msse4.2 -mfma -g3"
)
# contrib
add_subdirectory
(
contrib
)
...
...
contrib/test/traft/CMakeLists.txt
浏览文件 @
ee52870b
add_subdirectory
(
rebalance_leader
)
add_subdirectory
(
make_cluster
)
add_subdirectory
(
single_node
)
contrib/test/traft/cluster/Makefile.2
0 → 100644
浏览文件 @
ee52870b
all
:
gcc node10000.c
-I
../../include/ ../../.libs/libraft.a
-o
node10000
-luv
-llz4
-lpthread
-g
gcc node10001.c
-I
../../include/ ../../.libs/libraft.a
-o
node10001
-luv
-llz4
-lpthread
-g
gcc node10002.c
-I
../../include/ ../../.libs/libraft.a
-o
node10002
-luv
-llz4
-lpthread
-g
gcc node10000_restart.c
-I
../../include/ ../../.libs/libraft.a
-o
node10000_restart
-luv
-llz4
-lpthread
-g
gcc node10001_restart.c
-I
../../include/ ../../.libs/libraft.a
-o
node10001_restart
-luv
-llz4
-lpthread
-g
gcc node10002_restart.c
-I
../../include/ ../../.libs/libraft.a
-o
node10002_restart
-luv
-llz4
-lpthread
-g
clean
:
rm
-f
node10000
rm
-f
node10001
rm
-f
node10002
rm
-f
node10000_restart
rm
-f
node10001_restart
rm
-f
node10002_restart
sh clear.sh
contrib/test/traft/
make_
cluster/clear.sh
→
contrib/test/traft/cluster/clear.sh
浏览文件 @
ee52870b
文件已移动
contrib/test/traft/cluster/node10000.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
// printRaftState(r);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10000
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// add vgroup, id = 100, only has 3 replica.
// array <peers, peersCount> gives the peer replica infomation.
char
peers
[
MAX_PEERS_COUNT
][
ADDRESS_LEN
];
memset
(
peers
,
0
,
sizeof
(
peers
));
snprintf
(
peers
[
0
],
ADDRESS_LEN
,
"%s"
,
"127.0.0.1:10001"
);
snprintf
(
peers
[
1
],
ADDRESS_LEN
,
"%s"
,
"127.0.0.1:10002"
);
uint32_t
peersCount
=
2
;
r
=
addRaftVoter
(
&
raftEnv
,
peers
,
peersCount
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit a value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/cluster/node10000_restart.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
// printRaftState(r);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10000
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// add vgroup, id = 100, only has 3 replica.
// here only add self.
// peer replica information will restore from wal.
r
=
addRaftVoter
(
&
raftEnv
,
NULL
,
0
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit a value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/cluster/node10001.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
// printRaftState(r);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10001
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// add vgroup, id = 100, only has 3 replica.
// array <peers, peersCount> gives the peer replica infomation.
char
peers
[
MAX_PEERS_COUNT
][
ADDRESS_LEN
];
memset
(
peers
,
0
,
sizeof
(
peers
));
snprintf
(
peers
[
0
],
ADDRESS_LEN
,
"%s"
,
"127.0.0.1:10000"
);
snprintf
(
peers
[
1
],
ADDRESS_LEN
,
"%s"
,
"127.0.0.1:10002"
);
uint32_t
peersCount
=
2
;
r
=
addRaftVoter
(
&
raftEnv
,
peers
,
peersCount
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit a value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/cluster/node10001_restart.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
// printRaftState(r);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10001
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// add vgroup, id = 100, only has 3 replica.
// here only add self.
// peer replica information will restore from wal.
r
=
addRaftVoter
(
&
raftEnv
,
NULL
,
0
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit a value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/cluster/node10002.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
// printRaftState(r);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10002
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// add vgroup, id = 100, only has 3 replica.
// array <peers, peersCount> gives the peer replica infomation.
char
peers
[
MAX_PEERS_COUNT
][
ADDRESS_LEN
];
memset
(
peers
,
0
,
sizeof
(
peers
));
snprintf
(
peers
[
0
],
ADDRESS_LEN
,
"%s"
,
"127.0.0.1:10000"
);
snprintf
(
peers
[
1
],
ADDRESS_LEN
,
"%s"
,
"127.0.0.1:10001"
);
uint32_t
peersCount
=
2
;
r
=
addRaftVoter
(
&
raftEnv
,
peers
,
peersCount
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit a value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/cluster/node10002_restart.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
// printRaftState(r);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10002
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// add vgroup, id = 100, only has 3 replica.
// here only add self.
// peer replica information will restore from wal.
r
=
addRaftVoter
(
&
raftEnv
,
NULL
,
0
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit a value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/join_into_vgroup/Makefile.2
0 → 100644
浏览文件 @
ee52870b
all
:
gcc node_follower10000.c
-I
../../include/ ../../.libs/libraft.a
-o
node_follower10000
-luv
-llz4
-lpthread
-g
gcc node_follower10001.c
-I
../../include/ ../../.libs/libraft.a
-o
node_follower10001
-luv
-llz4
-lpthread
-g
gcc node_leader10002.c
-I
../../include/ ../../.libs/libraft.a
-o
node_leader10002
-luv
-llz4
-lpthread
-g
clean
:
rm
-f
node_follower10000
rm
-f
node_follower10001
rm
-f
node_leader10002
sh clear.sh
contrib/test/traft/
rebalance_leader
/clear.sh
→
contrib/test/traft/
join_into_vgroup
/clear.sh
浏览文件 @
ee52870b
文件已移动
contrib/test/traft/join_into_vgroup/node_follower10000.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
printRaftState
(
r
);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
signal
(
SIGPIPE
,
SIG_IGN
);
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10000
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// add one replica
r
=
addRaftSpare
(
&
raftEnv
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/join_into_vgroup/node_follower10001.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
printRaftState
(
r
);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
signal
(
SIGPIPE
,
SIG_IGN
);
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10001
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// add one replica
r
=
addRaftSpare
(
&
raftEnv
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/join_into_vgroup/node_leader10002.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
printRaftState
(
r
);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
void
joinRaftPeerCb
(
struct
raft_change
*
req
,
int
status
)
{
struct
raft
*
r
=
req
->
data
;
if
(
status
!=
0
)
{
fprintf
(
stderr
,
"joinRaftPeerCb error: %s
\n
"
,
raft_errmsg
(
r
));
}
else
{
fprintf
(
stderr
,
"joinRaftPeerCb ok
\n
"
);
}
raft_free
(
req
);
}
int
main
(
int
argc
,
char
**
argv
)
{
signal
(
SIGPIPE
,
SIG_IGN
);
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
10002
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// add one replica
r
=
addRaftVoter
(
&
raftEnv
,
NULL
,
0
,
100
,
pFsm
);
assert
(
r
==
0
);
printRaftState
(
getRaft
(
&
raftEnv
,
100
));
// wait for being leader
while
(
1
)
{
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
if
(
r
->
state
==
RAFT_LEADER
)
{
break
;
}
}
// join peers
r
=
joinRaftPeer
(
&
raftEnv
,
100
,
"127.0.0.1"
,
10000
,
joinRaftPeerCb
);
assert
(
r
==
0
);
// wait for join over
sleep
(
2
);
r
=
joinRaftPeer
(
&
raftEnv
,
100
,
"127.0.0.1"
,
10001
,
joinRaftPeerCb
);
assert
(
r
==
0
);
// for test: submit value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
contrib/test/traft/make_cluster/CMakeLists.txt
已删除
100644 → 0
浏览文件 @
54e59090
add_executable
(
makeCluster
""
)
target_sources
(
makeCluster
PRIVATE
"raftMain.c"
"raftServer.c"
"config.c"
"console.c"
"simpleHash.c"
"util.c"
)
target_link_libraries
(
makeCluster PUBLIC traft lz4 uv_a
)
contrib/test/traft/make_cluster/common.h
已删除
100644 → 0
浏览文件 @
54e59090
#ifndef TRAFT_COMMON_H
#define TRAFT_COMMON_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include <stdint.h>
#define COMMAND_LEN 512
#define MAX_CMD_COUNT 10
#define TOKEN_LEN 128
#define MAX_PEERS_COUNT 19
#define HOST_LEN 64
#define ADDRESS_LEN (HOST_LEN * 2)
#define BASE_DIR_LEN 128
#ifdef __cplusplus
}
#endif
#endif
contrib/test/traft/make_cluster/config.c
已删除
100644 → 0
浏览文件 @
54e59090
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
void
addrToString
(
const
char
*
host
,
uint16_t
port
,
char
*
addr
,
int
len
)
{
snprintf
(
addr
,
len
,
"%s:%hu"
,
host
,
port
);
}
void
parseAddr
(
const
char
*
addr
,
char
*
host
,
int
len
,
uint16_t
*
port
)
{
char
*
tmp
=
(
char
*
)
malloc
(
strlen
(
addr
)
+
1
);
strcpy
(
tmp
,
addr
);
char
*
context
;
char
*
separator
=
":"
;
char
*
token
=
strtok_r
(
tmp
,
separator
,
&
context
);
if
(
token
)
{
snprintf
(
host
,
len
,
"%s"
,
token
);
}
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
token
)
{
sscanf
(
token
,
"%hu"
,
port
);
}
free
(
tmp
);
}
int
parseConf
(
int
argc
,
char
**
argv
,
RaftServerConfig
*
pConf
)
{
memset
(
pConf
,
0
,
sizeof
(
*
pConf
));
int
option_index
,
option_value
;
option_index
=
0
;
static
struct
option
long_options
[]
=
{{
"help"
,
no_argument
,
NULL
,
'h'
},
{
"addr"
,
required_argument
,
NULL
,
'a'
},
{
"dir"
,
required_argument
,
NULL
,
'd'
},
{
NULL
,
0
,
NULL
,
0
}};
while
((
option_value
=
getopt_long
(
argc
,
argv
,
"ha:d:"
,
long_options
,
&
option_index
))
!=
-
1
)
{
switch
(
option_value
)
{
case
'a'
:
{
parseAddr
(
optarg
,
pConf
->
me
.
host
,
sizeof
(
pConf
->
me
.
host
),
&
pConf
->
me
.
port
);
break
;
}
case
'd'
:
{
snprintf
(
pConf
->
baseDir
,
sizeof
(
pConf
->
baseDir
),
"%s"
,
optarg
);
break
;
}
case
'h'
:
{
return
-
2
;
}
default:
{
return
-
2
;
}
}
}
return
0
;
}
void
printConf
(
RaftServerConfig
*
pConf
)
{
printf
(
"
\n
---printConf:
\n
"
);
printf
(
"me: [%s:%hu]
\n
"
,
pConf
->
me
.
host
,
pConf
->
me
.
port
);
printf
(
"dataDir: [%s]
\n\n
"
,
pConf
->
baseDir
);
}
contrib/test/traft/make_cluster/config.h
已删除
100644 → 0
浏览文件 @
54e59090
#ifndef TRAFT_CONFIG_H
#define TRAFT_CONFIG_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include <getopt.h>
#include <stdint.h>
#include "common.h"
typedef
struct
{
char
host
[
HOST_LEN
];
uint16_t
port
;
}
Addr
;
typedef
struct
{
Addr
me
;
char
baseDir
[
BASE_DIR_LEN
];
}
RaftServerConfig
;
void
addrToString
(
const
char
*
host
,
uint16_t
port
,
char
*
addr
,
int
len
);
void
parseAddr
(
const
char
*
addr
,
char
*
host
,
int
len
,
uint16_t
*
port
);
int
parseConf
(
int
argc
,
char
**
argv
,
RaftServerConfig
*
pConf
);
void
printConf
(
RaftServerConfig
*
pConf
);
#ifdef __cplusplus
}
#endif
#endif
contrib/test/traft/make_cluster/console.c
已删除
100644 → 0
浏览文件 @
54e59090
#include "console.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "raftServer.h"
#include "util.h"
void
printHelp
()
{
printf
(
"---------------------
\n
"
);
printf
(
"help:
\n\n
"
);
printf
(
"create a vgroup with 3 replicas:
\n
"
);
printf
(
"create vnode voter vid 100 peers 127.0.0.1:10001 127.0.0.1:10002
\n
"
);
printf
(
"create vnode voter vid 100 peers 127.0.0.1:10000 127.0.0.1:10002
\n
"
);
printf
(
"create vnode voter vid 100 peers 127.0.0.1:10000 127.0.0.1:10001
\n
"
);
printf
(
"
\n
"
);
printf
(
"create a vgroup with only one replica:
\n
"
);
printf
(
"create vnode voter vid 200
\n
"
);
printf
(
"
\n
"
);
printf
(
"add vnode into vgroup:
\n
"
);
printf
(
"create vnode spare vid 100 ---- run at 127.0.0.1:10003
\n
"
);
printf
(
"join vnode vid 100 addr 127.0.0.1:10003 ---- run at leader of vgroup 100
\n
"
);
printf
(
"
\n
"
);
printf
(
"run
\n
"
);
printf
(
"put 0 key value
\n
"
);
printf
(
"get 0 key
\n
"
);
printf
(
"---------------------
\n
"
);
}
void
console
(
RaftServer
*
pRaftServer
)
{
while
(
1
)
{
int
ret
;
char
cmdBuf
[
COMMAND_LEN
];
memset
(
cmdBuf
,
0
,
sizeof
(
cmdBuf
));
printf
(
"(console)> "
);
char
*
retp
=
fgets
(
cmdBuf
,
COMMAND_LEN
,
stdin
);
if
(
!
retp
)
{
exit
(
-
1
);
}
int
pos
=
strlen
(
cmdBuf
);
if
(
cmdBuf
[
pos
-
1
]
==
'\n'
)
{
cmdBuf
[
pos
-
1
]
=
'\0'
;
}
if
(
strncmp
(
cmdBuf
,
""
,
COMMAND_LEN
)
==
0
)
{
continue
;
}
char
cmds
[
MAX_CMD_COUNT
][
TOKEN_LEN
];
memset
(
cmds
,
0
,
sizeof
(
cmds
));
int
cmdCount
;
cmdCount
=
splitString
(
cmdBuf
,
" "
,
cmds
,
MAX_CMD_COUNT
);
if
(
strcmp
(
cmds
[
0
],
"create"
)
==
0
&&
strcmp
(
cmds
[
1
],
"vnode"
)
==
0
&&
strcmp
(
cmds
[
3
],
"vid"
)
==
0
)
{
uint16_t
vid
;
sscanf
(
cmds
[
4
],
"%hu"
,
&
vid
);
if
(
strcmp
(
cmds
[
2
],
"voter"
)
==
0
)
{
char
peers
[
MAX_PEERS_COUNT
][
ADDRESS_LEN
];
memset
(
peers
,
0
,
sizeof
(
peers
));
uint32_t
peersCount
=
0
;
if
(
strcmp
(
cmds
[
5
],
"peers"
)
==
0
&&
cmdCount
>
6
)
{
// create vnode voter vid 100 peers 127.0.0.1:10001 127.0.0.1:10002
for
(
int
i
=
6
;
i
<
cmdCount
;
++
i
)
{
snprintf
(
peers
[
i
-
6
],
ADDRESS_LEN
,
"%s"
,
cmds
[
i
]);
peersCount
++
;
}
}
else
{
// create vnode voter vid 200
}
ret
=
addRaftVoter
(
pRaftServer
,
peers
,
peersCount
,
vid
);
if
(
ret
==
0
)
{
printf
(
"create vnode voter ok
\n
"
);
}
else
{
printf
(
"create vnode voter error
\n
"
);
}
}
else
if
(
strcmp
(
cmds
[
2
],
"spare"
)
==
0
)
{
ret
=
addRaftSpare
(
pRaftServer
,
vid
);
if
(
ret
==
0
)
{
printf
(
"create vnode spare ok
\n
"
);
}
else
{
printf
(
"create vnode spare error
\n
"
);
}
}
else
{
printHelp
();
}
}
else
if
(
strcmp
(
cmds
[
0
],
"join"
)
==
0
&&
strcmp
(
cmds
[
1
],
"vnode"
)
==
0
&&
strcmp
(
cmds
[
2
],
"vid"
)
==
0
&&
strcmp
(
cmds
[
4
],
"addr"
)
==
0
&&
cmdCount
==
6
)
{
// join vnode vid 100 addr 127.0.0.1:10004
char
*
address
=
cmds
[
5
];
char
host
[
64
];
uint16_t
port
;
parseAddr
(
address
,
host
,
sizeof
(
host
),
&
port
);
uint16_t
vid
;
sscanf
(
cmds
[
3
],
"%hu"
,
&
vid
);
HashNode
**
pp
=
pRaftServer
->
raftInstances
.
find
(
&
pRaftServer
->
raftInstances
,
vid
);
if
(
*
pp
==
NULL
)
{
printf
(
"vid:%hu not found
\n
"
,
vid
);
break
;
}
RaftInstance
*
pRaftInstance
=
(
*
pp
)
->
data
;
uint64_t
destRaftId
=
encodeRaftId
(
host
,
port
,
vid
);
struct
raft_change
*
req
=
raft_malloc
(
sizeof
(
*
req
));
RaftJoin
*
pRaftJoin
=
raft_malloc
(
sizeof
(
*
pRaftJoin
));
pRaftJoin
->
r
=
&
pRaftInstance
->
raft
;
pRaftJoin
->
joinId
=
destRaftId
;
req
->
data
=
pRaftJoin
;
ret
=
raft_add
(
&
pRaftInstance
->
raft
,
req
,
destRaftId
,
address
,
raftChangeAddCb
);
if
(
ret
!=
0
)
{
printf
(
"raft_add error: %s
\n
"
,
raft_errmsg
(
&
pRaftInstance
->
raft
));
}
}
else
if
(
strcmp
(
cmds
[
0
],
"dropnode"
)
==
0
)
{
}
else
if
(
strcmp
(
cmds
[
0
],
"state"
)
==
0
)
{
pRaftServer
->
raftInstances
.
print
(
&
pRaftServer
->
raftInstances
);
for
(
size_t
i
=
0
;
i
<
pRaftServer
->
raftInstances
.
length
;
++
i
)
{
HashNode
*
ptr
=
pRaftServer
->
raftInstances
.
table
[
i
];
if
(
ptr
!=
NULL
)
{
while
(
ptr
!=
NULL
)
{
RaftInstance
*
pRaftInstance
=
ptr
->
data
;
printf
(
"instance vid:%hu raftId:%llu
\n
"
,
ptr
->
vgroupId
,
pRaftInstance
->
raftId
);
printRaftState
(
&
pRaftInstance
->
raft
);
printf
(
"
\n
"
);
ptr
=
ptr
->
next
;
}
printf
(
"
\n
"
);
}
}
}
else
if
(
strcmp
(
cmds
[
0
],
"put"
)
==
0
&&
cmdCount
==
4
)
{
uint16_t
vid
;
sscanf
(
cmds
[
1
],
"%hu"
,
&
vid
);
char
*
key
=
cmds
[
2
];
char
*
value
=
cmds
[
3
];
HashNode
**
pp
=
pRaftServer
->
raftInstances
.
find
(
&
pRaftServer
->
raftInstances
,
vid
);
if
(
*
pp
==
NULL
)
{
printf
(
"vid:%hu not found
\n
"
,
vid
);
break
;
}
RaftInstance
*
pRaftInstance
=
(
*
pp
)
->
data
;
char
*
raftValue
=
malloc
(
TOKEN_LEN
*
2
+
3
);
snprintf
(
raftValue
,
TOKEN_LEN
*
2
+
3
,
"%s--%s"
,
key
,
value
);
putValue
(
&
pRaftInstance
->
raft
,
raftValue
);
free
(
raftValue
);
}
else
if
(
strcmp
(
cmds
[
0
],
"run"
)
==
0
)
{
pthread_t
tidRaftServer
;
pthread_create
(
&
tidRaftServer
,
NULL
,
startServerFunc
,
pRaftServer
);
}
else
if
(
strcmp
(
cmds
[
0
],
"get"
)
==
0
&&
cmdCount
==
3
)
{
uint16_t
vid
;
sscanf
(
cmds
[
1
],
"%hu"
,
&
vid
);
char
*
key
=
cmds
[
2
];
HashNode
**
pp
=
pRaftServer
->
raftInstances
.
find
(
&
pRaftServer
->
raftInstances
,
vid
);
if
(
*
pp
==
NULL
)
{
printf
(
"vid:%hu not found
\n
"
,
vid
);
break
;
}
RaftInstance
*
pRaftInstance
=
(
*
pp
)
->
data
;
SimpleHash
*
pKV
=
pRaftInstance
->
fsm
.
data
;
SimpleHashNode
**
ppNode
=
pKV
->
find_cstr
(
pKV
,
key
);
if
(
*
ppNode
==
NULL
)
{
printf
(
"key:%s not found
\n
"
,
key
);
}
else
{
printf
(
"find key:%s value:%s
\n
"
,
key
,
(
char
*
)((
*
ppNode
)
->
data
));
}
}
else
if
(
strcmp
(
cmds
[
0
],
"transfer"
)
==
0
)
{
}
else
if
(
strcmp
(
cmds
[
0
],
"state"
)
==
0
)
{
}
else
if
(
strcmp
(
cmds
[
0
],
"snapshot"
)
==
0
)
{
}
else
if
(
strcmp
(
cmds
[
0
],
"exit"
)
==
0
)
{
exit
(
0
);
}
else
if
(
strcmp
(
cmds
[
0
],
"quit"
)
==
0
)
{
exit
(
0
);
}
else
if
(
strcmp
(
cmds
[
0
],
"help"
)
==
0
)
{
printHelp
();
}
else
{
printf
(
"unknown command: %s
\n
"
,
cmdBuf
);
printHelp
();
}
/*
printf("cmdBuf: [%s] \n", cmdBuf);
printf("cmdCount : %d \n", cmdCount);
for (int i = 0; i < MAX_CMD_COUNT; ++i) {
printf("cmd%d : %s \n", i, cmds[i]);
}
*/
}
}
contrib/test/traft/make_cluster/console.h
已删除
100644 → 0
浏览文件 @
54e59090
#ifndef TRAFT_CONSOLE_H
#define TRAFT_CONSOLE_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include <getopt.h>
#include <stdint.h>
#include "common.h"
#include "raftServer.h"
void
console
(
RaftServer
*
pRaftServer
);
#ifdef __cplusplus
}
#endif
#endif
contrib/test/traft/make_cluster/raftMain.c
已删除
100644 → 0
浏览文件 @
54e59090
#include <assert.h>
#include <getopt.h>
#include <pthread.h>
#include <raft.h>
#include <raft/uv.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
#include "common.h"
#include "config.h"
#include "console.h"
#include "raftServer.h"
#include "simpleHash.h"
#include "util.h"
const
char
*
exe_name
;
void
*
startConsoleFunc
(
void
*
param
)
{
RaftServer
*
pRaftServer
=
(
RaftServer
*
)
param
;
console
(
pRaftServer
);
return
NULL
;
}
void
usage
()
{
printf
(
"
\n
usage:
\n
"
);
printf
(
"%s --addr=127.0.0.1:10000 --dir=./data
\n
"
,
exe_name
);
printf
(
"
\n
"
);
}
RaftServerConfig
gConfig
;
RaftServer
gRaftServer
;
int
main
(
int
argc
,
char
**
argv
)
{
srand
(
time
(
NULL
));
int32_t
ret
;
exe_name
=
argv
[
0
];
if
(
argc
<
3
)
{
usage
();
exit
(
-
1
);
}
ret
=
parseConf
(
argc
,
argv
,
&
gConfig
);
if
(
ret
!=
0
)
{
usage
();
exit
(
-
1
);
}
printConf
(
&
gConfig
);
if
(
!
dirOK
(
gConfig
.
baseDir
))
{
ret
=
mkdir
(
gConfig
.
baseDir
,
0775
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"mkdir error, %s
\n
"
,
gConfig
.
baseDir
);
exit
(
-
1
);
}
}
ret
=
raftServerInit
(
&
gRaftServer
,
&
gConfig
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raftServerInit error
\n
"
);
exit
(
-
1
);
}
/*
pthread_t tidRaftServer;
pthread_create(&tidRaftServer, NULL, startServerFunc, &gRaftServer);
*/
pthread_t
tidConsole
;
pthread_create
(
&
tidConsole
,
NULL
,
startConsoleFunc
,
&
gRaftServer
);
while
(
1
)
{
sleep
(
10
);
}
return
0
;
}
contrib/test/traft/make_cluster/raftServer.c
已删除
100644 → 0
浏览文件 @
54e59090
#include "raftServer.h"
#include <stdlib.h>
#include <unistd.h>
#include "common.h"
#include "simpleHash.h"
#include "util.h"
void
*
startServerFunc
(
void
*
param
)
{
RaftServer
*
pRaftServer
=
(
RaftServer
*
)
param
;
int32_t
r
=
raftServerStart
(
pRaftServer
);
assert
(
r
==
0
);
return
NULL
;
}
void
raftChangeAssignCb
(
struct
raft_change
*
req
,
int
status
)
{
struct
raft
*
r
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"raftChangeAssignCb error: %s
\n
"
,
raft_errmsg
(
r
));
}
else
{
printf
(
"raftChangeAssignCb ok
\n
"
);
}
raft_free
(
req
);
}
void
raftChangeAddCb
(
struct
raft_change
*
req
,
int
status
)
{
RaftJoin
*
pRaftJoin
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"raftChangeAddCb error: %s
\n
"
,
raft_errmsg
(
pRaftJoin
->
r
));
}
else
{
struct
raft_change
*
req2
=
raft_malloc
(
sizeof
(
*
req2
));
req2
->
data
=
pRaftJoin
->
r
;
int
ret
=
raft_assign
(
pRaftJoin
->
r
,
req2
,
pRaftJoin
->
joinId
,
RAFT_VOTER
,
raftChangeAssignCb
);
if
(
ret
!=
0
)
{
printf
(
"raftChangeAddCb error: %s
\n
"
,
raft_errmsg
(
pRaftJoin
->
r
));
}
}
raft_free
(
req
->
data
);
raft_free
(
req
);
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
)
{
// get fsm data
SimpleHash
*
sh
=
pFsm
->
data
;
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: [%s]
\n
"
,
msg
);
char
arr
[
2
][
TOKEN_LEN
];
int
r
=
splitString
(
msg
,
"--"
,
arr
,
2
);
assert
(
r
==
2
);
// do the value on fsm
sh
->
insert_cstr
(
sh
,
arr
[
0
],
arr
[
1
]);
raft_free
(
buf
->
base
);
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
struct
raft
*
r
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error: %s
\n
"
,
raft_errmsg
(
r
));
}
else
{
printf
(
"putValueCb: %s
\n
"
,
"ok"
);
}
raft_free
(
req
);
}
void
putValue
(
struct
raft
*
r
,
const
char
*
value
)
{
struct
raft_buffer
buf
;
buf
.
len
=
strlen
(
value
)
+
1
;
buf
.
base
=
raft_malloc
(
buf
.
len
);
snprintf
(
buf
.
base
,
buf
.
len
,
"%s"
,
value
);
struct
raft_apply
*
req
=
raft_malloc
(
sizeof
(
*
req
));
req
->
data
=
r
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
const
char
*
state2String
(
unsigned
short
state
)
{
if
(
state
==
RAFT_UNAVAILABLE
)
{
return
"RAFT_UNAVAILABLE"
;
}
else
if
(
state
==
RAFT_FOLLOWER
)
{
return
"RAFT_FOLLOWER"
;
}
else
if
(
state
==
RAFT_CANDIDATE
)
{
return
"RAFT_CANDIDATE"
;
}
else
if
(
state
==
RAFT_LEADER
)
{
return
"RAFT_LEADER"
;
}
return
"UNKNOWN_RAFT_STATE"
;
}
void
printRaftConfiguration
(
struct
raft_configuration
*
c
)
{
printf
(
"configuration:
\n
"
);
for
(
int
i
=
0
;
i
<
c
->
n
;
++
i
)
{
printf
(
"%llu -- %d -- %s
\n
"
,
c
->
servers
[
i
].
id
,
c
->
servers
[
i
].
role
,
c
->
servers
[
i
].
address
);
}
}
void
printRaftState
(
struct
raft
*
r
)
{
printf
(
"----Raft State: -----------
\n
"
);
printf
(
"mem_addr: %p
\n
"
,
r
);
printf
(
"my_id: %llu
\n
"
,
r
->
id
);
printf
(
"address: %s
\n
"
,
r
->
address
);
printf
(
"current_term: %llu
\n
"
,
r
->
current_term
);
printf
(
"voted_for: %llu
\n
"
,
r
->
voted_for
);
printf
(
"role: %s
\n
"
,
state2String
(
r
->
state
));
printf
(
"commit_index: %llu
\n
"
,
r
->
commit_index
);
printf
(
"last_applied: %llu
\n
"
,
r
->
last_applied
);
printf
(
"last_stored: %llu
\n
"
,
r
->
last_stored
);
printf
(
"configuration_index: %llu
\n
"
,
r
->
configuration_index
);
printf
(
"configuration_uncommitted_index: %llu
\n
"
,
r
->
configuration_uncommitted_index
);
printRaftConfiguration
(
&
r
->
configuration
);
printf
(
"----------------------------
\n
"
);
}
int32_t
addRaftVoter
(
RaftServer
*
pRaftServer
,
char
peers
[][
ADDRESS_LEN
],
uint32_t
peersCount
,
uint16_t
vid
)
{
int
ret
;
RaftInstance
*
pRaftInstance
=
malloc
(
sizeof
(
*
pRaftInstance
));
assert
(
pRaftInstance
!=
NULL
);
// init raftId
pRaftInstance
->
raftId
=
encodeRaftId
(
pRaftServer
->
host
,
pRaftServer
->
port
,
vid
);
// init dir
snprintf
(
pRaftInstance
->
dir
,
sizeof
(
pRaftInstance
->
dir
),
"%s/%s_%hu_%hu_%llu"
,
pRaftServer
->
baseDir
,
pRaftServer
->
host
,
pRaftServer
->
port
,
vid
,
pRaftInstance
->
raftId
);
if
(
!
dirOK
(
pRaftInstance
->
dir
))
{
ret
=
mkdir
(
pRaftInstance
->
dir
,
0775
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"mkdir error, %s
\n
"
,
pRaftInstance
->
dir
);
assert
(
0
);
}
}
// init fsm
pRaftInstance
->
fsm
.
data
=
newSimpleHash
(
2
);
pRaftInstance
->
fsm
.
apply
=
fsmApplyCb
;
// init io
ret
=
raft_uv_init
(
&
pRaftInstance
->
io
,
&
pRaftServer
->
loop
,
pRaftInstance
->
dir
,
&
pRaftServer
->
transport
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raft_uv_init error, %s
\n
"
,
raft_errmsg
(
&
pRaftInstance
->
raft
));
assert
(
0
);
}
// init raft
ret
=
raft_init
(
&
pRaftInstance
->
raft
,
&
pRaftInstance
->
io
,
&
pRaftInstance
->
fsm
,
pRaftInstance
->
raftId
,
pRaftServer
->
address
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raft_init error, %s
\n
"
,
raft_errmsg
(
&
pRaftInstance
->
raft
));
assert
(
0
);
}
// init raft_configuration
struct
raft_configuration
conf
;
raft_configuration_init
(
&
conf
);
raft_configuration_add
(
&
conf
,
pRaftInstance
->
raftId
,
pRaftServer
->
address
,
RAFT_VOTER
);
for
(
int
i
=
0
;
i
<
peersCount
;
++
i
)
{
char
*
peerAddress
=
peers
[
i
];
char
host
[
64
];
uint16_t
port
;
parseAddr
(
peerAddress
,
host
,
sizeof
(
host
),
&
port
);
uint64_t
raftId
=
encodeRaftId
(
host
,
port
,
vid
);
raft_configuration_add
(
&
conf
,
raftId
,
peers
[
i
],
RAFT_VOTER
);
}
raft_bootstrap
(
&
pRaftInstance
->
raft
,
&
conf
);
// start raft
ret
=
raft_start
(
&
pRaftInstance
->
raft
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raft_start error, %s
\n
"
,
raft_errmsg
(
&
pRaftInstance
->
raft
));
assert
(
0
);
}
// add raft instance into raft server
pRaftServer
->
raftInstances
.
insert
(
&
pRaftServer
->
raftInstances
,
vid
,
pRaftInstance
);
return
0
;
}
int32_t
addRaftSpare
(
RaftServer
*
pRaftServer
,
uint16_t
vid
)
{
int
ret
;
RaftInstance
*
pRaftInstance
=
malloc
(
sizeof
(
*
pRaftInstance
));
assert
(
pRaftInstance
!=
NULL
);
// init raftId
pRaftInstance
->
raftId
=
encodeRaftId
(
pRaftServer
->
host
,
pRaftServer
->
port
,
vid
);
// init dir
snprintf
(
pRaftInstance
->
dir
,
sizeof
(
pRaftInstance
->
dir
),
"%s/%s_%hu_%hu_%llu"
,
pRaftServer
->
baseDir
,
pRaftServer
->
host
,
pRaftServer
->
port
,
vid
,
pRaftInstance
->
raftId
);
ret
=
mkdir
(
pRaftInstance
->
dir
,
0775
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"mkdir error, %s
\n
"
,
pRaftInstance
->
dir
);
assert
(
0
);
}
// init fsm
pRaftInstance
->
fsm
.
data
=
newSimpleHash
(
2
);
pRaftInstance
->
fsm
.
apply
=
fsmApplyCb
;
// init io
ret
=
raft_uv_init
(
&
pRaftInstance
->
io
,
&
pRaftServer
->
loop
,
pRaftInstance
->
dir
,
&
pRaftServer
->
transport
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raft_uv_init error, %s
\n
"
,
raft_errmsg
(
&
pRaftInstance
->
raft
));
assert
(
0
);
}
// init raft
ret
=
raft_init
(
&
pRaftInstance
->
raft
,
&
pRaftInstance
->
io
,
&
pRaftInstance
->
fsm
,
pRaftInstance
->
raftId
,
pRaftServer
->
address
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raft_init error, %s
\n
"
,
raft_errmsg
(
&
pRaftInstance
->
raft
));
assert
(
0
);
}
// init raft_configuration
struct
raft_configuration
conf
;
raft_configuration_init
(
&
conf
);
raft_configuration_add
(
&
conf
,
pRaftInstance
->
raftId
,
pRaftServer
->
address
,
RAFT_SPARE
);
raft_bootstrap
(
&
pRaftInstance
->
raft
,
&
conf
);
// start raft
ret
=
raft_start
(
&
pRaftInstance
->
raft
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raft_start error, %s
\n
"
,
raft_errmsg
(
&
pRaftInstance
->
raft
));
assert
(
0
);
}
// add raft instance into raft server
pRaftServer
->
raftInstances
.
insert
(
&
pRaftServer
->
raftInstances
,
vid
,
pRaftInstance
);
return
0
;
}
int32_t
raftServerInit
(
RaftServer
*
pRaftServer
,
const
RaftServerConfig
*
pConf
)
{
int
ret
;
// init host, port, address, dir
snprintf
(
pRaftServer
->
host
,
sizeof
(
pRaftServer
->
host
),
"%s"
,
pConf
->
me
.
host
);
pRaftServer
->
port
=
pConf
->
me
.
port
;
snprintf
(
pRaftServer
->
address
,
sizeof
(
pRaftServer
->
address
),
"%s:%u"
,
pRaftServer
->
host
,
pRaftServer
->
port
);
snprintf
(
pRaftServer
->
baseDir
,
sizeof
(
pRaftServer
->
baseDir
),
"%s"
,
pConf
->
baseDir
);
// init loop
ret
=
uv_loop_init
(
&
pRaftServer
->
loop
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"uv_loop_init error: %s
\n
"
,
uv_strerror
(
ret
));
assert
(
0
);
}
// init network
ret
=
raft_uv_tcp_init
(
&
pRaftServer
->
transport
,
&
pRaftServer
->
loop
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raft_uv_tcp_init: error %d
\n
"
,
ret
);
assert
(
0
);
}
// init raft instance container
initIdHash
(
&
pRaftServer
->
raftInstances
,
2
);
return
0
;
}
int32_t
raftServerStart
(
RaftServer
*
pRaftServer
)
{
// start loop
uv_run
(
&
pRaftServer
->
loop
,
UV_RUN_DEFAULT
);
return
0
;
}
void
raftServerStop
(
RaftServer
*
pRaftServer
)
{}
contrib/test/traft/make_cluster/raftServer.h
已删除
100644 → 0
浏览文件 @
54e59090
#ifndef TDENGINE_RAFT_SERVER_H
#define TDENGINE_RAFT_SERVER_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include <arpa/inet.h>
#include <assert.h>
#include <netinet/in.h>
#include <string.h>
#include "common.h"
#include "config.h"
#include "raft.h"
#include "raft/uv.h"
#include "simpleHash.h"
typedef
struct
RaftJoin
{
struct
raft
*
r
;
raft_id
joinId
;
}
RaftJoin
;
typedef
struct
{
raft_id
raftId
;
char
dir
[
BASE_DIR_LEN
*
2
];
struct
raft_fsm
fsm
;
struct
raft_io
io
;
struct
raft
raft
;
}
RaftInstance
;
typedef
struct
{
char
host
[
HOST_LEN
];
uint16_t
port
;
char
address
[
ADDRESS_LEN
];
/* Raft instance address */
char
baseDir
[
BASE_DIR_LEN
];
/* Raft instance address */
struct
uv_loop_s
loop
;
/* UV loop */
struct
raft_uv_transport
transport
;
/* UV I/O backend transport */
IdHash
raftInstances
;
/* multi raft instances. traft use IdHash to manager multi vgroup inside, here we can use IdHash
too. */
}
RaftServer
;
void
*
startServerFunc
(
void
*
param
);
int32_t
addRaftVoter
(
RaftServer
*
pRaftServer
,
char
peers
[][
ADDRESS_LEN
],
uint32_t
peersCount
,
uint16_t
vid
);
int32_t
addRaftSpare
(
RaftServer
*
pRaftServer
,
uint16_t
vid
);
int32_t
raftServerInit
(
RaftServer
*
pRaftServer
,
const
RaftServerConfig
*
pConf
);
int32_t
raftServerStart
(
RaftServer
*
pRaftServer
);
void
raftServerStop
(
RaftServer
*
pRaftServer
);
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
);
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
);
void
putValue
(
struct
raft
*
r
,
const
char
*
value
);
void
raftChangeAddCb
(
struct
raft_change
*
req
,
int
status
);
const
char
*
state2String
(
unsigned
short
state
);
void
printRaftConfiguration
(
struct
raft_configuration
*
c
);
void
printRaftState
(
struct
raft
*
r
);
#ifdef __cplusplus
}
#endif
#endif // TDENGINE_RAFT_SERVER_H
contrib/test/traft/make_cluster/simpleHash.c
已删除
100644 → 0
浏览文件 @
54e59090
#include "simpleHash.h"
uint32_t
mySimpleHash
(
const
char
*
data
,
size_t
n
,
uint32_t
seed
)
{
// Similar to murmur hash
const
uint32_t
m
=
0xc6a4a793
;
const
uint32_t
r
=
24
;
const
char
*
limit
=
data
+
n
;
uint32_t
h
=
seed
^
(
n
*
m
);
// Pick up four bytes at a time
while
(
data
+
4
<=
limit
)
{
// uint32_t w = DecodeFixed32(data);
uint32_t
w
;
memcpy
(
&
w
,
data
,
4
);
data
+=
4
;
h
+=
w
;
h
*=
m
;
h
^=
(
h
>>
16
);
}
// Pick up remaining bytes
switch
(
limit
-
data
)
{
case
3
:
h
+=
(
unsigned
char
)(
data
[
2
])
<<
16
;
do
{
}
while
(
0
);
case
2
:
h
+=
(
unsigned
char
)(
data
[
1
])
<<
8
;
do
{
}
while
(
0
);
case
1
:
h
+=
(
unsigned
char
)(
data
[
0
]);
h
*=
m
;
h
^=
(
h
>>
r
);
break
;
}
return
h
;
}
int
insertCStrSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
,
char
*
data
)
{
return
insertSimpleHash
(
ths
,
key
,
strlen
(
key
)
+
1
,
data
,
strlen
(
data
)
+
1
);
}
int
removeCStrSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
)
{
return
removeSimpleHash
(
ths
,
key
,
strlen
(
key
)
+
1
);
}
SimpleHashNode
**
findCStrSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
)
{
return
findSimpleHash
(
ths
,
key
,
strlen
(
key
)
+
1
);
}
int
insertSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
,
char
*
data
,
size_t
dataLen
)
{
SimpleHashNode
**
pp
=
ths
->
find
(
ths
,
key
,
keyLen
);
if
(
*
pp
!=
NULL
)
{
fprintf
(
stderr
,
"insertSimpleHash, already has key
\n
"
);
return
-
1
;
}
SimpleHashNode
*
node
=
malloc
(
sizeof
(
*
node
));
node
->
hashCode
=
ths
->
hashFunc
(
key
,
keyLen
);
node
->
key
=
malloc
(
keyLen
);
node
->
keyLen
=
keyLen
;
memcpy
(
node
->
key
,
key
,
keyLen
);
node
->
data
=
malloc
(
dataLen
);
node
->
dataLen
=
dataLen
;
memcpy
(
node
->
data
,
data
,
dataLen
);
node
->
next
=
NULL
;
// printf("insertSimpleHash: <%s, %ld, %s, %ld, %u> \n", node->key, node->keyLen, node->data, node->dataLen,
// node->hashCode);
size_t
index
=
node
->
hashCode
&
(
ths
->
length
-
1
);
SimpleHashNode
*
ptr
=
ths
->
table
[
index
];
if
(
ptr
!=
NULL
)
{
node
->
next
=
ptr
;
ths
->
table
[
index
]
=
node
;
}
else
{
ths
->
table
[
index
]
=
node
;
}
ths
->
elems
++
;
if
(
ths
->
elems
>
2
*
ths
->
length
)
{
ths
->
resize
(
ths
);
}
return
0
;
}
int
removeSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
)
{
SimpleHashNode
**
pp
=
ths
->
find
(
ths
,
key
,
keyLen
);
if
(
*
pp
==
NULL
)
{
fprintf
(
stderr
,
"removeSimpleHash, key not exist
\n
"
);
return
-
1
;
}
SimpleHashNode
*
del
=
*
pp
;
*
pp
=
del
->
next
;
free
(
del
->
key
);
free
(
del
->
data
);
free
(
del
);
ths
->
elems
--
;
return
0
;
}
SimpleHashNode
**
findSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
)
{
uint32_t
hashCode
=
ths
->
hashFunc
(
key
,
keyLen
);
// size_t index = hashCode % ths->length;
size_t
index
=
hashCode
&
(
ths
->
length
-
1
);
// printf("findSimpleHash: %s %ld %u \n", key, keyLen, hashCode);
SimpleHashNode
**
pp
=
&
(
ths
->
table
[
index
]);
while
(
*
pp
!=
NULL
&&
((
*
pp
)
->
hashCode
!=
hashCode
||
memcmp
(
key
,
(
*
pp
)
->
key
,
keyLen
)
!=
0
))
{
pp
=
&
((
*
pp
)
->
next
);
}
return
pp
;
}
void
printCStrSimpleHash
(
struct
SimpleHash
*
ths
)
{
printf
(
"
\n
--- printCStrSimpleHash: elems:%d length:%d
\n
"
,
ths
->
elems
,
ths
->
length
);
for
(
size_t
i
=
0
;
i
<
ths
->
length
;
++
i
)
{
SimpleHashNode
*
ptr
=
ths
->
table
[
i
];
if
(
ptr
!=
NULL
)
{
printf
(
"%zu: "
,
i
);
while
(
ptr
!=
NULL
)
{
printf
(
"<%u, %s, %ld, %s, %ld> "
,
ptr
->
hashCode
,
(
char
*
)
ptr
->
key
,
ptr
->
keyLen
,
(
char
*
)
ptr
->
data
,
ptr
->
dataLen
);
ptr
=
ptr
->
next
;
}
printf
(
"
\n
"
);
}
}
printf
(
"---------------
\n
"
);
}
void
destroySimpleHash
(
struct
SimpleHash
*
ths
)
{
for
(
size_t
i
=
0
;
i
<
ths
->
length
;
++
i
)
{
SimpleHashNode
*
ptr
=
ths
->
table
[
i
];
while
(
ptr
!=
NULL
)
{
SimpleHashNode
*
tmp
=
ptr
;
ptr
=
ptr
->
next
;
free
(
tmp
->
key
);
free
(
tmp
->
data
);
free
(
tmp
);
}
}
ths
->
length
=
0
;
ths
->
elems
=
0
;
free
(
ths
->
table
);
free
(
ths
);
}
void
resizeSimpleHash
(
struct
SimpleHash
*
ths
)
{
uint32_t
new_length
=
ths
->
length
;
while
(
new_length
<
ths
->
elems
)
{
new_length
*=
2
;
}
printf
(
"resizeSimpleHash: %p from %u to %u
\n
"
,
ths
,
ths
->
length
,
new_length
);
SimpleHashNode
**
new_table
=
malloc
(
new_length
*
sizeof
(
SimpleHashNode
*
));
memset
(
new_table
,
0
,
new_length
*
sizeof
(
SimpleHashNode
*
));
uint32_t
count
=
0
;
for
(
uint32_t
i
=
0
;
i
<
ths
->
length
;
i
++
)
{
if
(
ths
->
table
[
i
]
==
NULL
)
{
continue
;
}
SimpleHashNode
*
it
=
ths
->
table
[
i
];
while
(
it
!=
NULL
)
{
SimpleHashNode
*
move_node
=
it
;
it
=
it
->
next
;
// move move_node
move_node
->
next
=
NULL
;
size_t
index
=
move_node
->
hashCode
&
(
new_length
-
1
);
SimpleHashNode
*
ptr
=
new_table
[
index
];
if
(
ptr
!=
NULL
)
{
move_node
->
next
=
ptr
;
new_table
[
index
]
=
move_node
;
}
else
{
new_table
[
index
]
=
move_node
;
}
count
++
;
}
}
assert
(
ths
->
elems
==
count
);
free
(
ths
->
table
);
ths
->
table
=
new_table
;
ths
->
length
=
new_length
;
}
uint32_t
simpleHashFunc
(
const
char
*
key
,
size_t
keyLen
)
{
return
mySimpleHash
(
key
,
keyLen
,
1
);
}
struct
SimpleHash
*
newSimpleHash
(
size_t
length
)
{
struct
SimpleHash
*
ths
=
malloc
(
sizeof
(
*
ths
));
ths
->
length
=
length
;
ths
->
elems
=
0
;
ths
->
table
=
malloc
(
length
*
sizeof
(
SimpleHashNode
*
));
memset
(
ths
->
table
,
0
,
length
*
sizeof
(
SimpleHashNode
*
));
ths
->
insert
=
insertSimpleHash
;
ths
->
remove
=
removeSimpleHash
;
ths
->
find
=
findSimpleHash
;
ths
->
insert_cstr
=
insertCStrSimpleHash
;
ths
->
remove_cstr
=
removeCStrSimpleHash
;
ths
->
find_cstr
=
findCStrSimpleHash
;
ths
->
print_cstr
=
printCStrSimpleHash
;
ths
->
destroy
=
destroySimpleHash
;
ths
->
resize
=
resizeSimpleHash
;
ths
->
hashFunc
=
simpleHashFunc
;
}
contrib/test/traft/make_cluster/simpleHash.h
已删除
100644 → 0
浏览文件 @
54e59090
#ifndef __SIMPLE_HASH_H__
#define __SIMPLE_HASH_H__
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
uint32_t
mySimpleHash
(
const
char
*
data
,
size_t
n
,
uint32_t
seed
);
typedef
struct
SimpleHashNode
{
uint32_t
hashCode
;
void
*
key
;
size_t
keyLen
;
void
*
data
;
size_t
dataLen
;
struct
SimpleHashNode
*
next
;
}
SimpleHashNode
;
typedef
struct
SimpleHash
{
// public:
int
(
*
insert
)(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
,
char
*
data
,
size_t
dataLen
);
int
(
*
remove
)(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
);
SimpleHashNode
**
(
*
find
)(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
);
// wrapper
int
(
*
insert_cstr
)(
struct
SimpleHash
*
ths
,
char
*
key
,
char
*
data
);
int
(
*
remove_cstr
)(
struct
SimpleHash
*
ths
,
char
*
key
);
SimpleHashNode
**
(
*
find_cstr
)(
struct
SimpleHash
*
ths
,
char
*
key
);
void
(
*
print_cstr
)(
struct
SimpleHash
*
ths
);
void
(
*
destroy
)(
struct
SimpleHash
*
ths
);
uint32_t
length
;
uint32_t
elems
;
// private:
void
(
*
resize
)(
struct
SimpleHash
*
ths
);
uint32_t
(
*
hashFunc
)(
const
char
*
key
,
size_t
keyLen
);
SimpleHashNode
**
table
;
}
SimpleHash
;
int
insertCStrSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
,
char
*
data
);
int
removeCStrSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
);
SimpleHashNode
**
findCStrSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
);
void
printCStrSimpleHash
(
struct
SimpleHash
*
ths
);
int
insertSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
,
char
*
data
,
size_t
dataLen
);
int
removeSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
);
SimpleHashNode
**
findSimpleHash
(
struct
SimpleHash
*
ths
,
char
*
key
,
size_t
keyLen
);
void
destroySimpleHash
(
struct
SimpleHash
*
ths
);
void
resizeSimpleHash
(
struct
SimpleHash
*
ths
);
uint32_t
simpleHashFunc
(
const
char
*
key
,
size_t
keyLen
);
struct
SimpleHash
*
newSimpleHash
(
size_t
length
);
#endif
contrib/test/traft/make_cluster/util.c
已删除
100644 → 0
浏览文件 @
54e59090
#include "util.h"
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
int
dirOK
(
const
char
*
path
)
{
DIR
*
dir
=
opendir
(
path
);
if
(
dir
!=
NULL
)
{
closedir
(
dir
);
return
1
;
}
else
{
return
0
;
}
}
int
splitString
(
const
char
*
str
,
char
*
separator
,
char
(
*
arr
)[
TOKEN_LEN
],
int
n_arr
)
{
if
(
n_arr
<=
0
)
{
return
-
1
;
}
char
*
tmp
=
(
char
*
)
malloc
(
strlen
(
str
)
+
1
);
strcpy
(
tmp
,
str
);
char
*
context
;
int
n
=
0
;
char
*
token
=
strtok_r
(
tmp
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
strncpy
(
arr
[
n
],
token
,
TOKEN_LEN
);
n
++
;
while
(
1
)
{
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
!
token
||
n
>=
n_arr
)
{
goto
ret
;
}
strncpy
(
arr
[
n
],
token
,
TOKEN_LEN
);
n
++
;
}
ret:
free
(
tmp
);
return
n
;
}
contrib/test/traft/make_cluster/util.h
已删除
100644 → 0
浏览文件 @
54e59090
#ifndef TRAFT_UTIL_H
#define TRAFT_UTIL_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include "common.h"
int
dirOK
(
const
char
*
path
);
int
splitString
(
const
char
*
str
,
char
*
separator
,
char
(
*
arr
)[
TOKEN_LEN
],
int
n_arr
);
#ifdef __cplusplus
}
#endif
#endif
contrib/test/traft/rebalance_leader/CMakeLists.txt
已删除
100644 → 0
浏览文件 @
54e59090
add_executable
(
rebalanceLeader
""
)
target_sources
(
rebalanceLeader
PRIVATE
"raftMain.c"
"raftServer.c"
)
target_link_libraries
(
rebalanceLeader PUBLIC traft lz4 uv_a
)
contrib/test/traft/rebalance_leader/common.h
已删除
100644 → 0
浏览文件 @
54e59090
#ifndef TDENGINE_COMMON_H
#define TDENGINE_COMMON_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include <stdint.h>
#define MAX_INSTANCE_NUM 100
#define MAX_PEERS 10
#define COMMAND_LEN 1024
#define TOKEN_LEN 128
#define DIR_LEN 256
#define HOST_LEN 64
#define ADDRESS_LEN (HOST_LEN + 16)
typedef
struct
{
char
host
[
HOST_LEN
];
uint32_t
port
;
}
Addr
;
typedef
struct
{
Addr
me
;
Addr
peers
[
MAX_PEERS
];
int
peersCount
;
char
dir
[
DIR_LEN
];
char
dataDir
[
DIR_LEN
+
HOST_LEN
*
2
];
}
SRaftServerConfig
;
#ifdef __cplusplus
}
#endif
#endif // TDENGINE_COMMON_H
contrib/test/traft/rebalance_leader/raftMain.c
已删除
100644 → 0
浏览文件 @
54e59090
#include <stdio.h>
#include <unistd.h>
#include <pthread.h>
#include <string.h>
#include <assert.h>
#include <getopt.h>
#include <time.h>
#include <stdlib.h>
#include <getopt.h>
#include <raft.h>
#include <raft/uv.h>
#include "raftServer.h"
#include "common.h"
const
char
*
exe_name
;
typedef
struct
LeaderState
{
char
address
[
48
];
int
leaderCount
;
}
LeaderState
;
#define NODE_COUNT 3
LeaderState
leaderStates
[
NODE_COUNT
];
void
printLeaderCount
()
{
for
(
int
i
=
0
;
i
<
NODE_COUNT
;
++
i
)
{
printf
(
"%s: leaderCount:%d
\n
"
,
leaderStates
[
i
].
address
,
leaderStates
[
i
].
leaderCount
);
}
}
void
updateLeaderStates
(
SRaftServer
*
pRaftServer
)
{
for
(
int
i
=
0
;
i
<
pRaftServer
->
instance
[
0
].
raft
.
configuration
.
n
;
++
i
)
{
snprintf
(
leaderStates
[
i
].
address
,
sizeof
(
leaderStates
[
i
].
address
),
"%s"
,
pRaftServer
->
instance
[
0
].
raft
.
configuration
.
servers
[
i
].
address
);
leaderStates
[
i
].
leaderCount
=
0
;
}
for
(
int
i
=
0
;
i
<
pRaftServer
->
instanceCount
;
++
i
)
{
struct
raft
*
r
=
&
pRaftServer
->
instance
[
i
].
raft
;
char
leaderAddress
[
128
];
memset
(
leaderAddress
,
0
,
sizeof
(
leaderAddress
));
if
(
r
->
state
==
RAFT_LEADER
)
{
snprintf
(
leaderAddress
,
sizeof
(
leaderAddress
),
"%s"
,
r
->
address
);
}
else
if
(
r
->
state
==
RAFT_FOLLOWER
)
{
snprintf
(
leaderAddress
,
sizeof
(
leaderAddress
),
"%s"
,
r
->
follower_state
.
current_leader
.
address
);
}
for
(
int
j
=
0
;
j
<
NODE_COUNT
;
j
++
)
{
if
(
strcmp
(
leaderAddress
,
leaderStates
[
j
].
address
)
==
0
)
{
leaderStates
[
j
].
leaderCount
++
;
}
}
}
}
void
raftTransferCb
(
struct
raft_transfer
*
req
)
{
SRaftServer
*
pRaftServer
=
req
->
data
;
raft_free
(
req
);
//printf("raftTransferCb: \n");
updateLeaderStates
(
pRaftServer
);
//printLeaderCount();
int
myLeaderCount
;
for
(
int
i
=
0
;
i
<
NODE_COUNT
;
++
i
)
{
if
(
strcmp
(
pRaftServer
->
address
,
leaderStates
[
i
].
address
)
==
0
)
{
myLeaderCount
=
leaderStates
[
i
].
leaderCount
;
}
}
//printf("myLeaderCount:%d waterLevel:%d \n", myLeaderCount, pRaftServer->instanceCount / NODE_COUNT);
if
(
myLeaderCount
>
pRaftServer
->
instanceCount
/
NODE_COUNT
)
{
struct
raft
*
r
;
for
(
int
j
=
0
;
j
<
pRaftServer
->
instanceCount
;
++
j
)
{
if
(
pRaftServer
->
instance
[
j
].
raft
.
state
==
RAFT_LEADER
)
{
r
=
&
pRaftServer
->
instance
[
j
].
raft
;
break
;
}
}
struct
raft_transfer
*
transfer
=
raft_malloc
(
sizeof
(
*
transfer
));
transfer
->
data
=
pRaftServer
;
uint64_t
destRaftId
;
int
minIndex
=
-
1
;
int
minLeaderCount
=
myLeaderCount
;
for
(
int
j
=
0
;
j
<
NODE_COUNT
;
++
j
)
{
if
(
strcmp
(
leaderStates
[
j
].
address
,
pRaftServer
->
address
)
==
0
)
{
continue
;
}
if
(
leaderStates
[
j
].
leaderCount
<=
minLeaderCount
)
{
minLeaderCount
=
leaderStates
[
j
].
leaderCount
;
minIndex
=
j
;
}
}
char
myHost
[
48
];
uint16_t
myPort
;
uint16_t
myVid
;
decodeRaftId
(
r
->
id
,
myHost
,
sizeof
(
myHost
),
&
myPort
,
&
myVid
);
//printf("raftTransferCb transfer leader: vid[%u] choose: index:%d, leaderStates[%d].address:%s, leaderStates[%d].leaderCount:%d \n", minIndex, minIndex, leaderStates[minIndex].address, minIndex, leaderStates[minIndex].leaderCount);
char
*
destAddress
=
leaderStates
[
minIndex
].
address
;
char
tokens
[
MAX_PEERS
][
MAX_TOKEN_LEN
];
splitString
(
destAddress
,
":"
,
tokens
,
2
);
char
*
destHost
=
tokens
[
0
];
uint16_t
destPort
=
atoi
(
tokens
[
1
]);
destRaftId
=
encodeRaftId
(
destHost
,
destPort
,
myVid
);
printf
(
"
\n
raftTransferCb transfer leader: vgroupId:%u from:%s:%u --> to:%s:%u "
,
myVid
,
myHost
,
myPort
,
destHost
,
destPort
);
fflush
(
stdout
);
raft_transfer
(
r
,
transfer
,
destRaftId
,
raftTransferCb
);
}
}
void
parseAddr
(
const
char
*
addr
,
char
*
host
,
int
len
,
uint32_t
*
port
)
{
char
*
tmp
=
(
char
*
)
malloc
(
strlen
(
addr
)
+
1
);
strcpy
(
tmp
,
addr
);
char
*
context
;
char
*
separator
=
":"
;
char
*
token
=
strtok_r
(
tmp
,
separator
,
&
context
);
if
(
token
)
{
snprintf
(
host
,
len
,
"%s"
,
token
);
}
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
token
)
{
sscanf
(
token
,
"%u"
,
port
);
}
free
(
tmp
);
}
// only parse 3 tokens
int
parseCommand3
(
const
char
*
str
,
char
*
token1
,
char
*
token2
,
char
*
token3
,
int
len
)
{
char
*
tmp
=
(
char
*
)
malloc
(
strlen
(
str
)
+
1
);
strcpy
(
tmp
,
str
);
char
*
context
;
char
*
separator
=
" "
;
int
n
=
0
;
char
*
token
=
strtok_r
(
tmp
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
if
(
strcmp
(
token
,
""
)
!=
0
)
{
strncpy
(
token1
,
token
,
len
);
n
++
;
}
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
if
(
strcmp
(
token
,
""
)
!=
0
)
{
strncpy
(
token2
,
token
,
len
);
n
++
;
}
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
if
(
strcmp
(
token
,
""
)
!=
0
)
{
strncpy
(
token3
,
token
,
len
);
n
++
;
}
ret:
return
n
;
free
(
tmp
);
}
// only parse 4 tokens
int
parseCommand4
(
const
char
*
str
,
char
*
token1
,
char
*
token2
,
char
*
token3
,
char
*
token4
,
int
len
)
{
char
*
tmp
=
(
char
*
)
malloc
(
strlen
(
str
)
+
1
);
strcpy
(
tmp
,
str
);
char
*
context
;
char
*
separator
=
" "
;
int
n
=
0
;
char
*
token
=
strtok_r
(
tmp
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
if
(
strcmp
(
token
,
""
)
!=
0
)
{
strncpy
(
token1
,
token
,
len
);
n
++
;
}
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
if
(
strcmp
(
token
,
""
)
!=
0
)
{
strncpy
(
token2
,
token
,
len
);
n
++
;
}
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
if
(
strcmp
(
token
,
""
)
!=
0
)
{
strncpy
(
token3
,
token
,
len
);
n
++
;
}
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
if
(
strcmp
(
token
,
""
)
!=
0
)
{
strncpy
(
token4
,
token
,
len
);
n
++
;
}
ret:
return
n
;
free
(
tmp
);
}
void
*
startServerFunc
(
void
*
param
)
{
SRaftServer
*
pServer
=
(
SRaftServer
*
)
param
;
int32_t
r
=
raftServerStart
(
pServer
);
assert
(
r
==
0
);
return
NULL
;
}
// Console ---------------------------------
const
char
*
state2String
(
unsigned
short
state
)
{
if
(
state
==
RAFT_UNAVAILABLE
)
{
return
"RAFT_UNAVAILABLE"
;
}
else
if
(
state
==
RAFT_FOLLOWER
)
{
return
"RAFT_FOLLOWER"
;
}
else
if
(
state
==
RAFT_CANDIDATE
)
{
return
"RAFT_CANDIDATE"
;
}
else
if
(
state
==
RAFT_LEADER
)
{
return
"RAFT_LEADER"
;
}
return
"UNKNOWN_RAFT_STATE"
;
}
void
printRaftState2
(
struct
raft
*
r
)
{
char
leaderAddress
[
128
];
memset
(
leaderAddress
,
0
,
sizeof
(
leaderAddress
));
if
(
r
->
state
==
RAFT_LEADER
)
{
snprintf
(
leaderAddress
,
sizeof
(
leaderAddress
),
"%s"
,
r
->
address
);
}
else
if
(
r
->
state
==
RAFT_FOLLOWER
)
{
snprintf
(
leaderAddress
,
sizeof
(
leaderAddress
),
"%s"
,
r
->
follower_state
.
current_leader
.
address
);
}
for
(
int
i
=
0
;
i
<
r
->
configuration
.
n
;
++
i
)
{
char
tmpAddress
[
128
];
snprintf
(
tmpAddress
,
sizeof
(
tmpAddress
),
"%s"
,
r
->
configuration
.
servers
[
i
].
address
);
uint64_t
raftId
=
r
->
configuration
.
servers
[
i
].
id
;
char
host
[
128
];
uint16_t
port
;
uint16_t
vid
;
decodeRaftId
(
raftId
,
host
,
128
,
&
port
,
&
vid
);
char
buf
[
512
];
memset
(
buf
,
0
,
sizeof
(
buf
));
if
(
strcmp
(
tmpAddress
,
leaderAddress
)
==
0
)
{
snprintf
(
buf
,
sizeof
(
buf
),
"<%s:%u-%u-LEADER>
\t
"
,
host
,
port
,
vid
);
}
else
{
snprintf
(
buf
,
sizeof
(
buf
),
"<%s:%u-%u-FOLLOWER>
\t
"
,
host
,
port
,
vid
);
}
printf
(
"%s"
,
buf
);
}
printf
(
"
\n
"
);
}
void
printRaftConfiguration
(
struct
raft_configuration
*
c
)
{
printf
(
"configuration:
\n
"
);
for
(
int
i
=
0
;
i
<
c
->
n
;
++
i
)
{
printf
(
"%llu -- %d -- %s
\n
"
,
c
->
servers
[
i
].
id
,
c
->
servers
[
i
].
role
,
c
->
servers
[
i
].
address
);
}
}
void
printRaftState
(
struct
raft
*
r
)
{
printf
(
"----Raft State: -----------
\n
"
);
printf
(
"mem_addr: %p
\n
"
,
r
);
printf
(
"my_id: %llu
\n
"
,
r
->
id
);
printf
(
"address: %s
\n
"
,
r
->
address
);
printf
(
"current_term: %llu
\n
"
,
r
->
current_term
);
printf
(
"voted_for: %llu
\n
"
,
r
->
voted_for
);
printf
(
"role: %s
\n
"
,
state2String
(
r
->
state
));
printf
(
"commit_index: %llu
\n
"
,
r
->
commit_index
);
printf
(
"last_applied: %llu
\n
"
,
r
->
last_applied
);
printf
(
"last_stored: %llu
\n
"
,
r
->
last_stored
);
printf
(
"configuration_index: %llu
\n
"
,
r
->
configuration_index
);
printf
(
"configuration_uncommitted_index: %llu
\n
"
,
r
->
configuration_uncommitted_index
);
printRaftConfiguration
(
&
r
->
configuration
);
printf
(
"----------------------------
\n
"
);
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
raft_free
(
req
);
struct
raft
*
r
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb: %s
\n
"
,
raft_errmsg
(
r
));
}
else
{
printf
(
"putValueCb: %s
\n
"
,
"ok"
);
}
}
void
putValue
(
struct
raft
*
r
,
const
char
*
value
)
{
struct
raft_buffer
buf
;
buf
.
len
=
TOKEN_LEN
;;
buf
.
base
=
raft_malloc
(
buf
.
len
);
snprintf
(
buf
.
base
,
buf
.
len
,
"%s"
,
value
);
struct
raft_apply
*
req
=
raft_malloc
(
sizeof
(
struct
raft_apply
));
req
->
data
=
r
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
void
getValue
(
const
char
*
key
)
{
char
*
ptr
=
getKV
(
key
);
if
(
ptr
)
{
printf
(
"get value: [%s]
\n
"
,
ptr
);
}
else
{
printf
(
"value not found for key: [%s]
\n
"
,
key
);
}
}
void
console
(
SRaftServer
*
pRaftServer
)
{
while
(
1
)
{
char
cmd_buf
[
COMMAND_LEN
];
memset
(
cmd_buf
,
0
,
sizeof
(
cmd_buf
));
printf
(
"(console)> "
);
char
*
ret
=
fgets
(
cmd_buf
,
COMMAND_LEN
,
stdin
);
if
(
!
ret
)
{
exit
(
-
1
);
}
int
pos
=
strlen
(
cmd_buf
);
if
(
cmd_buf
[
pos
-
1
]
==
'\n'
)
{
cmd_buf
[
pos
-
1
]
=
'\0'
;
}
if
(
strncmp
(
cmd_buf
,
""
,
COMMAND_LEN
)
==
0
)
{
continue
;
}
char
cmd
[
TOKEN_LEN
];
memset
(
cmd
,
0
,
sizeof
(
cmd
));
char
param1
[
TOKEN_LEN
];
memset
(
param1
,
0
,
sizeof
(
param1
));
char
param2
[
TOKEN_LEN
];
memset
(
param2
,
0
,
sizeof
(
param2
));
char
param3
[
TOKEN_LEN
];
memset
(
param2
,
0
,
sizeof
(
param2
));
parseCommand4
(
cmd_buf
,
cmd
,
param1
,
param2
,
param3
,
TOKEN_LEN
);
if
(
strcmp
(
cmd
,
"addnode"
)
==
0
)
{
printf
(
"not support
\n
"
);
/*
char host[HOST_LEN];
uint32_t port;
parseAddr(param1, host, HOST_LEN, &port);
uint64_t rid = raftId(host, port);
struct raft_change *req = raft_malloc(sizeof(*req));
int r = raft_add(&pRaftServer->raft, req, rid, param1, NULL);
if (r != 0) {
printf("raft_add: %s \n", raft_errmsg(&pRaftServer->raft));
}
printf("add node: %lu %s \n", rid, param1);
struct raft_change *req2 = raft_malloc(sizeof(*req2));
r = raft_assign(&pRaftServer->raft, req2, rid, RAFT_VOTER, NULL);
if (r != 0) {
printf("raft_assign: %s \n", raft_errmsg(&pRaftServer->raft));
}
*/
}
else
if
(
strcmp
(
cmd
,
"dropnode"
)
==
0
)
{
printf
(
"not support
\n
"
);
}
else
if
(
strcmp
(
cmd
,
"quit"
)
==
0
||
strcmp
(
cmd
,
"exit"
)
==
0
)
{
exit
(
0
);
}
else
if
(
strcmp
(
cmd
,
"rebalance"
)
==
0
&&
strcmp
(
param1
,
"leader"
)
==
0
)
{
/*
updateLeaderStates(pRaftServer);
int myLeaderCount;
for (int i = 0; i < NODE_COUNT; ++i) {
if (strcmp(pRaftServer->address, leaderStates[i].address) == 0) {
myLeaderCount = leaderStates[i].leaderCount;
}
}
while (myLeaderCount > pRaftServer->instanceCount / NODE_COUNT) {
printf("myLeaderCount:%d waterLevel:%d \n", myLeaderCount, pRaftServer->instanceCount / NODE_COUNT);
struct raft *r;
for (int j = 0; j < pRaftServer->instanceCount; ++j) {
if (pRaftServer->instance[j].raft.state == RAFT_LEADER) {
r = &pRaftServer->instance[j].raft;
}
}
struct raft_transfer *transfer = raft_malloc(sizeof(*transfer));
transfer->data = pRaftServer;
uint64_t destRaftId;
int minIndex = -1;
int minLeaderCount = myLeaderCount;
for (int j = 0; j < NODE_COUNT; ++j) {
if (strcmp(leaderStates[j].address, pRaftServer->address) == 0) continue;
printf("-----leaderStates[%d].leaderCount:%d \n", j, leaderStates[j].leaderCount);
if (leaderStates[j].leaderCount <= minLeaderCount) {
minIndex = j;
printf("++++ assign minIndex : %d \n", minIndex);
}
}
printf("minIndex:%d minLeaderCount:%d \n", minIndex, minLeaderCount);
char myHost[48];
uint16_t myPort;
uint16_t myVid;
decodeRaftId(r->id, myHost, sizeof(myHost), &myPort, &myVid);
char *destAddress = leaderStates[minIndex].address;
char tokens[MAX_PEERS][MAX_TOKEN_LEN];
splitString(destAddress, ":", tokens, 2);
char *destHost = tokens[0];
uint16_t destPort = atoi(tokens[1]);
destRaftId = encodeRaftId(destHost, destPort, myVid);
printf("destHost:%s destPort:%u myVid:%u", destHost, destPort, myVid);
raft_transfer(r, transfer, destRaftId, raftTransferCb);
sleep(1);
for (int i = 0; i < NODE_COUNT; ++i) {
if (strcmp(pRaftServer->address, leaderStates[i].address) == 0) {
myLeaderCount = leaderStates[i].leaderCount;
}
}
}
*/
int
leaderCount
=
0
;
struct
raft
*
firstR
;
for
(
int
i
=
0
;
i
<
pRaftServer
->
instanceCount
;
++
i
)
{
struct
raft
*
r
=
&
pRaftServer
->
instance
[
i
].
raft
;
if
(
r
->
state
==
RAFT_LEADER
)
{
leaderCount
++
;
firstR
=
r
;
}
}
if
(
leaderCount
>
pRaftServer
->
instanceCount
/
NODE_COUNT
)
{
struct
raft_transfer
*
transfer
=
raft_malloc
(
sizeof
(
*
transfer
));
transfer
->
data
=
pRaftServer
;
raft_transfer
(
firstR
,
transfer
,
0
,
raftTransferCb
);
}
}
else
if
(
strcmp
(
cmd
,
"put"
)
==
0
)
{
char
buf
[
256
];
uint16_t
vid
;
sscanf
(
param1
,
"%hu"
,
&
vid
);
snprintf
(
buf
,
sizeof
(
buf
),
"%s--%s"
,
param2
,
param3
);
putValue
(
&
pRaftServer
->
instance
[
vid
].
raft
,
buf
);
}
else
if
(
strcmp
(
cmd
,
"get"
)
==
0
)
{
getValue
(
param1
);
}
else
if
(
strcmp
(
cmd
,
"transfer"
)
==
0
)
{
uint16_t
vid
;
sscanf
(
param1
,
"%hu"
,
&
vid
);
struct
raft_transfer
transfer
;
raft_transfer
(
&
pRaftServer
->
instance
[
vid
].
raft
,
&
transfer
,
0
,
NULL
);
}
else
if
(
strcmp
(
cmd
,
"state"
)
==
0
)
{
for
(
int
i
=
0
;
i
<
pRaftServer
->
instanceCount
;
++
i
)
{
printf
(
"instance %d: "
,
i
);
printRaftState
(
&
pRaftServer
->
instance
[
i
].
raft
);
}
}
else
if
(
strcmp
(
cmd
,
"leader"
)
==
0
&&
strcmp
(
param1
,
"state"
)
==
0
)
{
updateLeaderStates
(
pRaftServer
);
printf
(
"
\n
--------------------------------------------
\n
"
);
printLeaderCount
();
for
(
int
i
=
0
;
i
<
pRaftServer
->
instanceCount
;
++
i
)
{
printRaftState2
(
&
pRaftServer
->
instance
[
i
].
raft
);
}
printf
(
"--------------------------------------------
\n
"
);
}
else
if
(
strcmp
(
cmd
,
"snapshot"
)
==
0
)
{
printf
(
"not support
\n
"
);
}
else
if
(
strcmp
(
cmd
,
"help"
)
==
0
)
{
printf
(
"addnode
\"
127.0.0.1:8888
\"
\n
"
);
printf
(
"dropnode
\"
127.0.0.1:8888
\"
\n
"
);
printf
(
"put key value
\n
"
);
printf
(
"get key
\n
"
);
printf
(
"state
\n
"
);
}
else
{
printf
(
"unknown command: [%s], type
\"
help
\"
to see help
\n
"
,
cmd
);
}
//printf("cmd_buf: [%s] \n", cmd_buf);
}
}
void
*
startConsoleFunc
(
void
*
param
)
{
SRaftServer
*
pServer
=
(
SRaftServer
*
)
param
;
console
(
pServer
);
return
NULL
;
}
// Config ---------------------------------
void
usage
()
{
printf
(
"
\n
usage:
\n
"
);
printf
(
"%s --me=127.0.0.1:10000 --dir=./data
\n
"
,
exe_name
);
printf
(
"
\n
"
);
printf
(
"%s --me=127.0.0.1:10000 --peers=127.0.0.1:10001,127.0.0.1:10002 --dir=./data
\n
"
,
exe_name
);
printf
(
"%s --me=127.0.0.1:10001 --peers=127.0.0.1:10000,127.0.0.1:10002 --dir=./data
\n
"
,
exe_name
);
printf
(
"%s --me=127.0.0.1:10002 --peers=127.0.0.1:10000,127.0.0.1:10001 --dir=./data
\n
"
,
exe_name
);
printf
(
"
\n
"
);
}
void
parseConf
(
int
argc
,
char
**
argv
,
SRaftServerConfig
*
pConf
)
{
memset
(
pConf
,
0
,
sizeof
(
*
pConf
));
int
option_index
,
option_value
;
option_index
=
0
;
static
struct
option
long_options
[]
=
{
{
"help"
,
no_argument
,
NULL
,
'h'
},
{
"peers"
,
required_argument
,
NULL
,
'p'
},
{
"me"
,
required_argument
,
NULL
,
'm'
},
{
"dir"
,
required_argument
,
NULL
,
'd'
},
{
NULL
,
0
,
NULL
,
0
}
};
while
((
option_value
=
getopt_long
(
argc
,
argv
,
"hp:m:d:"
,
long_options
,
&
option_index
))
!=
-
1
)
{
switch
(
option_value
)
{
case
'm'
:
{
parseAddr
(
optarg
,
pConf
->
me
.
host
,
sizeof
(
pConf
->
me
.
host
),
&
pConf
->
me
.
port
);
break
;
}
case
'p'
:
{
char
tokens
[
MAX_PEERS
][
MAX_TOKEN_LEN
];
int
peerCount
=
splitString
(
optarg
,
","
,
tokens
,
MAX_PEERS
);
pConf
->
peersCount
=
peerCount
;
for
(
int
i
=
0
;
i
<
peerCount
;
++
i
)
{
Addr
*
pAddr
=
&
pConf
->
peers
[
i
];
parseAddr
(
tokens
[
i
],
pAddr
->
host
,
sizeof
(
pAddr
->
host
),
&
pAddr
->
port
);
}
break
;
}
case
'd'
:
{
snprintf
(
pConf
->
dir
,
sizeof
(
pConf
->
dir
),
"%s"
,
optarg
);
break
;
}
case
'h'
:
{
usage
();
exit
(
-
1
);
}
default:
{
usage
();
exit
(
-
1
);
}
}
}
snprintf
(
pConf
->
dataDir
,
sizeof
(
pConf
->
dataDir
),
"%s/%s_%u"
,
pConf
->
dir
,
pConf
->
me
.
host
,
pConf
->
me
.
port
);
}
void
printConf
(
SRaftServerConfig
*
pConf
)
{
printf
(
"
\n
conf:
\n
"
);
printf
(
"me: %s:%u
\n
"
,
pConf
->
me
.
host
,
pConf
->
me
.
port
);
printf
(
"peersCount: %d
\n
"
,
pConf
->
peersCount
);
for
(
int
i
=
0
;
i
<
pConf
->
peersCount
;
++
i
)
{
Addr
*
pAddr
=
&
pConf
->
peers
[
i
];
printf
(
"peer%d: %s:%u
\n
"
,
i
,
pAddr
->
host
,
pAddr
->
port
);
}
printf
(
"dataDir: %s
\n\n
"
,
pConf
->
dataDir
);
}
int
main
(
int
argc
,
char
**
argv
)
{
srand
(
time
(
NULL
));
int32_t
ret
;
exe_name
=
argv
[
0
];
if
(
argc
<
3
)
{
usage
();
exit
(
-
1
);
}
SRaftServerConfig
conf
;
parseConf
(
argc
,
argv
,
&
conf
);
printConf
(
&
conf
);
signal
(
SIGPIPE
,
SIG_IGN
);
/*
char cmd_buf[COMMAND_LEN];
snprintf(cmd_buf, sizeof(cmd_buf), "mkdir -p %s", conf.dataDir);
system(cmd_buf);
*/
struct
raft_fsm
fsm
;
initFsm
(
&
fsm
);
SRaftServer
raftServer
;
ret
=
raftServerInit
(
&
raftServer
,
&
conf
,
&
fsm
);
assert
(
ret
==
0
);
pthread_t
tidRaftServer
;
pthread_create
(
&
tidRaftServer
,
NULL
,
startServerFunc
,
&
raftServer
);
pthread_t
tidConsole
;
pthread_create
(
&
tidConsole
,
NULL
,
startConsoleFunc
,
&
raftServer
);
while
(
1
)
{
sleep
(
10
);
}
return
0
;
}
contrib/test/traft/rebalance_leader/raftServer.c
已删除
100644 → 0
浏览文件 @
54e59090
#include <unistd.h>
#include <stdlib.h>
#include "common.h"
#include "raftServer.h"
//char *keys = malloc(MAX_RECORD_COUNT * MAX_KV_LEN);;
//char *values = malloc(MAX_RECORD_COUNT * MAX_KV_LEN);
char
keys
[
MAX_KV_LEN
][
MAX_RECORD_COUNT
];
char
values
[
MAX_KV_LEN
][
MAX_RECORD_COUNT
];
int
writeIndex
=
0
;
void
initStore
()
{
}
void
destroyStore
()
{
//free(keys);
//free(values);
}
void
putKV
(
const
char
*
key
,
const
char
*
value
)
{
if
(
writeIndex
<
MAX_RECORD_COUNT
)
{
strncpy
(
keys
[
writeIndex
],
key
,
MAX_KV_LEN
);
strncpy
(
values
[
writeIndex
],
value
,
MAX_KV_LEN
);
writeIndex
++
;
}
}
char
*
getKV
(
const
char
*
key
)
{
for
(
int
i
=
0
;
i
<
MAX_RECORD_COUNT
;
++
i
)
{
if
(
strcmp
(
keys
[
i
],
key
)
==
0
)
{
return
values
[
i
];
}
}
return
NULL
;
}
int
splitString
(
const
char
*
str
,
char
*
separator
,
char
(
*
arr
)[
MAX_TOKEN_LEN
],
int
n_arr
)
{
if
(
n_arr
<=
0
)
{
return
-
1
;
}
char
*
tmp
=
(
char
*
)
malloc
(
strlen
(
str
)
+
1
);
strcpy
(
tmp
,
str
);
char
*
context
;
int
n
=
0
;
char
*
token
=
strtok_r
(
tmp
,
separator
,
&
context
);
if
(
!
token
)
{
goto
ret
;
}
strncpy
(
arr
[
n
],
token
,
MAX_TOKEN_LEN
);
n
++
;
while
(
1
)
{
token
=
strtok_r
(
NULL
,
separator
,
&
context
);
if
(
!
token
||
n
>=
n_arr
)
{
goto
ret
;
}
strncpy
(
arr
[
n
],
token
,
MAX_TOKEN_LEN
);
n
++
;
}
ret:
free
(
tmp
);
return
n
;
}
/*
uint64_t raftId(const char *host, uint32_t port) {
uint32_t host_uint32 = (uint32_t)inet_addr(host);
assert(host_uint32 != (uint32_t)-1);
uint64_t code = ((uint64_t)host_uint32) << 32 | port;
return code;
}
*/
/*
uint64_t encodeRaftId(const char *host, uint16_t port, uint16_t vid) {
uint64_t raftId;
uint32_t host_uint32 = (uint32_t)inet_addr(host);
assert(host_uint32 != (uint32_t)-1);
raftId = (((uint64_t)host_uint32) << 32) | (((uint32_t)port) << 16) | vid;
return raftId;
}
void decodeRaftId(uint64_t raftId, char *host, int32_t len, uint16_t *port, uint16_t *vid) {
uint32_t host32 = (uint32_t)((raftId >> 32) & 0x00000000FFFFFFFF);
struct in_addr addr;
addr.s_addr = host32;
snprintf(host, len, "%s", inet_ntoa(addr));
*port = (uint16_t)((raftId & 0x00000000FFFF0000) >> 16);
*vid = (uint16_t)(raftId & 0x000000000000FFFF);
}
*/
int32_t
raftServerInit
(
SRaftServer
*
pRaftServer
,
const
SRaftServerConfig
*
pConf
,
struct
raft_fsm
*
pFsm
)
{
int
ret
;
snprintf
(
pRaftServer
->
host
,
sizeof
(
pRaftServer
->
host
),
"%s"
,
pConf
->
me
.
host
);
pRaftServer
->
port
=
pConf
->
me
.
port
;
snprintf
(
pRaftServer
->
address
,
sizeof
(
pRaftServer
->
address
),
"%s:%u"
,
pRaftServer
->
host
,
pRaftServer
->
port
);
//strncpy(pRaftServer->dir, pConf->dataDir, sizeof(pRaftServer->dir));
ret
=
uv_loop_init
(
&
pRaftServer
->
loop
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"uv_loop_init error: %s
\n
"
,
uv_strerror
(
ret
));
assert
(
0
);
}
ret
=
raft_uv_tcp_init
(
&
pRaftServer
->
transport
,
&
pRaftServer
->
loop
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"raft_uv_tcp_init: error %d
\n
"
,
ret
);
assert
(
0
);
}
uint16_t
vid
;
pRaftServer
->
instanceCount
=
20
;
for
(
int
i
=
0
;
i
<
pRaftServer
->
instanceCount
;
++
i
)
{
//vid = 0;
vid
=
i
;
pRaftServer
->
instance
[
vid
].
raftId
=
encodeRaftId
(
pRaftServer
->
host
,
pRaftServer
->
port
,
vid
);
snprintf
(
pRaftServer
->
instance
[
vid
].
dir
,
sizeof
(
pRaftServer
->
instance
[
vid
].
dir
),
"%s_%llu"
,
pConf
->
dataDir
,
pRaftServer
->
instance
[
vid
].
raftId
);
char
cmd_buf
[
COMMAND_LEN
];
snprintf
(
cmd_buf
,
sizeof
(
cmd_buf
),
"mkdir -p %s"
,
pRaftServer
->
instance
[
vid
].
dir
);
system
(
cmd_buf
);
sleep
(
1
);
pRaftServer
->
instance
[
vid
].
fsm
=
pFsm
;
ret
=
raft_uv_init
(
&
pRaftServer
->
instance
[
vid
].
io
,
&
pRaftServer
->
loop
,
pRaftServer
->
instance
[
vid
].
dir
,
&
pRaftServer
->
transport
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"%s
\n
"
,
raft_errmsg
(
&
pRaftServer
->
instance
[
vid
].
raft
));
assert
(
0
);
}
ret
=
raft_init
(
&
pRaftServer
->
instance
[
vid
].
raft
,
&
pRaftServer
->
instance
[
vid
].
io
,
pRaftServer
->
instance
[
vid
].
fsm
,
pRaftServer
->
instance
[
vid
].
raftId
,
pRaftServer
->
address
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"%s
\n
"
,
raft_errmsg
(
&
pRaftServer
->
instance
[
vid
].
raft
));
assert
(
0
);
}
struct
raft_configuration
conf
;
raft_configuration_init
(
&
conf
);
raft_configuration_add
(
&
conf
,
pRaftServer
->
instance
[
vid
].
raftId
,
pRaftServer
->
address
,
RAFT_VOTER
);
printf
(
"add myself: %llu - %s
\n
"
,
pRaftServer
->
instance
[
vid
].
raftId
,
pRaftServer
->
address
);
for
(
int
i
=
0
;
i
<
pConf
->
peersCount
;
++
i
)
{
const
Addr
*
pAddr
=
&
pConf
->
peers
[
i
];
raft_id
rid
=
encodeRaftId
(
pAddr
->
host
,
pAddr
->
port
,
vid
);
char
addrBuf
[
ADDRESS_LEN
];
snprintf
(
addrBuf
,
sizeof
(
addrBuf
),
"%s:%u"
,
pAddr
->
host
,
pAddr
->
port
);
raft_configuration_add
(
&
conf
,
rid
,
addrBuf
,
RAFT_VOTER
);
printf
(
"add peers: %llu - %s
\n
"
,
rid
,
addrBuf
);
}
raft_bootstrap
(
&
pRaftServer
->
instance
[
vid
].
raft
,
&
conf
);
}
return
0
;
}
int32_t
raftServerStart
(
SRaftServer
*
pRaftServer
)
{
int
ret
;
for
(
int
i
=
0
;
i
<
pRaftServer
->
instanceCount
;
++
i
)
{
ret
=
raft_start
(
&
pRaftServer
->
instance
[
i
].
raft
);
if
(
ret
!=
0
)
{
fprintf
(
stderr
,
"%s
\n
"
,
raft_errmsg
(
&
pRaftServer
->
instance
[
i
].
raft
));
}
}
uv_run
(
&
pRaftServer
->
loop
,
UV_RUN_DEFAULT
);
}
void
raftServerClose
(
SRaftServer
*
pRaftServer
)
{
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
)
{
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: %s
\n
"
,
msg
);
char
arr
[
2
][
MAX_TOKEN_LEN
];
splitString
(
msg
,
"--"
,
arr
,
2
);
putKV
(
arr
[
0
],
arr
[
1
]);
return
0
;
}
int32_t
initFsm
(
struct
raft_fsm
*
fsm
)
{
initStore
();
fsm
->
apply
=
fsmApplyCb
;
return
0
;
}
contrib/test/traft/rebalance_leader/raftServer.h
已删除
100644 → 0
浏览文件 @
54e59090
#ifndef TDENGINE_RAFT_SERVER_H
#define TDENGINE_RAFT_SERVER_H
#ifdef __cplusplus
extern
"C"
{
#endif
#include <netinet/in.h>
#include <arpa/inet.h>
#include <assert.h>
#include <string.h>
#include "raft.h"
#include "raft/uv.h"
#include "common.h"
// simulate a db store, just for test
#define MAX_KV_LEN 20
#define MAX_RECORD_COUNT 16
//char *keys;
//char *values;
//int writeIndex;
void
initStore
();
void
destroyStore
();
void
putKV
(
const
char
*
key
,
const
char
*
value
);
char
*
getKV
(
const
char
*
key
);
typedef
struct
{
char
dir
[
DIR_LEN
+
HOST_LEN
*
4
];
/* Data dir of UV I/O backend */
raft_id
raftId
;
/* For vote */
struct
raft_fsm
*
fsm
;
/* Sample application FSM */
struct
raft
raft
;
/* Raft instance */
struct
raft_io
io
;
/* UV I/O backend */
}
SInstance
;
typedef
struct
{
char
host
[
HOST_LEN
];
uint32_t
port
;
char
address
[
ADDRESS_LEN
];
/* Raft instance address */
struct
uv_loop_s
loop
;
/* UV loop */
struct
raft_uv_transport
transport
;
/* UV I/O backend transport */
SInstance
instance
[
MAX_INSTANCE_NUM
];
int32_t
instanceCount
;
}
SRaftServer
;
#define MAX_TOKEN_LEN 32
int
splitString
(
const
char
*
str
,
char
*
separator
,
char
(
*
arr
)[
MAX_TOKEN_LEN
],
int
n_arr
);
int32_t
raftServerInit
(
SRaftServer
*
pRaftServer
,
const
SRaftServerConfig
*
pConf
,
struct
raft_fsm
*
pFsm
);
int32_t
raftServerStart
(
SRaftServer
*
pRaftServer
);
void
raftServerClose
(
SRaftServer
*
pRaftServer
);
int
initFsm
(
struct
raft_fsm
*
fsm
);
#ifdef __cplusplus
}
#endif
#endif // TDENGINE_RAFT_SERVER_H
contrib/test/traft/single_node/CMakeLists.txt
0 → 100644
浏览文件 @
ee52870b
add_executable
(
singleNode
""
)
target_sources
(
singleNode
PRIVATE
"singleNode.c"
)
target_link_libraries
(
singleNode PUBLIC traft lz4 uv_a
)
contrib/test/traft/single_node/clear.sh
0 → 100644
浏览文件 @
ee52870b
#!/bin/bash
rm
-rf
127.0.0.1
*
rm
-rf
./data
contrib/test/traft/single_node/cmd
0 → 100644
浏览文件 @
ee52870b
all:
gcc singleNode.c -I ../../include/ ../../.libs/libraft.a -o singleNode -luv -llz4 -lpthread -g
clean:
rm -f singleNode
sh clear.sh
contrib/test/traft/single_node/singleNode.c
0 → 100644
浏览文件 @
ee52870b
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
//#include <uv.h>
#include "raft.h"
SRaftEnv
raftEnv
;
typedef
struct
Tsdb
{
uint64_t
lastApplyIndex
;
void
*
mem
;
void
*
imm
;
void
*
store
;
}
Tsdb
;
void
tsdbWrite
(
Tsdb
*
t
,
char
*
msg
)
{}
void
*
startFunc
(
void
*
param
)
{
SRaftEnv
*
pSRaftEnv
=
(
SRaftEnv
*
)
param
;
int32_t
r
=
raftEnvStart
(
pSRaftEnv
);
assert
(
r
==
0
);
return
NULL
;
}
int
fsmApplyCb
(
struct
raft_fsm
*
pFsm
,
const
struct
raft_buffer
*
buf
,
void
**
result
,
raft_index
index
)
{
// get commit value
char
*
msg
=
(
char
*
)
buf
->
base
;
printf
(
"fsm apply: index:%llu value:%s
\n
"
,
index
,
msg
);
Tsdb
*
t
=
pFsm
->
data
;
if
(
index
>
t
->
lastApplyIndex
)
{
// apply value into tsdb
tsdbWrite
(
t
,
msg
);
// update lastApplyIndex
t
->
lastApplyIndex
=
index
;
}
return
0
;
}
void
putValueCb
(
struct
raft_apply
*
req
,
int
status
,
void
*
result
)
{
void
*
ptr
=
req
->
data
;
if
(
status
!=
0
)
{
printf
(
"putValueCb error
\n
"
);
}
else
{
printf
(
"putValueCb ok
\n
"
);
}
free
(
ptr
);
free
(
req
);
}
void
submitValue
()
{
// prepare value
struct
raft_buffer
buf
;
buf
.
len
=
32
;
void
*
ptr
=
malloc
(
buf
.
len
);
buf
.
base
=
ptr
;
snprintf
(
buf
.
base
,
buf
.
len
,
"%ld"
,
time
(
NULL
));
// get raft
struct
raft
*
r
=
getRaft
(
&
raftEnv
,
100
);
assert
(
r
!=
NULL
);
// printRaftState(r);
// submit value
struct
raft_apply
*
req
=
malloc
(
sizeof
(
*
req
));
req
->
data
=
ptr
;
int
ret
=
raft_apply
(
r
,
req
,
&
buf
,
1
,
putValueCb
);
if
(
ret
==
0
)
{
printf
(
"put %s
\n
"
,
(
char
*
)
buf
.
base
);
}
else
{
printf
(
"put error: %s
\n
"
,
raft_errmsg
(
r
));
}
}
int
main
(
int
argc
,
char
**
argv
)
{
// init raft env
int
r
=
raftEnvInit
(
&
raftEnv
,
"127.0.0.1"
,
38000
,
"./data"
);
assert
(
r
==
0
);
// start raft env
pthread_t
tid
;
pthread_create
(
&
tid
,
NULL
,
startFunc
,
&
raftEnv
);
// wait for start, just for simple
while
(
raftEnv
.
isStart
!=
1
)
{
sleep
(
1
);
}
// init fsm
struct
raft_fsm
*
pFsm
=
malloc
(
sizeof
(
*
pFsm
));
pFsm
->
apply
=
fsmApplyCb
;
Tsdb
*
tsdb
=
malloc
(
sizeof
(
*
tsdb
));
pFsm
->
data
=
tsdb
;
// add vgroup, id = 100, only has one replica
r
=
addRaftVoter
(
&
raftEnv
,
NULL
,
0
,
100
,
pFsm
);
assert
(
r
==
0
);
// for test: submit a value every second
while
(
1
)
{
sleep
(
1
);
submitValue
();
}
return
0
;
}
include/common/tmsg.h
浏览文件 @
ee52870b
...
...
@@ -696,13 +696,13 @@ typedef struct SVgroupInfo {
uint32_t
hashEnd
;
int8_t
inUse
;
int8_t
numOfEps
;
SEpAddr
epAddr
[
TSDB_MAX_REPLICA
];
SEpAddr
epAddr
[
TSDB_MAX_REPLICA
];
}
SVgroupInfo
;
typedef
struct
{
int32_t
vgId
;
int8_t
numOfEps
;
SEpAddr
epAddr
[
TSDB_MAX_REPLICA
];
SEpAddr
epAddr
[
TSDB_MAX_REPLICA
];
}
SVgroupMsg
;
typedef
struct
{
...
...
@@ -1525,9 +1525,28 @@ typedef struct SMqSetCVgReq {
char
*
sql
;
char
*
logicalPlan
;
char
*
physicalPlan
;
S
Array
*
tasks
;
// SArray<SSubQueryMsg>
S
SubQueryMsg
msg
;
}
SMqSetCVgReq
;
static
FORCE_INLINE
int32_t
tEncodeSSubQueryMsg
(
void
**
buf
,
const
SSubQueryMsg
*
pMsg
)
{
int32_t
tlen
=
0
;
tlen
+=
taosEncodeFixedU64
(
buf
,
pMsg
->
sId
);
tlen
+=
taosEncodeFixedU64
(
buf
,
pMsg
->
queryId
);
tlen
+=
taosEncodeFixedU64
(
buf
,
pMsg
->
taskId
);
tlen
+=
taosEncodeFixedU32
(
buf
,
pMsg
->
contentLen
);
tlen
+=
taosEncodeBinary
(
buf
,
pMsg
->
msg
,
pMsg
->
contentLen
);
return
tlen
;
}
static
FORCE_INLINE
void
*
tDecodeSSubQueryMsg
(
void
*
buf
,
SSubQueryMsg
*
pMsg
)
{
buf
=
taosDecodeFixedU64
(
buf
,
&
pMsg
->
sId
);
buf
=
taosDecodeFixedU64
(
buf
,
&
pMsg
->
queryId
);
buf
=
taosDecodeFixedU64
(
buf
,
&
pMsg
->
taskId
);
buf
=
taosDecodeFixedU32
(
buf
,
&
pMsg
->
contentLen
);
buf
=
taosDecodeBinaryTo
(
buf
,
pMsg
->
msg
,
pMsg
->
contentLen
);
return
buf
;
}
static
FORCE_INLINE
int32_t
tEncodeSMqSetCVgReq
(
void
**
buf
,
const
SMqSetCVgReq
*
pReq
)
{
int32_t
tlen
=
0
;
tlen
+=
taosEncodeFixedI32
(
buf
,
pReq
->
vgId
);
...
...
@@ -1537,6 +1556,7 @@ static FORCE_INLINE int32_t tEncodeSMqSetCVgReq(void** buf, const SMqSetCVgReq*
tlen
+=
taosEncodeString
(
buf
,
pReq
->
sql
);
tlen
+=
taosEncodeString
(
buf
,
pReq
->
logicalPlan
);
tlen
+=
taosEncodeString
(
buf
,
pReq
->
physicalPlan
);
tlen
+=
tEncodeSSubQueryMsg
(
buf
,
&
pReq
->
msg
);
return
tlen
;
}
...
...
@@ -1548,7 +1568,7 @@ static FORCE_INLINE void* tDecodeSMqSetCVgReq(void* buf, SMqSetCVgReq* pReq) {
buf
=
taosDecodeString
(
buf
,
&
pReq
->
sql
);
buf
=
taosDecodeString
(
buf
,
&
pReq
->
logicalPlan
);
buf
=
taosDecodeString
(
buf
,
&
pReq
->
physicalPlan
);
pReq
->
tasks
=
NULL
;
buf
=
tDecodeSSubQueryMsg
(
buf
,
&
pReq
->
msg
)
;
return
buf
;
}
...
...
@@ -1559,32 +1579,47 @@ typedef struct SMqSetCVgRsp {
char
cGroup
[
TSDB_CONSUMER_GROUP_LEN
];
}
SMqSetCVgRsp
;
typedef
struct
SMqC
VC
onsumeReq
{
typedef
struct
SMqConsumeReq
{
int64_t
reqId
;
int64_t
offset
;
int64_t
consumerId
;
int64_t
blockingTime
;
char
topicName
[
TSDB_TOPIC_FNAME_LEN
];
char
cgroup
[
TSDB_CONSUMER_GROUP_LEN
];
}
SMqC
VC
onsumeReq
;
}
SMqConsumeReq
;
typedef
struct
SMqConsumeRspBlock
{
int32_t
bodyLen
;
char
topicName
[
TSDB_TOPIC_FNAME_LEN
];
char
body
[];
}
SMqConsumeRspBlock
;
typedef
struct
SMqCVConsumeRsp
{
int64_t
reqId
;
int64_t
clientId
;
int64_t
committedOffset
;
int64_t
receiveOffset
;
int64_t
rspOffset
;
int32_t
skipLogNum
;
int32_t
bodyLen
;
char
topicName
[
TSDB_TOPIC_FNAME_LEN
];
SMqConsumeRspBlock
blocks
[];
}
SMqCvConsumeRsp
;
typedef
struct
SMqColData
{
int16_t
colId
;
int16_t
type
;
int16_t
bytes
;
char
data
[];
}
SMqColData
;
typedef
struct
SMqTbData
{
int64_t
uid
;
int32_t
numOfCols
;
int32_t
numOfRows
;
SMqColData
colData
[];
}
SMqTbData
;
typedef
struct
SMqTopicBlk
{
char
topicName
[
TSDB_TOPIC_FNAME_LEN
];
int64_t
committedOffset
;
int64_t
reqOffset
;
int64_t
rspOffset
;
int32_t
skipLogNum
;
int32_t
bodyLen
;
int32_t
numOfTb
;
SMqTbData
tbData
[];
}
SMqTopicData
;
typedef
struct
SMqConsumeRsp
{
int64_t
reqId
;
int64_t
clientId
;
int32_t
bodyLen
;
int32_t
numOfTopics
;
SMqTopicData
data
[];
}
SMqConsumeRsp
;
#ifdef __cplusplus
}
...
...
include/libs/executor/executor.h
浏览文件 @
ee52870b
...
...
@@ -26,17 +26,26 @@ typedef void* qTaskInfo_t;
typedef
void
*
DataSinkHandle
;
struct
SSubplan
;
/**
* Create the exec task for streaming mode
* @param pMsg
* @param streamReadHandle
* @return
*/
qTaskInfo_t
qCreateStreamExecTaskInfo
(
SSubQueryMsg
*
pMsg
,
void
*
streamReadHandle
);
int32_t
qSetStreamInput
(
qTaskInfo_t
tinfo
,
void
*
input
);
/**
* Create the exec task object according to task json
* @param
tsdb
* @param
readHandle
* @param vgId
* @param pTaskInfoMsg
* @param pTaskInfo
* @param qId
* @return
*/
int32_t
qCreateExecTask
(
void
*
tsdb
,
int32_t
vgId
,
struct
SSubplan
*
pPlan
,
qTaskInfo_t
*
pTaskInfo
,
DataSinkHandle
*
handle
);
int32_t
qCreateExecTask
(
void
*
readHandle
,
int32_t
vgId
,
struct
SSubplan
*
pPlan
,
qTaskInfo_t
*
pTaskInfo
,
DataSinkHandle
*
handle
);
/**
* The main task execution function, including query on both table and multiple tables,
...
...
@@ -53,63 +62,63 @@ int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t *useconds);
* this function will be blocked to wait for the query execution completed or paused,
* in which case enough results have been produced already.
*
* @param
q
info
* @param
t
info
* @return
*/
int32_t
qRetrieveQueryResultInfo
(
qTaskInfo_t
q
info
,
bool
*
buildRes
,
void
*
pRspContext
);
int32_t
qRetrieveQueryResultInfo
(
qTaskInfo_t
t
info
,
bool
*
buildRes
,
void
*
pRspContext
);
/**
*
* Retrieve the actual results to fill the response message payload.
* Note that this function must be executed after qRetrieveQueryResultInfo is invoked.
*
* @param
qinfo q
info object
* @param
tinfo t
info object
* @param pRsp response message
* @param contLen payload length
* @return
*/
//int32_t qDumpRetrieveResult(qTaskInfo_t
q
info, SRetrieveTableRsp** pRsp, int32_t* contLen, bool* continueExec);
//int32_t qDumpRetrieveResult(qTaskInfo_t
t
info, SRetrieveTableRsp** pRsp, int32_t* contLen, bool* continueExec);
/**
* return the transporter context (RPC)
* @param
q
info
* @param
t
info
* @return
*/
void
*
qGetResultRetrieveMsg
(
qTaskInfo_t
q
info
);
void
*
qGetResultRetrieveMsg
(
qTaskInfo_t
t
info
);
/**
* kill the ongoing query and free the query handle and corresponding resources automatically
* @param
q
info qhandle
* @param
t
info qhandle
* @return
*/
int32_t
qKillTask
(
qTaskInfo_t
q
info
);
int32_t
qKillTask
(
qTaskInfo_t
t
info
);
/**
* kill the ongoing query asynchronously
* @param
q
info qhandle
* @param
t
info qhandle
* @return
*/
int32_t
qAsyncKillTask
(
qTaskInfo_t
q
info
);
int32_t
qAsyncKillTask
(
qTaskInfo_t
t
info
);
/**
* return whether query is completed or not
* @param
q
info
* @param
t
info
* @return
*/
int32_t
qIsTaskCompleted
(
qTaskInfo_t
q
info
);
int32_t
qIsTaskCompleted
(
qTaskInfo_t
t
info
);
/**
* destroy query info structure
* @param qHandle
*/
void
qDestroyTask
(
qTaskInfo_t
qHandle
);
void
qDestroyTask
(
qTaskInfo_t
tinfo
);
/**
* Get the queried table uid
* @param qHandle
* @return
*/
int64_t
qGetQueriedTableUid
(
qTaskInfo_t
qHandle
);
int64_t
qGetQueriedTableUid
(
qTaskInfo_t
tinfo
);
/**
* Extract the qualified table id list, and than pass them to the TSDB driver to load the required table data blocks.
...
...
@@ -136,7 +145,7 @@ int32_t qGetQualifiedTableIdList(void* pTableList, const char* tagCond, int32_t
* @param type operation type: ADD|DROP
* @return
*/
int32_t
qUpdateQueriedTableIdList
(
qTaskInfo_t
q
info
,
int64_t
uid
,
int32_t
type
);
int32_t
qUpdateQueriedTableIdList
(
qTaskInfo_t
t
info
,
int64_t
uid
,
int32_t
type
);
//================================================================================================
// query handle management
...
...
@@ -203,4 +212,4 @@ void** qDeregisterQInfo(void* pMgmt, void* pQInfo);
}
#endif
#endif
/*_TD_EXECUTOR_H_*/
\ No newline at end of file
#endif
/*_TD_EXECUTOR_H_*/
include/libs/function/function.h
浏览文件 @
ee52870b
...
...
@@ -254,6 +254,7 @@ typedef struct SMultiFunctionsDesc {
bool
interpQuery
;
bool
distinct
;
bool
join
;
bool
continueQuery
;
}
SMultiFunctionsDesc
;
int32_t
getResultDataInfo
(
int32_t
dataType
,
int32_t
dataBytes
,
int32_t
functionId
,
int32_t
param
,
SResultDataInfo
*
pInfo
,
int16_t
extLength
,
...
...
include/libs/planner/planner.h
浏览文件 @
ee52870b
...
...
@@ -178,7 +178,7 @@ struct SQueryNode;
* @param requestId
* @return
*/
int32_t
qCreateQueryDag
(
const
struct
SQueryNode
*
pQueryInfo
,
struct
SQueryDag
**
pDag
,
uint64_t
requestId
);
int32_t
qCreateQueryDag
(
const
struct
SQueryNode
*
pNode
,
struct
SQueryDag
**
pDag
,
SSchema
**
pResSchema
,
int32_t
*
numOfCols
,
SArray
*
pNodeList
,
uint64_t
requestId
);
// Set datasource of this subplan, multiple calls may be made to a subplan.
// @subplan subplan to be schedule
...
...
include/libs/planner/plannerOp.h
浏览文件 @
ee52870b
...
...
@@ -23,11 +23,13 @@
#error To use this include file, first define either INCLUDE_AS_ENUM or INCLUDE_AS_NAME
#endif
OP_ENUM_MACRO
(
StreamScan
)
OP_ENUM_MACRO
(
TableScan
)
OP_ENUM_MACRO
(
DataBlocksOptScan
)
OP_ENUM_MACRO
(
TableSeqScan
)
OP_ENUM_MACRO
(
TagScan
)
OP_ENUM_MACRO
(
SystemTableScan
)
OP_ENUM_MACRO
(
StreamBlockScan
)
OP_ENUM_MACRO
(
Aggregate
)
OP_ENUM_MACRO
(
Project
)
// OP_ENUM_MACRO(Groupby)
...
...
include/libs/qcom/query.h
浏览文件 @
ee52870b
...
...
@@ -109,12 +109,71 @@ typedef struct STableMetaOutput {
STableMeta
*
tbMeta
;
}
STableMetaOutput
;
const
SSchema
*
tGetTbnameColumnSchema
();
typedef
struct
SDataBuf
{
void
*
pData
;
uint32_t
len
;
}
SDataBuf
;
typedef
int32_t
(
*
__async_send_cb_fn_t
)(
void
*
param
,
const
SDataBuf
*
pMsg
,
int32_t
code
);
typedef
int32_t
(
*
__async_exec_fn_t
)(
void
*
param
);
typedef
struct
SMsgSendInfo
{
__async_send_cb_fn_t
fp
;
//async callback function
void
*
param
;
uint64_t
requestId
;
uint64_t
requestObjRefId
;
int32_t
msgType
;
SDataBuf
msgInfo
;
}
SMsgSendInfo
;
typedef
struct
SQueryNodeAddr
{
int32_t
nodeId
;
// vgId or qnodeId
int8_t
inUse
;
int8_t
numOfEps
;
SEpAddr
epAddr
[
TSDB_MAX_REPLICA
];
}
SQueryNodeAddr
;
static
FORCE_INLINE
void
tConvertQueryAddrToEpSet
(
SEpSet
*
pEpSet
,
const
SQueryNodeAddr
*
pAddr
)
{
pEpSet
->
inUse
=
pAddr
->
inUse
;
pEpSet
->
numOfEps
=
pAddr
->
numOfEps
;
for
(
int
j
=
0
;
j
<
TSDB_MAX_REPLICA
;
j
++
)
{
pEpSet
->
port
[
j
]
=
pAddr
->
epAddr
[
j
].
port
;
memcpy
(
pEpSet
->
fqdn
[
j
],
pAddr
->
epAddr
[
j
].
fqdn
,
TSDB_FQDN_LEN
);
}
}
int32_t
initTaskQueue
();
int32_t
cleanupTaskQueue
();
/**
*
* @param execFn The asynchronously execution function
* @param execParam The parameters of the execFn
* @param code The response code during execution the execFn
* @return
*/
int32_t
taosAsyncExec
(
__async_exec_fn_t
execFn
,
void
*
execParam
,
int32_t
*
code
);
/**
* Asynchronously send message to server, after the response received, the callback will be incured.
*
* @param pTransporter
* @param epSet
* @param pTransporterId
* @param pInfo
* @return
*/
int32_t
asyncSendMsgToServer
(
void
*
pTransporter
,
SEpSet
*
epSet
,
int64_t
*
pTransporterId
,
const
SMsgSendInfo
*
pInfo
);
void
initQueryModuleMsgHandle
();
const
SSchema
*
tGetTbnameColumnSchema
();
bool
tIsValidSchema
(
struct
SSchema
*
pSchema
,
int32_t
numOfCols
,
int32_t
numOfTags
);
extern
int32_t
(
*
queryBuildMsg
[
TDMT_MAX
])(
void
*
input
,
char
**
msg
,
int32_t
msgSize
,
int32_t
*
msgLen
);
extern
int32_t
(
*
queryProcessMsgRsp
[
TDMT_MAX
])(
void
*
output
,
char
*
msg
,
int32_t
msgSize
);
#define SET_META_TYPE_NONE(t) (t) = META_TYPE_NON_TABLE
#define SET_META_TYPE_CTABLE(t) (t) = META_TYPE_CTABLE
#define SET_META_TYPE_TABLE(t) (t) = META_TYPE_TABLE
...
...
include/libs/transport/trpc.h
浏览文件 @
ee52870b
...
...
@@ -83,56 +83,6 @@ int rpcGetConnInfo(void *thandle, SRpcConnInfo *pInfo);
void
rpcSendRecv
(
void
*
shandle
,
SEpSet
*
pEpSet
,
SRpcMsg
*
pReq
,
SRpcMsg
*
pRsp
);
int
rpcReportProgress
(
void
*
pConn
,
char
*
pCont
,
int
contLen
);
void
rpcCancelRequest
(
int64_t
rid
);
typedef
struct
SDataBuf
{
void
*
pData
;
uint32_t
len
;
}
SDataBuf
;
typedef
int32_t
(
*
__async_send_cb_fn_t
)(
void
*
param
,
const
SDataBuf
*
pMsg
,
int32_t
code
);
typedef
int32_t
(
*
__async_exec_fn_t
)(
void
*
param
);
typedef
struct
SMsgSendInfo
{
__async_send_cb_fn_t
fp
;
//async callback function
void
*
param
;
uint64_t
requestId
;
uint64_t
requestObjRefId
;
int32_t
msgType
;
SDataBuf
msgInfo
;
}
SMsgSendInfo
;
typedef
struct
SQueryNodeAddr
{
int32_t
nodeId
;
// vgId or qnodeId
int8_t
inUse
;
int8_t
numOfEps
;
SEpAddr
epAddr
[
TSDB_MAX_REPLICA
];
}
SQueryNodeAddr
;
bool
tIsValidSchema
(
struct
SSchema
*
pSchema
,
int32_t
numOfCols
,
int32_t
numOfTags
);
int32_t
initTaskQueue
();
int32_t
cleanupTaskQueue
();
/**
*
* @param execFn The asynchronously execution function
* @param execParam The parameters of the execFn
* @param code The response code during execution the execFn
* @return
*/
int32_t
taosAsyncExec
(
__async_exec_fn_t
execFn
,
void
*
execParam
,
int32_t
*
code
);
/**
* Asynchronously send message to server, after the response received, the callback will be incured.
*
* @param pTransporter
* @param epSet
* @param pTransporterId
* @param pInfo
* @return
*/
int32_t
asyncSendMsgToServer
(
void
*
pTransporter
,
SEpSet
*
epSet
,
int64_t
*
pTransporterId
,
const
SMsgSendInfo
*
pInfo
);
#ifdef __cplusplus
}
#endif
...
...
include/util/compare.h
浏览文件 @
ee52870b
...
...
@@ -13,8 +13,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _TD_UTIL_COMPARE_H
#define _TD_UTIL_COMPARE_H
#ifndef _TD_UTIL_COMPARE_H
_
#define _TD_UTIL_COMPARE_H
_
#ifdef __cplusplus
extern
"C"
{
...
...
@@ -35,67 +35,65 @@ extern "C" {
#define FLT_GREATEREQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) > (_y)))
#define FLT_LESSEQUAL(_x, _y) (FLT_EQUAL((_x), (_y)) || ((_x) < (_y)))
#define PATTERN_COMPARE_INFO_INITIALIZER { '%', '_' }
#define PATTERN_COMPARE_INFO_INITIALIZER \
{ '%', '_' }
typedef
struct
SPatternCompareInfo
{
char
matchAll
;
// symbol for match all wildcard, default: '%'
char
matchOne
;
// symbol for match one wildcard, default: '_'
}
SPatternCompareInfo
;
int
patternMatch
(
const
char
*
pattern
,
const
char
*
str
,
size_t
size
,
const
SPatternCompareInfo
*
pInfo
);
int
32_t
patternMatch
(
const
char
*
pattern
,
const
char
*
str
,
size_t
size
,
const
SPatternCompareInfo
*
pInfo
);
int
WCSPatternMatch
(
const
wchar_t
*
pattern
,
const
wchar_t
*
str
,
size_t
size
,
const
SPatternCompareInfo
*
pInfo
);
int
32_t
WCSPatternMatch
(
const
wchar_t
*
pattern
,
const
wchar_t
*
str
,
size_t
size
,
const
SPatternCompareInfo
*
pInfo
);
int32_t
taosArrayCompareString
(
const
void
*
a
,
const
void
*
b
);
int32_t
taosArrayCompareString
(
const
void
*
a
,
const
void
*
b
);
int32_t
setCompareBytes1
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
setCompareBytes2
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
setCompareBytes4
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
setCompareBytes8
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt8Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt16Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt32Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt64Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt16Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt8Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint8Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint16Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint32Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint64Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint16Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint8Val
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareFloatVal
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareDoubleVal
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareLenPrefixedStr
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareLenPrefixedWStr
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareStrRegexComp
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareStrRegexCompMatch
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareStrRegexCompNMatch
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareFindItemInSet
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareStrRegexComp
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareStrRegexCompMatch
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareStrRegexCompNMatch
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareFindItemInSet
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt8ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt16ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt32ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt64ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareFloatValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareDoubleValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint8ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint16ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint32ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint64ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareLenPrefixedStrDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareLenPrefixedWStrDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt16ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt32ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareInt64ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareFloatValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareDoubleValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint8ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint16ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint32ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareUint64ValDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareLenPrefixedStrDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
int32_t
compareLenPrefixedWStrDesc
(
const
void
*
pLeft
,
const
void
*
pRight
);
#ifdef __cplusplus
}
#endif
#endif
/*_TD_UTIL_COMPARE_H
*/
#endif
/*_TD_UTIL_COMPARE_H_
*/
include/util/tcoding.h
浏览文件 @
ee52870b
...
...
@@ -372,7 +372,7 @@ static FORCE_INLINE void *taosDecodeStringTo(void *buf, char *value) {
}
// ---- binary
static
FORCE_INLINE
int
taosEncodeBinary
(
void
**
buf
,
const
void
*
value
,
int
valueLen
)
{
static
FORCE_INLINE
int
taosEncodeBinary
(
void
**
buf
,
const
void
*
value
,
int
32_t
valueLen
)
{
int
tlen
=
0
;
if
(
buf
!=
NULL
)
{
...
...
@@ -384,14 +384,19 @@ static FORCE_INLINE int taosEncodeBinary(void **buf, const void *value, int valu
return
tlen
;
}
static
FORCE_INLINE
void
*
taosDecodeBinary
(
void
*
buf
,
void
**
value
,
int
valueLen
)
{
uint64_t
size
=
0
;
static
FORCE_INLINE
void
*
taosDecodeBinary
(
void
*
buf
,
void
**
value
,
int32_t
valueLen
)
{
*
value
=
malloc
((
size_t
)
valueLen
);
if
(
*
value
==
NULL
)
return
NULL
;
memcpy
(
*
value
,
buf
,
(
size_t
)
size
);
memcpy
(
*
value
,
buf
,
(
size_t
)
valueLen
);
return
POINTER_SHIFT
(
buf
,
size
);
return
POINTER_SHIFT
(
buf
,
valueLen
);
}
static
FORCE_INLINE
void
*
taosDecodeBinaryTo
(
void
*
buf
,
void
*
value
,
int32_t
valueLen
)
{
memcpy
(
value
,
buf
,
(
size_t
)
valueLen
);
return
POINTER_SHIFT
(
buf
,
valueLen
);
}
#endif
...
...
source/client/inc/clientInt.h
浏览文件 @
ee52870b
...
...
@@ -136,6 +136,7 @@ typedef struct SReqResultInfo {
TAOS_ROW
row
;
char
**
pCol
;
uint32_t
numOfRows
;
uint64_t
totalRows
;
uint32_t
current
;
bool
completed
;
}
SReqResultInfo
;
...
...
source/client/src/clientEnv.c
浏览文件 @
ee52870b
...
...
@@ -110,7 +110,7 @@ void* openTransporter(const char *user, const char *auth, int32_t numOfThread) {
rpcInit
.
user
=
(
char
*
)
user
;
rpcInit
.
idleTime
=
tsShellActivityTimer
*
1000
;
rpcInit
.
ckey
=
"key"
;
//
rpcInit.spi = 1;
rpcInit
.
spi
=
1
;
rpcInit
.
secret
=
(
char
*
)
auth
;
void
*
pDnodeConn
=
rpcOpen
(
&
rpcInit
);
...
...
@@ -196,6 +196,10 @@ static void doDestroyRequest(void* p) {
doFreeReqResultInfo
(
&
pRequest
->
body
.
resInfo
);
qDestroyQueryDag
(
pRequest
->
body
.
pDag
);
if
(
pRequest
->
body
.
showInfo
.
pArray
!=
NULL
)
{
taosArrayDestroy
(
pRequest
->
body
.
showInfo
.
pArray
);
}
deregisterRequest
(
pRequest
);
tfree
(
pRequest
);
}
...
...
source/client/src/clientImpl.c
浏览文件 @
ee52870b
...
...
@@ -25,9 +25,9 @@
static
int32_t
initEpSetFromCfg
(
const
char
*
firstEp
,
const
char
*
secondEp
,
SCorEpSet
*
pEpSet
);
static
SMsgSendInfo
*
buildConnectMsg
(
SRequestObj
*
pRequest
);
static
void
destroySendMsgInfo
(
SMsgSendInfo
*
pMsgBody
);
static
void
setQueryResult
By
Rsp
(
SReqResultInfo
*
pResultInfo
,
const
SRetrieveTableRsp
*
pRsp
);
static
void
setQueryResult
From
Rsp
(
SReqResultInfo
*
pResultInfo
,
const
SRetrieveTableRsp
*
pRsp
);
static
bool
stringLengthCheck
(
const
char
*
str
,
size_t
maxsize
)
{
static
bool
stringLengthCheck
(
const
char
*
str
,
size_t
maxsize
)
{
if
(
str
==
NULL
)
{
return
false
;
}
...
...
@@ -59,7 +59,7 @@ static char* getClusterKey(const char* user, const char* auth, const char* ip, i
}
static
STscObj
*
taosConnectImpl
(
const
char
*
user
,
const
char
*
auth
,
const
char
*
db
,
uint16_t
port
,
__taos_async_fn_t
fp
,
void
*
param
,
SAppInstInfo
*
pAppInfo
);
static
void
setResSchemaInfo
(
SReqResultInfo
*
pResInfo
,
const
SDataBlockSchema
*
pDataBlockSchema
);
static
void
setResSchemaInfo
(
SReqResultInfo
*
pResInfo
,
const
SSchema
*
pSchema
,
int32_t
numOfCols
);
TAOS
*
taos_connect_internal
(
const
char
*
ip
,
const
char
*
user
,
const
char
*
pass
,
const
char
*
auth
,
const
char
*
db
,
uint16_t
port
)
{
if
(
taos_init
()
!=
TSDB_CODE_SUCCESS
)
{
...
...
@@ -117,7 +117,7 @@ TAOS *taos_connect_internal(const char *ip, const char *user, const char *pass,
SAppInstInfo
*
p
=
calloc
(
1
,
sizeof
(
struct
SAppInstInfo
));
p
->
mgmtEp
=
epSet
;
p
->
pTransporter
=
openTransporter
(
user
,
secretEncrypt
,
tsNumOfCores
);
p
->
pAppHbMgr
=
appHbMgrInit
(
p
);
/*p->pAppHbMgr = appHbMgrInit(p);*/
taosHashPut
(
appInfo
.
pInstMap
,
key
,
strlen
(
key
),
&
p
,
POINTER_BYTES
);
pInst
=
&
p
;
...
...
@@ -202,43 +202,38 @@ int32_t execDdlQuery(SRequestObj* pRequest, SQueryNode* pQuery) {
return
TSDB_CODE_SUCCESS
;
}
int32_t
getPlan
(
SRequestObj
*
pRequest
,
SQueryNode
*
pQueryNode
,
SQueryDag
**
pDag
)
{
int32_t
getPlan
(
SRequestObj
*
pRequest
,
SQueryNode
*
pQueryNode
,
SQueryDag
**
pDag
,
SArray
*
pNodeList
)
{
pRequest
->
type
=
pQueryNode
->
type
;
SReqResultInfo
*
pResInfo
=
&
pRequest
->
body
.
resInfo
;
int32_t
code
=
qCreateQueryDag
(
pQueryNode
,
pDag
,
pRequest
->
requestId
);
SSchema
*
pSchema
=
NULL
;
int32_t
numOfCols
=
0
;
int32_t
code
=
qCreateQueryDag
(
pQueryNode
,
pDag
,
&
pSchema
,
&
numOfCols
,
pNodeList
,
pRequest
->
requestId
);
if
(
code
!=
0
)
{
return
code
;
}
if
(
pQueryNode
->
type
==
TSDB_SQL_SELECT
)
{
SArray
*
pa
=
taosArrayGetP
((
*
pDag
)
->
pSubplans
,
0
);
SSubplan
*
pPlan
=
taosArrayGetP
(
pa
,
0
);
SDataBlockSchema
*
pDataBlockSchema
=
&
(
pPlan
->
pDataSink
->
schema
);
setResSchemaInfo
(
pResInfo
,
pDataBlockSchema
);
setResSchemaInfo
(
&
pRequest
->
body
.
resInfo
,
pSchema
,
numOfCols
);
pRequest
->
type
=
TDMT_VND_QUERY
;
}
return
code
;
}
void
setResSchemaInfo
(
SReqResultInfo
*
pResInfo
,
const
S
DataBlockSchema
*
pDataBlockSchema
)
{
assert
(
p
DataBlockSchema
!=
NULL
&&
pDataBlockSchema
->
numOfCols
>
0
);
void
setResSchemaInfo
(
SReqResultInfo
*
pResInfo
,
const
S
Schema
*
pSchema
,
int32_t
numOfCols
)
{
assert
(
p
Schema
!=
NULL
&&
numOfCols
>
0
);
pResInfo
->
numOfCols
=
pDataBlockSchema
->
numOfCols
;
pResInfo
->
fields
=
calloc
(
pDataBlockSchema
->
numOfCols
,
sizeof
(
pDataBlockSchema
->
pSchema
[
0
]));
pResInfo
->
numOfCols
=
numOfCols
;
pResInfo
->
fields
=
calloc
(
numOfCols
,
sizeof
(
pSchema
[
0
]));
for
(
int32_t
i
=
0
;
i
<
pResInfo
->
numOfCols
;
++
i
)
{
SSchema
*
pSchema
=
&
pDataBlockSchema
->
pSchema
[
i
];
pResInfo
->
fields
[
i
].
bytes
=
pSchema
->
bytes
;
pResInfo
->
fields
[
i
].
type
=
pSchema
->
type
;
tstrncpy
(
pResInfo
->
fields
[
i
].
name
,
pSchema
->
name
,
tListLen
(
pResInfo
->
fields
[
i
].
name
));
pResInfo
->
fields
[
i
].
bytes
=
pSchema
[
i
].
bytes
;
pResInfo
->
fields
[
i
].
type
=
pSchema
[
i
].
type
;
tstrncpy
(
pResInfo
->
fields
[
i
].
name
,
pSchema
[
i
].
name
,
tListLen
(
pResInfo
->
fields
[
i
].
name
));
}
}
int32_t
scheduleQuery
(
SRequestObj
*
pRequest
,
SQueryDag
*
pDag
)
{
int32_t
scheduleQuery
(
SRequestObj
*
pRequest
,
SQueryDag
*
pDag
,
SArray
*
pNodeList
)
{
if
(
TSDB_SQL_INSERT
==
pRequest
->
type
||
TSDB_SQL_CREATE_TABLE
==
pRequest
->
type
)
{
SQueryResult
res
=
{.
code
=
0
,
.
numOfRows
=
0
,
.
msgSize
=
ERROR_MSG_BUF_DEFAULT_SIZE
,
.
msg
=
pRequest
->
msgBuf
};
...
...
@@ -256,14 +251,7 @@ int32_t scheduleQuery(SRequestObj* pRequest, SQueryDag* pDag) {
return
pRequest
->
code
;
}
SArray
*
execNode
=
taosArrayInit
(
4
,
sizeof
(
SQueryNodeAddr
));
SQueryNodeAddr
addr
=
{.
numOfEps
=
1
,
.
inUse
=
0
,
.
nodeId
=
2
};
addr
.
epAddr
[
0
].
port
=
7100
;
strcpy
(
addr
.
epAddr
[
0
].
fqdn
,
"localhost"
);
taosArrayPush
(
execNode
,
&
addr
);
return
schedulerAsyncExecJob
(
pRequest
->
pTscObj
->
pAppInfo
->
pTransporter
,
execNode
,
pDag
,
&
pRequest
->
body
.
pQueryJob
);
return
schedulerAsyncExecJob
(
pRequest
->
pTscObj
->
pAppInfo
->
pTransporter
,
pNodeList
,
pDag
,
&
pRequest
->
body
.
pQueryJob
);
}
typedef
struct
tmq_t
tmq_t
;
...
...
@@ -394,15 +382,22 @@ TAOS_RES *taos_create_topic(TAOS* taos, const char* topicName, const char* sql,
CHECK_CODE_GOTO
(
buildRequest
(
pTscObj
,
sql
,
sqlLen
,
&
pRequest
),
_return
);
CHECK_CODE_GOTO
(
parseSql
(
pRequest
,
&
pQueryNode
),
_return
);
SQueryStmtInfo
*
pQueryStmtInfo
=
(
SQueryStmtInfo
*
)
pQueryNode
;
pQueryStmtInfo
->
info
.
continueQuery
=
true
;
// todo check for invalid sql statement and return with error code
CHECK_CODE_GOTO
(
qCreateQueryDag
(
pQueryNode
,
&
pRequest
->
body
.
pDag
,
pRequest
->
requestId
),
_return
);
SSchema
*
schema
=
NULL
;
int32_t
numOfCols
=
0
;
CHECK_CODE_GOTO
(
qCreateQueryDag
(
pQueryNode
,
&
pRequest
->
body
.
pDag
,
&
schema
,
&
numOfCols
,
NULL
,
pRequest
->
requestId
),
_return
);
pStr
=
qDagToString
(
pRequest
->
body
.
pDag
);
if
(
pStr
==
NULL
)
{
goto
_return
;
}
printf
(
"%s
\n
"
,
pStr
);
// The topic should be related to a database that the queried table is belonged to.
SName
name
=
{
0
};
char
dbName
[
TSDB_DB_FNAME_LEN
]
=
{
0
};
...
...
@@ -487,6 +482,7 @@ TAOS_RES *taos_query_l(TAOS *taos, const char *sql, int sqlLen) {
SRequestObj
*
pRequest
=
NULL
;
SQueryNode
*
pQueryNode
=
NULL
;
SArray
*
pNodeList
=
taosArrayInit
(
4
,
sizeof
(
struct
SQueryNodeAddr
));
terrno
=
TSDB_CODE_SUCCESS
;
CHECK_CODE_GOTO
(
buildRequest
(
pTscObj
,
sql
,
sqlLen
,
&
pRequest
),
_return
);
...
...
@@ -495,8 +491,8 @@ TAOS_RES *taos_query_l(TAOS *taos, const char *sql, int sqlLen) {
if
(
qIsDdlQuery
(
pQueryNode
))
{
CHECK_CODE_GOTO
(
execDdlQuery
(
pRequest
,
pQueryNode
),
_return
);
}
else
{
CHECK_CODE_GOTO
(
getPlan
(
pRequest
,
pQueryNode
,
&
pRequest
->
body
.
pDag
),
_return
);
CHECK_CODE_GOTO
(
scheduleQuery
(
pRequest
,
pRequest
->
body
.
pDag
),
_return
);
CHECK_CODE_GOTO
(
getPlan
(
pRequest
,
pQueryNode
,
&
pRequest
->
body
.
pDag
,
pNodeList
),
_return
);
CHECK_CODE_GOTO
(
scheduleQuery
(
pRequest
,
pRequest
->
body
.
pDag
,
pNodeList
),
_return
);
pRequest
->
code
=
terrno
;
}
...
...
@@ -566,7 +562,7 @@ STscObj* taosConnectImpl(const char *user, const char *auth, const char *db, uin
tsem_wait
(
&
pRequest
->
body
.
rspSem
);
if
(
pRequest
->
code
!=
TSDB_CODE_SUCCESS
)
{
const
char
*
errorMsg
=
(
pRequest
->
code
==
TSDB_CODE_RPC_FQDN_ERROR
)
?
taos_errstr
(
pRequest
)
:
tstrerror
(
terrno
);
const
char
*
errorMsg
=
(
pRequest
->
code
==
TSDB_CODE_RPC_FQDN_ERROR
)
?
taos_errstr
(
pRequest
)
:
tstrerror
(
pRequest
->
code
);
printf
(
"failed to connect to server, reason: %s
\n\n
"
,
errorMsg
);
destroyRequest
(
pRequest
);
...
...
@@ -714,13 +710,17 @@ void* doFetchRow(SRequestObj* pRequest) {
return
NULL
;
}
int32_t
code
=
schedulerFetchRows
(
pRequest
->
body
.
pQueryJob
,
(
void
**
)
&
pRequest
->
body
.
resInfo
.
pData
);
SReqResultInfo
*
pResInfo
=
&
pRequest
->
body
.
resInfo
;
int32_t
code
=
schedulerFetchRows
(
pRequest
->
body
.
pQueryJob
,
(
void
**
)
&
pResInfo
->
pData
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
pRequest
->
code
=
code
;
return
NULL
;
}
setQueryResultByRsp
(
&
pRequest
->
body
.
resInfo
,
(
SRetrieveTableRsp
*
)
pRequest
->
body
.
resInfo
.
pData
);
setQueryResultFromRsp
(
&
pRequest
->
body
.
resInfo
,
(
SRetrieveTableRsp
*
)
pResInfo
->
pData
);
tscDebug
(
"0x%"
PRIx64
" fetch results, numOfRows:%d total Rows:%"
PRId64
", complete:%d, reqId:0x%"
PRIx64
,
pRequest
->
self
,
pResInfo
->
numOfRows
,
pResInfo
->
totalRows
,
pResInfo
->
completed
,
pRequest
->
requestId
);
if
(
pResultInfo
->
numOfRows
==
0
)
{
return
NULL
;
}
...
...
@@ -850,7 +850,7 @@ void setConnectionDB(STscObj* pTscObj, const char* db) {
pthread_mutex_unlock
(
&
pTscObj
->
mutex
);
}
void
setQueryResult
By
Rsp
(
SReqResultInfo
*
pResultInfo
,
const
SRetrieveTableRsp
*
pRsp
)
{
void
setQueryResult
From
Rsp
(
SReqResultInfo
*
pResultInfo
,
const
SRetrieveTableRsp
*
pRsp
)
{
assert
(
pResultInfo
!=
NULL
&&
pRsp
!=
NULL
);
pResultInfo
->
pRspMsg
=
(
const
char
*
)
pRsp
;
...
...
@@ -859,5 +859,6 @@ void setQueryResultByRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* p
pResultInfo
->
current
=
0
;
pResultInfo
->
completed
=
(
pRsp
->
completed
==
1
);
pResultInfo
->
totalRows
+=
pResultInfo
->
numOfRows
;
setResultDataPtr
(
pResultInfo
,
pResultInfo
->
fields
,
pResultInfo
->
numOfCols
,
pResultInfo
->
numOfRows
);
}
source/client/src/clientMsgHandler.c
浏览文件 @
ee52870b
...
...
@@ -72,7 +72,7 @@ int processConnectRsp(void* param, const SDataBuf* pMsg, int32_t code) {
atomic_add_fetch_64
(
&
pTscObj
->
pAppInfo
->
numOfConns
,
1
);
SClientHbKey
connKey
=
{.
connId
=
pConnect
->
connId
,
.
hbType
=
HEARTBEAT_TYPE_QUERY
};
hbRegisterConn
(
pTscObj
->
pAppInfo
->
pAppHbMgr
,
connKey
,
NULL
);
/*hbRegisterConn(pTscObj->pAppInfo->pAppHbMgr, connKey, NULL);*/
// pRequest->body.resInfo.pRspMsg = pMsg->pData;
tscDebug
(
"0x%"
PRIx64
" clusterId:%"
PRId64
", totalConn:%"
PRId64
,
pRequest
->
requestId
,
pConnect
->
clusterId
,
...
...
@@ -145,19 +145,23 @@ int32_t processShowRsp(void* param, const SDataBuf* pMsg, int32_t code) {
}
pSchema
=
pMetaMsg
->
pSchema
;
TAOS_FIELD
*
pFields
=
calloc
(
pMetaMsg
->
numOfColumns
,
sizeof
(
TAOS_FIELD
));
for
(
int32_t
i
=
0
;
i
<
pMetaMsg
->
numOfColumns
;
++
i
)
{
tstrncpy
(
pFields
[
i
].
name
,
pSchema
[
i
].
name
,
tListLen
(
pFields
[
i
].
name
));
pFields
[
i
].
type
=
pSchema
[
i
].
type
;
pFields
[
i
].
bytes
=
pSchema
[
i
].
bytes
;
}
tfree
(
pRequest
->
body
.
resInfo
.
pRspMsg
);
pRequest
->
body
.
resInfo
.
pRspMsg
=
pMsg
->
pData
;
SReqResultInfo
*
pResInfo
=
&
pRequest
->
body
.
resInfo
;
pResInfo
->
fields
=
pFields
;
pResInfo
->
numOfCols
=
pMetaMsg
->
numOfColumns
;
if
(
pResInfo
->
fields
==
NULL
)
{
TAOS_FIELD
*
pFields
=
calloc
(
pMetaMsg
->
numOfColumns
,
sizeof
(
TAOS_FIELD
));
for
(
int32_t
i
=
0
;
i
<
pMetaMsg
->
numOfColumns
;
++
i
)
{
tstrncpy
(
pFields
[
i
].
name
,
pSchema
[
i
].
name
,
tListLen
(
pFields
[
i
].
name
));
pFields
[
i
].
type
=
pSchema
[
i
].
type
;
pFields
[
i
].
bytes
=
pSchema
[
i
].
bytes
;
}
pResInfo
->
fields
=
pFields
;
}
pResInfo
->
numOfCols
=
pMetaMsg
->
numOfColumns
;
pRequest
->
body
.
showInfo
.
execId
=
pShow
->
showId
;
// todo
...
...
source/client/test/clientTests.cpp
浏览文件 @
ee52870b
...
...
@@ -17,8 +17,9 @@
#include <taoserror.h>
#include <tglobal.h>
#include <iostream>
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wsign-compare"
...
...
@@ -451,39 +452,39 @@ TEST(testCase, driverInit_Test) {
//
// taos_close(pConn);
//}
//
//
TEST(testCase, show_table_Test) {
//
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
//
assert(pConn != NULL);
//
//
TAOS_RES* pRes = taos_query(pConn, "show tables");
//
if (taos_errno(pRes) != 0) {
//
printf("failed to show tables, reason:%s\n", taos_errstr(pRes));
//
taos_free_result(pRes);
//
}
//
//
pRes = taos_query(pConn, "show abc1.tables");
//
if (taos_errno(pRes) != 0) {
//
printf("failed to show tables, reason:%s\n", taos_errstr(pRes));
//
taos_free_result(pRes);
//
}
//
//
TAOS_ROW pRow = NULL;
//
TAOS_FIELD* pFields = taos_fetch_fields(pRes);
//
int32_t numOfFields = taos_num_fields(pRes);
//
//
int32_t count = 0;
//
char str[512] = {0};
//
//
while ((pRow = taos_fetch_row(pRes)) != NULL) {
//
int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
//
printf("%d: %s\n", ++count, str);
//
}
//
//
taos_free_result(pRes);
//
taos_close(pConn);
//
}
//
TEST
(
testCase
,
show_table_Test
)
{
TAOS
*
pConn
=
taos_connect
(
"localhost"
,
"root"
,
"taosdata"
,
NULL
,
0
);
assert
(
pConn
!=
NULL
);
TAOS_RES
*
pRes
=
taos_query
(
pConn
,
"show tables"
);
if
(
taos_errno
(
pRes
)
!=
0
)
{
printf
(
"failed to show tables, reason:%s
\n
"
,
taos_errstr
(
pRes
));
taos_free_result
(
pRes
);
}
pRes
=
taos_query
(
pConn
,
"show abc1.tables"
);
if
(
taos_errno
(
pRes
)
!=
0
)
{
printf
(
"failed to show tables, reason:%s
\n
"
,
taos_errstr
(
pRes
));
taos_free_result
(
pRes
);
}
TAOS_ROW
pRow
=
NULL
;
TAOS_FIELD
*
pFields
=
taos_fetch_fields
(
pRes
);
int32_t
numOfFields
=
taos_num_fields
(
pRes
);
int32_t
count
=
0
;
char
str
[
512
]
=
{
0
};
while
((
pRow
=
taos_fetch_row
(
pRes
))
!=
NULL
)
{
int32_t
code
=
taos_print_row
(
str
,
pRow
,
pFields
,
numOfFields
);
printf
(
"%d: %s
\n
"
,
++
count
,
str
);
}
taos_free_result
(
pRes
);
taos_close
(
pConn
);
}
//TEST(testCase, drop_stable_Test) {
// TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
// assert(pConn != NULL);
...
...
@@ -548,7 +549,7 @@ TEST(testCase, driverInit_Test) {
// taos_free_result(pRes);
// taos_close(pConn);
//}
//
//TEST(testCase, insert_test) {
// TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
// ASSERT_NE(pConn, nullptr);
...
...
@@ -566,38 +567,66 @@ TEST(testCase, driverInit_Test) {
// taos_free_result(pRes);
// taos_close(pConn);
//}
//
//TEST(testCase, projection_query_tables) {
TEST
(
testCase
,
projection_query_tables
)
{
TAOS
*
pConn
=
taos_connect
(
"localhost"
,
"root"
,
"taosdata"
,
NULL
,
0
);
ASSERT_NE
(
pConn
,
nullptr
);
TAOS_RES
*
pRes
=
taos_query
(
pConn
,
"use abc1"
);
taos_free_result
(
pRes
);
pRes
=
taos_query
(
pConn
,
"create stable st1 (ts timestamp, k int) tags(a int)"
);
if
(
taos_errno
(
pRes
)
!=
0
)
{
printf
(
"failed to create table tu, reason:%s
\n
"
,
taos_errstr
(
pRes
));
}
taos_free_result
(
pRes
);
pRes
=
taos_query
(
pConn
,
"create table tu using st1 tags(1)"
);
if
(
taos_errno
(
pRes
)
!=
0
)
{
printf
(
"failed to create table tu, reason:%s
\n
"
,
taos_errstr
(
pRes
));
}
taos_free_result
(
pRes
);
for
(
int32_t
i
=
0
;
i
<
100000
;
++
i
)
{
char
sql
[
512
]
=
{
0
};
sprintf
(
sql
,
"insert into tu values(now+%da, %d)"
,
i
,
i
);
TAOS_RES
*
p
=
taos_query
(
pConn
,
sql
);
if
(
taos_errno
(
p
)
!=
0
)
{
printf
(
"failed to insert data, reason:%s
\n
"
,
taos_errstr
(
p
));
}
taos_free_result
(
p
);
}
pRes
=
taos_query
(
pConn
,
"select * from tu"
);
if
(
taos_errno
(
pRes
)
!=
0
)
{
printf
(
"failed to select from table, reason:%s
\n
"
,
taos_errstr
(
pRes
));
taos_free_result
(
pRes
);
ASSERT_TRUE
(
false
);
}
TAOS_ROW
pRow
=
NULL
;
TAOS_FIELD
*
pFields
=
taos_fetch_fields
(
pRes
);
int32_t
numOfFields
=
taos_num_fields
(
pRes
);
char
str
[
512
]
=
{
0
};
while
((
pRow
=
taos_fetch_row
(
pRes
))
!=
NULL
)
{
int32_t
code
=
taos_print_row
(
str
,
pRow
,
pFields
,
numOfFields
);
printf
(
"%s
\n
"
,
str
);
}
taos_free_result
(
pRes
);
taos_close
(
pConn
);
}
//TEST(testCase, projection_query_stables) {
// TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
// ASSERT_NE(pConn, nullptr);
//
// TAOS_RES* pRes = taos_query(pConn, "use abc1");
// taos_free_result(pRes);
//
//// pRes = taos_query(pConn, "create stable st1 (ts timestamp, k int) tags(a int)");
//// if (taos_errno(pRes) != 0) {
//// printf("failed to create table tu, reason:%s\n", taos_errstr(pRes));
//// }
//// taos_free_result(pRes);
////
//// pRes = taos_query(pConn, "create table tu using st1 tags(1)");
//// if (taos_errno(pRes) != 0) {
//// printf("failed to create table tu, reason:%s\n", taos_errstr(pRes));
//// }
//// taos_free_result(pRes);
////
//// for(int32_t i = 0; i < 100; ++i) {
//// char sql[512] = {0};
//// sprintf(sql, "insert into tu values(now+%da, %d)", i, i);
//// TAOS_RES* p = taos_query(pConn, sql);
//// if (taos_errno(p) != 0) {
//// printf("failed to insert data, reason:%s\n", taos_errstr(p));
//// }
////
//// taos_free_result(p);
//// }
//
// pRes = taos_query(pConn, "select * from tu");
// pRes = taos_query(pConn, "select ts from m1");
// if (taos_errno(pRes) != 0) {
// printf("failed to select from table, reason:%s\n", taos_errstr(pRes));
// taos_free_result(pRes);
...
...
@@ -617,15 +646,21 @@ TEST(testCase, driverInit_Test) {
// taos_free_result(pRes);
// taos_close(pConn);
//}
//
//TEST(testCase,
projection_query_s
tables) {
//TEST(testCase,
agg_query_
tables) {
// TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
// ASSERT_NE(pConn, nullptr);
//
// TAOS_RES* pRes = taos_query(pConn, "use
abc1
");
// TAOS_RES* pRes = taos_query(pConn, "use
dbv
");
// taos_free_result(pRes);
//
// pRes = taos_query(pConn, "select ts from m1");
// pRes = taos_query(pConn, "create table tx using st tags(111111111111111)");
// if (taos_errno(pRes) != 0) {
// printf("failed to create table, reason:%s\n", taos_errstr(pRes));
// }
// taos_free_result(pRes);
//
// pRes = taos_query(pConn, "select count(*) from tu");
// if (taos_errno(pRes) != 0) {
// printf("failed to select from table, reason:%s\n", taos_errstr(pRes));
// taos_free_result(pRes);
...
...
@@ -646,30 +681,4 @@ TEST(testCase, driverInit_Test) {
// taos_close(pConn);
//}
TEST
(
testCase
,
agg_query_tables
)
{
TAOS
*
pConn
=
taos_connect
(
"localhost"
,
"root"
,
"taosdata"
,
NULL
,
0
);
ASSERT_NE
(
pConn
,
nullptr
);
TAOS_RES
*
pRes
=
taos_query
(
pConn
,
"use abc1"
);
taos_free_result
(
pRes
);
pRes
=
taos_query
(
pConn
,
"select count(*) from tu"
);
if
(
taos_errno
(
pRes
)
!=
0
)
{
printf
(
"failed to select from table, reason:%s
\n
"
,
taos_errstr
(
pRes
));
taos_free_result
(
pRes
);
ASSERT_TRUE
(
false
);
}
TAOS_ROW
pRow
=
NULL
;
TAOS_FIELD
*
pFields
=
taos_fetch_fields
(
pRes
);
int32_t
numOfFields
=
taos_num_fields
(
pRes
);
char
str
[
512
]
=
{
0
};
while
((
pRow
=
taos_fetch_row
(
pRes
))
!=
NULL
)
{
int32_t
code
=
taos_print_row
(
str
,
pRow
,
pFields
,
numOfFields
);
printf
(
"%s
\n
"
,
str
);
}
taos_free_result
(
pRes
);
taos_close
(
pConn
);
}
\ No newline at end of file
#pragma GCC diagnostic pop
\ No newline at end of file
source/common/src/tglobal.c
浏览文件 @
ee52870b
...
...
@@ -44,7 +44,7 @@ int32_t tsRpcTimer = 300;
int32_t
tsRpcMaxTime
=
600
;
// seconds;
int32_t
tsRpcForceTcp
=
1
;
// disable this, means query, show command use udp protocol as default
int32_t
tsMaxShellConns
=
50000
;
int32_t
tsMaxConnections
=
5000
;
int32_t
tsMaxConnections
=
5000
0
;
int32_t
tsShellActivityTimer
=
3
;
// second
float
tsNumOfThreadsPerCore
=
1
.
0
f
;
int32_t
tsNumOfCommitThreads
=
4
;
...
...
source/common/src/ttime.c
浏览文件 @
ee52870b
...
...
@@ -100,12 +100,12 @@ int32_t taosParseTime(const char* timestr, int64_t* time, int32_t len, int32_t t
}
else
if
(
checkTzPresent
(
timestr
,
len
))
{
return
parseTimeWithTz
(
timestr
,
time
,
timePrec
,
0
);
}
else
{
return
(
*
parseLocaltimeFp
[
day_light
])(
timestr
,
time
,
timePrec
);
return
(
*
parseLocaltimeFp
[
day_light
])(
(
char
*
)
timestr
,
time
,
timePrec
);
}
}
bool
checkTzPresent
(
const
char
*
str
,
int32_t
len
)
{
char
*
seg
=
forwardToTimeStringEnd
(
str
);
bool
checkTzPresent
(
const
char
*
str
,
int32_t
len
)
{
char
*
seg
=
forwardToTimeStringEnd
((
char
*
)
str
);
int32_t
seg_len
=
len
-
(
int32_t
)(
seg
-
str
);
char
*
c
=
&
seg
[
seg_len
-
1
];
...
...
@@ -267,7 +267,7 @@ int32_t parseTimeWithTz(const char* timestr, int64_t* time, int32_t timePrec, ch
#endif
int64_t
fraction
=
0
;
str
=
forwardToTimeStringEnd
(
timestr
);
str
=
forwardToTimeStringEnd
(
(
char
*
)
timestr
);
if
((
str
[
0
]
==
'Z'
||
str
[
0
]
==
'z'
)
&&
str
[
1
]
==
'\0'
)
{
/* utc time, no millisecond, return directly*/
...
...
source/common/test/commonTests.cpp
浏览文件 @
ee52870b
#include <gtest/gtest.h>
#include <iostream>
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
#pragma GCC diagnostic ignored "-Wunused-function"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
...
...
@@ -94,3 +95,5 @@ TEST(testCase, toInteger_test) {
ret
=
toInteger
(
s
,
strlen
(
s
),
10
,
&
val
,
&
sign
);
ASSERT_EQ
(
ret
,
-
1
);
}
#pragma GCC diagnostic pop
\ No newline at end of file
source/dnode/mgmt/impl/src/dndMnode.c
浏览文件 @
ee52870b
...
...
@@ -621,5 +621,7 @@ int32_t dndGetUserAuthFromMnode(SDnode *pDnode, char *user, char *spi, char *enc
int32_t
code
=
mndRetriveAuth
(
pMnode
,
user
,
spi
,
encrypt
,
secret
,
ckey
);
dndReleaseMnode
(
pDnode
,
pMnode
);
dTrace
(
"user:%s, retrieve auth spi:%d encrypt:%d"
,
user
,
*
spi
,
*
encrypt
);
return
code
;
}
source/dnode/mgmt/impl/src/dndTransport.c
浏览文件 @
ee52870b
...
...
@@ -172,7 +172,7 @@ static int32_t dndInitClient(SDnode *pDnode) {
SRpcInit
rpcInit
;
memset
(
&
rpcInit
,
0
,
sizeof
(
rpcInit
));
rpcInit
.
label
=
"D
ND
-C"
;
rpcInit
.
label
=
"D-C"
;
rpcInit
.
numOfThreads
=
1
;
rpcInit
.
cfp
=
dndProcessResponse
;
rpcInit
.
sessions
=
1024
;
...
...
@@ -180,9 +180,13 @@ static int32_t dndInitClient(SDnode *pDnode) {
rpcInit
.
idleTime
=
pDnode
->
cfg
.
shellActivityTimer
*
1000
;
rpcInit
.
user
=
INTERNAL_USER
;
rpcInit
.
ckey
=
INTERNAL_CKEY
;
rpcInit
.
s
ecret
=
INTERNAL_SECRET
;
rpcInit
.
s
pi
=
1
;
rpcInit
.
parent
=
pDnode
;
char
pass
[
TSDB_PASSWORD_LEN
+
1
]
=
{
0
};
taosEncryptPass_c
((
uint8_t
*
)(
INTERNAL_SECRET
),
strlen
(
INTERNAL_SECRET
),
pass
);
rpcInit
.
secret
=
pass
;
pMgmt
->
clientRpc
=
rpcOpen
(
&
rpcInit
);
if
(
pMgmt
->
clientRpc
==
NULL
)
{
dError
(
"failed to init rpc client"
);
...
...
@@ -257,20 +261,18 @@ static void dndSendMsgToMnodeRecv(SDnode *pDnode, SRpcMsg *pRpcMsg, SRpcMsg *pRp
static
int32_t
dndAuthInternalReq
(
SDnode
*
pDnode
,
char
*
user
,
char
*
spi
,
char
*
encrypt
,
char
*
secret
,
char
*
ckey
)
{
if
(
strcmp
(
user
,
INTERNAL_USER
)
==
0
)
{
// A simple temporary implementation
char
pass
[
TSDB_PASSWORD_LEN
]
=
{
0
};
taosEncryptPass
((
uint8_t
*
)(
INTERNAL_SECRET
),
strlen
(
INTERNAL_SECRET
),
pass
);
char
pass
[
TSDB_PASSWORD_LEN
+
1
]
=
{
0
};
taosEncryptPass_c
((
uint8_t
*
)(
INTERNAL_SECRET
),
strlen
(
INTERNAL_SECRET
),
pass
);
memcpy
(
secret
,
pass
,
TSDB_PASSWORD_LEN
);
*
spi
=
0
;
*
spi
=
1
;
*
encrypt
=
0
;
*
ckey
=
0
;
return
0
;
}
else
if
(
strcmp
(
user
,
TSDB_NETTEST_USER
)
==
0
)
{
// A simple temporary implementation
char
pass
[
TSDB_PASSWORD_LEN
]
=
{
0
};
taosEncryptPass
((
uint8_t
*
)(
TSDB_NETTEST_USER
),
strlen
(
TSDB_NETTEST_USER
),
pass
);
char
pass
[
TSDB_PASSWORD_LEN
+
1
]
=
{
0
};
taosEncryptPass_c
((
uint8_t
*
)(
TSDB_NETTEST_USER
),
strlen
(
TSDB_NETTEST_USER
),
pass
);
memcpy
(
secret
,
pass
,
TSDB_PASSWORD_LEN
);
*
spi
=
0
;
*
spi
=
1
;
*
encrypt
=
0
;
*
ckey
=
0
;
return
0
;
...
...
@@ -283,12 +285,12 @@ static int32_t dndRetrieveUserAuthInfo(void *parent, char *user, char *spi, char
SDnode
*
pDnode
=
parent
;
if
(
dndAuthInternalReq
(
parent
,
user
,
spi
,
encrypt
,
secret
,
ckey
)
==
0
)
{
// dTrace("get internal auth success"
);
dTrace
(
"user:%s, get auth from internal mnode, spi:%d encrypt:%d"
,
user
,
*
spi
,
*
encrypt
);
return
0
;
}
if
(
dndGetUserAuthFromMnode
(
pDnode
,
user
,
spi
,
encrypt
,
secret
,
ckey
)
==
0
)
{
// dTrace("get auth from internal mnode"
);
dTrace
(
"user:%s, get auth from internal mnode, spi:%d encrypt:%d"
,
user
,
*
spi
,
*
encrypt
);
return
0
;
}
...
...
@@ -297,13 +299,12 @@ static int32_t dndRetrieveUserAuthInfo(void *parent, char *user, char *spi, char
return
-
1
;
}
// dDebug("user:%s, send auth msg to other mnodes", user);
SAuthReq
*
pReq
=
rpcMallocCont
(
sizeof
(
SAuthReq
));
tstrncpy
(
pReq
->
user
,
user
,
TSDB_USER_LEN
);
SRpcMsg
rpcMsg
=
{.
pCont
=
pReq
,
.
contLen
=
sizeof
(
SAuthReq
),
.
msgType
=
TDMT_MND_AUTH
};
SRpcMsg
rpcRsp
=
{
0
};
dTrace
(
"user:%s, send user auth req to other mnodes, spi:%d encrypt:%d"
,
user
,
pReq
->
spi
,
pReq
->
encrypt
);
dndSendMsgToMnodeRecv
(
pDnode
,
&
rpcMsg
,
&
rpcRsp
);
if
(
rpcRsp
.
code
!=
0
)
{
...
...
@@ -315,7 +316,7 @@ static int32_t dndRetrieveUserAuthInfo(void *parent, char *user, char *spi, char
memcpy
(
ckey
,
pRsp
->
ckey
,
TSDB_PASSWORD_LEN
);
*
spi
=
pRsp
->
spi
;
*
encrypt
=
pRsp
->
encrypt
;
d
Debug
(
"user:%s, success to get user auth from other mnodes"
,
user
);
d
Trace
(
"user:%s, success to get user auth from other mnodes, spi:%d encrypt:%d"
,
user
,
pRsp
->
spi
,
pRsp
->
encrypt
);
}
rpcFreeCont
(
rpcRsp
.
pCont
);
...
...
@@ -334,7 +335,7 @@ static int32_t dndInitServer(SDnode *pDnode) {
SRpcInit
rpcInit
;
memset
(
&
rpcInit
,
0
,
sizeof
(
rpcInit
));
rpcInit
.
localPort
=
pDnode
->
cfg
.
serverPort
;
rpcInit
.
label
=
"D
ND
-S"
;
rpcInit
.
label
=
"D-S"
;
rpcInit
.
numOfThreads
=
numOfThreads
;
rpcInit
.
cfp
=
dndProcessRequest
;
rpcInit
.
sessions
=
pDnode
->
cfg
.
maxShellConns
;
...
...
source/dnode/mgmt/impl/test/sut/src/client.cpp
浏览文件 @
ee52870b
...
...
@@ -27,8 +27,8 @@ void TestClient::SetRpcRsp(SRpcMsg* pRsp) { this->pRsp = pRsp; };
tsem_t
*
TestClient
::
GetSem
()
{
return
&
sem
;
}
bool
TestClient
::
Init
(
const
char
*
user
,
const
char
*
pass
,
const
char
*
fqdn
,
uint16_t
port
)
{
char
secretEncrypt
[
TSDB_PASSWORD_LEN
]
=
{
0
};
taosEncryptPass
((
uint8_t
*
)
pass
,
strlen
(
pass
),
secretEncrypt
);
char
secretEncrypt
[
TSDB_PASSWORD_LEN
+
1
]
=
{
0
};
taosEncryptPass
_c
((
uint8_t
*
)
pass
,
strlen
(
pass
),
secretEncrypt
);
SRpcInit
rpcInit
;
memset
(
&
rpcInit
,
0
,
sizeof
(
rpcInit
));
...
...
@@ -42,7 +42,7 @@ bool TestClient::Init(const char* user, const char* pass, const char* fqdn, uint
rpcInit
.
ckey
=
(
char
*
)
"key"
;
rpcInit
.
parent
=
this
;
rpcInit
.
secret
=
(
char
*
)
secretEncrypt
;
//
rpcInit.spi = 1;
rpcInit
.
spi
=
1
;
clientRpc
=
rpcOpen
(
&
rpcInit
);
ASSERT
(
clientRpc
);
...
...
source/dnode/mnode/impl/inc/mndDef.h
浏览文件 @
ee52870b
...
...
@@ -327,25 +327,30 @@ typedef struct SMqTopicConsumer {
#endif
typedef
struct
SMqConsumerEp
{
int32_t
vgId
;
// -1 for unassigned
SEpSet
epset
;
int64_t
consumerId
;
// -1 for unassigned
int64_t
lastConsumerHbTs
;
int64_t
lastVgHbTs
;
int32_t
vgId
;
// -1 for unassigned
SEpSet
epSet
;
int64_t
consumerId
;
// -1 for unassigned
int64_t
lastConsumerHbTs
;
int64_t
lastVgHbTs
;
int32_t
execLen
;
SSubQueryMsg
qExec
;
}
SMqConsumerEp
;
static
FORCE_INLINE
int32_t
tEncodeSMqConsumerEp
(
void
**
buf
,
SMqConsumerEp
*
pConsumerEp
)
{
int32_t
tlen
=
0
;
tlen
+=
taosEncodeFixedI32
(
buf
,
pConsumerEp
->
vgId
);
tlen
+=
taosEncodeSEpSet
(
buf
,
&
pConsumerEp
->
ep
s
et
);
tlen
+=
taosEncodeSEpSet
(
buf
,
&
pConsumerEp
->
ep
S
et
);
tlen
+=
taosEncodeFixedI64
(
buf
,
pConsumerEp
->
consumerId
);
tlen
+=
tEncodeSSubQueryMsg
(
buf
,
&
pConsumerEp
->
qExec
);
return
tlen
;
}
static
FORCE_INLINE
void
*
tDecodeSMqConsumerEp
(
void
**
buf
,
SMqConsumerEp
*
pConsumerEp
)
{
buf
=
taosDecodeFixedI32
(
buf
,
&
pConsumerEp
->
vgId
);
buf
=
taosDecodeSEpSet
(
buf
,
&
pConsumerEp
->
ep
s
et
);
buf
=
taosDecodeSEpSet
(
buf
,
&
pConsumerEp
->
ep
S
et
);
buf
=
taosDecodeFixedI64
(
buf
,
&
pConsumerEp
->
consumerId
);
buf
=
tDecodeSSubQueryMsg
(
buf
,
&
pConsumerEp
->
qExec
);
pConsumerEp
->
execLen
=
sizeof
(
SSubQueryMsg
)
+
pConsumerEp
->
qExec
.
contentLen
;
return
buf
;
}
...
...
source/dnode/mnode/impl/src/mndAuth.c
浏览文件 @
ee52870b
...
...
@@ -15,6 +15,7 @@
#define _DEFAULT_SOURCE
#include "mndAuth.h"
#include "mndUser.h"
static
int32_t
mndProcessAuthReq
(
SMnodeMsg
*
pReq
);
...
...
@@ -25,9 +26,34 @@ int32_t mndInitAuth(SMnode *pMnode) {
void
mndCleanupAuth
(
SMnode
*
pMnode
)
{}
int32_t
mndRetriveAuth
(
SMnode
*
pMnode
,
char
*
user
,
char
*
spi
,
char
*
encrypt
,
char
*
secret
,
char
*
ckey
)
{
return
0
;
}
int32_t
mndRetriveAuth
(
SMnode
*
pMnode
,
char
*
user
,
char
*
spi
,
char
*
encrypt
,
char
*
secret
,
char
*
ckey
)
{
SUserObj
*
pUser
=
mndAcquireUser
(
pMnode
,
user
);
if
(
pUser
==
NULL
)
{
*
secret
=
0
;
mError
(
"user:%s, failed to auth user since %s"
,
user
,
terrstr
());
return
-
1
;
}
static
int32_t
mndProcessAuthReq
(
SMnodeMsg
*
pReq
)
{
mDebug
(
"user:%s, auth req is processed"
,
pReq
->
user
);
*
spi
=
1
;
*
encrypt
=
0
;
*
ckey
=
0
;
memcpy
(
secret
,
pUser
->
pass
,
TSDB_PASSWORD_LEN
);
mndReleaseUser
(
pMnode
,
pUser
);
mDebug
(
"user:%s, auth info is returned"
,
user
);
return
0
;
}
static
int32_t
mndProcessAuthReq
(
SMnodeMsg
*
pReq
)
{
SAuthReq
*
pAuth
=
pReq
->
rpcMsg
.
pCont
;
int32_t
contLen
=
sizeof
(
SAuthRsp
);
SAuthRsp
*
pRsp
=
rpcMallocCont
(
contLen
);
pReq
->
pCont
=
pRsp
;
pReq
->
contLen
=
contLen
;
int32_t
code
=
mndRetriveAuth
(
pReq
->
pMnode
,
pAuth
->
user
,
&
pRsp
->
spi
,
&
pRsp
->
encrypt
,
pRsp
->
secret
,
pRsp
->
ckey
);
mTrace
(
"user:%s, auth req received, spi:%d encrypt:%d ruser:%s"
,
pReq
->
user
,
pAuth
->
spi
,
pAuth
->
encrypt
,
pAuth
->
user
);
return
code
;
}
\ No newline at end of file
source/dnode/mnode/impl/src/mndSubscribe.c
浏览文件 @
ee52870b
...
...
@@ -105,6 +105,7 @@ static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg) {
strcpy
(
req
.
sql
,
pTopic
->
sql
);
strcpy
(
req
.
logicalPlan
,
pTopic
->
logicalPlan
);
strcpy
(
req
.
physicalPlan
,
pTopic
->
physicalPlan
);
memcpy
(
&
req
.
msg
,
&
pCEp
->
qExec
,
pCEp
->
execLen
);
int32_t
tlen
=
tEncodeSMqSetCVgReq
(
NULL
,
&
req
);
void
*
reqStr
=
malloc
(
tlen
);
if
(
reqStr
==
NULL
)
{
...
...
@@ -116,7 +117,7 @@ static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg) {
// persist msg
STransAction
action
=
{
0
};
action
.
epSet
=
pCEp
->
ep
s
et
;
action
.
epSet
=
pCEp
->
ep
S
et
;
action
.
pCont
=
reqStr
;
action
.
contLen
=
tlen
;
action
.
msgType
=
TDMT_VND_MQ_SET_CONN
;
...
...
@@ -141,20 +142,24 @@ static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg) {
}
static
int
mndInitUnassignedVg
(
SMnode
*
pMnode
,
SMqTopicObj
*
pTopic
,
SArray
*
unassignedVg
)
{
SMqConsumerEp
CEp
;
CEp
.
lastConsumerHbTs
=
CEp
.
lastVgHbTs
=
-
1
;
int32_t
sz
;
SVgObj
*
pVgroup
=
NULL
;
SSdb
*
pSdb
=
pMnode
->
pSdb
;
void
*
pIter
=
sdbFetch
(
pSdb
,
SDB_VGROUP
,
NULL
,
(
void
**
)
&
pVgroup
);
while
(
pIter
!=
NULL
)
{
if
(
pVgroup
->
dbUid
==
pTopic
->
dbUid
)
{
CEp
.
epset
=
mndGetVgroupEpset
(
pMnode
,
pVgroup
);
CEp
.
vgId
=
pVgroup
->
vgId
;
taosArrayPush
(
unassignedVg
,
&
CEp
);
}
pIter
=
sdbFetch
(
pSdb
,
SDB_VGROUP
,
pIter
,
(
void
**
)
&
pVgroup
);
//convert phyplan to dag
SQueryDag
*
pDag
=
qStringToDag
(
pTopic
->
physicalPlan
);
SArray
*
pArray
;
if
(
schedulerConvertDagToTaskList
(
pDag
,
&
pArray
)
<
0
)
{
return
-
1
;
}
int32_t
sz
=
taosArrayGetSize
(
pArray
);
//convert dag to msg
for
(
int32_t
i
=
0
;
i
<
sz
;
i
++
)
{
SMqConsumerEp
CEp
;
CEp
.
lastConsumerHbTs
=
CEp
.
lastVgHbTs
=
-
1
;
STaskInfo
*
pTaskInfo
=
taosArrayGet
(
pArray
,
i
);
tConvertQueryAddrToEpSet
(
&
CEp
.
epSet
,
&
pTaskInfo
->
addr
);
CEp
.
vgId
=
pTaskInfo
->
addr
.
nodeId
;
taosArrayPush
(
unassignedVg
,
&
CEp
);
}
qDestroyQueryDag
(
pDag
);
return
0
;
}
...
...
source/dnode/mnode/impl/src/mndTopic.c
浏览文件 @
ee52870b
...
...
@@ -127,7 +127,7 @@ SSdbRow *mndTopicActionDecode(SSdbRaw *pRaw) {
SDB_GET_INT32
(
pRaw
,
dataPos
,
&
pTopic
->
sqlLen
,
TOPIC_DECODE_OVER
);
pTopic
->
sql
=
calloc
(
pTopic
->
sqlLen
+
1
,
sizeof
(
char
));
SDB_GET_BINARY
(
pRaw
,
dataPos
,
pTopic
->
sql
,
pTopic
->
sqlLen
,
TOPIC_DECODE_OVER
);
SDB_GET_BINARY
(
pRaw
,
dataPos
,
pTopic
->
sql
,
pTopic
->
sqlLen
,
TOPIC_DECODE_OVER
);
SDB_GET_INT32
(
pRaw
,
dataPos
,
&
len
,
TOPIC_DECODE_OVER
);
pTopic
->
logicalPlan
=
calloc
(
len
+
1
,
sizeof
(
char
));
...
...
source/dnode/mnode/impl/src/mndUser.c
浏览文件 @
ee52870b
...
...
@@ -60,9 +60,9 @@ void mndCleanupUser(SMnode *pMnode) {}
static
int32_t
mndCreateDefaultUser
(
SMnode
*
pMnode
,
char
*
acct
,
char
*
user
,
char
*
pass
)
{
SUserObj
userObj
=
{
0
};
taosEncryptPass_c
((
uint8_t
*
)
pass
,
strlen
(
pass
),
userObj
.
pass
);
tstrncpy
(
userObj
.
user
,
user
,
TSDB_USER_LEN
);
tstrncpy
(
userObj
.
acct
,
acct
,
TSDB_USER_LEN
);
taosEncryptPass
((
uint8_t
*
)
pass
,
strlen
(
pass
),
userObj
.
pass
);
userObj
.
createdTime
=
taosGetTimestampMs
();
userObj
.
updateTime
=
userObj
.
createdTime
;
...
...
@@ -202,7 +202,7 @@ SUserObj *mndAcquireUser(SMnode *pMnode, char *userName) {
SSdb
*
pSdb
=
pMnode
->
pSdb
;
SUserObj
*
pUser
=
sdbAcquire
(
pSdb
,
SDB_USER
,
userName
);
if
(
pUser
==
NULL
)
{
terrno
=
TSDB_CODE_MND_
DB
_NOT_EXIST
;
terrno
=
TSDB_CODE_MND_
USER
_NOT_EXIST
;
}
return
pUser
;
}
...
...
@@ -214,9 +214,9 @@ void mndReleaseUser(SMnode *pMnode, SUserObj *pUser) {
static
int32_t
mndCreateUser
(
SMnode
*
pMnode
,
char
*
acct
,
char
*
user
,
char
*
pass
,
SMnodeMsg
*
pReq
)
{
SUserObj
userObj
=
{
0
};
taosEncryptPass_c
((
uint8_t
*
)
pass
,
strlen
(
pass
),
userObj
.
pass
);
tstrncpy
(
userObj
.
user
,
user
,
TSDB_USER_LEN
);
tstrncpy
(
userObj
.
acct
,
acct
,
TSDB_USER_LEN
);
taosEncryptPass
((
uint8_t
*
)
pass
,
strlen
(
pass
),
userObj
.
pass
);
userObj
.
createdTime
=
taosGetTimestampMs
();
userObj
.
updateTime
=
userObj
.
createdTime
;
userObj
.
superUser
=
0
;
...
...
@@ -351,8 +351,9 @@ static int32_t mndProcessAlterUserReq(SMnodeMsg *pReq) {
SUserObj
newUser
=
{
0
};
memcpy
(
&
newUser
,
pUser
,
sizeof
(
SUserObj
));
memset
(
pUser
->
pass
,
0
,
sizeof
(
pUser
->
pass
));
taosEncryptPass
((
uint8_t
*
)
pAlter
->
pass
,
strlen
(
pAlter
->
pass
),
pUser
->
pass
);
char
pass
[
TSDB_PASSWORD_LEN
+
1
]
=
{
0
};
taosEncryptPass_c
((
uint8_t
*
)
pAlter
->
pass
,
strlen
(
pAlter
->
pass
),
pass
);
memcpy
(
pUser
->
pass
,
pass
,
TSDB_PASSWORD_LEN
);
newUser
.
updateTime
=
taosGetTimestampMs
();
int32_t
code
=
mndUpdateUser
(
pMnode
,
pUser
,
&
newUser
,
pReq
);
...
...
source/dnode/mnode/sdb/src/sdbHash.c
浏览文件 @
ee52870b
...
...
@@ -152,6 +152,7 @@ static int32_t sdbInsertRow(SSdb *pSdb, SHashObj *hash, SSdbRaw *pRaw, SSdbRow *
if
(
insertFp
!=
NULL
)
{
code
=
(
*
insertFp
)(
pSdb
,
pRow
->
pObj
);
if
(
code
!=
0
)
{
code
=
terrno
;
taosWLockLatch
(
pLock
);
taosHashRemove
(
hash
,
pRow
->
pObj
,
keySize
);
taosWUnLockLatch
(
pLock
);
...
...
source/dnode/vnode/CMakeLists.txt
浏览文件 @
ee52870b
...
...
@@ -26,6 +26,7 @@ target_link_libraries(
PUBLIC tfs
PUBLIC wal
PUBLIC scheduler
PUBLIC executor
PUBLIC qworker
)
...
...
source/dnode/vnode/inc/tq.h
浏览文件 @
ee52870b
...
...
@@ -17,6 +17,8 @@
#define _TD_TQ_H_
#include "common.h"
#include "executor.h"
#include "vnode.h"
#include "mallocator.h"
#include "meta.h"
#include "os.h"
...
...
@@ -81,27 +83,12 @@ typedef struct STqSubscribeReq {
int64_t
topic
[];
}
STqSubscribeReq
;
typedef
struct
STqSubscribeRsp
{
STqMsgHead
head
;
int64_t
vgId
;
char
ep
[
TSDB_EP_LEN
];
// TSDB_EP_LEN
}
STqSubscribeRsp
;
typedef
struct
STqHeartbeatReq
{
}
STqHeartbeatReq
;
typedef
struct
STqHeartbeatRsp
{
}
STqHeartbeatRsp
;
typedef
struct
STqTopicVhandle
{
int64_t
topicId
;
// executor for filter
void
*
filterExec
;
// callback for mnode
// trigger when vnode list associated topic change
void
*
(
*
mCallback
)(
void
*
,
void
*
);
}
STqTopicVhandle
;
#define TQ_BUFFER_SIZE 8
typedef
struct
STqExec
{
...
...
@@ -162,10 +149,10 @@ typedef struct STqGroup {
}
STqGroup
;
typedef
struct
STqTaskItem
{
int8_t
status
;
int64_t
offset
;
void
*
dst
;
SSubQueryMsg
*
pMsg
;
int8_t
status
;
int64_t
offset
;
void
*
dst
;
qTaskInfo_t
task
;
}
STqTaskItem
;
// new version
...
...
@@ -198,10 +185,6 @@ typedef struct STqQueryMsg {
struct
STqQueryMsg
*
next
;
}
STqQueryMsg
;
typedef
struct
STqCfg
{
// TODO
}
STqCfg
;
typedef
struct
STqMemRef
{
SMemAllocatorFactory
*
pAllocatorFactory
;
SMemAllocator
*
pAllocator
;
...
...
@@ -298,6 +281,7 @@ typedef struct STQ {
STqMemRef
tqMemRef
;
STqMetaStore
*
tqMeta
;
SWal
*
pWal
;
SMeta
*
pMeta
;
}
STQ
;
typedef
struct
STqMgmt
{
...
...
@@ -312,13 +296,15 @@ int tqInit();
void
tqCleanUp
();
// open in each vnode
STQ
*
tqOpen
(
const
char
*
path
,
SWal
*
pWal
,
STqCfg
*
tqConfig
,
SMemAllocatorFactory
*
allocFac
);
STQ
*
tqOpen
(
const
char
*
path
,
SWal
*
pWal
,
S
Meta
*
pMeta
,
S
TqCfg
*
tqConfig
,
SMemAllocatorFactory
*
allocFac
);
void
tqClose
(
STQ
*
);
// void* will be replace by a msg type
int
tqPushMsg
(
STQ
*
,
void
*
msg
,
int64_t
version
);
int
tqCommit
(
STQ
*
);
int
tqSetCursor
(
STQ
*
,
STqSetCurReq
*
pMsg
);
#if 0
int tqConsume(STQ*, SRpcMsg* pReq, SRpcMsg** pRsp);
int tqSetCursor(STQ*, STqSetCurReq* pMsg);
...
...
@@ -334,23 +320,6 @@ int tqSendLaunchQuery(STqMsgItem*, int64_t offset);
int32_t
tqProcessConsumeReq
(
STQ
*
pTq
,
SRpcMsg
*
pMsg
,
SRpcMsg
**
ppRsp
);
int32_t
tqProcessSetConnReq
(
STQ
*
pTq
,
SMqSetCVgReq
*
pReq
);
typedef
struct
STqReadHandle
{
int64_t
ver
;
SSubmitMsg
*
pMsg
;
SSubmitBlk
*
pBlock
;
SSubmitMsgIter
msgIter
;
SSubmitBlkIter
blkIter
;
SMeta
*
pMeta
;
SArray
*
pColumnIdList
;
}
STqReadHandle
;
STqReadHandle
*
tqInitSubmitMsgScanner
(
SMeta
*
pMeta
,
SArray
*
pColumnIdList
);
void
tqReadHandleSetMsg
(
STqReadHandle
*
pHandle
,
SSubmitMsg
*
pMsg
,
int64_t
ver
);
bool
tqNextDataBlock
(
STqReadHandle
*
pHandle
);
int
tqRetrieveDataBlockInfo
(
STqReadHandle
*
pHandle
,
SDataBlockInfo
*
pBlockInfo
);
// return SArray<SColumnInfoData>
SArray
*
tqRetrieveDataBlock
(
STqReadHandle
*
pHandle
);
#ifdef __cplusplus
}
#endif
...
...
source/dnode/vnode/inc/vnode.h
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/dnode/vnode/src/inc/tqInt.h
浏览文件 @
ee52870b
...
...
@@ -17,6 +17,7 @@
#define _TD_TQ_INT_H_
#include "tq.h"
#include "meta.h"
#include "tlog.h"
#include "trpc.h"
#ifdef __cplusplus
...
...
source/dnode/vnode/src/inc/vnd.h
浏览文件 @
ee52870b
...
...
@@ -24,6 +24,7 @@
#include "tlockfree.h"
#include "tmacro.h"
#include "wal.h"
#include "tq.h"
#include "vnode.h"
...
...
source/dnode/vnode/src/meta/metaTbCfg.c
浏览文件 @
ee52870b
...
...
@@ -32,7 +32,7 @@ size_t metaEncodeTbObjFromTbOptions(const STbCfg *pTbOptions, void *pBuf, size_t
switch
(
pTbOptions
->
type
)
{
case
META_SUPER_TABLE
:
tlen
+=
taosEncodeFixedU64
(
ppBuf
,
pTbOptions
->
stbCfg
.
suid
);
tlen
+=
tdEncodeSchema
(
ppBuf
,
pTbOptions
->
stbCfg
.
pTagSchema
);
tlen
+=
tdEncodeSchema
(
ppBuf
,
(
STSchema
*
)
pTbOptions
->
stbCfg
.
pTagSchema
);
// TODO: encode schema version array
break
;
case
META_CHILD_TABLE
:
...
...
source/dnode/vnode/src/tq/tq.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/dnode/vnode/src/vnd/vnodeMain.c
浏览文件 @
ee52870b
...
...
@@ -127,7 +127,7 @@ static int vnodeOpenImpl(SVnode *pVnode) {
// Open TQ
sprintf
(
dir
,
"%s/tq"
,
pVnode
->
path
);
pVnode
->
pTq
=
tqOpen
(
dir
,
pVnode
->
pWal
,
&
(
pVnode
->
config
.
tqCfg
),
vBufPoolGetMAF
(
pVnode
));
pVnode
->
pTq
=
tqOpen
(
dir
,
pVnode
->
pWal
,
pVnode
->
pMeta
,
&
(
pVnode
->
config
.
tqCfg
),
vBufPoolGetMAF
(
pVnode
));
if
(
pVnode
->
pTq
==
NULL
)
{
// TODO: handle error
return
-
1
;
...
...
source/dnode/vnode/src/vnd/vnodeQuery.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/dnode/vnode/src/vnd/vnodeWrite.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/catalog/test/catalogTests.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/executor/inc/executorimpl.h
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/executor/src/executor.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/executor/src/executorMain.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/executor/src/executorimpl.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/executor/test/executorTests.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/parser/src/dCDAstProcess.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/parser/src/parser.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/parser/src/parserUtil.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/parser/test/mockCatalog.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/parser/test/parserTests.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/parser/test/plannerTest.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/parser/test/tokenizerTest.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/planner/inc/plannerInt.h
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/planner/src/logicPlan.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/planner/src/physicalPlan.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/planner/src/physicalPlanJson.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/planner/src/planner.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/planner/test/phyPlanTests.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/planner/test/plannerTests.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/qcom/src/querymsg.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/qcom/test/queryTest.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/qworker/inc/qworkerInt.h
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/qworker/src/qworker.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/qworker/test/qworkerTests.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/scheduler/inc/schedulerInt.h
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/scheduler/src/scheduler.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/scheduler/test/schedulerTests.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/sync/src/raft_handle_vote_message.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/sync/src/sync.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/tfs/src/tfs.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/tfs/src/tfsTier.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/tfs/test/tfsTest.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/transport/src/rpcMain.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/transport/src/trans.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/transport/src/transCli.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/transport/src/transSrv.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/transport/test/rclient.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/libs/transport/test/rserver.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/util/src/compare.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/util/src/tskiplist.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
source/util/test/encodeTest.cpp
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
tests/script/jenkins/basic.txt
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
tests/script/sh/deploy.sh
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
tests/script/sh/massiveTable/setupDnodes.sh
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
tests/script/tmp/prepare.sim
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
tests/script/sim/db/basic1.sim
→
tests/script/
t
sim/db/basic1.sim
浏览文件 @
ee52870b
文件已移动
tests/script/sim/db/basic6.sim
→
tests/script/
t
sim/db/basic6.sim
浏览文件 @
ee52870b
文件已移动
tests/script/sim/db/error1.sim
→
tests/script/
t
sim/db/error1.sim
浏览文件 @
ee52870b
文件已移动
tests/script/sim/dnode/basic1.sim
→
tests/script/
t
sim/dnode/basic1.sim
浏览文件 @
ee52870b
文件已移动
tests/script/sim/table/basic1.sim
→
tests/script/
t
sim/table/basic1.sim
浏览文件 @
ee52870b
文件已移动
tests/script/sim/user/basic1.sim
→
tests/script/
t
sim/user/basic1.sim
浏览文件 @
ee52870b
文件已移动
tests/test/c/create_table.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
tests/tsim/src/simSystem.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
tools/shell/src/backup/tnettest.c
浏览文件 @
ee52870b
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录