Merge pull request #9599 from taosdata/feature/3.0_wxy

TD-12696 bug fix for insert

include/common/tmsg.h

@@ -156,10 +156,6 @@ typedef struct {
   uint16_t port;
 } SEpAddr;
 
-typedef struct {
-  int32_t numOfVnodes;
-} SMsgDesc;
-
 typedef struct SMsgHead {
   int32_t contLen;
   int32_t vgId;

source/libs/parser/src/dataBlockMgt.c

@@ -467,7 +467,7 @@ static int trimDataBlock(void* pDataBlock, STableDataBlocks* pTableDataBlock, SB
 }
 
 int32_t mergeTableDataBlocks(SHashObj* pHashObj, int8_t schemaAttached, uint8_t payloadType, SArray** pVgDataBlocks) {
-  const int INSERT_HEAD_SIZE = sizeof(SMsgDesc) + sizeof(SSubmitMsg);
+  const int INSERT_HEAD_SIZE = sizeof(SSubmitMsg);
   int       code = 0;
   bool      isRawPayload = IS_RAW_PAYLOAD(payloadType);
   SHashObj* pVnodeDataBlockHashList = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, false);

source/libs/parser/src/insertParser.c

@@ -121,11 +121,9 @@ static int32_t findCol(SToken* pColname, int32_t start, int32_t end, SSchema* pS
 }
 
 static void buildMsgHeader(SVgDataBlocks* blocks) {
-    SMsgDesc* desc = (SMsgDesc*)blocks->pData;
-    desc->numOfVnodes = htonl(1);
-    SSubmitMsg* submit = (SSubmitMsg*)(desc + 1);
+    SSubmitMsg* submit = (SSubmitMsg*)blocks->pData;
     submit->header.vgId    = htonl(blocks->vg.vgId);
-    submit->header.contLen = htonl(blocks->size - sizeof(SMsgDesc));
+    submit->header.contLen = htonl(blocks->size);
     submit->length         = submit->header.contLen;
     submit->numOfBlocks    = htonl(blocks->numOfTables);
     SSubmitBlk* blk = (SSubmitBlk*)(submit + 1);

source/libs/parser/test/insertParserTest.cpp

@@ -70,9 +70,7 @@ protected:
     for (size_t i = 0; i < num; ++i) {
       SVgDataBlocks* vg = (SVgDataBlocks*)taosArrayGetP(res_->pDataBlocks, i);
       cout << "vgId:" << vg->vg.vgId << ", numOfTables:" << vg->numOfTables << ", dataSize:" << vg->size << endl;
-      SMsgDesc* desc = (SMsgDesc*)(vg->pData);
-      cout << "numOfVnodes:" << ntohl(desc->numOfVnodes) << endl;
-      SSubmitMsg* submit = (SSubmitMsg*)(desc + 1);
+      SSubmitMsg* submit = (SSubmitMsg*)vg->pData;
       cout << "length:" << ntohl(submit->length) << ", numOfBlocks:" << ntohl(submit->numOfBlocks) << endl;
       int32_t numOfBlocks = ntohl(submit->numOfBlocks);
       SSubmitBlk* blk = (SSubmitBlk*)(submit + 1);
@@ -95,9 +93,7 @@ protected:
       SVgDataBlocks* vg = (SVgDataBlocks*)taosArrayGetP(res_->pDataBlocks, i);
       ASSERT_EQ(vg->numOfTables, numOfTables);
       ASSERT_GE(vg->size, 0);
-      SMsgDesc* desc = (SMsgDesc*)(vg->pData);
-      ASSERT_EQ(ntohl(desc->numOfVnodes), 1);
-      SSubmitMsg* submit = (SSubmitMsg*)(desc + 1);
+      SSubmitMsg* submit = (SSubmitMsg*)vg->pData;
       ASSERT_GE(ntohl(submit->length), 0);
       ASSERT_GE(ntohl(submit->numOfBlocks), 0);
       int32_t numOfBlocks = ntohl(submit->numOfBlocks);

source/libs/parser/test/mockCatalogService.cpp

@@ -27,8 +27,8 @@ std::unique_ptr<MockCatalogService> mockCatalogService;
 class TableBuilder : public ITableBuilder {
 public:
   virtual TableBuilder& addColumn(const std::string& name, int8_t type, int32_t bytes) {
-    assert(colId_ < schema()->tableInfo.numOfTags + schema()->tableInfo.numOfColumns);
-    SSchema* col = schema()->schema + colId_;
+    assert(colId_ <= schema()->tableInfo.numOfTags + schema()->tableInfo.numOfColumns);
+    SSchema* col = schema()->schema + (colId_ - 1);
     col->type = type;
     col->colId = colId_++;
     col->bytes = bytes;
@@ -66,7 +66,7 @@ private:
     return std::unique_ptr<TableBuilder>(new TableBuilder(meta));
   }
 
-  TableBuilder(STableMeta* schemaMeta) : colId_(0), rowsize_(0), meta_(new MockTableMeta()) {
+  TableBuilder(STableMeta* schemaMeta) : colId_(1), rowsize_(0), meta_(new MockTableMeta()) {
     meta_->schema.reset(schemaMeta);
   }
 

source/libs/planner/test/phyPlanTests.cpp

@@ -33,7 +33,7 @@ protected:
   void pushScan(const string& db, const string& table, int32_t scanOp) {
     shared_ptr<MockTableMeta> meta = mockCatalogService->getTableMeta(db, table);
     EXPECT_TRUE(meta);
-    unique_ptr<SQueryPlanNode> scan((SQueryPlanNode*)calloc(1, sizeof(SQueryPlanNode)));
+    unique_ptr<SQueryPlanNode> scan((SQueryPlanNode*)myCalloc(1, sizeof(SQueryPlanNode)));
     scan->info.type = scanOp;
     scan->numOfCols = meta->schema->tableInfo.numOfColumns;
     scan->pSchema = (SSchema*)myCalloc(1, sizeof(SSchema) * scan->numOfCols);