Skip to content

limitless solomon read actor draft #15200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 11, 2025
Merged

limitless solomon read actor draft #15200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9a97f23
limitless solomon read actor draft
evanevanevanevannnn Feb 28, 2025
68f6ebc
fixed issues
evanevanevanevannnn Mar 3, 2025
b760321
fixed issues
evanevanevanevannnn Mar 3, 2025
0dfe76b
fixed issues
evanevanevanevannnn Mar 3, 2025
66ee811
fixed issues;
evanevanevanevannnn Mar 4, 2025
da3bc00
fixed bugs and issues + new grpc solomon emulatot for tests
evanevanevanevannnn Mar 5, 2025
46f47d3
linter fix
evanevanevanevannnn Mar 5, 2025
8a49049
linter fix
evanevanevanevannnn Mar 6, 2025
01be2cc
Merge branch 'main' into solomon_limitless_read_actor
evanevanevanevannnn Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ydb/core/base/events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ struct TKikimrEvents : TEvents {
ES_INCREMENTAL_RESTORE_SCAN = 4261,
ES_FEATURE_FLAGS = 4262,
ES_PRIORITY_QUEUE = 4263,
ES_SOLOMON_PROVIDER = 4264,
};
};

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/external_sources/external_source_factory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ IExternalSourceFactory::TPtr CreateExternalSourceFactory(const std::vector<TStri
},
{
ToString(NYql::EDatabaseType::Solomon),
CreateExternalDataSource(TString{NYql::SolomonProviderName}, {"NONE", "TOKEN"}, {}, hostnamePatternsRegEx)
CreateExternalDataSource(TString{NYql::SolomonProviderName}, {"NONE", "TOKEN"}, {"use_ssl", "grpc_port"}, hostnamePatternsRegEx)
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/fq/libs/actors/run_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1980,7 +1980,7 @@ class TRunActor : public NActors::TActorBootstrapped<TRunActor> {
{
auto solomonConfig = gatewaysConfig.GetSolomon();
auto solomonGateway = NYql::CreateSolomonGateway(solomonConfig);
dataProvidersInit.push_back(GetSolomonDataProviderInitializer(solomonGateway, false));
dataProvidersInit.push_back(GetSolomonDataProviderInitializer(solomonGateway, Params.CredentialsFactory, false));
}

SessionId = TStringBuilder()
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/fq/libs/init/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include <ydb/library/yql/providers/pq/async_io/dq_pq_read_actor.h>
#include <ydb/library/yql/providers/pq/async_io/dq_pq_write_actor.h>
#include <ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h>
#include <ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h>
#include <ydb/library/yql/providers/solomon/actors/dq_solomon_write_actor.h>
#include <ydb/library/yql/providers/common/http_gateway/yql_http_default_retry_policy.h>


Expand Down
2 changes: 1 addition & 1 deletion ydb/core/fq/libs/init/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ PEERDIR(
ydb/library/yql/providers/s3/actors
ydb/library/yql/providers/s3/proto
ydb/library/yql/providers/s3/provider
ydb/library/yql/providers/solomon/async_io
ydb/library/yql/providers/solomon/actors
ydb/library/yql/providers/solomon/gateway
ydb/library/yql/providers/solomon/proto
ydb/library/yql/providers/solomon/provider
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/fq/libs/test_connection/test_monitoring.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <yql/essentials/providers/common/structured_token/yql_token_builder.h>
#include <yql/essentials/utils/url_builder.h>

#include <ydb/library/yql/providers/solomon/async_io/dq_solomon_write_actor.h>
#include <ydb/library/yql/providers/solomon/actors/dq_solomon_write_actor.h>
#include <ydb/library/yql/utils/actors/http_sender_actor.h>

#include <ydb/library/actors/core/actor_bootstrapped.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/fq/libs/test_connection/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ PEERDIR(
ydb/core/fq/libs/control_plane_storage
ydb/core/fq/libs/test_connection/events
ydb/library/yql/providers/pq/cm_client
ydb/library/yql/providers/solomon/async_io
ydb/library/yql/providers/solomon/actors
)

YQL_LAST_ABI_VERSION()
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/kqp/compute_actor/kqp_compute_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <ydb/library/yql/providers/generic/actors/yql_generic_provider_factories.h>
#include <ydb/library/formats/arrow/protos/ssa.pb.h>
#include <ydb/library/yql/dq/proto/dq_tasks.pb.h>
#include <ydb/library/yql/providers/solomon/async_io/dq_solomon_read_actor.h>
#include <ydb/library/yql/providers/solomon/actors/dq_solomon_read_actor.h>


namespace NKikimr {
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/kqp/compute_actor/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ PEERDIR(
ydb/library/yql/dq/actors/compute
ydb/library/yql/providers/generic/actors
ydb/library/yql/providers/s3/actors_factory
ydb/library/yql/providers/solomon/async_io
ydb/library/yql/providers/solomon/actors
yql/essentials/public/issue
)

Expand Down
4 changes: 3 additions & 1 deletion ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ TString GetOrEmpty(const NYql::TCreateObjectSettings& container, const TString&
"use_tls",
"schema", // managed PG, GP
"service_name", // oracle
"folder_id" // logging
"folder_id", // logging
"use_ssl", // solomon
"grpc_port" // solomon
};

auto& featuresExtractor = settings.GetFeaturesExtractor();
Expand Down
1 change: 1 addition & 0 deletions ydb/core/kqp/host/kqp_host.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1893,6 +1893,7 @@ class TKqpHost : public IKqpHost {
solomonState->Gateway = FederatedQuerySetup->SolomonGateway;
solomonState->DqIntegration = NYql::CreateSolomonDqIntegration(solomonState);
solomonState->Configuration->Init(FederatedQuerySetup->SolomonGatewayConfig, TypesCtx);
solomonState->ExecutorPoolId = AppData()->UserPoolId;

TypesCtx->AddDataSource(NYql::SolomonProviderName, NYql::CreateSolomonDataSource(solomonState));
TypesCtx->AddDataSink(NYql::SolomonProviderName, NYql::CreateSolomonDataSink(solomonState));
Expand Down
4 changes: 3 additions & 1 deletion ydb/core/kqp/session_actor/kqp_worker_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,9 @@ bool CanCacheQuery(const NKqpProto::TKqpPhyQuery& query) {
// S3 provider stores S3 paths to read in AST,
// YT provider opens read session during compilation,
// so we can't cache such queries
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Сюда бы ещё комент про solomon провайдер, что кеш для него выключен из-за runtime листинга (и по идее это будет исправлено)

if (externalSourceType == "S3Source" || externalSourceType == YtProviderName) {
if (externalSourceType == "S3Source" ||
externalSourceType == "SolomonSource" ||
externalSourceType == YtProviderName) {
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/providers/dq/metrics/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SRCS(

PEERDIR(
ydb/library/actors/core
ydb/library/yql/providers/solomon/async_io
ydb/library/yql/providers/solomon/actors
)

YQL_LAST_ABI_VERSION()
Expand Down
13 changes: 7 additions & 6 deletions ...ders/solomon/async_io/metrics_encoder.cpp → ...solomon/actors/dq_solomon_actors_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "metrics_encoder.h"

#include <yql/essentials/public/udf/udf_data_type.h>
#include "dq_solomon_actors_util.h"

#include <library/cpp/monlib/encode/json/json.h>
#include <util/datetime/base.h>
#include <yql/essentials/public/udf/udf_data_type.h>

using namespace NYql;

Expand Down Expand Up @@ -96,11 +96,12 @@ void EncodeSensorValue(
Y_ENSURE(false, "Bad type for sensor " << scheme.GetDataTypeId());
}
}
}

} // namespace

namespace NYql::NDq {

TMetricsEncoder::TMetricsEncoder(const NSo::NProto::TDqSolomonShardScheme& scheme, bool useCloudFormat)
TMetricsEncoder::TMetricsEncoder(const NSo::NProto::TDqSolomonShardScheme& scheme, bool useCloudFormat)
: Scheme(scheme)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Этот отступ тут нужен? Как будто всё ниже идёт без отступа

, UseCloudFormat(useCloudFormat)
{
Expand Down Expand Up @@ -154,4 +155,4 @@ TString TMetricsEncoder::Encode() {
return res;
}

}
} // namespace NYql::NDq
15 changes: 7 additions & 8 deletions ...viders/solomon/async_io/metrics_encoder.h → ...s/solomon/actors/dq_solomon_actors_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
#pragma once

#include <ydb/library/yql/utils/actors/http_sender.h>

#include <library/cpp/monlib/encode/encoder.h>
#include <ydb/library/yql/providers/solomon/proto/dq_solomon_shard.pb.h>
#include <yql/essentials/public/udf/udf_value.h>

#include <library/cpp/monlib/encode/json/json.h>

#include <util/stream/str.h>


namespace NYql::NDq {

struct TDqSolomonReadParams {
NSo::NProto::TDqSolomonSource Source;
};

class TMetricsEncoder {
public:
explicit TMetricsEncoder(const NSo::NProto::TDqSolomonShardScheme& scheme, bool cloudFormat);
Expand All @@ -28,4 +27,4 @@ class TMetricsEncoder {
bool UseCloudFormat;
};

}
} // namespace NYql::NDq
Loading
Loading