solomon data source plan properties (#23798) (#24061)

Author: evanevanevanevannnn

ydb/library/yql/providers/solomon/actors/dq_solomon_read_actor.cpp

@@ -525,14 +525,13 @@ class TDqSolomonReadActor : public NActors::TActorBootstrapped<TDqSolomonReadAct
             return result;
         }
 
-        result.reserve(pointsCount / MaxPointsPerOneRequest);
+        ui64 timeIntervals = ceil(pointsCount * 1.0 / MaxPointsPerOneRequest);
+        result.reserve(timeIntervals);
         auto rangeDuration = to - from;
-        for (ui64 i = 0; i < pointsCount; i += MaxPointsPerOneRequest) {
-            double start = i;
-            double end = std::min(i + MaxPointsPerOneRequest, pointsCount);
+        for (ui64 i = 0; i < timeIntervals; ++i) {
             result.emplace_back(
-                from + rangeDuration * start / pointsCount,
-                from + rangeDuration * end / pointsCount
+                from + rangeDuration * 1.0 / timeIntervals * i,
+                from + rangeDuration * 1.0 / timeIntervals * (i + 1)
             );
         }
 

ydb/library/yql/providers/solomon/provider/yql_solomon_dq_integration.cpp

@@ -23,6 +23,11 @@ using namespace NNodes;
 
 namespace {
 
+TString GetLastName(const TString& fullName) {
+    auto n = fullName.find_last_of('/');
+    return (n == fullName.npos) ? fullName : fullName.substr(n + 1);
+}
+
 bool ExtractSettingValue(const TExprNode& value, TStringBuf settingName, TExprContext& ctx, TStringBuf& settingValue) {
     if (value.IsAtom()) {
         settingValue = value.Content();
@@ -116,7 +121,7 @@ class TSolomonDqIntegration: public TDqIntegrationBase {
 
             auto settings = soReadObject.Object().Settings();
             auto& settingsRef = settings.Ref();
-            TInstant from = TInstant::Now() - TDuration::Hours(1);
+            TInstant from = TInstant::Zero();
             TInstant to = TInstant::Now();
             TString program;
             TString selectors;
@@ -437,6 +442,50 @@ class TSolomonDqIntegration: public TDqIntegrationBase {
         sinkType = "SolomonSink";
     }
 
+    bool FillSourcePlanProperties(const NNodes::TExprBase& node, TMap<TString, NJson::TJsonValue>& properties) override {
+        if (!node.Maybe<TDqSource>()) {
+            return false;
+        }
+
+        auto source = node.Cast<TDqSource>();
+        const auto maybeSettings = source.Settings().Maybe<TSoSourceSettings>();
+        if (!maybeSettings) {
+            return false;
+        }
+
+        const auto settings = maybeSettings.Cast();
+        const auto& cluster = source.DataSource().Cast<TSoDataSource>().Cluster().StringValue();
+        const auto* clusterDesc = State_->Configuration->ClusterConfigs.FindPtr(cluster);
+
+        properties["ExternalDataSource"] = GetLastName(cluster);
+        properties["ClusterType"] = clusterDesc->GetClusterType() == TSolomonClusterConfig::SCT_SOLOMON ? "solomon" : "monitoring";
+
+        properties["From"] = settings.From().StringValue();
+        properties["To"] = settings.To().StringValue();
+
+        auto selectors = settings.Selectors().StringValue();
+        if (!selectors.empty()) {
+            properties["Selectors"] = selectors;
+        }
+
+        auto program = settings.Program().StringValue();
+        if (!program.empty()) {
+            properties["Program"] = program;
+        }
+        
+        const bool isDisabled = FromString<bool>(settings.DownsamplingDisabled().Literal().Value());
+        if (!isDisabled) {
+            properties["DownsamplingDisabled"] = "false";
+            properties["DownsamplingAggregation"] = settings.DownsamplingAggregation().StringValue();
+            properties["DownsamplingFill"] = settings.DownsamplingFill().StringValue();
+            properties["DownsamplingGridInterval"] = settings.DownsamplingGridSec().Literal().Value();
+        } else {
+            properties["DownsamplingDisabled"] = "true";
+        }
+
+        return true;
+    }
+
     void RegisterMkqlCompiler(NCommon::TMkqlCallableCompilerBase& compiler) override {
         RegisterDqSolomonMkqlCompilers(compiler);
     }