Skip to content

Commit 8df2c11

Browse files
vitstnvitstn
committed
init
1 parent ea0c2bd commit 8df2c11

File tree

132 files changed

+2833
-623
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+2833
-623
lines changed

‎ydb/core/formats/arrow/converter.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ static bool ConvertData(TCell& cell, const NScheme::TTypeInfo& colType, TMemoryP
3131
}
3232
case NScheme::NTypeIds::JsonDocument: {
3333
const auto binaryJson = NBinaryJson::SerializeToBinaryJson(cell.AsBuf());
34-
if (binaryJson.IsFail()) {
35-
errorMessage = "Invalid JSON for JsonDocument provided: " + binaryJson.GetErrorMessage();
34+
if (std::holds_alternative<TString>(binaryJson)) {
35+
errorMessage = "Invalid JSON for JsonDocument provided: " + std::get<TString>(binaryJson);
3636
return false;
3737
}
38-
const auto saved = memPool.AppendString(TStringBuf(binaryJson->Data(), binaryJson->Size()));
38+
const auto& value = std::get<NBinaryJson::TBinaryJson>(binaryJson);
39+
const auto saved = memPool.AppendString(TStringBuf(value.Data(), value.Size()));
3940
cell = TCell(saved.data(), saved.size());
4041
break;
4142
}
@@ -97,12 +98,13 @@ static arrow::Status ConvertColumn(const NScheme::TTypeInfo colType, std::shared
9798
return appendResult;
9899
}
99100
} else {
100-
const auto binaryJson = NBinaryJson::SerializeToBinaryJson(valueBuf);
101-
if (binaryJson.IsFail()) {
102-
return arrow::Status::SerializationError("Cannot serialize json (", binaryJson.GetErrorMessage(),
101+
const auto maybeBinaryJson = NBinaryJson::SerializeToBinaryJson(valueBuf);
102+
if (std::holds_alternative<TString>(maybeBinaryJson)) {
103+
return arrow::Status::SerializationError("Cannot serialize json (", std::get<TString>(maybeBinaryJson),
103104
"): ", valueBuf.SubStr(0, Min(valueBuf.Size(), size_t{1024})));
104105
}
105-
auto appendResult = builder.Append(binaryJson->Data(), binaryJson->Size());
106+
const auto& binaryJson = std::get<NBinaryJson::TBinaryJson>(maybeBinaryJson);
107+
auto appendResult = builder.Append(binaryJson.Data(), binaryJson.Size());
106108
if (!appendResult.ok()) {
107109
return appendResult;
108110
}

‎ydb/core/formats/arrow/ut/ut_arrow.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,11 @@ struct TDataRow {
222222
NKikimr::TDbTupleRef value = ToDbTupleRef();
223223
std::vector<TCell> cells(value.Cells().data(), value.Cells().data() + value.Cells().size());
224224

225-
auto binaryJson = NBinaryJson::SerializeToBinaryJson(TStringBuf(JsonDocument.data(), JsonDocument.size()));
226-
UNIT_ASSERT(binaryJson.IsSuccess());
225+
auto maybeBinaryJson = NBinaryJson::SerializeToBinaryJson(TStringBuf(JsonDocument.data(), JsonDocument.size()));
226+
UNIT_ASSERT(std::holds_alternative<NBinaryJson::TBinaryJson>(maybeBinaryJson));
227227

228-
cells[19] = TCell(binaryJson->Data(), binaryJson->Size());
228+
const auto& binaryJson = std::get<NBinaryJson::TBinaryJson>(maybeBinaryJson);
229+
cells[19] = TCell(binaryJson.Data(), binaryJson.Size());
229230
return TOwnedCellVec(cells);
230231
}
231232
};

‎ydb/core/fq/libs/actors/pending_fetcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include <ydb/library/yql/providers/dq/provider/yql_dq_gateway.h>
2424
#include <ydb/library/yql/providers/dq/provider/yql_dq_provider.h>
2525
#include <ydb/library/yql/providers/generic/connector/libcpp/client.h>
26-
#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
26+
#include <yql/essentials/core/dq_integration/transform/yql_dq_task_transform.h>
2727
#include <ydb/library/yql/providers/ydb/provider/yql_ydb_provider.h>
2828
#include <yql/essentials/sql/settings/translation_settings.h>
2929
#include <library/cpp/yson/node/node_io.h>

‎ydb/core/fq/libs/actors/run_actor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <ydb/library/yql/providers/dq/provider/yql_dq_provider.h>
2525
#include <ydb/library/yql/providers/dq/provider/exec/yql_dq_exectransformer.h>
2626
#include <ydb/library/yql/providers/generic/provider/yql_generic_provider.h>
27-
#include <ydb/library/yql/dq/integration/transform/yql_dq_task_transform.h>
27+
#include <yql/essentials/core/dq_integration/transform/yql_dq_task_transform.h>
2828
#include <ydb/library/yql/providers/pq/gateway/native/yql_pq_gateway.h>
2929
#include <ydb/library/yql/providers/pq/provider/yql_pq_provider.h>
3030
#include <ydb/library/yql/providers/pq/proto/dq_io.pb.h>

‎ydb/core/fq/libs/actors/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ PEERDIR(
5656
yql/essentials/ast
5757
yql/essentials/core/facade
5858
yql/essentials/core/services/mounts
59-
ydb/library/yql/dq/integration/transform
59+
yql/essentials/core/dq_integration/transform
6060
yql/essentials/minikql/comp_nodes
6161
yql/essentials/providers/common/codec
6262
yql/essentials/providers/common/comp_nodes

‎ydb/core/fq/libs/mock/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ PEERDIR(
2222
yql/essentials/ast
2323
yql/essentials/core/facade
2424
yql/essentials/core/services/mounts
25-
ydb/library/yql/dq/integration/transform
25+
yql/essentials/core/dq_integration/transform
2626
yql/essentials/minikql/comp_nodes
2727
ydb/library/yql/providers/clickhouse/provider
2828
yql/essentials/providers/common/codec

‎ydb/core/io_formats/cell_maker/cell_maker.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ namespace {
8888
}
8989

9090
auto serializedJson = NBinaryJson::SerializeToBinaryJson(unescaped);
91-
if (serializedJson.IsFail()) {
91+
if (std::holds_alternative<TString>(serializedJson)) {
9292
return false;
9393
}
9494

95-
result = serializedJson.DetachResult();
95+
result = std::get<NBinaryJson::TBinaryJson>(std::move(serializedJson));
9696
return true;
9797
}
9898

@@ -400,8 +400,8 @@ bool MakeCell(TCell& cell, const NJson::TJsonValue& value, const NScheme::TTypeI
400400
case NScheme::NTypeIds::Json:
401401
return TCellMaker<TString, TStringBuf>::MakeDirect(cell, NFormats::WriteJson(value), pool, err);
402402
case NScheme::NTypeIds::JsonDocument:
403-
if (auto result = NBinaryJson::SerializeToBinaryJson(NFormats::WriteJson(value)); result.IsSuccess()) {
404-
return TCellMaker<TMaybe<NBinaryJson::TBinaryJson>, TStringBuf>::MakeDirect(cell, result.DetachResult(), pool, err, &BinaryJsonToStringBuf);
403+
if (auto result = NBinaryJson::SerializeToBinaryJson(NFormats::WriteJson(value)); std::holds_alternative<NBinaryJson::TBinaryJson>(result)) {
404+
return TCellMaker<TMaybe<NBinaryJson::TBinaryJson>, TStringBuf>::MakeDirect(cell, std::get<NBinaryJson::TBinaryJson>(std::move(result)), pool, err, &BinaryJsonToStringBuf);
405405
} else {
406406
return false;
407407
}

‎ydb/core/kqp/common/kqp_yql.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <yql/essentials/core/yql_expr_type_annotation.h>
44
#include <yql/essentials/core/expr_nodes/yql_expr_nodes.h>
55
#include <yql/essentials/core/services/yql_transform_pipeline.h>
6-
#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
6+
#include <yql/essentials/core/dq_integration/yql_dq_integration.h>
77

88
namespace NYql {
99

‎ydb/core/kqp/common/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ PEERDIR(
4040
yql/essentials/core/services
4141
ydb/library/yql/dq/actors
4242
ydb/library/yql/dq/common
43-
ydb/library/yql/dq/integration
43+
yql/essentials/core/dq_integration
4444
yql/essentials/parser/pg_wrapper/interface
4545
ydb/public/lib/operation_id
4646
ydb/public/lib/operation_id/protos

‎ydb/core/kqp/opt/kqp_opt_effects.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "kqp_opt_impl.h"
22

33
#include <yql/essentials/core/yql_opt_utils.h>
4-
#include <ydb/library/yql/dq/integration/yql_dq_integration.h>
4+
#include <yql/essentials/core/dq_integration/yql_dq_integration.h>
55

66
namespace NKikimr::NKqp::NOpt {
77

0 commit comments

Comments
 (0)