xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(keeper): fix endpoint value too long for column/tag

This commit is contained in:
qevolg 2024-12-03 11:45:57 +08:00
parent fb8a10e717
commit f1902dd69c
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/keeper/api/adapter2.go
View File

@ -23,8 +23,8 @@ var adapterLog = log.GetLogger("ADP")
type adapterReqType int type adapterReqType int
const ( const (
rest adapterReqType = iota // 0 - rest rest adapterReqType = iota
ws // 1 - ws ws
) )
type Adapter struct { type Adapter struct {
@ -210,7 +210,7 @@ var adapterTableSql = "create stable if not exists `adapter_requests` (" +
"`other_fail` int unsigned, " + "`other_fail` int unsigned, " +
"`query_in_process` int unsigned, " + "`query_in_process` int unsigned, " +
"`write_in_process` int unsigned ) " + "`write_in_process` int unsigned ) " +
"tags (`endpoint` varchar(32), `req_type` tinyint unsigned )" "tags (`endpoint` varchar(255), `req_type` tinyint unsigned )"
func (a *Adapter) createTable() error { func (a *Adapter) createTable() error {
if a.conn == nil { if a.conn == nil {

6
tools/keeper/api/gen_metric.go
View File

@ -749,7 +749,7 @@ func (gm *GeneralMetric) initColumnSeqMap() error {
func (gm *GeneralMetric) createSTables() error { func (gm *GeneralMetric) createSTables() error {
var createTableSql = "create stable if not exists taosd_cluster_basic " + var createTableSql = "create stable if not exists taosd_cluster_basic " +
"(ts timestamp, first_ep varchar(100), first_ep_dnode_id INT, cluster_version varchar(20)) " + "(ts timestamp, first_ep varchar(255), first_ep_dnode_id INT, cluster_version varchar(20)) " +
"tags (cluster_id varchar(50))" "tags (cluster_id varchar(50))"
if gm.conn == nil { if gm.conn == nil {
@ -760,8 +760,8 @@ func (gm *GeneralMetric) createSTables() error {
return err return err
} }
createTableSql = "create stable if not exists taos_slow_sql_detail" + createTableSql = "create stable if not exists taos_slow_sql_detail " +
" (start_ts TIMESTAMP, request_id BIGINT UNSIGNED PRIMARY KEY, query_time INT, code INT, error_info varchar(128), " + "(start_ts TIMESTAMP, request_id BIGINT UNSIGNED PRIMARY KEY, query_time INT, code INT, error_info varchar(128), " +
"type TINYINT, rows_num BIGINT, sql varchar(16384), process_name varchar(32), process_id varchar(32)) " + "type TINYINT, rows_num BIGINT, sql varchar(16384), process_name varchar(32), process_id varchar(32)) " +
"tags (db varchar(1024), `user` varchar(32), ip varchar(32), cluster_id varchar(32))" "tags (db varchar(1024), `user` varchar(32), ip varchar(32), cluster_id varchar(32))"

2
tools/keeper/api/tables.go
View File

@ -45,7 +45,7 @@ var dnodeEpLen = strconv.Itoa(255)
var CreateClusterInfoSql = "create table if not exists cluster_info (" + var CreateClusterInfoSql = "create table if not exists cluster_info (" +
"ts timestamp, " + "ts timestamp, " +
"first_ep binary(134), " + "first_ep binary(255), " +
"first_ep_dnode_id int, " + "first_ep_dnode_id int, " +
"version binary(12), " + "version binary(12), " +
"master_uptime float, " + "master_uptime float, " +

2
tools/keeper/cmd/command.go
View File

@ -322,7 +322,7 @@ func (cmd *Command) TransferTaosdClusterBasicInfo() error {
delta := time.Hour * 24 * 10 delta := time.Hour * 24 * 10
var createTableSql = "create stable if not exists taosd_cluster_basic " + var createTableSql = "create stable if not exists taosd_cluster_basic " +
"(ts timestamp, first_ep varchar(100), first_ep_dnode_id INT, cluster_version varchar(20)) " + "(ts timestamp, first_ep varchar(255), first_ep_dnode_id INT, cluster_version varchar(20)) " +
"tags (cluster_id varchar(50))" "tags (cluster_id varchar(50))"
if _, err := cmd.conn.Exec(ctx, createTableSql, util.GetQidOwn()); err != nil { if _, err := cmd.conn.Exec(ctx, createTableSql, util.GetQidOwn()); err != nil {

8
tools/keeper/system/empty_test.go
View File

@ -1,8 +0,0 @@
package system
import (
"testing"
)
func TestEmpty(t *testing.T) {
}