From 08b98fa2dd69cce165debad49135f3cdc18cfe32 Mon Sep 17 00:00:00 2001 From: sheyanjie-qq <249478495@qq.com> Date: Tue, 25 Mar 2025 00:20:51 +0800 Subject: [PATCH] remove readme --- docs/examples/JDBC/highvolume/readme.md | 31 ------------------------ source/client/inc/clientInt.h | 2 +- source/client/src/clientImpl.c | 6 ++--- source/client/src/clientMain.c | 4 +-- source/common/src/msg/tmsg.c | 6 ----- source/common/src/tdatablock.c | 2 +- source/dnode/mnode/impl/src/mndStb.c | 10 -------- source/dnode/vnode/src/meta/metaEntry.c | 13 ---------- source/dnode/vnode/src/meta/metaTable2.c | 17 ------------- source/libs/function/src/builtinsimpl.c | 1 - source/libs/scalar/src/sclfunc.c | 1 - source/libs/scalar/src/sclvector.c | 4 --- 12 files changed, 7 insertions(+), 90 deletions(-) delete mode 100644 docs/examples/JDBC/highvolume/readme.md diff --git a/docs/examples/JDBC/highvolume/readme.md b/docs/examples/JDBC/highvolume/readme.md deleted file mode 100644 index 21f9153935..0000000000 --- a/docs/examples/JDBC/highvolume/readme.md +++ /dev/null @@ -1,31 +0,0 @@ -# How to Run the JDBC Demo Code On Linux OS -TDengine's JDBC demo project is organized in a Maven way so that users can easily compile, package and run the project. If you don't have Maven on your server, you may install it using -``` -sudo apt-get install maven -``` - -## Install TDengine Client -Make sure you have already installed a tdengine client on your current develop environment. -Download the tdengine package on our website: ``https://www.taosdata.com/cn/all-downloads/`` and install the client. - -## Run jdbcDemo using mvn plugin -run command: -``` -mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JdbcDemo" -``` - -and run with your customed args -``` -mvn clean compile exec:java -Dexec.mainClass="com.taosdata.example.JdbcDemo" -Dexec.args="-host [HOSTNAME]" -``` - -## Compile the Demo Code and Run It -``` -mvn clean package -Dmaven.test.skip=true -``` - -To run JDBCDemo.jar, execute -``` -java -jar target/JDBCDemo-SNAPSHOT-jar-with-dependencies.jar -host [HOSTNAME] -``` - diff --git a/source/client/inc/clientInt.h b/source/client/inc/clientInt.h index 1464c3580e..13269f5a1a 100644 --- a/source/client/inc/clientInt.h +++ b/source/client/inc/clientInt.h @@ -313,7 +313,7 @@ typedef struct SSyncQueryParam { void* doAsyncFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertUcs4); void* doFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertUcs4); -void doSetOneRowPtr(SReqResultInfo* pResultInfo, bool isStmt); +void doSetOneRowPtr(SReqResultInfo* pResultInfo); void setResPrecision(SReqResultInfo* pResInfo, int32_t precision); int32_t setQueryResultFromRsp(SReqResultInfo* pResultInfo, const SRetrieveTableRsp* pRsp, bool convertUcs4, bool isStmt); int32_t setResultDataPtr(SReqResultInfo* pResultInfo, bool convertUcs4, bool isStmt); diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c index cd0d555e7c..7e2454bf6f 100644 --- a/source/client/src/clientImpl.c +++ b/source/client/src/clientImpl.c @@ -1941,7 +1941,7 @@ TAOS* taos_connect_auth(const char* ip, const char* user, const char* auth, cons // return taos_connect(ipStr, userStr, passStr, dbStr, port); // } -void doSetOneRowPtr(SReqResultInfo* pResultInfo, bool isStmt) { +void doSetOneRowPtr(SReqResultInfo* pResultInfo) { for (int32_t i = 0; i < pResultInfo->numOfCols; ++i) { SResultColumn* pCol = &pResultInfo->pCol[i]; @@ -2012,7 +2012,7 @@ void* doFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertUcs4) } if (setupOneRowPtr) { - doSetOneRowPtr(pResultInfo, pRequest->isStmtBind); + doSetOneRowPtr(pResultInfo); pResultInfo->current += 1; } @@ -2059,7 +2059,7 @@ void* doAsyncFetchRows(SRequestObj* pRequest, bool setupOneRowPtr, bool convertU return NULL; } else { if (setupOneRowPtr) { - doSetOneRowPtr(pResultInfo, pRequest->isStmtBind); + doSetOneRowPtr(pResultInfo); pResultInfo->current += 1; } diff --git a/source/client/src/clientMain.c b/source/client/src/clientMain.c index eca1b286f6..50fadc9593 100644 --- a/source/client/src/clientMain.c +++ b/source/client/src/clientMain.c @@ -647,7 +647,7 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) { } if (pResultInfo->current < pResultInfo->numOfRows) { - doSetOneRowPtr(pResultInfo, false); + doSetOneRowPtr(pResultInfo); pResultInfo->current += 1; return pResultInfo->row; } else { @@ -655,7 +655,7 @@ TAOS_ROW taos_fetch_row(TAOS_RES *res) { return NULL; } - doSetOneRowPtr(pResultInfo, false); + doSetOneRowPtr(pResultInfo); pResultInfo->current += 1; return pResultInfo->row; } diff --git a/source/common/src/msg/tmsg.c b/source/common/src/msg/tmsg.c index cfd45e356b..5d99ef8fea 100644 --- a/source/common/src/msg/tmsg.c +++ b/source/common/src/msg/tmsg.c @@ -11029,12 +11029,6 @@ int tEncodeSVCreateTbReq(SEncoder *pCoder, const SVCreateTbReq *pReq) { // Encode Column Options: encode compress level if (pReq->type == TSDB_SUPER_TABLE || pReq->type == TSDB_NORMAL_TABLE) { TAOS_CHECK_EXIT(tEncodeSColCmprWrapper(pCoder, &pReq->colCmpr)); - if (pReq->pExtSchemas) { - TAOS_CHECK_EXIT(tEncodeI8(pCoder, 1)); - TAOS_CHECK_EXIT(tEncodeSExtSchemas(pCoder, pReq->pExtSchemas, pReq->ntb.schemaRow.nCols)); - } else { - TAOS_CHECK_EXIT(tEncodeI8(pCoder, 0)); - } } if (pReq->type == TSDB_VIRTUAL_NORMAL_TABLE || pReq->type == TSDB_VIRTUAL_CHILD_TABLE) { TAOS_CHECK_EXIT(tEncodeSColRefWrapper(pCoder, &pReq->colRef)); diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c index d0a94e2cc6..1f5f808a65 100644 --- a/source/common/src/tdatablock.c +++ b/source/common/src/tdatablock.c @@ -2945,7 +2945,7 @@ int32_t buildSubmitReqFromDataBlock(SSubmitReq2** ppReq, const SSDataBlock* pDat } break; } - case TSDB_DATA_TYPE_DECIMAL: // TODO wjm + case TSDB_DATA_TYPE_DECIMAL: case TSDB_DATA_TYPE_BLOB: case TSDB_DATA_TYPE_JSON: case TSDB_DATA_TYPE_MEDIUMBLOB: diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index c4e4e2f2be..35c753022b 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -347,16 +347,6 @@ static SSdbRow *mndStbActionDecode(SSdbRaw *pRaw) { SDB_GET_INT8(pRaw, dataPos, &pStb->virtualStb, _OVER) } - // type mod - if (hasExtSchemas) { - pStb->pExtSchemas = taosMemoryCalloc(pStb->numOfColumns, sizeof(SExtSchema)); - if (!pStb->pExtSchemas) goto _OVER; - for (int32_t i = 0; i < pStb->numOfColumns; ++i) { - SSchema *pSchema = &pStb->pColumns[i]; - SDB_GET_INT32(pRaw, dataPos, &pStb->pExtSchemas[i].typeMod, _OVER) - } - } - SDB_GET_RESERVE(pRaw, dataPos, STB_RESERVE_SIZE, _OVER) terrno = 0; diff --git a/source/dnode/vnode/src/meta/metaEntry.c b/source/dnode/vnode/src/meta/metaEntry.c index fe7adbeded..dfa0ea13bd 100644 --- a/source/dnode/vnode/src/meta/metaEntry.c +++ b/source/dnode/vnode/src/meta/metaEntry.c @@ -387,9 +387,6 @@ int metaDecodeEntryImpl(SDecoder *pCoder, SMetaEntry *pME, bool headerOnly) { if (!tDecodeIsEnd(pCoder)) { TAOS_CHECK_RETURN(metaDecodeExtSchemas(pCoder, pME)); } - if (!tDecodeIsEnd(pCoder)) { - TAOS_CHECK_RETURN(metaDecodeExtSchemas(pCoder, pME)); - } } if (pME->type == TSDB_SUPER_TABLE) { if (!tDecodeIsEnd(pCoder)) { @@ -398,7 +395,6 @@ int metaDecodeEntryImpl(SDecoder *pCoder, SMetaEntry *pME, bool headerOnly) { } - tEndDecode(pCoder); return 0; } @@ -577,15 +573,6 @@ int32_t metaCloneEntry(const SMetaEntry *pEntry, SMetaEntry **ppEntry) { } memcpy((*ppEntry)->pExtSchemas, pEntry->pExtSchemas, sizeof(SExtSchema) * pEntry->colCmpr.nCols); } - if (pEntry->pExtSchemas && pEntry->colCmpr.nCols > 0) { - (*ppEntry)->pExtSchemas = taosMemoryCalloc(pEntry->colCmpr.nCols, sizeof(SExtSchema)); - if (!(*ppEntry)->pExtSchemas) { - code = terrno; - metaCloneEntryFree(ppEntry); - return code; - } - memcpy((*ppEntry)->pExtSchemas, pEntry->pExtSchemas, sizeof(SExtSchema) * pEntry->colCmpr.nCols); - } return code; } diff --git a/source/dnode/vnode/src/meta/metaTable2.c b/source/dnode/vnode/src/meta/metaTable2.c index 2bd6a2b8b8..abdd8bc023 100644 --- a/source/dnode/vnode/src/meta/metaTable2.c +++ b/source/dnode/vnode/src/meta/metaTable2.c @@ -194,7 +194,6 @@ int32_t metaCreateSuperTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq TABLE_SET_COL_COMPRESSED(entry.flags); entry.colCmpr = pReq->colCmpr; } - entry.pExtSchemas = pReq->pExtSchemas; entry.pExtSchemas = pReq->pExtSchemas; @@ -861,13 +860,6 @@ int32_t metaAddTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pReq, ST metaFetchEntryFree(&pEntry); TAOS_RETURN(code); } - code = addTableExtSchema(pEntry, pColumn, pSchema->nCols, &extSchema); - if (code) { - metaError("vgId:%d, %s failed to add ext schema at %s:%d since %s, version:%" PRId64, TD_VID(pMeta->pVnode), - __func__, __FILE__, __LINE__, tstrerror(code), version); - metaFetchEntryFree(&pEntry); - TAOS_RETURN(code); - } // do handle entry code = metaHandleEntry2(pMeta, pEntry); @@ -1019,15 +1011,6 @@ int32_t metaDropTableColumn(SMeta *pMeta, int64_t version, SVAlterTbReq *pReq, S TAOS_RETURN(code); } - // update column extschema - code = dropTableExtSchema(pEntry, iColumn, pSchema->nCols); - if (code) { - metaError("vgId:%d, %s failed to remove extschema at %s:%d since %s, version:%" PRId64, TD_VID(pMeta->pVnode), - __func__, __FILE__, __LINE__, tstrerror(code), version); - metaFetchEntryFree(&pEntry); - TAOS_RETURN(code); - } - // do handle entry code = metaHandleEntry2(pMeta, pEntry); if (code) { diff --git a/source/libs/function/src/builtinsimpl.c b/source/libs/function/src/builtinsimpl.c index ca402431c7..2c9d8ca358 100644 --- a/source/libs/function/src/builtinsimpl.c +++ b/source/libs/function/src/builtinsimpl.c @@ -782,7 +782,6 @@ int32_t sumInvertFunction(SqlFunctionCtx* pCtx) { } #endif -// TODO wjm impl for decimal int32_t sumCombine(SqlFunctionCtx* pDestCtx, SqlFunctionCtx* pSourceCtx) { SResultRowEntryInfo* pDResInfo = GET_RES_INFO(pDestCtx); void* pDBuf = GET_ROWCELL_INTERBUF(pDResInfo); diff --git a/source/libs/scalar/src/sclfunc.c b/source/libs/scalar/src/sclfunc.c index d56d21758e..b0b1100151 100644 --- a/source/libs/scalar/src/sclfunc.c +++ b/source/libs/scalar/src/sclfunc.c @@ -3285,7 +3285,6 @@ int32_t countScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam return TSDB_CODE_SUCCESS; } -// TODO wjm what is sum scalar function??? int32_t sumScalarFunction(SScalarParam *pInput, int32_t inputNum, SScalarParam *pOutput) { SColumnInfoData *pInputData = pInput->columnData; SColumnInfoData *pOutputData = pOutput->columnData; diff --git a/source/libs/scalar/src/sclvector.c b/source/libs/scalar/src/sclvector.c index 3eb3ef5f7e..1c3fc3625d 100644 --- a/source/libs/scalar/src/sclvector.c +++ b/source/libs/scalar/src/sclvector.c @@ -1347,8 +1347,6 @@ int32_t vectorMathAdd(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p } else if (pRight->numOfRows == 1) { SCL_ERR_JRET(vectorMathAddHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, i)); } - } else if (IS_DECIMAL_TYPE(pOutputCol->info.type)) { - SCL_ERR_JRET(vectorMathBinaryOpForDecimal(pLeft, pRight, pOut, step, i, OP_TYPE_ADD)); } _return: @@ -1482,8 +1480,6 @@ int32_t vectorMathSub(SScalarParam *pLeft, SScalarParam *pRight, SScalarParam *p } else if (pRight->numOfRows == 1) { SCL_ERR_JRET(vectorMathSubHelper(pLeftCol, pRightCol, pOutputCol, pLeft->numOfRows, step, 1, i)); } - } else if (pOutputCol->info.type == TSDB_DATA_TYPE_DECIMAL) { - SCL_ERR_JRET(vectorMathBinaryOpForDecimal(pLeft, pRight, pOut, step, i, OP_TYPE_SUB)); } _return: