#3562

Committed 20 Dec 2024 09:57AM UTC coverage: 26.655% (-32.2%) from 58.812%

Build # #3562

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

Merge pull request #29229 from taosdata/enh/TS-5749-3.0

enh: seperate tsdb async tasks to different thread pools

Run Details

21498 of 109421 branches covered (19.65%)

Branch coverage included in aggregate %.

66 of 96 new or added lines in 7 files covered. (68.75%)

39441 existing lines in 157 files now uncovered.

35007 of 102566 relevant lines covered (34.13%)

53922.97 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

41.01

/source/dnode/mnode/impl/src/mndPerfSchema.c

/*
 * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
 *
 * This program is free software: you can use, redistribute, and/or modify
 * it under the terms of the GNU Affero General Public License, version 3
 * or later ("AGPL"), as published by the Free Software Foundation.
 *
 * This program is distributed in the hope that it will be useful, but WITHOUT
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 * FITNESS FOR A PARTICULAR PURPOSE.
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

#define _DEFAULT_SOURCE
#include "mndInt.h"
#include "systable.h"

// connection/application/
int32_t mndInitPerfsTableSchema(const SSysDbTableSchema *pSrc, int32_t colNum, SSchema **pDst) {
  int32_t  code = 0;
  SSchema *schema = taosMemoryCalloc(colNum, sizeof(SSchema));
  if (NULL == schema) {
    code = terrno;
    TAOS_RETURN(code);
  }

  for (int32_t i = 0; i < colNum; ++i) {
    tstrncpy(schema[i].name, pSrc[i].name, sizeof(schema[i].name));

    schema[i].type = pSrc[i].type;
    schema[i].colId = i + 1;
    schema[i].bytes = pSrc[i].bytes;
  }

  *pDst = schema;
  TAOS_RETURN(code);
}

int32_t mndPerfsInitMeta(SHashObj *hash) {
  int32_t       code = 0;
  STableMetaRsp meta = {0};

  tstrncpy(meta.dbFName, TSDB_PERFORMANCE_SCHEMA_DB, sizeof(meta.dbFName));
  meta.tableType = TSDB_SYSTEM_TABLE;
  meta.sversion = 1;
  meta.tversion = 1;

  size_t               size = 0;
  const SSysTableMeta *pSysDbTableMeta = NULL;
  getPerfDbMeta(&pSysDbTableMeta, &size);

  for (int32_t i = 0; i < size; ++i) {
    tstrncpy(meta.tbName, pSysDbTableMeta[i].name, sizeof(meta.tbName));
    meta.numOfColumns = pSysDbTableMeta[i].colNum;

    TAOS_CHECK_RETURN(mndInitPerfsTableSchema(pSysDbTableMeta[i].schema, pSysDbTableMeta[i].colNum, &meta.pSchemas));

    if (taosHashPut(hash, meta.tbName, strlen(meta.tbName), &meta, sizeof(meta))) {
      code = terrno;
      TAOS_RETURN(code);
    }
  }

  TAOS_RETURN(code);
}

int32_t mndBuildPerfsTableSchema(SMnode *pMnode, const char *dbFName, const char *tbName, STableMetaRsp *pRsp) {
  int32_t code = 0;
  if (NULL == pMnode->perfsMeta) {
    code = TSDB_CODE_APP_ERROR;
    TAOS_RETURN(code);
  }

  STableMetaRsp *meta = (STableMetaRsp *)taosHashGet(pMnode->perfsMeta, tbName, strlen(tbName));
  if (NULL == meta) {
    mError("invalid performance schema table name:%s", tbName);
    code = TSDB_CODE_PAR_TABLE_NOT_EXIST;
    TAOS_RETURN(code);
  }

  *pRsp = *meta;

  pRsp->pSchemas = taosMemoryCalloc(meta->numOfColumns, sizeof(SSchema));
  if (pRsp->pSchemas == NULL) {
    code = terrno;
    pRsp->pSchemas = NULL;
    TAOS_RETURN(code);
  }

  memcpy(pRsp->pSchemas, meta->pSchemas, meta->numOfColumns * sizeof(SSchema));
  TAOS_RETURN(code);
}

int32_t mndBuildPerfsTableCfg(SMnode *pMnode, const char *dbFName, const char *tbName, STableCfgRsp *pRsp) {
  int32_t code = 0;
  if (NULL == pMnode->perfsMeta) {
    code = TSDB_CODE_APP_ERROR;
    TAOS_RETURN(code);
  }

  STableMetaRsp *pMeta = taosHashGet(pMnode->perfsMeta, tbName, strlen(tbName));
  if (NULL == pMeta) {
    mError("invalid performance schema table name:%s", tbName);
    code = TSDB_CODE_PAR_TABLE_NOT_EXIST;
    TAOS_RETURN(code);
  }

  tstrncpy(pRsp->tbName, pMeta->tbName, sizeof(pRsp->tbName));
  tstrncpy(pRsp->stbName, pMeta->stbName, sizeof(pRsp->stbName));
  tstrncpy(pRsp->dbFName, pMeta->dbFName, sizeof(pRsp->dbFName));
  pRsp->numOfTags = pMeta->numOfTags;
  pRsp->numOfColumns = pMeta->numOfColumns;
  pRsp->tableType = pMeta->tableType;

  pRsp->pSchemas = taosMemoryCalloc(pMeta->numOfColumns, sizeof(SSchema));
  if (pRsp->pSchemas == NULL) {
    code = terrno;
    pRsp->pSchemas = NULL;
    TAOS_RETURN(code);
  }

  memcpy(pRsp->pSchemas, pMeta->pSchemas, pMeta->numOfColumns * sizeof(SSchema));
  TAOS_RETURN(code);
}

int32_t mndInitPerfs(SMnode *pMnode) {
  int32_t code = 0;
  pMnode->perfsMeta = taosHashInit(20, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);
  if (pMnode->perfsMeta == NULL) {
    code = terrno;
    TAOS_RETURN(code);
  }

  return mndPerfsInitMeta(pMnode->perfsMeta);
}

void mndCleanupPerfs(SMnode *pMnode) {
  if (NULL == pMnode->perfsMeta) {
    return;
  }

  void *pIter = taosHashIterate(pMnode->perfsMeta, NULL);
  while (pIter) {
    STableMetaRsp *meta = (STableMetaRsp *)pIter;

    taosMemoryFreeClear(meta->pSchemas);

    pIter = taosHashIterate(pMnode->perfsMeta, pIter);
  }

  taosHashCleanup(pMnode->perfsMeta);
  pMnode->perfsMeta = NULL;
}

1	/*
2	* Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
3	*
4	* This program is free software: you can use, redistribute, and/or modify
5	* it under the terms of the GNU Affero General Public License, version 3
6	* or later ("AGPL"), as published by the Free Software Foundation.
7	*
8	* This program is distributed in the hope that it will be useful, but WITHOUT
9	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10	* FITNESS FOR A PARTICULAR PURPOSE.
11	*
12	* You should have received a copy of the GNU Affero General Public License
13	* along with this program. If not, see <http://www.gnu.org/licenses/>.
14	*/
15
16	#define _DEFAULT_SOURCE
17	#include "mndInt.h"
18	#include "systable.h"
19
20	// connection/application/
21	int32_t mndInitPerfsTableSchema(const SSysDbTableSchema pSrc, int32_t colNum, SSchema *pDst) {	65✔
22	int32_t code = 0;	65✔
23	SSchema *schema = taosMemoryCalloc(colNum, sizeof(SSchema));	65!
24	if (NULL == schema) {	65!
25	code = terrno;	×
26	TAOS_RETURN(code);	×
27	}
28
29	for (int32_t i = 0; i < colNum; ++i) {	845✔
30	tstrncpy(schema[i].name, pSrc[i].name, sizeof(schema[i].name));	780✔
31
32	schema[i].type = pSrc[i].type;	780✔
33	schema[i].colId = i + 1;	780✔
34	schema[i].bytes = pSrc[i].bytes;	780✔
35	}
36
37	*pDst = schema;	65✔
38	TAOS_RETURN(code);	65✔
39	}
40
41	int32_t mndPerfsInitMeta(SHashObj *hash) {	13✔
42	int32_t code = 0;	13✔
43	STableMetaRsp meta = {0};	13✔
44
45	tstrncpy(meta.dbFName, TSDB_PERFORMANCE_SCHEMA_DB, sizeof(meta.dbFName));	13✔
46	meta.tableType = TSDB_SYSTEM_TABLE;	13✔
47	meta.sversion = 1;	13✔
48	meta.tversion = 1;	13✔
49
50	size_t size = 0;	13✔
51	const SSysTableMeta *pSysDbTableMeta = NULL;	13✔
52	getPerfDbMeta(&pSysDbTableMeta, &size);	13✔
53
54	for (int32_t i = 0; i < size; ++i) {	78✔
55	tstrncpy(meta.tbName, pSysDbTableMeta[i].name, sizeof(meta.tbName));	65✔
56	meta.numOfColumns = pSysDbTableMeta[i].colNum;	65✔
57
58	TAOS_CHECK_RETURN(mndInitPerfsTableSchema(pSysDbTableMeta[i].schema, pSysDbTableMeta[i].colNum, &meta.pSchemas));	65!
59
60	if (taosHashPut(hash, meta.tbName, strlen(meta.tbName), &meta, sizeof(meta))) {	65!
61	code = terrno;	×
62	TAOS_RETURN(code);	×
63	}
64	}
65
66	TAOS_RETURN(code);	13✔
67	}
68
UNCOV 69	int32_t mndBuildPerfsTableSchema(SMnode pMnode, const char dbFName, const char tbName, STableMetaRsp pRsp) {	×
UNCOV 70	int32_t code = 0;	×
UNCOV 71	if (NULL == pMnode->perfsMeta) {	×
72	code = TSDB_CODE_APP_ERROR;	×
73	TAOS_RETURN(code);	×
74	}
75
UNCOV 76	STableMetaRsp meta = (STableMetaRsp )taosHashGet(pMnode->perfsMeta, tbName, strlen(tbName));	×
UNCOV 77	if (NULL == meta) {	×
UNCOV 78	mError("invalid performance schema table name:%s", tbName);	×
UNCOV 79	code = TSDB_CODE_PAR_TABLE_NOT_EXIST;	×
UNCOV 80	TAOS_RETURN(code);	×
81	}
82
UNCOV 83	pRsp = meta;	×
84
UNCOV 85	pRsp->pSchemas = taosMemoryCalloc(meta->numOfColumns, sizeof(SSchema));	×
UNCOV 86	if (pRsp->pSchemas == NULL) {	×
87	code = terrno;	×
88	pRsp->pSchemas = NULL;	×
89	TAOS_RETURN(code);	×
90	}
91
UNCOV 92	memcpy(pRsp->pSchemas, meta->pSchemas, meta->numOfColumns * sizeof(SSchema));	×
UNCOV 93	TAOS_RETURN(code);	×
94	}
95
96	int32_t mndBuildPerfsTableCfg(SMnode pMnode, const char dbFName, const char tbName, STableCfgRsp pRsp) {	×
97	int32_t code = 0;	×
98	if (NULL == pMnode->perfsMeta) {	×
99	code = TSDB_CODE_APP_ERROR;	×
100	TAOS_RETURN(code);	×
101	}
102
103	STableMetaRsp *pMeta = taosHashGet(pMnode->perfsMeta, tbName, strlen(tbName));	×
104	if (NULL == pMeta) {	×
105	mError("invalid performance schema table name:%s", tbName);	×
106	code = TSDB_CODE_PAR_TABLE_NOT_EXIST;	×
107	TAOS_RETURN(code);	×
108	}
109
110	tstrncpy(pRsp->tbName, pMeta->tbName, sizeof(pRsp->tbName));	×
111	tstrncpy(pRsp->stbName, pMeta->stbName, sizeof(pRsp->stbName));	×
112	tstrncpy(pRsp->dbFName, pMeta->dbFName, sizeof(pRsp->dbFName));	×
113	pRsp->numOfTags = pMeta->numOfTags;	×
114	pRsp->numOfColumns = pMeta->numOfColumns;	×
115	pRsp->tableType = pMeta->tableType;	×
116
117	pRsp->pSchemas = taosMemoryCalloc(pMeta->numOfColumns, sizeof(SSchema));	×
118	if (pRsp->pSchemas == NULL) {	×
119	code = terrno;	×
120	pRsp->pSchemas = NULL;	×
121	TAOS_RETURN(code);	×
122	}
123
124	memcpy(pRsp->pSchemas, pMeta->pSchemas, pMeta->numOfColumns * sizeof(SSchema));	×
125	TAOS_RETURN(code);	×
126	}
127
128	int32_t mndInitPerfs(SMnode *pMnode) {	13✔
129	int32_t code = 0;	13✔
130	pMnode->perfsMeta = taosHashInit(20, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), false, HASH_NO_LOCK);	13✔
131	if (pMnode->perfsMeta == NULL) {	13!
132	code = terrno;	×
133	TAOS_RETURN(code);	×
134	}
135
136	return mndPerfsInitMeta(pMnode->perfsMeta);	13✔
137	}
138
139	void mndCleanupPerfs(SMnode *pMnode) {	13✔
140	if (NULL == pMnode->perfsMeta) {	13!
141	return;	×
142	}
143
144	void *pIter = taosHashIterate(pMnode->perfsMeta, NULL);	13✔
145	while (pIter) {	78✔
146	STableMetaRsp meta = (STableMetaRsp )pIter;	65✔
147
148	taosMemoryFreeClear(meta->pSchemas);	65!
149
150	pIter = taosHashIterate(pMnode->perfsMeta, pIter);	65✔
151	}
152
153	taosHashCleanup(pMnode->perfsMeta);	13✔
154	pMnode->perfsMeta = NULL;	13✔
155	}

taosdata / TDengine / #3562

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous