wangyong9999 commented on code in PR #254: URL: https://github.com/apache/paimon-cpp/pull/254#discussion_r3871807055
########## src/paimon/common/utils/std_concurrent_hash_map.h: ########## @@ -0,0 +1,129 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#pragma once + +#include <algorithm> +#include <cstddef> +#include <cstdint> +#include <functional> +#include <mutex> +#include <optional> +#include <shared_mutex> +#include <string> +#include <unordered_map> +#include <vector> + +#include "paimon/common/utils/murmurhash_utils.h" + +namespace paimon { + +template <typename Key> +class DefaultHashCompare { + public: + size_t hash(const Key& key) const { + return std::hash<Key>{}(key); + } + + bool equal(const Key& lhs, const Key& rhs) const { + return lhs == rhs; + } +}; + +namespace detail { + +template <typename Key, typename HashCompare> +class HashCompareHasher { + public: + size_t operator()(const Key& key) const { + return HashCompare{}.hash(key); Review Comment: Verified on f481ffa. Both adapters now share the same HashCompare instance, and the stateful-comparator repro passes with TBB enabled and disabled. Fixed, thanks. ########## src/paimon/common/utils/std_concurrent_bounded_queue.h: ########## @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#pragma once + +#include <condition_variable> +#include <cstddef> +#include <limits> +#include <mutex> +#include <queue> +#include <utility> + +namespace paimon { + +template <typename T> +class ConcurrentBoundedQueue { + public: + using size_type = std::ptrdiff_t; + using value_type = T; + using reference = T&; + using const_reference = const T&; + + ConcurrentBoundedQueue() = default; + ~ConcurrentBoundedQueue() = default; + + ConcurrentBoundedQueue(const ConcurrentBoundedQueue&) = delete; + ConcurrentBoundedQueue& operator=(const ConcurrentBoundedQueue&) = delete; + ConcurrentBoundedQueue(ConcurrentBoundedQueue&&) = delete; + ConcurrentBoundedQueue& operator=(ConcurrentBoundedQueue&&) = delete; + + void set_capacity(size_type capacity) { + { + std::unique_lock<std::mutex> lock(mutex_); + capacity_ = + capacity < 0 ? std::numeric_limits<size_t>::max() : static_cast<size_t>(capacity); + } + capacity_available_.notify_all(); + } + + void push(const T& value) { + T copied_value = value; + push(std::move(copied_value)); + } + + void push(T&& value) { + std::unique_lock<std::mutex> lock(mutex_); + capacity_available_.wait(lock, [this]() { return queue_.size() < capacity_; }); Review Comment: Verified on f481ffa. Cleanup now keeps draining until the producer and all consumers finish, and the early-close stress case completes with both backends, including under ThreadSanitizer. Fixed, thanks. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
