Merge branch 'develop' into feature/clusterization

# Conflicts: # changelog.md
Restream · Aug 15, 2024 · ebd0177 · ebd0177
1 parent 94e79c9
commit ebd0177
Show file tree

Hide file tree

Showing 675 changed files with 42,854 additions and 21,030 deletions.
diff --git a/.clang-format b/.clang-format
@@ -99,7 +99,7 @@ CompactNamespaces: false
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DerivePointerAlignment: true
+DerivePointerAlignment: false
 DisableFormat:   false
 EmptyLineAfterAccessModifier: Never
 EmptyLineBeforeAccessModifier: LogicalBlock
@@ -136,7 +136,7 @@ IndentPPDirectives: None
 IndentRequiresClause: true
 IndentWidth:     4
 IndentWrappedFunctionNames: false
-InsertBraces:    false
+InsertBraces:    true
 InsertNewlineAtEOF: false
 InsertTrailingCommas: None
 IntegerLiteralSeparator:
@@ -175,12 +175,12 @@ PenaltyIndentedWhitespace: 0
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 PPIndentWidth:   -1
-QualifierAlignment: Leave
+QualifierAlignment: Left
 ReferenceAlignment: Pointer
 ReflowComments:  true
 RemoveBracesLLVM: false
 RemoveParentheses: Leave
-RemoveSemicolon: false
+RemoveSemicolon: true
 RequiresClausePosition: OwnLine
 RequiresExpressionIndentation: OuterScope
 SeparateDefinitionBlocks: Leave

diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,20 @@
+# Version 4.17.0 *beta* (XX.XX.2024)
+
+## Core
+- [fea] Updated [logging library](https://github.com/gabime/spdlog) to v1.14.1 and [formatting library](https://github.com/fmtlib/fmt) to v11.0.2
+- [fea] Optimized log level checks to avoid excessive serializtion in core logs
+- [fea] Added support for [array_remove](readme.md#remove-array-elements-by-values) with scalar values in SQL
+- [fea] Added support for [array_remove](readme.md#remove-array-elements-by-values) with non-integral values
+- [fix] Disabled default values creation for object array indexes to avoid Go/Java connectors incompatibility
+- [fix] Fixed sorted JOIN-subqueries over optimized `tree`-indexes with unordered conditions
+- [fix] Fixed `LIMIT`/`OFFSET` stability for fulltext [MERGE-queries](fulltext.md#merging-queries-results)
+
+## Reindexer server
+- [fix] Fixed [docker's](https://hub.docker.com/r/reindexer/reindexer) SEGFAULT on M1 CPU
+
+## Reindexer tool
+- [fix] Fixed possible stucking in interactive mode on Windows
+
 # Version 4.16.0 *beta* (26.07.2024)
 
 ## Reindexer server

diff --git a/cpp_src/CMakeLists.txt b/cpp_src/CMakeLists.txt
@@ -302,7 +302,8 @@ set_source_files_properties (${REINDEXER_SOURCE_PATH}/core/storage/leveldblogger
 list(APPEND REINDEXER_LIBRARIES reindexer)
 add_library(${TARGET} STATIC ${HDRS} ${SRCS} ${VENDORS})
 add_definitions(-DREINDEX_CORE_BUILD=1)
-
+add_definitions(-DFMT_HEADER_ONLY=1)
+add_definitions(-DSPDLOG_FMT_EXTERNAL=1)
 
 # add_definitions(-DREINDEX_FT_EXTRA_DEBUG=1)
 if (ENABLE_SERVER_AS_PROCESS_IN_TEST)

diff --git a/cpp_src/client/connectionspool.h b/cpp_src/client/connectionspool.h
@@ -7,7 +7,7 @@ namespace reindexer {
 namespace client {
 
 struct ConnectionsPoolData {
-	ConnectionsPoolData(size_t connCount, const ReindexerConfig &cfg, INamespaces::PtrT sharedNss) {
+	ConnectionsPoolData(size_t connCount, const ReindexerConfig& cfg, INamespaces::PtrT sharedNss) {
 		assert(connCount);
 		assert(sharedNss);
 		sharedNamespaces = std::move(sharedNss);
@@ -24,10 +24,10 @@ template <typename CmdT>
 class Connection {
 public:
 	static constexpr auto kConnectionChSize = 100;
-	Connection(RPCClient &_rx) : rx(_rx), cmdCh_(kConnectionChSize) {}
+	Connection(RPCClient& _rx) : rx(_rx), cmdCh_(kConnectionChSize) {}
 
 	template <typename U>
-	void PushCmd(U &&obj) {
+	void PushCmd(U&& obj) {
 		++requests_;
 		cmdCh_.push(std::forward<U>(obj));
 	}
@@ -40,7 +40,7 @@ class Connection {
 	}
 	size_t Requests() const noexcept { return requests_; }
 
-	RPCClient &rx;
+	RPCClient& rx;
 
 private:
 	coroutine::channel<CmdT> cmdCh_;
@@ -50,13 +50,13 @@ class Connection {
 template <typename CmdT>
 class ConnectionsPool {
 public:
-	ConnectionsPool(ConnectionsPoolData &data) noexcept : data_(data) {
-		for (auto &c : data_.clients) {
+	ConnectionsPool(ConnectionsPoolData& data) noexcept : data_(data) {
+		for (auto& c : data_.clients) {
 			connections_.emplace_back(c);
 		}
 	}
 
-	Connection<CmdT> &GetConn() noexcept {
+	Connection<CmdT>& GetConn() noexcept {
 		size_t idx = 0;
 		size_t minReq = std::numeric_limits<size_t>::max();
 		for (size_t i = 0; i < data_.clients.size(); ++i) {
@@ -68,13 +68,13 @@ class ConnectionsPool {
 		}
 		return connections_[idx];
 	}
-	Connection<CmdT> &GetConn(size_t idx) noexcept { return connections_[idx]; }
+	Connection<CmdT>& GetConn(size_t idx) noexcept { return connections_[idx]; }
 	typename std::deque<Connection<CmdT>>::iterator begin() noexcept { return connections_.begin(); }
 	typename std::deque<Connection<CmdT>>::const_iterator end() const noexcept { return connections_.cend(); }
 	size_t Size() const noexcept { return data_.clients.size(); }
 
 private:
-	ConnectionsPoolData &data_;
+	ConnectionsPoolData& data_;
 	std::deque<Connection<CmdT>> connections_;
 	size_t idx_ = 0;
 };

diff --git a/cpp_src/client/connectopts.h b/cpp_src/client/connectopts.h
@@ -29,5 +29,5 @@ struct ConnectOpts {
 	int expectedClusterID = -1;
 };
 
-}
-}
+}  // namespace client
+}  // namespace reindexer