HPCC-31615 Coverity scan for parquetembed.hpp

hpcc-systems · Apr 23, 2024 · 0e52e6e · 0e52e6e
1 parent c9d459a
commit 0e52e6e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/plugins/parquet/parquetembed.cpp b/plugins/parquet/parquetembed.cpp
@@ -814,7 +814,7 @@ void ParquetWriter::beginSet(const char *fieldName)
     }
     arrow::ArrayBuilder *childBuilder;
     arrow::FieldPath match = getNestedFieldBuilder(fieldName, childBuilder);
-    fieldBuilderStack.push_back(std::make_shared<ArrayBuilderTracker>(fieldName, childBuilder, CPNTSet, match));
+    fieldBuilderStack.push_back(std::make_shared<ArrayBuilderTracker>(fieldName, childBuilder, CPNTSet, std::move(match)));
 
     arrow::ListBuilder *listBuilder = static_cast<arrow::ListBuilder *>(childBuilder);
     reportIfFailure(listBuilder->Append());
@@ -833,7 +833,7 @@ void ParquetWriter::beginRow(const char *fieldName)
     {
         arrow::ArrayBuilder *childBuilder;
         arrow::FieldPath match = getNestedFieldBuilder(fieldName, childBuilder);
-        fieldBuilderStack.push_back(std::make_shared<ArrayBuilderTracker>(fieldName, childBuilder, CPNTDataset, match));
+        fieldBuilderStack.push_back(std::make_shared<ArrayBuilderTracker>(fieldName, childBuilder, CPNTDataset, std::move(match)));
 
         arrow::StructBuilder *structBuilder = static_cast<arrow::StructBuilder *>(childBuilder);
         reportIfFailure(structBuilder->Append());

diff --git a/plugins/parquet/parquetembed.hpp b/plugins/parquet/parquetembed.hpp
@@ -107,8 +107,12 @@ struct ArrayBuilderTracker
     unsigned int childCount = 0;
     unsigned int childrenProcessed = 0;
 
-    ArrayBuilderTracker(const char *_nodeName, arrow::ArrayBuilder *_struct, PathNodeType _nodeType, arrow::FieldPath  _nodePath)
-        : nodeName(_nodeName), nodeType(_nodeType), structPtr(_struct), nodePath(_nodePath) { if (nodeType == CPNTDataset) childCount == structPtr->num_children(); }
+    ArrayBuilderTracker(const char *_nodeName, arrow::ArrayBuilder *_struct, PathNodeType _nodeType, arrow::FieldPath && _nodePath)
+        : nodeName(_nodeName), nodeType(_nodeType), structPtr(_struct), nodePath(std::move(_nodePath))
+    {
+        if (nodeType == CPNTDataset)
+            childCount = structPtr->num_children();
+    }
 
     bool finishedChildren() { return childrenProcessed < childCount; }
 };