aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraneporada <aneporada@ydb.tech>2023-08-25 21:06:41 +0300
committeraneporada <aneporada@ydb.tech>2023-08-25 21:46:02 +0300
commit4e50e4dab52ecbdcb21616cdfbedadd3b95fa4e4 (patch)
tree295925b88744c29bab770aac1acf1a6439cb3e65
parent95f58de0390db8a1a2ada4c540b0cc8e851a0a60 (diff)
downloadydb-4e50e4dab52ecbdcb21616cdfbedadd3b95fa4e4.tar.gz
[yql] Fix darwin build
-rw-r--r--ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp5
-rw-r--r--ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp5
-rw-r--r--ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp8
-rw-r--r--ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp1
-rw-r--r--ydb/library/yql/minikql/computation/mkql_block_transport.cpp4
-rw-r--r--ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp3
-rw-r--r--ydb/library/yql/minikql/computation/mkql_computation_node_pack.cpp3
7 files changed, 16 insertions, 13 deletions
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
index 0a590e7eb35..ae48c2a331b 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
@@ -280,6 +280,11 @@ public:
memcpy(U.A, other.U.A, SSO_Length + 1);
}
+ TSSOKey& operator=(const TSSOKey& other) {
+ memcpy(U.A, other.U.A, SSO_Length + 1);
+ return *this;
+ }
+
static bool CanBeInplace(TStringBuf data) {
return data.Size() + 1 <= sizeof(TSSOKey);
}
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp
index 4e158002028..5baa4ab6bdd 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_block_coalesce.cpp
@@ -36,7 +36,6 @@ public:
auto secondReader = NYql::NUdf::MakeBlockReader(TTypeInfoHelper(), SecondItemType_);
if (first.is_scalar()) {
auto firstValue = firstReader->GetScalarItem(*first.scalar());
- const auto& secondArray = *second.array();
if (firstValue) {
auto builder = NYql::NUdf::MakeArrayBuilder(TTypeInfoHelper(), SecondItemType_, *ctx->memory_pool(), length, nullptr);
builder->Add(NeedUnwrapFirst_ ? firstValue.GetOptionalValue() : firstValue, length);
@@ -48,7 +47,7 @@ public:
const auto& firstArray = *first.array();
if (firstArray.GetNullCount() == 0) {
*res = NeedUnwrapFirst_ ? Unwrap(firstArray, FirstItemType_) : first;
- } else if (firstArray.GetNullCount() == length) {
+ } else if ((size_t)firstArray.GetNullCount() == length) {
auto builder = NYql::NUdf::MakeArrayBuilder(TTypeInfoHelper(), SecondItemType_, *ctx->memory_pool(), length, nullptr);
auto secondValue = secondReader->GetScalarItem(*second.scalar());
builder->Add(secondValue, length);
@@ -72,7 +71,7 @@ public:
const auto& secondArray = *second.array();
if (firstArray.GetNullCount() == 0) {
*res = NeedUnwrapFirst_ ? Unwrap(firstArray, FirstItemType_) : first;
- } else if (firstArray.GetNullCount() == length) {
+ } else if ((size_t)firstArray.GetNullCount() == length) {
*res = second;
} else {
auto builder = NYql::NUdf::MakeArrayBuilder(TTypeInfoHelper(), SecondItemType_, *ctx->memory_pool(), length, nullptr);
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp
index 63c353fbfdc..2bba7188602 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp
@@ -20,7 +20,7 @@ public:
{}
EFetchResult DoCalculate(NUdf::TUnboxedValue& state, TComputationContext& ctx, NUdf::TUnboxedValue*const* output) const {
- auto& s = GetState(state, ctx, output);
+ auto& s = GetState(state, ctx);
size_t yieldCount = 0;
while (s.LiveInputs) {
@@ -59,7 +59,7 @@ private:
size_t LiveInputs;
size_t InputIndex = 0;
- TState(TMemoryUsageInfo* memInfo, const TComputationWideFlowNodePtrVector& inputs, NUdf::TUnboxedValue*const* output)
+ TState(TMemoryUsageInfo* memInfo, const TComputationWideFlowNodePtrVector& inputs)
: TComputationValue(memInfo)
, Inputs(inputs)
, LiveInputs(Inputs.size())
@@ -74,9 +74,9 @@ private:
};
- TState& GetState(NUdf::TUnboxedValue& state, TComputationContext& ctx, NUdf::TUnboxedValue*const* output) const {
+ TState& GetState(NUdf::TUnboxedValue& state, TComputationContext& ctx) const {
if (!state.HasValue()) {
- state = ctx.HolderFactory.Create<TState>(Flows_, output);
+ state = ctx.HolderFactory.Create<TState>(Flows_);
}
return *static_cast<TState*>(state.AsBoxed().Get());
}
diff --git a/ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp b/ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp
index 8da7c7670b8..ed5a9588f4b 100644
--- a/ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp
+++ b/ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp
@@ -1017,7 +1017,6 @@ IComputationNode* WrapSelfJoin(TCallable& callable, const TComputationNodeFactor
const auto leftFlowNode = callable.GetInput(0);
const auto leftFlowComponents = GetWideComponents(AS_TYPE(TFlowType, leftFlowNode));
- const auto rightFlowComponents{leftFlowComponents};
const auto joinKindNode = callable.GetInput(1);
const auto leftKeyColumnsNode = AS_VALUE(TTupleLiteral, callable.GetInput(2));
const auto rightKeyColumnsNode = AS_VALUE(TTupleLiteral, callable.GetInput(3));
diff --git a/ydb/library/yql/minikql/computation/mkql_block_transport.cpp b/ydb/library/yql/minikql/computation/mkql_block_transport.cpp
index bf27906faa3..e7697f0c12d 100644
--- a/ydb/library/yql/minikql/computation/mkql_block_transport.cpp
+++ b/ydb/library/yql/minikql/computation/mkql_block_transport.cpp
@@ -45,7 +45,7 @@ std::shared_ptr<arrow::Buffer> MakeZeroBitmap(size_t bitCount) {
}
bool NeedStoreBitmap(const arrow::ArrayData& data) {
- size_t nullCount = data.GetNullCount();
+ auto nullCount = data.GetNullCount();
return nullCount != 0 && nullCount != data.length;
}
@@ -73,7 +73,7 @@ void StoreNulls(const arrow::ArrayData& data, TRope& dst) {
}
const ui64 desiredOffset = data.offset % 8;
size_t nullBytes = (((size_t)data.length + desiredOffset + 7) & ~7ull) >> 3;
- YQL_ENSURE(desiredOffset <= data.offset);
+ YQL_ENSURE(desiredOffset <= (size_t)data.offset);
YQL_ENSURE((data.offset - desiredOffset) % 8 == 0);
const char* nulls = data.GetValues<char>(0, 0) + (data.offset - desiredOffset) / 8;
dst.Insert(dst.End(), NYql::MakeReadOnlyRope(data.buffers[0], nulls, nullBytes));
diff --git a/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp b/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
index f50083cbc57..373976d79f4 100644
--- a/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
+++ b/ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
@@ -900,6 +900,9 @@ public:
timerFull.Release();
timerFull.Report(stats);
+#else
+ Y_UNUSED(optLLVM);
+ Y_UNUSED(stats);
#endif
IsPatternCompiled.store(true);
diff --git a/ydb/library/yql/minikql/computation/mkql_computation_node_pack.cpp b/ydb/library/yql/minikql/computation/mkql_computation_node_pack.cpp
index 0403860e130..cfe33b00208 100644
--- a/ydb/library/yql/minikql/computation/mkql_computation_node_pack.cpp
+++ b/ydb/library/yql/minikql/computation/mkql_computation_node_pack.cpp
@@ -1008,7 +1008,6 @@ void TValuePackerTransport<Fast>::InitBlocks() {
ConvertedScalars_.resize(width - 1);
for (ui32 i = 0; i < width - 1; ++i) {
const TBlockType* itemType = static_cast<const TBlockType*>(multiType->GetElementType(i));
- const bool isScalar = itemType->GetShape() == TBlockType::EShape::Scalar;
BlockSerializers_.emplace_back(MakeBlockSerializer(TTypeInfoHelper(), itemType->GetItemType()));
BlockDeserializers_.emplace_back(MakeBlockDeserializer(TTypeInfoHelper(), itemType->GetItemType()));
if (itemType->GetShape() == TBlockType::EShape::Scalar) {
@@ -1163,7 +1162,6 @@ TValuePackerTransport<Fast>& TValuePackerTransport<Fast>::AddWideItemBlocks(cons
// save metadata itself
ui32 savedMetadata = 0;
for (size_t i = 0; i < width - 1; ++i) {
- const bool isScalar = BlockReaders_[i] != nullptr;
BlockSerializers_[i]->StoreMetadata(*arrays[i], [&](ui64 meta) {
PackData<false>(meta, *metadataBuffer);
++savedMetadata;
@@ -1176,7 +1174,6 @@ TValuePackerTransport<Fast>& TValuePackerTransport<Fast>::AddWideItemBlocks(cons
NYql::MakeReadOnlyRope(metadataBuffer, metadataBuffer->data(), metadataBuffer->size()));
// save buffers
for (size_t i = 0; i < width - 1; ++i) {
- const bool isScalar = BlockReaders_[i] != nullptr;
BlockSerializers_[i]->StoreArray(*arrays[i], BlockBuffer_);
}
++ItemCount_;