From bb1d773ffd5a508f22330e5d4ac010f921fa589e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Mar=C3=ADn?= Date: Fri, 18 Feb 2022 17:45:17 +0100 Subject: [PATCH] Reduce changes against master --- src/Interpreters/HashJoin.cpp | 2 +- src/Interpreters/RowRefs.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp index 87b835c4749..38edbd2b3e6 100644 --- a/src/Interpreters/HashJoin.cpp +++ b/src/Interpreters/HashJoin.cpp @@ -615,7 +615,7 @@ namespace const IColumn & asof_column) { auto emplace_result = key_getter.emplaceKey(map, i, pool); - AsofRowRefs * time_series_map = &emplace_result.getMapped(); + typename Map::mapped_type * time_series_map = &emplace_result.getMapped(); TypeIndex asof_type = *join.getAsofType(); if (emplace_result.isInserted()) diff --git a/src/Interpreters/RowRefs.h b/src/Interpreters/RowRefs.h index 836fc8687bf..351fbc5e059 100644 --- a/src/Interpreters/RowRefs.h +++ b/src/Interpreters/RowRefs.h @@ -15,8 +15,6 @@ #include -#include - namespace DB { @@ -199,8 +197,6 @@ public: /// Loosely based on https://academy.realm.io/posts/how-we-beat-cpp-stl-binary-search/ /// In the future it'd interesting to replace it with a B+Tree Layout as described /// at https://en.algorithmica.org/hpc/data-structures/s-tree/ - - size_t boundSearch(TKey value) { size_t size = array.size();