YQLAgent, free progress memory (#7585)

Author: Krisha11

ydb/library/yql/yt/bridge/interface.h

@@ -73,6 +73,14 @@ struct TBridgeQueryResult
     ssize_t YsonErrorLength = 0;
 };
 
+#define FOR_EACH_QUERY_RESULT_STRING_FIELD(XX) \
+    XX(YsonResult) \
+    XX(Plan) \
+    XX(Statistics) \
+    XX(Progress) \
+    XX(TaskInfo) \
+    XX(YsonError)
+
 struct TBridgeClustersResult
 {
     const char** Clusters = nullptr;
@@ -82,6 +90,9 @@ struct TBridgeClustersResult
     ssize_t YsonErrorLength = 0;
 };
 
+#define FOR_EACH_BRIDGE_RESULT_STRING_FIELD(XX) \
+    XX(YsonError)
+
 enum EQueryFileContentType
 {
     RawInlineData,
@@ -105,6 +116,9 @@ struct TBridgeAbortResult
     ssize_t YsonErrorLength = 0;
 };
 
+#define FOR_EACH_ABORT_RESULT_STRING_FIELD(XX) \
+    XX(YsonError)
+
 using TFuncBridgeFreeQueryResult = void(TBridgeQueryResult* result);
 using TFuncBridgeFreeClustersResult = void(TBridgeClustersResult* result);
 using TFuncBridgeRun = TBridgeQueryResult*(

ydb/library/yql/yt/dynamic/impl.cpp

@@ -8,6 +8,9 @@ using namespace NYT::NYson;
 
 extern "C" {
 
+#define FREE_STRING_FIELD(StringField) delete[] result->StringField;
+#define FILL_STRING_FIELD(StringField) FillString(bridgeResult->StringField, bridgeResult->StringField##Length, result.StringField);
+
 ////////////////////////////////////////////////////////////////////////////////
 
 ssize_t BridgeGetAbiVersion()
@@ -59,17 +62,14 @@ void BridgeFreeClustersResult(TBridgeClustersResult* result)
         delete[] result->Clusters[i];
     }
     delete[] result->Clusters;
-    delete[] result->YsonError;
+
+    FOR_EACH_BRIDGE_RESULT_STRING_FIELD(FREE_STRING_FIELD);
     delete result;
 }
 
 void BridgeFreeQueryResult(TBridgeQueryResult* result)
 {
-    delete[] result->TaskInfo;
-    delete[] result->Statistics;
-    delete[] result->Plan;
-    delete[] result->YsonResult;
-    delete[] result->YsonError;
+    FOR_EACH_QUERY_RESULT_STRING_FIELD(FREE_STRING_FIELD);
     delete result;
 }
 
@@ -97,7 +97,7 @@ TBridgeClustersResult* BridgeGetUsedClusters(
     static const auto EmptyMap = TYsonString(TString("{}"));
 
     auto* nativePlugin = reinterpret_cast<IYqlPlugin*>(plugin);
-    auto* bridgeClustersResult = new TBridgeClustersResult;
+    auto* bridgeResult = new TBridgeClustersResult;
 
     std::vector<TQueryFile> files(bridgeFileCount);
     for (int index = 0; index < bridgeFileCount; index++) {
@@ -109,21 +109,21 @@ TBridgeClustersResult* BridgeGetUsedClusters(
         });
     }
 
-    auto clustersResult = nativePlugin->GetUsedClusters(
+    auto result = nativePlugin->GetUsedClusters(
         TString(queryText),
         settings ? TYsonString(TString(settings, settingsLength)) : EmptyMap,
         files);
 
-    bridgeClustersResult->Clusters = new const char*[clustersResult.Clusters.size()];
-    for (size_t i = 0; i < clustersResult.Clusters.size(); i++) {
+    bridgeResult->Clusters = new const char*[result.Clusters.size()];
+    for (size_t i = 0; i < result.Clusters.size(); i++) {
         ssize_t clusterLength;
-        FillString(bridgeClustersResult->Clusters[i], clusterLength, clustersResult.Clusters[i]);
+        FillString(bridgeResult->Clusters[i], clusterLength, result.Clusters[i]);
     }
-    bridgeClustersResult->ClusterCount = clustersResult.Clusters.size();
+    bridgeResult->ClusterCount = result.Clusters.size();
 
-    FillString(bridgeClustersResult->YsonError, bridgeClustersResult->YsonErrorLength, clustersResult.YsonError);
+    FOR_EACH_BRIDGE_RESULT_STRING_FIELD(FILL_STRING_FIELD);
 
-    return bridgeClustersResult;
+    return bridgeResult;
 }
 
 TBridgeQueryResult* BridgeRun(
@@ -161,12 +161,7 @@ TBridgeQueryResult* BridgeRun(
         settings ? TYsonString(TString(settings, settingsLength)) : EmptyMap,
         files,
         executeMode);
-    FillString(bridgeResult->YsonResult, bridgeResult->YsonResultLength, result.YsonResult);
-    FillString(bridgeResult->Plan, bridgeResult->PlanLength, result.Plan);
-    FillString(bridgeResult->Statistics, bridgeResult->StatisticsLength, result.Statistics);
-    FillString(bridgeResult->Progress, bridgeResult->ProgressLength, result.Progress);
-    FillString(bridgeResult->TaskInfo, bridgeResult->TaskInfoLength, result.TaskInfo);
-    FillString(bridgeResult->YsonError, bridgeResult->YsonErrorLength, result.YsonError);
+    FOR_EACH_QUERY_RESULT_STRING_FIELD(FILL_STRING_FIELD);
 
     return bridgeResult;
 }
@@ -177,8 +172,7 @@ TBridgeQueryResult* BridgeGetProgress(TBridgeYqlPlugin* plugin, const char* quer
     auto* bridgeResult = new TBridgeQueryResult;
 
     auto result = nativePlugin->GetProgress(NYT::TGuid::FromString(queryId));
-    FillString(bridgeResult->Plan, bridgeResult->PlanLength, result.Plan);
-    FillString(bridgeResult->Progress, bridgeResult->ProgressLength, result.Progress);
+    FOR_EACH_QUERY_RESULT_STRING_FIELD(FILL_STRING_FIELD);
 
     return bridgeResult;
 }
@@ -189,14 +183,14 @@ TBridgeAbortResult* BridgeAbort(TBridgeYqlPlugin* plugin, const char* queryId)
     auto* bridgeResult = new TBridgeAbortResult;
 
     auto result = nativePlugin->Abort(NYT::TGuid::FromString(queryId));
-    FillString(bridgeResult->YsonError, bridgeResult->YsonErrorLength, result.YsonError);
+    FOR_EACH_ABORT_RESULT_STRING_FIELD(FILL_STRING_FIELD);
 
     return bridgeResult;
 }
 
 void BridgeFreeAbortResult(TBridgeAbortResult* result)
 {
-    delete[] result->YsonError;
+    FOR_EACH_ABORT_RESULT_STRING_FIELD(FREE_STRING_FIELD);
     delete result;
 }