YQL-20425: Move RH Hash Map to new api (#26412)

Author: Artemonchik

ydb/core/kqp/tools/combiner_perf/hashmaps.h

@@ -42,10 +42,23 @@ struct TRobinHoodMapImplBase
         bool isNew = false;
         auto ptr = map.Insert(key, isNew);
         if (isNew) {
+#if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+            auto* payloadPtr = map.GetMutablePayloadPtr(ptr);
+            WriteUnaligned<V>(payloadPtr, delta);
+#else 
             *(V*)map.GetMutablePayload(ptr) = delta;
+#endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
             map.CheckGrow();
         } else {
+#if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+            auto* payloadPtr = map.GetMutablePayloadPtr(ptr);
+            auto newValue =
+                ReadUnaligned<V>(payloadPtr);
+            newValue += delta;
+            WriteUnaligned<V>(payloadPtr, newValue);
+#else
             *(V*)map.GetMutablePayload(ptr) += delta;
+#endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
         }
     }
 
@@ -55,20 +68,36 @@ struct TRobinHoodMapImplBase
         if (existingPtr == nullptr) {
             return;
         }
+#if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+        auto* payloadPtr = map.GetMutablePayloadPtr(existingPtr);
+        auto newValue =
+            ReadUnaligned<V>(payloadPtr);
+        newValue += delta;
+        WriteUnaligned<V>(payloadPtr, newValue);
+#else
         *(V*)map.GetMutablePayload(existingPtr) += delta;
+#endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
     }
 
     template<typename Callback>
     static void IteratePairs(const TMapType& map, Callback&& callback)
     {
-        // TODO: GetPayload and IsValid should be const
         for (const char* iter = map.Begin(); iter != map.End(); map.Advance(iter)) {
+#if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+            if (!map.IsValid(iter)) {
+                continue;
+            }
+            const auto& key = map.GetKeyValue(iter);
+            const auto& value = ReadUnaligned<V>(map.GetPayloadPtr(iter));
+            callback(key, value);
+#else 
             if (!const_cast<TMapType&>(map).IsValid(iter)) {
                 continue;
             }
             const auto& key = map.GetKey(iter);
             const auto& value = *(V*)(const_cast<TMapType&>(map)).GetPayload(iter);
             callback(key, value);
+#endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
         }
     }
 

ydb/library/formats/arrow/replace_key.h

@@ -67,6 +67,7 @@ class TReplaceKeyTemplate {
         }
         return result;
     }
+    TReplaceKeyTemplate() = default;
 
     TReplaceKeyTemplate(TArrayVecPtr columns, const ui64 position)
         : Columns(columns)
@@ -334,6 +335,8 @@ class TReplaceKeyHashable: public TReplaceKeyTemplate<const TArrayVec*> {
         }
     }
 
+    TReplaceKeyHashable() = default;
+
     TReplaceKeyHashable(
         const std::vector<std::shared_ptr<arrow::Array>>& columns, const ui64 position, const std::vector<arrow::Type::type>& types)
         : TBase(&columns, position)

ydb/library/yql/dq/comp_nodes/dq_hash_combine.cpp

@@ -347,7 +347,11 @@ class TBaseAggregationState: public TComputationValue<TBaseAggregationState>
         if (isNew) {
             statePtr = static_cast<char *>(KeyStateBuffer) + StatesOffset;
         } else {
+#if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+            TUnboxedValuePod* mapKeyPtr = Map->GetKeyValue(mapIt);
+#else
             TUnboxedValuePod* mapKeyPtr = Map->GetKey(mapIt);
+#endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
             statePtr = reinterpret_cast<char *>(mapKeyPtr) + StatesOffset;
         }
 
@@ -495,7 +499,11 @@ class TBaseAggregationState: public TComputationValue<TBaseAggregationState>
             if (!Map->IsValid(mapIter)) {
                 continue;
             }
+#if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+            auto* entry = Map->GetKeyValue(mapIter);
+#else
             auto* entry = Map->GetKey(mapIter);
+#endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
             auto entryMem = MemoryHelper.EstimateKeySize(entry);
             if (!entryMem.has_value()) {
                 unbounded = true;
@@ -681,7 +689,11 @@ class TWideAggregationState: public TBaseAggregationState
             return false;
         }
 
+        #if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+        const auto key = Map->GetKeyValue(DrainMapIterator);
+        #else
         const auto key = Map->GetKey(DrainMapIterator);
+        #endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
 
         if (HasGenericAggregation) {
             auto keyIter = key;
@@ -726,7 +738,11 @@ class TWideAggregationState: public TBaseAggregationState
                 if (!Map->IsValid(DrainMapIterator)) {
                     continue;
                 }
+#if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+                const auto key = Map->GetKeyValue(DrainMapIterator);
+#else
                 const auto key = Map->GetKey(DrainMapIterator);
+#endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
                 char* statePtr = static_cast<char *>(static_cast<void *>(key)) + StatesOffset;
                 for (auto& agg : Aggs) {
                     agg->ForgetState(statePtr);
@@ -936,7 +952,11 @@ class TBlockAggregationState: public TBaseAggregationState
                 continue;
             }
 
+#if defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
+            const auto key = Map->GetKeyValue(DrainMapIterator);
+#else
             const auto key = Map->GetKey(DrainMapIterator);
+#endif // defined(MKQL_RH_HASH_MOVE_API_TO_NEW_VERSION)
             if (HasGenericAggregation) {
                 auto keyIter = key;
                 for (ui32 i = 0U; i < Nodes.FinishKeyNodes.size(); ++i) {