Merge pull request #1 from iresearch-toolkit/master

Update repo from orginal

Author: CryptoNinjaGeek

.clang-tidy

@@ -7,22 +7,29 @@ Checks: '*,
          -mpi-*,
          -objc-*,
          -openmp-*,
-         -cert-err58-cpp,
+         -fuchsia-trailing-return,
          -fuchsia-default-arguments-*,
-         -google-build-using-namespace,
-         -modernize-use-trailing-return-type,
-         -readability-identifier-length,
          -fuchsia-overloaded-operator,
-         -cppcoreguidelines-pro-type-union-access,
-         -modernize-use-nodiscard,
+         -readability-identifier-length,
+         -readability-suspicious-call-argument,
+         -readability-function-cognitive-complexity,
          -cppcoreguidelines-owning-memory,
+         -cppcoreguidelines-avoid-c-arrays,
+         -cppcoreguidelines-avoid-do-while,
+         -cppcoreguidelines-avoid-magic-numbers,
+         -cppcoreguidelines-pro-type-union-access,
+         -cppcoreguidelines-pro-bounds-pointer-arithmetic,
+         -cppcoreguidelines-pro-bounds-constant-array-index,
          -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
+         -modernize-use-nodiscard,
          -modernize-avoid-c-arrays,
-         -cppcoreguidelines-avoid-c-arrays,
+         -modernize-use-trailing-return-type,
          -hicpp-avoid-c-arrays,
          -hicpp-no-array-decay,
-         -cppcoreguidelines-pro-bounds-constant-array-index,
-         -llvm-header-guard'
+         -bugprone-easily-swappable-parameters,
+         -llvm-header-guard,
+         -cert-err58-cpp,
+         -google-build-using-namespace'
 
 WarningsAsErrors: '*'
 

core/CMakeLists.txt

@@ -290,11 +290,7 @@ set(IRESEARCH_EXTERNAL_INCLUDES
   ${Fasttext_INCLUDE_DIR}
   ${FROZEN_INCLUDE_DIR})
 
-if (SUPPRESS_EXTERNAL_WARNINGS)
-  include_directories(SYSTEM ${IRESEARCH_EXTERNAL_INCLUDES})
-else ()
-  include_directories(${IRESEARCH_EXTERNAL_INCLUDES})
-endif ()
+include_directories(SYSTEM ${IRESEARCH_EXTERNAL_INCLUDES})
 
 add_library(iresearch-static
   STATIC
@@ -347,6 +343,7 @@ add_dependencies(iresearch-static
   iresearch-build_identifier
   iresearch-build_version
   iresearch-analyzer-delimiter-static
+  iresearch-analyzer-multi-delimiter-static
   iresearch-analyzer-ngram-static
   iresearch-analyzer-text-static
   iresearch-analyzer-norm-static
@@ -396,6 +393,7 @@ endif ()
 
 target_link_libraries(iresearch-static
   PUBLIC iresearch-analyzer-delimiter-static
+  PUBLIC iresearch-analyzer-multi-delimiter-static
   PUBLIC iresearch-analyzer-ngram-static
   PUBLIC iresearch-analyzer-text-static
   PUBLIC iresearch-analyzer-norm-static
@@ -437,7 +435,7 @@ endif ()
 add_library(iresearch-analyzer-delimiter-static
   STATIC
   ./analysis/delimited_token_stream.cpp
-  )
+)
 
 set_ipo(iresearch-analyzer-delimiter-static)
 
@@ -446,11 +444,34 @@ set_target_properties(iresearch-analyzer-delimiter-static
   PREFIX lib
   IMPORT_PREFIX lib
   OUTPUT_NAME analyzer-delimiter-s
-  )
+)
 
 target_link_libraries(iresearch-analyzer-delimiter-static
   iresearch-static
-  )
+)
+
+################################################################################
+### analysis plugin : multi-delimiter
+################################################################################
+
+add_library(iresearch-analyzer-multi-delimiter-static
+  STATIC
+  ./analysis/multi_delimited_token_stream.cpp
+)
+
+set_ipo(iresearch-analyzer-multi-delimiter-static)
+
+set_target_properties(iresearch-analyzer-multi-delimiter-static
+  PROPERTIES
+  PREFIX lib
+  IMPORT_PREFIX lib
+  OUTPUT_NAME analyzer-multi-delimiter-s
+)
+
+target_link_libraries(iresearch-analyzer-multi-delimiter-static
+  iresearch-static
+  iresearch-ofst
+)
 
 ################################################################################
 ### analysis plugin : text

core/analysis/analyzers.cpp

@@ -106,7 +106,7 @@ constexpr std::string_view kAnalyzerParam = "analyzer";
 std::string_view GetType(velocypack::Slice& input) {
   IRS_ASSERT(input.isObject());
   input = input.get(kAnalyzerParam);
-  if (input.isNone() || input.isNull() || input.isEmptyObject()) {
+  if (input.isNone() || input.isNull()) {
     return irs::string_token_stream::type_name();
   }
   if (!input.isObject()) {
@@ -247,10 +247,10 @@ bool NormalizeAnalyzer(velocypack::Slice input, velocypack::Builder& output) {
   if (type.empty()) {
     return false;
   }
-  velocypack::ObjectBuilder scope{&output, kAnalyzerParam};
   if (type == irs::string_token_stream::type_name()) {
     return true;
   }
+  velocypack::ObjectBuilder scope{&output, kAnalyzerParam};
   output.add(kTypeParam, velocypack::Value{type});
   input = input.get(kPropertiesParam);
   if (input.isNone()) {

core/analysis/delimited_token_stream.cpp

@@ -125,8 +125,9 @@ bool parse_vpack_options(const VPackSlice slice, std::string& delimiter) {
         delimiter = delim_type_slice.stringView();
         return true;
       }
-    default: {
-    }  // fall through
+      break;
+    default:
+      break;
   }
 
   IRS_LOG_ERROR(absl::StrCat(

core/analysis/minhash_token_stream.cpp

@@ -103,7 +103,7 @@ static uint64_t HashLen0to16(const char* s, size_t len) {
     uint8_t b = s[len >> 1];
     uint8_t c = s[len - 1];
     uint32_t y = static_cast<uint32_t>(a) + (static_cast<uint32_t>(b) << 8);
-    uint32_t z = len + (static_cast<uint32_t>(c) << 2);
+    uint32_t z = static_cast<uint32_t>(len) + (static_cast<uint32_t>(c) << 2);
     return ShiftMix(y * k2 ^ z * k0) * k2;
   }
   return k2;