#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

58.82

/source/dnode/vnode/src/meta/metaCommit.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/>.
 */

#include "meta.h"
#include "vnd.h"

static FORCE_INLINE void *metaMalloc(void *pPool, size_t size) {
  SVBufPool *pool = (SVBufPool *)pPool;
  SVnode    *pVnode = pool->pVnode;

  if (pVnode->inUse && pVnode->inUse->size > pVnode->inUse->node.size) {
    return NULL;
  }

  return vnodeBufPoolMallocAligned((SVBufPool *)pPool, size);
}

static FORCE_INLINE void metaFree(void *pPool, void *p) { vnodeBufPoolFree((SVBufPool *)pPool, p); }

// begin a meta txn
int32_t metaBegin(SMeta *pMeta, int8_t heap) {
  int32_t code = 0;
  int32_t lino;

  void *(*xMalloc)(void *, size_t) = NULL;
  void (*xFree)(void *, void *) = NULL;
  void *xArg = NULL;

  // default heap to META_BEGIN_HEAP_NIL
  if (heap == META_BEGIN_HEAP_OS) {
    xMalloc = tdbDefaultMalloc;
    xFree = tdbDefaultFree;
  } else if (heap == META_BEGIN_HEAP_BUFFERPOOL) {
    xMalloc = metaMalloc;
    xFree = metaFree;
    xArg = pMeta->pVnode->inUse;
  }

  code = tdbBegin(pMeta->pEnv, &pMeta->txn, xMalloc, xFree, xArg, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED);
  TSDB_CHECK_CODE(code, lino, _exit);

  code = tdbCommit(pMeta->pEnv, pMeta->txn);
  TSDB_CHECK_CODE(code, lino, _exit);

_exit:
  if (code) {
    metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__,
              tstrerror(terrno));
  } else {
    metaDebug("vgId:%d %s success", TD_VID(pMeta->pVnode), __func__);
  }

  TAOS_RETURN(code);
}

// commit the meta txn
TXN *metaGetTxn(SMeta *pMeta) { return pMeta->txn; }
int  metaCommit(SMeta *pMeta, TXN *txn) { return tdbCommit(pMeta->pEnv, txn); }
int  metaFinishCommit(SMeta *pMeta, TXN *txn) { return tdbPostCommit(pMeta->pEnv, txn); }

int metaPrepareAsyncCommit(SMeta *pMeta) {
  // return tdbPrepareAsyncCommit(pMeta->pEnv, pMeta->txn);
  int     code = 0;
  int32_t lino;

  metaWLock(pMeta);
  int32_t ret = ttlMgrFlush(pMeta->pTtlMgr, pMeta->txn);
  if (ret < 0) {
    metaError("vgId:%d, failed to flush ttl since %s", TD_VID(pMeta->pVnode), tstrerror(ret));
  }
  metaULock(pMeta);

  code = tdbCommit(pMeta->pEnv, pMeta->txn);
  TSDB_CHECK_CODE(code, lino, _exit);
  pMeta->changed = false;

  pMeta->txn = NULL;

_exit:
  if (code) {
    metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__,
              tstrerror(terrno));
  } else {
    metaDebug("vgId:%d %s success", TD_VID(pMeta->pVnode), __func__);
  }

  TAOS_RETURN(code);
}

