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

Fix the issure #103, alter table change tag bug

This commit is contained in:
slguan 2019-07-18 18:55:30 +08:00
parent 04e0600907
commit 136f34044b
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/src/tscAsync.c
View File

@ -526,8 +526,7 @@ void tscMeterMetaCallBack(void *param, TAOS_RES *res, int code) {
/* /*
* NOTE: * NOTE:
* transfer the sql function for metric query before get meter/metric meta, * transfer the sql function for metric query before get meter/metric meta,
* since in callback functions, * since in callback functions, only tscProcessSql(pStream->pSql) is executed!
* only tscProcessSql(pStream->pSql) is executed!
*/ */
tscTansformSQLFunctionForMetricQuery(&pSql->cmd); tscTansformSQLFunctionForMetricQuery(&pSql->cmd);
tscIncStreamExecutionCount(pSql->pStream); tscIncStreamExecutionCount(pSql->pStream);

24
src/client/src/tscSQLParser.c
View File

@ -1586,7 +1586,7 @@ static int32_t setExprInfoForFunctions(SSqlCmd* pCmd, SSchema* pSchema, int32_t
int16_t type = 0; int16_t type = 0;
int16_t bytes = 0; int16_t bytes = 0;
char columnName[TSDB_COL_NAME_LEN + 1] = {0}; char columnName[TSDB_COL_NAME_LEN] = {0};
char msg1[] = "not support column types"; char msg1[] = "not support column types";
if (functionID == TSDB_FUNC_SPREAD) { if (functionID == TSDB_FUNC_SPREAD) {
@ -3570,20 +3570,27 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
pCmd->numOfCols = 1; // only one column pCmd->numOfCols = 1; // only one column
} else if (pInfo->sqlType == ALTER_TABLE_TAGS_CHG) { } else if (pInfo->sqlType == ALTER_TABLE_TAGS_CHG) {
char msg1[] = "tag name too long";
char msg2[] = "invalid tag name";
pCmd->count = TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN; pCmd->count = TSDB_ALTER_TABLE_CHANGE_TAG_COLUMN;
tVariantList* pVarList = pAlterSQL->varList; tVariantList* pVarList = pAlterSQL->varList;
if (pVarList->nExpr > 2) { if (pVarList->nExpr > 2) {
return TSDB_CODE_INVALID_SQL; return TSDB_CODE_INVALID_SQL;
} }
if (pVarList->a[0].pVar.nLen > TSDB_COL_NAME_LEN || pVarList->a[1].pVar.nLen > TSDB_COL_NAME_LEN) { tVariantListItem* pSrcItem = &pAlterSQL->varList->a[0];
char msg[] = "tag name too long"; tVariantListItem* pDstItem = &pAlterSQL->varList->a[1];
setErrMsg(pCmd, msg, tListLen(msg));
if (pSrcItem->pVar.nLen >= TSDB_COL_NAME_LEN || pDstItem->pVar.nLen >= TSDB_COL_NAME_LEN) {
setErrMsg(pCmd, msg1, tListLen(msg1));
return TSDB_CODE_INVALID_SQL; return TSDB_CODE_INVALID_SQL;
} }
tVariantListItem* pSrcItem = &pAlterSQL->varList->a[0]; if (pSrcItem->pVar.nType != TSDB_DATA_TYPE_BINARY || pDstItem->pVar.nType != TSDB_DATA_TYPE_BINARY) {
tVariantListItem* pDstItem = &pAlterSQL->varList->a[1]; setErrMsg(pCmd, msg2, tListLen(msg2));
return TSDB_CODE_INVALID_SQL;
}
bool srcFound = false; bool srcFound = false;
bool dstFound = false; bool dstFound = false;
@ -3592,11 +3599,12 @@ int32_t setAlterTableInfo(SSqlObj* pSql, struct SSqlInfo* pInfo) {
char* tagName = pSchema[tagIdx].name; char* tagName = pSchema[tagIdx].name;
size_t nameLen = strlen(tagName); size_t nameLen = strlen(tagName);
if ((!srcFound) && strncasecmp(tagName, pSrcItem->pVar.pz, nameLen) == 0) { if ((!srcFound) && (strncasecmp(tagName, pSrcItem->pVar.pz, nameLen) == 0 && (pSrcItem->pVar.nLen == nameLen))) {
srcFound = true; srcFound = true;
} }
if ((!dstFound) && strncasecmp(tagName, pDstItem->pVar.pz, nameLen) == 0) { //todo extract method
if ((!dstFound) && (strncasecmp(tagName, pDstItem->pVar.pz, nameLen) == 0 && (pDstItem->pVar.nLen == nameLen))) {
dstFound = true; dstFound = true;
} }
} }

2
src/system/src/mgmtMeter.c
View File

@ -1621,7 +1621,7 @@ int32_t mgmtMeterModifyTagNameByCol(STabObj *pMetric, uint32_t col, const char *
return TSDB_CODE_APP_ERROR; return TSDB_CODE_APP_ERROR;
} }
mError("Succeed to modify table %s tag column", pMetric->meterId); mTrace("Succeed to modify table %s tag column", pMetric->meterId);
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }