arangodb · gnusi · Apr 3, 2020 · Mar 25, 2020 · Mar 25, 2020 · Mar 25, 2020
diff --git a/3rdParty/iresearch/core/index/index_writer.cpp b/3rdParty/iresearch/core/index/index_writer.cpp
@@ -49,7 +49,7 @@ const size_t NON_UPDATE_RECORD = irs::integer_traits<size_t>::const_max; // non-
 
 const irs::column_info_provider_t DEFAULT_COLUMN_INFO = [](const irs::string_ref&) {
   // no compression, no encryption
-  return irs::column_info{ irs::compression::raw::type(), {}, false };
+  return irs::column_info{ irs::compression::none::type(), {}, false };
 };
 
 struct flush_segment_context {

diff --git a/3rdParty/iresearch/core/utils/compression.cpp b/3rdParty/iresearch/core/utils/compression.cpp
@@ -172,7 +172,7 @@ void init() {
 #ifndef IRESEARCH_DLL
   lz4::init();
   delta::init();
-  raw::init();
+  none::init();
 #endif
 }
 
@@ -192,16 +192,16 @@ bool visit(const std::function<bool(const string_ref&)>& visitor) {
 // --SECTION--                                                raw implementation
 // -----------------------------------------------------------------------------
 
-/*static*/ void raw::init() {
+/*static*/ void none::init() {
 #ifndef IRESEARCH_DLL
   // match registration below
-  REGISTER_COMPRESSION(raw, &raw::compressor, &raw::decompressor);
+  REGISTER_COMPRESSION(none, &none::compressor, &none::decompressor);
 #endif
 }
 
-DEFINE_COMPRESSION_TYPE(iresearch::compression::raw);
+DEFINE_COMPRESSION_TYPE(iresearch::compression::none);
 
-REGISTER_COMPRESSION(raw, &raw::compressor, &raw::decompressor);
+REGISTER_COMPRESSION(none, &none::compressor, &none::decompressor);
 
 NS_END // compression
 NS_END
diff --git a/3rdParty/iresearch/core/utils/compression.hpp b/3rdParty/iresearch/core/utils/compression.hpp
@@ -210,7 +210,7 @@ IRESEARCH_API bool visit(const std::function<bool(const string_ref&)>& visitor);
 /// @class raw
 /// @brief no compression
 ////////////////////////////////////////////////////////////////////////////////
-struct IRESEARCH_API raw {
+struct IRESEARCH_API none {
   DECLARE_COMPRESSION_TYPE();
 
   static void init();

diff --git a/3rdParty/iresearch/tests/index/index_column_tests.cpp b/3rdParty/iresearch/tests/index/index_column_tests.cpp
@@ -1969,7 +1969,7 @@ TEST_P(index_column_test_case, read_write_doc_attributes_sparse_column_dense_var
   // sparse_column<dense_block>
   irs::index_writer::init_options options;
   options.column_info = [](const irs::string_ref&) {
-    return irs::column_info{ irs::compression::raw::type(), irs::compression::options{}, true };
+    return irs::column_info{ irs::compression::none::type(), irs::compression::options{}, true };
   };
 
   static const irs::doc_id_t BLOCK_SIZE = 1024;
@@ -3118,7 +3118,7 @@ TEST_P(index_column_test_case, read_write_doc_attributes_sparse_column_dense_fix
 
   irs::index_writer::init_options options;
   options.column_info = [](const irs::string_ref&) {
-    return irs::column_info{ irs::compression::raw::type(), irs::compression::options{}, false };
+    return irs::column_info{ irs::compression::none::type(), irs::compression::options{}, false };
   };
 
   // border case for sparse fixed offset columns, e.g.

diff --git a/3rdParty/iresearch/tests/index/sorted_column_test.cpp b/3rdParty/iresearch/tests/index/sorted_column_test.cpp
@@ -160,7 +160,7 @@ TEST(sorted_column_test, insert_duplicates) {
 
     writer->prepare(dir, segment);
 
-    irs::sorted_column col({ irs::compression::raw::type(), {}, true });
+    irs::sorted_column col({ irs::compression::none::type(), {}, true });
     ASSERT_TRUE(col.empty());
     ASSERT_EQ(0, col.size());
     ASSERT_EQ(0, col.memory_active());

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,12 @@
 devel
 -----
+* Added JACCARD AQL function
+
+* storedValues property is removed from arngosearch link properties output.
+
+* Added primarySortCompression property to ArangoSearch Views
+
+* Added compression property to ArangoSearch View storedValues
 
 * Added INTERLEAVE AQL function.
 

diff --git a/arangod/Aql/Functions.cpp b/arangod/Aql/Functions.cpp
@@ -5066,7 +5066,7 @@ AqlValue Functions::Jaccard(ExpressionContext* ctx, transaction::Methods* trx,
     count = 0;
   }
 
-  auto const jaccard = values.empty() ? 0.0 : double_t(cardinality) / values.size();
+  auto const jaccard = values.empty() ? 1.0 : double_t(cardinality) / values.size();
 
   return AqlValue{AqlValueHintDouble{jaccard}};
 }

diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
@@ -53,6 +53,7 @@ add_library(arango_iresearch
   IResearch/Containers.cpp IResearch/Containers.h
   IResearch/IResearchAnalyzerFeature.cpp IResearch/IResearchAnalyzerFeature.h
   IResearch/IResearchCommon.cpp IResearch/IResearchCommon.h
+  IResearch/IResearchCompression.cpp IResearch/IResearchCompression.h
   IResearch/IResearchKludge.cpp IResearch/IResearchKludge.h
   IResearch/IResearchLink.cpp IResearch/IResearchLink.h
   IResearch/IResearchLinkCoordinator.cpp IResearch/IResearchLinkCoordinator.h

diff --git a/arangod/IResearch/IResearchCompression.cpp b/arangod/IResearch/IResearchCompression.cpp
@@ -0,0 +1,64 @@
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2020 ArangoDB GmbH, Cologne, Germany
+///
+/// Licensed 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.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Andrei Lobov
+////////////////////////////////////////////////////////////////////////////////
+
+#include "IResearchCompression.h"
+#include "Basics/debugging.h"
+#include <unordered_map>
+
+namespace {
+const std::unordered_map<
+  std::string,
+  arangodb::iresearch::ColumnCompression> COMPRESSION_CONVERT_MAP = {
+{ "lz4", arangodb::iresearch::ColumnCompression::LZ4 },
+{ "none", arangodb::iresearch::ColumnCompression::NONE },
+#ifdef ARANGODB_USE_GOOGLE_TESTS
+{ "test", arangodb::iresearch::ColumnCompression::TEST },
+#endif
+};
+}
+
+
+namespace arangodb {
+namespace iresearch {
+
F987

+irs::string_ref columnCompressionToString(ColumnCompression c) {
+  for (auto const&it : COMPRESSION_CONVERT_MAP) {
+    if (it.second == c) {
+      return it.first;
+    }
+  }
+  TRI_ASSERT(false);
+  return irs::string_ref::NIL;
+}
+
+ColumnCompression columnCompressionFromString(irs::string_ref const& c) {
+  TRI_ASSERT(!c.null());
+  auto it = COMPRESSION_CONVERT_MAP.find(c);
+  if (it != COMPRESSION_CONVERT_MAP.end()) {
+    return it->second;
+  }
+  return ColumnCompression::INVALID;
+}
+
+}  // namespace iresearch
+}  // namespace arangodb
+
diff --git a/arangod/IResearch/IResearchCompression.h b/arangod/IResearch/IResearchCompression.h
@@ -0,0 +1,44 @@
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2020 ArangoDB GmbH, Cologne, Germany
+///
+/// Licensed 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.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Andrei Lobov
+////////////////////////////////////////////////////////////////////////////////
+#ifndef ARANGOD_IRESEARCH__IRESEARCH_COMPRESSION_H
+#define ARANGOD_IRESEARCH__IRESEARCH_COMPRESSION_H 1
+
+#include "utils/string.hpp"
+
+namespace arangodb {
+namespace iresearch {
+
+enum class ColumnCompression {
+  INVALID = 0,
+  NONE = 1,
+  LZ4
+#ifdef ARANGODB_USE_GOOGLE_TESTS
+  , TEST = 999
+#endif
+};
+
+irs::string_ref columnCompressionToString(ColumnCompression c);
+ColumnCompression columnCompressionFromString(irs::string_ref const& c);
+} // iresearch
+} // arangodb
+
+#endif // ARANGOD_IRESEARCH__IRESEARCH_COMPRESSION_H
diff --git a/arangod/IResearch/IResearchFilterFactory.cpp b/arangod/IResearch/IResearchFilterFactory.cpp
@@ -2742,7 +2742,7 @@ arangodb::Result fromFuncNgramMatch(
     kludge::mangleStringField(name, analyzerPool);
 
     auto& ngramFilter = filter->add<irs::by_ngram_similarity>();
-    ngramFilter.field(std::move(name)).threshold(threshold).boost(filterCtx.boost);;
+    ngramFilter.field(std::move(name)).threshold((float_t)threshold).boost(filterCtx.boost);;
 
     analyzer->reset(matchValue);
     irs::term_attribute const& token = *analyzer->attributes().get<irs::term_attribute>();

diff --git a/arangod/IResearch/IResearchKludge.h b/arangod/IResearch/IResearchKludge.h
@@ -37,6 +37,8 @@ namespace arangodb {
 namespace iresearch {
 namespace kludge {
 
+const std::string primarySortColumnName{ "" };
+
 void mangleType(std::string& name);
 void mangleAnalyzer(std::string& name);