slightly better

arthurpassos · arthurpassos · commit 72214cc9b1db · 2025-04-14T16:37:01.000-03:00
diff --git a/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h b/src/Functions/keyvaluepair/impl/CHKeyValuePairExtractor.h
@@ -36,7 +36,7 @@ class CHKeyValuePairExtractor : public KeyValuePairExtractor
     {
         auto state =  State::WAITING_KEY;
 
-        auto pair_writer = typename StateHandler::StringWriter(map);
+        auto pair_writer = typename StateHandler::StringWriter(&map);
 
         uint64_t row_offset = 0;
 
diff --git a/src/Functions/keyvaluepair/impl/StateHandlerImpl.h b/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
@@ -591,19 +591,17 @@ struct ReferencesOnlyStateHandler : public StateHandlerImpl<false>
      * */
     class StringWriter
     {
-        static inline absl::flat_hash_map<std::string_view, std::string_view> dummy_map;
-        absl::flat_hash_map<std::string_view, std::string_view> & map;
+        absl::flat_hash_map<std::string_view, std::string_view> * map = nullptr;
 
         std::string_view key;
         std::string_view value;
 
     public:
-        explicit StringWriter(absl::flat_hash_map<std::string_view, std::string_view> & map_)
+        explicit StringWriter(absl::flat_hash_map<std::string_view, std::string_view> * map_)
             : map(map_)
         {}
 
         StringWriter(ColumnString &, ColumnString &)
-            : map(dummy_map)
         {
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Constructor should never be called");
         }
@@ -673,13 +671,13 @@ struct ReferencesOnlyStateHandler : public StateHandlerImpl<false>
         {
             if constexpr (throwOnDuplicate)
             {
-                if (const auto it = map.find(key); it != map.end() && it->second != value)
+                if (const auto it = map->find(key); it != map->end() && it->second != value)
                 {
                     throw DuplicateFoundException(key, it->second, value);
                 }
             }
 
-            map[key] = value;
+            map->insert(std::make_pair(key, value));
 
             resetValue();
             resetKey();

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class CHKeyValuePairExtractor : public KeyValuePairExtractor`
`36`	`36`	`{`
`37`	`37`	`auto state = State::WAITING_KEY;`
`38`	`38`
`39`		`- auto pair_writer = typename StateHandler::StringWriter(map);`
	`39`	`+ auto pair_writer = typename StateHandler::StringWriter(&map);`
`40`	`40`
`41`	`41`	`uint64_t row_offset = 0;`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -591,19 +591,17 @@ struct ReferencesOnlyStateHandler : public StateHandlerImpl<false>`
`591`	`591`	`* */`
`592`	`592`	`class StringWriter`
`593`	`593`	`{`
`594`		`- static inline absl::flat_hash_map<std::string_view, std::string_view> dummy_map;`
`595`		`- absl::flat_hash_map<std::string_view, std::string_view> & map;`
	`594`	`+ absl::flat_hash_map<std::string_view, std::string_view> * map = nullptr;`
`596`	`595`
`597`	`596`	`std::string_view key;`
`598`	`597`	`std::string_view value;`
`599`	`598`
`600`	`599`	`public:`
`601`		`- explicit StringWriter(absl::flat_hash_map<std::string_view, std::string_view> & map_)`
	`600`	`+ explicit StringWriter(absl::flat_hash_map<std::string_view, std::string_view> * map_)`
`602`	`601`	`: map(map_)`
`603`	`602`	`{}`
`604`	`603`
`605`	`604`	`StringWriter(ColumnString &, ColumnString &)`
`606`		`- : map(dummy_map)`
`607`	`605`	`{`
`608`	`606`	`throw Exception(ErrorCodes::LOGICAL_ERROR, "Constructor should never be called");`
`609`	`607`	`}`
`@@ -673,13 +671,13 @@ struct ReferencesOnlyStateHandler : public StateHandlerImpl<false>`
`673`	`671`	`{`
`674`	`672`	`if constexpr (throwOnDuplicate)`
`675`	`673`	`{`
`676`		`- if (const auto it = map.find(key); it != map.end() && it->second != value)`
	`674`	`+ if (const auto it = map->find(key); it != map->end() && it->second != value)`
`677`	`675`	`{`
`678`	`676`	`throw DuplicateFoundException(key, it->second, value);`
`679`	`677`	`}`
`680`	`678`	`}`
`681`	`679`
`682`		`- map[key] = value;`
	`680`	`+ map->insert(std::make_pair(key, value));`
`683`	`681`
`684`	`682`	`resetValue();`
`685`	`683`	`resetKey();`