diff options
author | mdartemenko <mdartemenko@yandex-team.com> | 2022-09-19 18:20:36 +0300 |
---|---|---|
committer | mdartemenko <mdartemenko@yandex-team.com> | 2022-09-19 18:20:36 +0300 |
commit | a60997c1bd42b5de787131493a4562a127c672c2 (patch) | |
tree | c42ececb93d33d0d46fe250904393c509788b10b | |
parent | 2b93d69511e485b572a73be03819e21c80f97f86 (diff) | |
download | ydb-a60997c1bd42b5de787131493a4562a127c672c2.tar.gz |
fix whitespaces
-rw-r--r-- | ydb/core/base/wilson.h | 10 | ||||
-rw-r--r-- | ydb/core/kqp/compute_actor/kqp_compute_actor.h | 2 | ||||
-rw-r--r-- | ydb/core/kqp/executer/kqp_executer_impl.h | 6 | ||||
-rw-r--r-- | ydb/core/kqp/executer/kqp_planner.cpp | 4 | ||||
-rw-r--r-- | ydb/core/kqp/executer/kqp_scan_executer.cpp | 2 | ||||
-rw-r--r-- | ydb/core/kqp/kqp_compile_request.cpp | 32 | ||||
-rw-r--r-- | ydb/core/kqp/kqp_compile_service.cpp | 26 | ||||
-rw-r--r-- | ydb/core/kqp/kqp_impl.h | 2 | ||||
-rw-r--r-- | ydb/core/tx/datashard/datashard__propose_tx_base.cpp | 2 | ||||
-rw-r--r-- | ydb/library/workload/stock_workload.cpp | 12 | ||||
-rw-r--r-- | ydb/library/workload/stock_workload.h | 2 |
11 files changed, 50 insertions, 50 deletions
diff --git a/ydb/core/base/wilson.h b/ydb/core/base/wilson.h index 47dd6076988..d0a2299e208 100644 --- a/ydb/core/base/wilson.h +++ b/ydb/core/base/wilson.h @@ -17,20 +17,20 @@ namespace NKikimr { CompileRequest = 9, CompileService = 8, CompileActor = 7, - + KqpSessionCreateAndSendPropose = 9, ExecuterReadyState = 9, ExecuterWaitResolveState = 9, ExecuterTableResolve = 9, ExecuterZombieState = 9, - + ComputeActor = 6, LiteralExecuter = 9, LiteralExecuterPrepareTasks = 9, LiteralExecuterRunTasks = 9, - + DataExecuter = 9, DataExecuterPrepareState = 9, DataExecuterPrepateTasks = 9, @@ -38,13 +38,13 @@ namespace NKikimr { DataExecuterSendTasksAndTxs = 9, DataExecuterWaitSnapshotState = 9, ProposeTransaction = 8, - + ScanExecuter = 9, ScanExecuterExecuteState = 9, ScanExecuterPrepareTasks = 9, KqpPlanner = 8, KqpNodeSendTasks = 7, - }; + }; }; } // NKikimr diff --git a/ydb/core/kqp/compute_actor/kqp_compute_actor.h b/ydb/core/kqp/compute_actor/kqp_compute_actor.h index e031f74f3ac..e69f3f66c08 100644 --- a/ydb/core/kqp/compute_actor/kqp_compute_actor.h +++ b/ydb/core/kqp/compute_actor/kqp_compute_actor.h @@ -42,7 +42,7 @@ public: IActor* CreateKqpComputeActor(const TActorId& executerId, ui64 txId, NYql::NDqProto::TDqTask&& task, NYql::NDq::IDqAsyncIoFactory::TPtr asyncIoFactory, const NKikimr::NMiniKQL::IFunctionRegistry* functionRegistry, - const NYql::NDq::TComputeRuntimeSettings& settings, const NYql::NDq::TComputeMemoryLimits& memoryLimits, + const NYql::NDq::TComputeRuntimeSettings& settings, const NYql::NDq::TComputeMemoryLimits& memoryLimits, NWilson::TTraceId traceId = {}); IActor* CreateKqpScanComputeActor(const NKikimrKqp::TKqpSnapshot& snapshot, const TActorId& executerId, ui64 txId, diff --git a/ydb/core/kqp/executer/kqp_executer_impl.h b/ydb/core/kqp/executer/kqp_executer_impl.h index 583bcd6011c..435c8d988f7 100644 --- a/ydb/core/kqp/executer/kqp_executer_impl.h +++ b/ydb/core/kqp/executer/kqp_executer_impl.h @@ -196,7 +196,7 @@ protected: InternalError(issues); } else if (statusCode == Ydb::StatusIds::TIMEOUT) { auto abortEv = MakeHolder<TEvKqp::TEvAbortExecution>(NYql::NDqProto::StatusIds::TIMEOUT, "Request timeout exceeded"); - + if (ExecuterSpan) { ExecuterSpan.EndError("timeout"); } @@ -216,7 +216,7 @@ protected: if (cancel) { auto abortEv = MakeHolder<TEvKqp::TEvAbortExecution>(NYql::NDqProto::StatusIds::CANCELLED, "Request timeout exceeded"); - + if (ExecuterSpan) { ExecuterSpan.EndError("timeout"); } @@ -225,7 +225,7 @@ protected: CancelAtActor = {}; } else { auto abortEv = MakeHolder<TEvKqp::TEvAbortExecution>(NYql::NDqProto::StatusIds::TIMEOUT, "Request timeout exceeded"); - + if (ExecuterSpan) { ExecuterSpan.EndError("timeout"); } diff --git a/ydb/core/kqp/executer/kqp_planner.cpp b/ydb/core/kqp/executer/kqp_planner.cpp index a2258184358..aa0434c4e21 100644 --- a/ydb/core/kqp/executer/kqp_planner.cpp +++ b/ydb/core/kqp/executer/kqp_planner.cpp @@ -137,7 +137,7 @@ void TKqpPlanner::Process(const TVector<NKikimrKqp::TKqpNodeResources>& snapshot LOG_E("Not enough resources to execute query locally and no information about other nodes"); auto ev = MakeHolder<TEvKqp::TEvAbortExecution>(NYql::NDqProto::StatusIds::PRECONDITION_FAILED, "Not enough resources to execute query locally and no information about other nodes"); - + if (KqpPlannerSpan) { KqpPlannerSpan.EndError("Not enough resources to execute query locally and no information about other nodes"); } @@ -194,7 +194,7 @@ void TKqpPlanner::Process(const TVector<NKikimrKqp::TKqpNodeResources>& snapshot } else { auto ev = MakeHolder<TEvKqp::TEvAbortExecution>(NYql::NDqProto::StatusIds::PRECONDITION_FAILED, "Not enough resources to execute query"); - + if (KqpPlannerSpan) { KqpPlannerSpan.EndError("Not enough resources to execute query"); } diff --git a/ydb/core/kqp/executer/kqp_scan_executer.cpp b/ydb/core/kqp/executer/kqp_scan_executer.cpp index af65c7240d3..45400e69f43 100644 --- a/ydb/core/kqp/executer/kqp_scan_executer.cpp +++ b/ydb/core/kqp/executer/kqp_scan_executer.cpp @@ -406,7 +406,7 @@ private: auto* resultStructType = static_cast<NKikimr::NMiniKQL::TStructType*>(resultType); ui32 resultColsCount = resultStructType->GetMembersCount(); - + taskMeta.ReadInfo.ResultColumnsTypes.reserve(resultColsCount); for (ui32 i = 0; i < resultColsCount; ++i) { auto memberType = resultStructType->GetMemberType(i); diff --git a/ydb/core/kqp/kqp_compile_request.cpp b/ydb/core/kqp/kqp_compile_request.cpp index a06a1a43c0d..c15994be4c8 100644 --- a/ydb/core/kqp/kqp_compile_request.cpp +++ b/ydb/core/kqp/kqp_compile_request.cpp @@ -41,10 +41,10 @@ public: , DbCounters(dbCounters) , Orbit{std::move(orbit)} , CompileRequestSpan(TWilsonKqp::CompileRequest, std::move(traceId), "CompileRequest") {} - + void Bootstrap(const TActorContext& ctx) { - LWTRACK(KqpCompileRequestBootstrap, - Orbit, + LWTRACK(KqpCompileRequestBootstrap, + Orbit, Query ? Query->UserSid : 0); TimeoutTimerId = CreateLongTimer(ctx, Deadline - TInstant::Now(), @@ -62,10 +62,10 @@ public: void Handle(TEvKqp::TEvCompileResponse::TPtr& ev, const TActorContext &ctx) { const auto& query = ev->Get()->CompileResult->Query; - LWTRACK(KqpCompileRequestHandleServiceReply, - ev->Get()->Orbit, + LWTRACK(KqpCompileRequestHandleServiceReply, + ev->Get()->Orbit, query ? query->UserSid : 0); - + auto compileResult = ev->Get()->CompileResult; const auto& stats = ev->Get()->Stats; @@ -81,7 +81,7 @@ public: } if (!NavigateTables(*compileResult->PreparedQuery, compileResult->Query->Database, ctx)) { - + if (CompileRequestSpan) { CompileRequestSpan.End(); } @@ -318,7 +318,7 @@ private: if (CompileRequestSpan) { CompileRequestSpan.EndError(issues.ToOneLineString()); } - + ctx.Send(Owner, responseEv.Release()); Die(ctx); } @@ -341,17 +341,17 @@ private: IActor* CreateKqpCompileRequestActor(const TActorId& owner, const TString& userToken, const TMaybe<TString>& uid, - TMaybe<TKqpQueryId>&& query, bool keepInCache, const TInstant& deadline, TKqpDbCountersPtr dbCounters, NLWTrace::TOrbit orbit, + TMaybe<TKqpQueryId>&& query, bool keepInCache, const TInstant& deadline, TKqpDbCountersPtr dbCounters, NLWTrace::TOrbit orbit, NWilson::TTraceId traceId) { return new TKqpCompileRequestActor( - owner, - userToken, - uid, - std::move(query), - keepInCache, - deadline, - dbCounters, + owner, + userToken, + uid, + std::move(query), + keepInCache, + deadline, + dbCounters, std::move(orbit), std::move(traceId)); } diff --git a/ydb/core/kqp/kqp_compile_service.cpp b/ydb/core/kqp/kqp_compile_service.cpp index efba6222ffd..c701763ef3c 100644 --- a/ydb/core/kqp/kqp_compile_service.cpp +++ b/ydb/core/kqp/kqp_compile_service.cpp @@ -189,7 +189,7 @@ private: struct TKqpCompileRequest { TKqpCompileRequest(const TActorId& sender, const TString& uid, TKqpQueryId query, bool keepInCache, - const TString& userToken, const TInstant& deadline, TKqpDbCountersPtr dbCounters, + const TString& userToken, const TInstant& deadline, TKqpDbCountersPtr dbCounters, NLWTrace::TOrbit orbit = {}, NWilson::TSpan span = {}) : Sender(sender) , Query(std::move(query)) @@ -411,8 +411,8 @@ private: void Handle(TEvKqp::TEvCompileRequest::TPtr& ev, const TActorContext& ctx) { const auto& query = ev->Get()->Query; - LWTRACK(KqpCompileServiceHandleRequest, - ev->Get()->Orbit, + LWTRACK(KqpCompileServiceHandleRequest, + ev->Get()->Orbit, query ? query->UserSid : 0); try { @@ -503,13 +503,13 @@ private: Counters->ReportQueryCacheHit(dbCounters, false); - LWTRACK(KqpCompileServiceEnqueued, - ev->Get()->Orbit, + LWTRACK(KqpCompileServiceEnqueued, + ev->Get()->Orbit, ev->Get()->Query ? ev->Get()->Query->UserSid : 0); - + TKqpCompileRequest compileRequest(ev->Sender, CreateGuidAsString(), std::move(*request.Query), - request.KeepInCache, request.UserToken, request.Deadline, dbCounters, + request.KeepInCache, request.UserToken, request.Deadline, dbCounters, std::move(ev->Get()->Orbit), std::move(CompileServiceSpan)); if (!RequestsQueue.Enqueue(std::move(compileRequest))) { @@ -558,8 +558,8 @@ private: NWilson::TSpan CompileServiceSpan(TWilsonKqp::CompileService, ev->Get() ? std::move(ev->TraceId) : NWilson::TTraceId(), "CompileService"); TKqpCompileRequest compileRequest(ev->Sender, request.Uid, compileResult ? *compileResult->Query : *request.Query, - true, request.UserToken, request.Deadline, dbCounters, - ev->Get() ? std::move(ev->Get()->Orbit) : NLWTrace::TOrbit(), + true, request.UserToken, request.Deadline, dbCounters, + ev->Get() ? std::move(ev->Get()->Orbit) : NLWTrace::TOrbit(), std::move(CompileServiceSpan)); if (!RequestsQueue.Enqueue(std::move(compileRequest))) { @@ -733,9 +733,9 @@ private: const NKqpProto::TKqpStatsCompile& compileStats, const TActorContext& ctx, NLWTrace::TOrbit orbit, NWilson::TSpan span) { const auto& query = compileResult->Query; - LWTRACK(KqpCompileServiceReply, - orbit, - query ? query->UserSid : 0, + LWTRACK(KqpCompileServiceReply, + orbit, + query ? query->UserSid : 0, compileResult->Issues.ToString()); LOG_DEBUG_S(ctx, NKikimrServices::KQP_COMPILE_SERVICE, "Send response" @@ -754,7 +754,7 @@ private: if (span) { span.End(); } - + ctx.Send(sender, responseEv.Release()); } diff --git a/ydb/core/kqp/kqp_impl.h b/ydb/core/kqp/kqp_impl.h index 0a34d68f845..f9b3333bc29 100644 --- a/ydb/core/kqp/kqp_impl.h +++ b/ydb/core/kqp/kqp_impl.h @@ -55,7 +55,7 @@ IActor* CreateKqpCompileActor(const TActorId& owner, const TKqpSettings::TConstP TKqpDbCountersPtr dbCounters, bool recompileWithNewEngine, NWilson::TTraceId traceId = {}); IActor* CreateKqpCompileRequestActor(const TActorId& owner, const TString& userToken, const TMaybe<TString>& uid, - TMaybe<TKqpQueryId>&& query, bool keepInCache, const TInstant& deadline, TKqpDbCountersPtr dbCounters, + TMaybe<TKqpQueryId>&& query, bool keepInCache, const TInstant& deadline, TKqpDbCountersPtr dbCounters, NLWTrace::TOrbit orbit = {}, NWilson::TTraceId = {}); struct TKqpWorkerSettings { diff --git a/ydb/core/tx/datashard/datashard__propose_tx_base.cpp b/ydb/core/tx/datashard/datashard__propose_tx_base.cpp index 94ff3791e6d..fea2907cfd4 100644 --- a/ydb/core/tx/datashard/datashard__propose_tx_base.cpp +++ b/ydb/core/tx/datashard/datashard__propose_tx_base.cpp @@ -171,7 +171,7 @@ void TDataShard::TTxProposeTransactionBase::Complete(const TActorContext &ctx) { if (ProposeTransactionSpan) { ProposeTransactionSpan.End(); } - + if (Op) { Y_VERIFY(!Op->GetExecutionPlan().empty()); if (!CompleteList.empty()) { diff --git a/ydb/library/workload/stock_workload.cpp b/ydb/library/workload/stock_workload.cpp index f46e16b40c5..ff734e03383 100644 --- a/ydb/library/workload/stock_workload.cpp +++ b/ydb/library/workload/stock_workload.cpp @@ -44,9 +44,9 @@ std::string TStockWorkloadGenerator::GetDDLQueries() const { std::string partsNum = std::to_string(Params.MinPartitions); StockPartitionsDdl = "WITH (AUTO_PARTITIONING_BY_LOAD = ENABLED, AUTO_PARTITIONING_MIN_PARTITIONS_COUNT = " + partsNum + ")"; - OrdersPartitionsDdl = "WITH (READ_REPLICAS_SETTINGS = \"per_az:1\", AUTO_PARTITIONING_BY_LOAD = ENABLED, AUTO_PARTITIONING_MIN_PARTITIONS_COUNT = " + OrdersPartitionsDdl = "WITH (READ_REPLICAS_SETTINGS = \"per_az:1\", AUTO_PARTITIONING_BY_LOAD = ENABLED, AUTO_PARTITIONING_MIN_PARTITIONS_COUNT = " + partsNum + ", UNIFORM_PARTITIONS = " + partsNum + ", AUTO_PARTITIONING_MAX_PARTITIONS_COUNT = 1000)"; - OrderLinesPartitionsDdl = "WITH (AUTO_PARTITIONING_BY_LOAD = ENABLED, AUTO_PARTITIONING_MIN_PARTITIONS_COUNT = " + OrderLinesPartitionsDdl = "WITH (AUTO_PARTITIONING_BY_LOAD = ENABLED, AUTO_PARTITIONING_MIN_PARTITIONS_COUNT = " + partsNum + ", UNIFORM_PARTITIONS = " + partsNum + ", AUTO_PARTITIONING_MAX_PARTITIONS_COUNT = 1000)"; } @@ -57,8 +57,8 @@ std::string TStockWorkloadGenerator::GetDDLQueries() const { )"; char buf[sizeof(TablesDdl) + sizeof(OrdersPartitionsDdl) + 8192*3]; // 32*256 for DbPath - int res = std::sprintf(buf, TablesDdl, - DbPath.c_str(), StockPartitionsDdl.c_str(), + int res = std::sprintf(buf, TablesDdl, + DbPath.c_str(), StockPartitionsDdl.c_str(), DbPath.c_str(), OrdersPartitionsDdl.c_str(), DbPath.c_str(), OrderLinesPartitionsDdl.c_str() ); @@ -198,7 +198,7 @@ TQueryInfo TStockWorkloadGenerator::SelectCustomerHistory(const std::string& cus std::string query = R"(--!syntax_v1 DECLARE $cust as Utf8; DECLARE $limit as UInt32; - select id, customer, created + select id, customer, created from orders view ix_cust where customer = $cust order by customer desc, created desc @@ -213,7 +213,7 @@ TQueryInfo TStockWorkloadGenerator::SelectCustomerHistory(const std::string& cus .AddParam("$limit") .Uint32(limit) .Build(); - + return TQueryInfo(query, paramsBuilder.Build()); } diff --git a/ydb/library/workload/stock_workload.h b/ydb/library/workload/stock_workload.h index b99edc81c7c..6418c7c324e 100644 --- a/ydb/library/workload/stock_workload.h +++ b/ydb/library/workload/stock_workload.h @@ -55,7 +55,7 @@ private: TQueryInfoList SubmitSameOrder(); TQueryInfoList GetRandomCustomerHistory(); TQueryInfoList GetCustomerHistory(); - + using TProductsQuantity = std::map<std::string, int64_t>; TQueryInfo InsertOrder(const uint64_t orderID, const std::string& customer, const TProductsQuantity& products); TQueryInfo ExecuteOrder(const uint64_t orderID); |