#3653

Committed 14 Mar 2025 08:10AM UTC coverage: 22.565% (-41.0%) from 63.596%

Build # #3653

Build Type

push

travis-ci

Committed by

web-flow

Commit Message

feat(keep): support keep on super table level. (#30097)

* Feat: support use keep while create super table.

* Test(keep): add test for create super table with keep option.

* Feat(keep): Add tmsg for create keep.

* Feat(keep): support alter table option keep.

* Fix(keep): Add baisc test for alter table option.

* Fix(keep): memory leek.

* Feat(keep): add keep to metaEntry&metaCache and fix earliestTs with stn keep.

* Test(keep): add some cases for select with stb keep.

* Fix: fix ci core while alter stb.

* Feat(keep): delete expired data in super table level.

* Feat: remove get stb keep while query.

* Fix : build error.

* Revert "Fix : build error."

This reverts commit 0ed66e4e8.

* Revert "Feat(keep): delete expired data in super table level."

This reverts commit 36330f6b4.

* Fix : build errors.

* Feat : support restart taosd.

* Fix : alter table comment problems.

* Test : add tests for super table keep.

* Fix: change sdb stb reserve size.

* Test: add more tests.

* Feat: Disable normal tables and sub tables from setting the keep parameter

* Fix: add more checks to avoid unknown address.

* Docs: Add docs for stable keep.

* Fix: some review changes.

* Fix: review errors.

Run Details

49248 of 302527 branches covered (16.28%)

Branch coverage included in aggregate %.

53 of 99 new or added lines in 12 files covered. (53.54%)

155872 existing lines in 443 files now uncovered.

87359 of 302857 relevant lines covered (28.84%)

570004.22 hits per line

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

72.85

/source/dnode/mnode/sdb/src/sdb.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 "sdb.h"

static int32_t sdbCreateDir(SSdb *pSdb);

SSdb *sdbInit(SSdbOpt *pOption) {
  mInfo("start to init sdb in %s", pOption->path);

  SSdb *pSdb = taosMemoryCalloc(1, sizeof(SSdb));
  if (pSdb == NULL) {
    terrno = TSDB_CODE_OUT_OF_MEMORY;
    mError("failed to init sdb since %s", terrstr());
    return NULL;
  }

  char path[PATH_MAX + 100] = {0};
  snprintf(path, sizeof(path), "%s%sdata", pOption->path, TD_DIRSEP);
  pSdb->currDir = taosStrdup(path);
  snprintf(path, sizeof(path), "%s%stmp", pOption->path, TD_DIRSEP);
  pSdb->tmpDir = taosStrdup(path);
  if (pSdb->currDir == NULL || pSdb->tmpDir == NULL) {
    sdbCleanup(pSdb);
    terrno = TSDB_CODE_OUT_OF_MEMORY;
    mError("failed to init sdb since %s", terrstr());
    return NULL;
  }

  if (sdbCreateDir(pSdb) != 0) {
    sdbCleanup(pSdb);
    return NULL;
  }

  for (ESdbType i = 0; i < SDB_MAX; ++i) {
    (void)taosThreadRwlockInit(&pSdb->locks[i], NULL);
    pSdb->maxId[i] = 0;
    pSdb->tableVer[i] = 0;
    pSdb->keyTypes[i] = SDB_KEY_INT32;
  }

  pSdb->pWal = pOption->pWal;
  pSdb->applyIndex = -1;
  pSdb->applyTerm = -1;
  pSdb->applyConfig = -1;
  pSdb->commitIndex = -1;
  pSdb->commitTerm = -1;
  pSdb->commitConfig = -1;
  pSdb->pMnode = pOption->pMnode;
  (void)taosThreadMutexInit(&pSdb->filelock, NULL);
  mInfo("sdb init success");
  return pSdb;
}

void sdbCleanup(SSdb *pSdb) {
  mInfo("start to cleanup sdb");

  int32_t code = 0;

  if ((code = sdbWriteFile(pSdb, 0)) != 0) {
    mError("failed to write sdb file since %s", tstrerror(code));
  }

  if (pSdb->currDir != NULL) {
    taosMemoryFreeClear(pSdb->currDir);
  }

  if (pSdb->tmpDir != NULL) {
    taosRemoveDir(pSdb->tmpDir);
    taosMemoryFreeClear(pSdb->tmpDir);
  }

  for (ESdbType i = 0; i < SDB_MAX; ++i) {
    SHashObj *hash = pSdb->hashObjs[i];
    if (hash == NULL) continue;

    SSdbRow **ppRow = taosHashIterate(hash, NULL);
    while (ppRow != NULL) {
      SSdbRow *pRow = *ppRow;
      if (pRow == NULL) continue;

      sdbFreeRow(pSdb, pRow, true);
      ppRow = taosHashIterate(hash, ppRow);
    }
  }

  for (ESdbType i = 0; i < SDB_MAX; ++i) {
    SHashObj *hash = pSdb->hashObjs[i];
    if (hash == NULL) continue;

    taosHashClear(hash);
    taosHashCleanup(hash);
    (void)taosThreadRwlockDestroy(&pSdb->locks[i]);
    pSdb->hashObjs[i] = NULL;
    memset(&pSdb->locks[i], 0, sizeof(pSdb->locks[i]));

    mInfo("sdb table:%s is cleaned up", sdbTableName(i));
  }

  (void)taosThreadMutexDestroy(&pSdb->filelock);
  taosMemoryFree(pSdb);
  mInfo("sdb is cleaned up");
}

int32_t sdbSetTable(SSdb *pSdb, SSdbTable table) {
  int32_t code = 0;

  ESdbType sdbType = table.sdbType;
  EKeyType keyType = table.keyType;
  pSdb->keyTypes[sdbType] = table.keyType;
  pSdb->insertFps[sdbType] = table.insertFp;
  pSdb->updateFps[sdbType] = table.updateFp;
  pSdb->deleteFps[sdbType] = table.deleteFp;
  pSdb->deployFps[sdbType] = table.deployFp;
  pSdb->encodeFps[sdbType] = table.encodeFp;
  pSdb->decodeFps[sdbType] = table.decodeFp;
  pSdb->afterRestoredFps[sdbType] = table.afterRestoredFp;
  pSdb->validateFps[sdbType] = table.validateFp;

  int32_t hashType = 0;
  if (keyType == SDB_KEY_INT32) {
    hashType = TSDB_DATA_TYPE_INT;
  } else if (keyType == SDB_KEY_INT64) {
    hashType = TSDB_DATA_TYPE_BIGINT;
  } else {
    hashType = TSDB_DATA_TYPE_BINARY;
  }

  SHashObj *hash = taosHashInit(64, taosGetDefaultHashFunction(hashType), true, HASH_ENTRY_LOCK);
  if (hash == NULL) {
    TAOS_RETURN(terrno);
  }

  pSdb->maxId[sdbType] = 0;
  pSdb->hashObjs[sdbType] = hash;
  mInfo("sdb table:%s is initialized", sdbTableName(sdbType));

  TAOS_RETURN(0);
}

static int32_t sdbCreateDir(SSdb *pSdb) {
  int32_t code = 0;
  if (taosMulMkDir(pSdb->currDir) != 0) {
    code = TAOS_SYSTEM_ERROR(ERRNO);
    mError("failed to create dir:%s since %s", pSdb->currDir, tstrerror(code));
    TAOS_RETURN(code);
  }

  if (taosMkDir(pSdb->tmpDir) != 0) {
    code = TAOS_SYSTEM_ERROR(ERRNO);
    mError("failed to create dir:%s since %s", pSdb->tmpDir, tstrerror(code));
    TAOS_RETURN(code);
  }

  return 0;
}

void sdbSetApplyInfo(SSdb *pSdb, int64_t index, int64_t term, int64_t config) {
  mInfo("vgId:1, mnode apply info changed from index:%" PRId64 " term:%" PRId64 " config:%" PRId64 " to index:%" PRId64
        " term:%" PRId64 " config:%" PRId64,
        pSdb->applyIndex, pSdb->applyTerm, pSdb->applyConfig, index, term, config);

  pSdb->applyIndex = index;
  pSdb->applyTerm = term;
  pSdb->applyConfig = config;
}

void sdbGetCommitInfo(SSdb *pSdb, int64_t *index, int64_t *term, int64_t *config) {
  *index = pSdb->commitIndex;
  *term = pSdb->commitTerm;
  *config = pSdb->commitConfig;
#if 1
  mTrace("mnode current info, apply index:%" PRId64 " term:%" PRId64 " config:%" PRId64 ", commit index:%" PRId64
         " term:%" PRId64 " config:%" PRId64,
         pSdb->applyIndex, pSdb->applyTerm, pSdb->applyConfig, *index, *term, *config);
#endif
}

void sdbWriteLock(SSdb *pSdb, int32_t type) {
  TdThreadRwlock *pLock = &pSdb->locks[type];
  // mTrace("sdb table:%d start write lock:%p", type, pLock);
  (void)taosThreadRwlockWrlock(pLock);
  // mTrace("sdb table:%d stop write lock:%p", type, pLock);
}

void sdbReadLock(SSdb *pSdb, int32_t type) {
  TdThreadRwlock *pLock = &pSdb->locks[type];
  // mTrace("sdb table:%d start read lock:%p", type, pLock);
  (void)taosThreadRwlockRdlock(pLock);
  // mTrace("sdb table:%d stop read lock:%p", type, pLock);
}

void sdbUnLock(SSdb *pSdb, int32_t type) {
  TdThreadRwlock *pLock = &pSdb->locks[type];
  // mTrace("sdb table:%d unlock:%p", type, pLock);
  (void)taosThreadRwlockUnlock(pLock);
}

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 "sdb.h"
18
19	static int32_t sdbCreateDir(SSdb *pSdb);
20
21	SSdb sdbInit(SSdbOpt pOption) {	12✔
22	mInfo("start to init sdb in %s", pOption->path);	12!
23
24	SSdb *pSdb = taosMemoryCalloc(1, sizeof(SSdb));	12!
25	if (pSdb == NULL) {	12!
26	terrno = TSDB_CODE_OUT_OF_MEMORY;	×
27	mError("failed to init sdb since %s", terrstr());	×
28	return NULL;	×
29	}
30
31	char path[PATH_MAX + 100] = {0};	12✔
32	snprintf(path, sizeof(path), "%s%sdata", pOption->path, TD_DIRSEP);	12✔
33	pSdb->currDir = taosStrdup(path);	12!
34	snprintf(path, sizeof(path), "%s%stmp", pOption->path, TD_DIRSEP);	12✔
35	pSdb->tmpDir = taosStrdup(path);	12!
36	if (pSdb->currDir == NULL \|\| pSdb->tmpDir == NULL) {	12!
37	sdbCleanup(pSdb);	×
38	terrno = TSDB_CODE_OUT_OF_MEMORY;	×
39	mError("failed to init sdb since %s", terrstr());	×
40	return NULL;	×
41	}
42
43	if (sdbCreateDir(pSdb) != 0) {	12!
44	sdbCleanup(pSdb);	×
45	return NULL;	×
46	}
47
48	for (ESdbType i = 0; i < SDB_MAX; ++i) {	372✔
49	(void)taosThreadRwlockInit(&pSdb->locks[i], NULL);	360✔
50	pSdb->maxId[i] = 0;	360✔
51	pSdb->tableVer[i] = 0;	360✔
52	pSdb->keyTypes[i] = SDB_KEY_INT32;	360✔
53	}
54
55	pSdb->pWal = pOption->pWal;	12✔
56	pSdb->applyIndex = -1;	12✔
57	pSdb->applyTerm = -1;	12✔
58	pSdb->applyConfig = -1;	12✔
59	pSdb->commitIndex = -1;	12✔
60	pSdb->commitTerm = -1;	12✔
61	pSdb->commitConfig = -1;	12✔
62	pSdb->pMnode = pOption->pMnode;	12✔
63	(void)taosThreadMutexInit(&pSdb->filelock, NULL);	12✔
64	mInfo("sdb init success");	12!
65	return pSdb;	12✔
66	}
67
68	void sdbCleanup(SSdb *pSdb) {	11✔
69	mInfo("start to cleanup sdb");	11!
70
71	int32_t code = 0;	11✔
72
73	if ((code = sdbWriteFile(pSdb, 0)) != 0) {	11!
UNCOV 74	mError("failed to write sdb file since %s", tstrerror(code));	×
75	}
76
77	if (pSdb->currDir != NULL) {	11!
78	taosMemoryFreeClear(pSdb->currDir);	11!
79	}
80
81	if (pSdb->tmpDir != NULL) {	11!
82	taosRemoveDir(pSdb->tmpDir);	11✔
83	taosMemoryFreeClear(pSdb->tmpDir);	11!
84	}
85
86	for (ESdbType i = 0; i < SDB_MAX; ++i) {	341✔
87	SHashObj *hash = pSdb->hashObjs[i];	330✔
88	if (hash == NULL) continue;	330✔
89
90	SSdbRow **ppRow = taosHashIterate(hash, NULL);	214✔
91	while (ppRow != NULL) {	286✔
92	SSdbRow pRow = ppRow;	72✔
93	if (pRow == NULL) continue;	72!
94
95	sdbFreeRow(pSdb, pRow, true);	72✔
96	ppRow = taosHashIterate(hash, ppRow);	72✔
97	}
98	}
99
100	for (ESdbType i = 0; i < SDB_MAX; ++i) {	341✔
101	SHashObj *hash = pSdb->hashObjs[i];	330✔
102	if (hash == NULL) continue;	330✔
103
104	taosHashClear(hash);	214✔
105	taosHashCleanup(hash);	214✔
106	(void)taosThreadRwlockDestroy(&pSdb->locks[i]);	214✔
107	pSdb->hashObjs[i] = NULL;	214✔
108	memset(&pSdb->locks[i], 0, sizeof(pSdb->locks[i]));	214✔
109
110	mInfo("sdb table:%s is cleaned up", sdbTableName(i));	214!
111	}
112
113	(void)taosThreadMutexDestroy(&pSdb->filelock);	11✔
114	taosMemoryFree(pSdb);	11!
115	mInfo("sdb is cleaned up");	11!
116	}	11✔
117
118	int32_t sdbSetTable(SSdb *pSdb, SSdbTable table) {	215✔
119	int32_t code = 0;	215✔
120
121	ESdbType sdbType = table.sdbType;	215✔
122	EKeyType keyType = table.keyType;	215✔
123	pSdb->keyTypes[sdbType] = table.keyType;	215✔
124	pSdb->insertFps[sdbType] = table.insertFp;	215✔
125	pSdb->updateFps[sdbType] = table.updateFp;	215✔
126	pSdb->deleteFps[sdbType] = table.deleteFp;	215✔
127	pSdb->deployFps[sdbType] = table.deployFp;	215✔
128	pSdb->encodeFps[sdbType] = table.encodeFp;	215✔
129	pSdb->decodeFps[sdbType] = table.decodeFp;	215✔
130	pSdb->afterRestoredFps[sdbType] = table.afterRestoredFp;	215✔
131	pSdb->validateFps[sdbType] = table.validateFp;	215✔
132
133	int32_t hashType = 0;	215✔
134	if (keyType == SDB_KEY_INT32) {	215✔
135	hashType = TSDB_DATA_TYPE_INT;	74✔
136	} else if (keyType == SDB_KEY_INT64) {	141✔
137	hashType = TSDB_DATA_TYPE_BIGINT;	26✔
138	} else {
139	hashType = TSDB_DATA_TYPE_BINARY;	115✔
140	}
141
142	SHashObj *hash = taosHashInit(64, taosGetDefaultHashFunction(hashType), true, HASH_ENTRY_LOCK);	215✔
143	if (hash == NULL) {	215!
144	TAOS_RETURN(terrno);	×
145	}
146
147	pSdb->maxId[sdbType] = 0;	215✔
148	pSdb->hashObjs[sdbType] = hash;	215✔
149	mInfo("sdb table:%s is initialized", sdbTableName(sdbType));	215!
150
151	TAOS_RETURN(0);	215✔
152	}
153
154	static int32_t sdbCreateDir(SSdb *pSdb) {	12✔
155	int32_t code = 0;	12✔
156	if (taosMulMkDir(pSdb->currDir) != 0) {	12!
157	code = TAOS_SYSTEM_ERROR(ERRNO);	×
158	mError("failed to create dir:%s since %s", pSdb->currDir, tstrerror(code));	×
159	TAOS_RETURN(code);	×
160	}
161
162	if (taosMkDir(pSdb->tmpDir) != 0) {	12!
163	code = TAOS_SYSTEM_ERROR(ERRNO);	×
164	mError("failed to create dir:%s since %s", pSdb->tmpDir, tstrerror(code));	×
165	TAOS_RETURN(code);	×
166	}
167
168	return 0;	12✔
169	}
170
171	void sdbSetApplyInfo(SSdb *pSdb, int64_t index, int64_t term, int64_t config) {	217✔
172	mInfo("vgId:1, mnode apply info changed from index:%" PRId64 " term:%" PRId64 " config:%" PRId64 " to index:%" PRId64	217!
173	" term:%" PRId64 " config:%" PRId64,
174	pSdb->applyIndex, pSdb->applyTerm, pSdb->applyConfig, index, term, config);
175
176	pSdb->applyIndex = index;	217✔
177	pSdb->applyTerm = term;	217✔
178	pSdb->applyConfig = config;	217✔
179	}	217✔
180
181	void sdbGetCommitInfo(SSdb pSdb, int64_t index, int64_t term, int64_t config) {	161✔
182	*index = pSdb->commitIndex;	161✔
183	*term = pSdb->commitTerm;	161✔
184	*config = pSdb->commitConfig;	161✔
185	#if 1
186	mTrace("mnode current info, apply index:%" PRId64 " term:%" PRId64 " config:%" PRId64 ", commit index:%" PRId64	161!
187	" term:%" PRId64 " config:%" PRId64,
188	pSdb->applyIndex, pSdb->applyTerm, pSdb->applyConfig, index, term, *config);
189	#endif
190	}	161✔
191
192	void sdbWriteLock(SSdb *pSdb, int32_t type) {	2,605✔
193	TdThreadRwlock *pLock = &pSdb->locks[type];	2,605✔
194	// mTrace("sdb table:%d start write lock:%p", type, pLock);
195	(void)taosThreadRwlockWrlock(pLock);	2,605✔
196	// mTrace("sdb table:%d stop write lock:%p", type, pLock);
197	}	2,605✔
198
199	void sdbReadLock(SSdb *pSdb, int32_t type) {	2,916✔
200	TdThreadRwlock *pLock = &pSdb->locks[type];	2,916✔
201	// mTrace("sdb table:%d start read lock:%p", type, pLock);
202	(void)taosThreadRwlockRdlock(pLock);	2,916✔
203	// mTrace("sdb table:%d stop read lock:%p", type, pLock);
204	}	2,916✔
205
206	void sdbUnLock(SSdb *pSdb, int32_t type) {	5,521✔
207	TdThreadRwlock *pLock = &pSdb->locks[type];	5,521✔
208	// mTrace("sdb table:%d unlock:%p", type, pLock);
209	(void)taosThreadRwlockUnlock(pLock);	5,521✔
210	}	5,521✔

taosdata / TDengine / #3653

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