Make Executor::getStringDictionary thread safe

yutiansut · Mar 17, 2015 · 93f26ba · 93f26ba
1 parent 713fda5
commit 93f26ba
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/QueryEngine/Execute.cpp b/QueryEngine/Execute.cpp
@@ -167,6 +167,7 @@ StringDictionary* Executor::getStringDictionary(const int dict_id) const {
   const auto dd = catalog_->getMetadataForDict(dict_id);
   CHECK(dd);
   CHECK_EQ(32, dd->dictNBits);
+  std::lock_guard<std::mutex> lock(str_dicts_mutex_);
   const auto dict_it = str_dicts_.find(dict_id);
   if (dict_it != str_dicts_.end()) {
     return dict_it->second.get();

diff --git a/QueryEngine/Execute.h b/QueryEngine/Execute.h
@@ -315,6 +315,7 @@ class Executor {
   std::mutex gpu_exec_mutex_[max_gpu_count];
 
   mutable std::unordered_map<int, std::unique_ptr<StringDictionary>> str_dicts_;
+  mutable std::mutex str_dicts_mutex_;
 
   std::map<CodeCacheKey, CodeCacheVal> cpu_code_cache_;
   std::map<CodeCacheKey, CodeCacheVal> gpu_code_cache_;