From a7acc79fe5eb8def7509369e7d70bb6c8fcef295 Mon Sep 17 00:00:00 2001
From: HarryLeeIBM <hleeatwork@outlook.com>
Date: Mon, 10 Jun 2024 10:52:35 -0700
Subject: [PATCH] Fix broken multi-column aggregation on s390x

---
 src/Interpreters/AggregationCommon.h   | 5 +----
 src/Interpreters/AggregationMethod.cpp | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index ab078d1c5e5..43c80d361d1 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -90,10 +90,7 @@ void fillFixedBatch(size_t keys_size, const ColumnRawPtrs & key_columns, const S
             /// Note: here we violate strict aliasing.
             /// It should be ok as log as we do not reffer to any value from `out` before filling.
             const char * source = static_cast<const ColumnFixedSizeHelper *>(column)->getRawDataBegin<sizeof(T)>();
-            size_t offset_to = offset;
-            if constexpr (std::endian::native == std::endian::big)
-                offset_to = sizeof(Key) - sizeof(T) - offset;
-            T * dest = reinterpret_cast<T *>(reinterpret_cast<char *>(out.data()) + offset_to);
+            T * dest = reinterpret_cast<T *>(reinterpret_cast<char *>(out.data()) + offset);
             fillFixedBatch<T, sizeof(Key) / sizeof(T)>(num_rows, reinterpret_cast<const T *>(source), dest); /// NOLINT(bugprone-sizeof-expression)
             offset += sizeof(T);
         }
diff --git a/src/Interpreters/AggregationMethod.cpp b/src/Interpreters/AggregationMethod.cpp
index 3ff4f0cae43..0fc789528b8 100644
--- a/src/Interpreters/AggregationMethod.cpp
+++ b/src/Interpreters/AggregationMethod.cpp
@@ -160,10 +160,7 @@ void AggregationMethodKeysFixed<TData, has_nullable_keys, has_low_cardinality,co
         else
         {
             size_t size = key_sizes[i];
-            size_t offset_to = pos;
-            if constexpr (std::endian::native == std::endian::big)
-                offset_to = sizeof(Key) - size - pos;
-            observed_column->insertData(reinterpret_cast<const char *>(&key) + offset_to, size);
+            observed_column->insertData(reinterpret_cast<const char *>(&key) + pos, size);
             pos += size;
         }
     }