// abort the meta txn
int metaAbort(SMeta *pMeta) {
  if (!pMeta->txn) {
    return 0;
  }

  tdbAbort(pMeta->pEnv, pMeta->txn);
  pMeta->txn = NULL;
  return 0;
}

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	#include "meta.h"
17	#include "vnd.h"
18
UNCOV 19	static FORCE_INLINE void metaMalloc(void pPool, size_t size) {	×
UNCOV 20	SVBufPool pool = (SVBufPool )pPool;	×
UNCOV 21	SVnode *pVnode = pool->pVnode;	×
22
UNCOV 23	if (pVnode->inUse && pVnode->inUse->size > pVnode->inUse->node.size) {	×
24	return NULL;	×
25	}
26
UNCOV 27	return vnodeBufPoolMallocAligned((SVBufPool *)pPool, size);	×
28	}
29
UNCOV 30	static FORCE_INLINE void metaFree(void pPool, void p) { vnodeBufPoolFree((SVBufPool *)pPool, p); }	×
31
32	// begin a meta txn
33	int32_t metaBegin(SMeta *pMeta, int8_t heap) {	22✔
34	int32_t code = 0;	22✔
35	int32_t lino;
36
37	void (xMalloc)(void *, size_t) = NULL;	22✔
38	void (xFree)(void , void *) = NULL;	22✔
39	void *xArg = NULL;	22✔
40
41	// default heap to META_BEGIN_HEAP_NIL
42	if (heap == META_BEGIN_HEAP_OS) {	22!
43	xMalloc = tdbDefaultMalloc;	×
44	xFree = tdbDefaultFree;	×
45	} else if (heap == META_BEGIN_HEAP_BUFFERPOOL) {	22!
46	xMalloc = metaMalloc;	22✔
47	xFree = metaFree;	22✔
48	xArg = pMeta->pVnode->inUse;	22✔
49	}
50
51	code = tdbBegin(pMeta->pEnv, &pMeta->txn, xMalloc, xFree, xArg, TDB_TXN_WRITE \| TDB_TXN_READ_UNCOMMITTED);	22✔
52	TSDB_CHECK_CODE(code, lino, _exit);	22!
53
54	code = tdbCommit(pMeta->pEnv, pMeta->txn);	22✔
55	TSDB_CHECK_CODE(code, lino, _exit);	22!
56
57	_exit:	22✔
58	if (code) {	22!
59	metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__,	×
60	tstrerror(terrno));
61	} else {
62	metaDebug("vgId:%d %s success", TD_VID(pMeta->pVnode), __func__);	22!
63	}
64
65	TAOS_RETURN(code);	22✔
66	}
67
68	// commit the meta txn
69	TXN metaGetTxn(SMeta pMeta) { return pMeta->txn; }	2✔
UNCOV 70	int metaCommit(SMeta pMeta, TXN txn) { return tdbCommit(pMeta->pEnv, txn); }	×
71	int metaFinishCommit(SMeta pMeta, TXN txn) { return tdbPostCommit(pMeta->pEnv, txn); }	2✔
72
73	int metaPrepareAsyncCommit(SMeta *pMeta) {	2✔
74	// return tdbPrepareAsyncCommit(pMeta->pEnv, pMeta->txn);
75	int code = 0;	2✔
76	int32_t lino;
77
78	metaWLock(pMeta);	2✔
79	int32_t ret = ttlMgrFlush(pMeta->pTtlMgr, pMeta->txn);	2✔
80	if (ret < 0) {	2!
81	metaError("vgId:%d, failed to flush ttl since %s", TD_VID(pMeta->pVnode), tstrerror(ret));	×
82	}
83	metaULock(pMeta);	2✔
84
85	code = tdbCommit(pMeta->pEnv, pMeta->txn);	2✔
86	TSDB_CHECK_CODE(code, lino, _exit);	2!
87	pMeta->changed = false;	2✔
88
89	pMeta->txn = NULL;	2✔
90
91	_exit:	2✔
92	if (code) {	2!
93	metaError("vgId:%d %s failed at %s:%d since %s", TD_VID(pMeta->pVnode), __func__, __FILE__, __LINE__,	×
94	tstrerror(terrno));
95	} else {
96	metaDebug("vgId:%d %s success", TD_VID(pMeta->pVnode), __func__);	2!
97	}
98
99	TAOS_RETURN(code);	2✔
100	}
101
102	// abort the meta txn
103	int metaAbort(SMeta *pMeta) {	20✔
104	if (!pMeta->txn) {	20!
105	return 0;	×
106	}
107
108	tdbAbort(pMeta->pEnv, pMeta->txn);	20✔
109	pMeta->txn = NULL;	20✔
110	return 0;	20✔
111	}

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