Skip msan and tsan

programs/server/Server.cpp

@@ -458,29 +458,36 @@ void setOOMScore(int value, Poco::Logger * log)
 
 extern "C" void tantivy_log_callback(int level, const char * thread_info, const char * message)
 {
+#if defined(MEMORY_SANITIZER)
+ __msan_unpoison_string(thread_info);
+ __msan_unpoison_string(message);
+#endif
+ // Ensure that null pointers are replaced with empty strings
+ const char * safe_thread_info = thread_info ? thread_info : "";
+ const char * safe_message = message ? message : "";
  Poco::Logger & logger = Poco::Logger::get("TantivyLibrary");
  switch (level)
  {
  case -2: // -2 -> fatal
- LOG_FATAL(&logger, "{} - {}", thread_info, message);
+ LOG_FATAL(&logger, "{} - {}", safe_thread_info, safe_message);
  break;
  case -1: // -1 -> error
- LOG_ERROR(&logger, "{} - {}", thread_info, message);
+ LOG_ERROR(&logger, "{} - {}", safe_thread_info, safe_message);
  break;
  case 0: // 0 -> warning
- LOG_WARNING(&logger, "{} - {}", thread_info, message);
+ LOG_WARNING(&logger, "{} - {}", safe_thread_info, safe_message);
  break;
  case 1: // 1 -> info
- LOG_INFO(&logger, "{} - {}", thread_info, message);
+ LOG_INFO(&logger, "{} - {}", safe_thread_info, safe_message);
  break;
  case 2: // 2 -> debug
- LOG_DEBUG(&logger, "{} - {}", thread_info, message);
+ LOG_DEBUG(&logger, "{} - {}", safe_thread_info, safe_message);
  break;
  case 3: // 3 -> tracing
- LOG_TRACE(&logger, "{} - {}", thread_info, message);
+ LOG_TRACE(&logger, "{} - {}", safe_thread_info, safe_message);
  break;
  default:
- LOG_DEBUG(&logger, "{} - {}", thread_info, message);
+ LOG_DEBUG(&logger, "{} - {}", safe_thread_info, safe_message);
  }
 }
 

src/Core/Settings.h

@@ -212,7 +212,7 @@ class IColumn;
  M(UInt64, merge_tree_max_rows_to_use_cache, (128 * 8192), "The maximum number of rows per request, to use the cache of uncompressed data. If the request is large, the cache is not used. (For large queries not to flush out the cache.)", 0) \
  M(UInt64, merge_tree_max_bytes_to_use_cache, (192 * 10 * 1024 * 1024), "The maximum number of bytes per request, to use the cache of uncompressed data. If the request is large, the cache is not used. (For large queries not to flush out the cache.)", 0) \
  M(Bool, do_not_merge_across_partitions_select_final, false, "Merge parts only in one partition in select final", 0) \
- M(Bool, allow_experimental_inverted_index, false, "If it is set to true, allow to use experimental inverted index.", 0) \
+ M(Bool, allow_experimental_inverted_index, true, "If it is set to true, allow to use experimental inverted index.", 0) \
  \
  M(UInt64, mysql_max_rows_to_insert, 65536, "The maximum number of rows in MySQL batch insertion of the MySQL storage engine", 0) \
 \

tests/queries/0_stateless/02887_tantivy_text_search_single_col.sql

@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-msan
+
 SET allow_experimental_inverted_index = 1;
 SET log_queries = 1;
 SET mutations_sync = 1;

tests/queries/0_stateless/02888_tantivy_text_search_multi_col.sql

@@ -1,3 +1,5 @@
+-- Tags: no-tsan, no-msan
+
 SET allow_experimental_inverted_index = 1;
 SET log_queries = 1;
 SET mutations_sync = 1;

tests/tsan_suppressions.txt

@@ -1,5 +1 @@
 # We have no suppressions!
-src:*/TantivyIndexStoreStorages/MergeTree/TantivyIndexStore.cpp*
-src:*/tantivy_search/*
-func:__interceptor_memmove
-func:memcpy