8000 Merge branch 'devel' of https://github.com/arangodb/arangodb into fea… · arangodb/arangodb@2dba460 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2dba460

Browse files
ObiWahnObiWahn
committed
Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/utf-8-validation
* 'devel' of https://github.com/arangodb/arangodb: (21 commits) Bug fix/headers cleanup (#11391) Feature/internal issue #672 (#11370) GraphNodes now copy the graph when cloned (#11345) fix lame compile error Feature/aql subquery execution block impl execute implementation harvesting (#11349) remove obsolete recoveryData Feature/dismantle mmfiles (#11354) Fix an agency supervision bug. (#11356) (mostly) restore pre-3.7 API behavior (#11364) validation: AQL functions (#11327) Check MSVC_VERSION instead of CMAKE_GENERATOR (#11351) added sleep time (lousy fix) Feature/aql interleave function (#11352) cheapify IN lookups on unsorted arrays (#11342) Bug fix/fix msvc2019 build (#11052) Allow easier removal of validation rules. (#11346) upgrade RocksDB (#11308) Introduce more type-safe identifiers (#11270) Bug fix/schema validation return code (#11341) Fix explainer output when restricting collections (#11338) ...
2 parents 983a3ac + 0346348 commit 2dba460

File tree

2,567 files changed

+191272
-193865
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,567 files changed

+191272
-193865
lines changed

‎3rdParty/README_maintainers.md

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,14 @@ https://www.boost.org/
1010
(we don't ship the upstream documentation!)
1111
To remove some unused doc files, you can run something as follows:
1212

13-
cd 3rdParty/boost/1.69.0
13+
cd 3rdParty/boost/1.71.0
1414
for i in `find -type d -name "doc"`; do git rm -r "$i"; done
1515

1616

1717
## cmake
1818

1919
Custom boost locator
2020

21-
## curl
22-
23-
HTTP client library https://curl.haxx.se/
24-
25-
We apply several build system patches to avoid unneccessary recompiles, bugfixes.
26-
27-
For example, we commented out curl's check for nroff to avoid documentation
28-
building (and complaining about it on Windows).
29-
30-
We also deactivated some of curl's install CMake commands, as we don't need
31-
anything installed (apart from that the vanilla curl install commands don't work
32-
when compiled as part of ArangoDB).
33-
34-
We also disabled adding the OpenSSL libraries via the following command:
35-
36-
list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto)
37-
38-
and instead are using the command
39-
40-
list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
41-
42-
from the previous version of curl's CMake file. When not applying this change,
43-
the static builds try to look for libssl.so, which will not work.
44-
4521
## date
4622

4723
Forward port of C++20 date/time class
@@ -74,7 +50,6 @@ https://github.com/arangodb/linenoise-ng
7450
We may want to switch to replxx (uniting our & other forks):
7551
https://github.com/AmokHuginnsson/replxx
7652

77-
7853
## lz4
7954

8055
https://github.com/lz4/lz4
@@ -100,13 +75,6 @@ On Upgrade:
10075
+#set(SNAPPY_LIB_DEBUG ${SNAPPY_HOME}/lib/native/debug/amd64/snappy.lib)
10176
+#set(SNAPPY_LIB_RELEASE ${SNAPPY_HOME}/lib/native/retail/amd64/snappy.lib)
10277

103-
- fix timestamp in `./CMakeLists.txt` to avoid recompilation
104-
105-
-string(TIMESTAMP GIT_DATE_TIME "%Y/%m/%d %H:%M:%S" UTC)
106-
+string(TIMESTAMP TS "%Y/%m/%d %H:%M:%S" UTC )
107-
+set(GIT_DATE_TIME "${TS}" CACHE STRING "the time we first built rocksdb")
108-
109-
11078
## s2geometry
11179

11280
http://s2geometry.io/

‎3rdParty/V8/v7.9.317/src/codegen/source-position.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,23 +146,23 @@ class SourcePosition final {
146146

147147
// The two below are only used if IsExternal() is true.
148148
using ExternalLineField = BitField64<int, 1, 20>;
149-
#ifdef DEBUG
149+
//#ifdef DEBUG
150150
// looks like debug build uses more external files
151151
// so extend bits for this field, but play safe for release builds
152152
using ExternalFileIdField = BitField64<int, 21, 16>;
153-
#else
154-
using ExternalFileIdField = BitField64<int, 21, 10>;
155-
#endif
153+
//#else
154+
// using ExternalFileIdField = BitField64<int, 21, 10>;
155+
//#endif
156156
// ScriptOffsetField is only used if IsExternal() is false.
157157
using ScriptOffsetField = BitField64<int, 1, 30>;
158158

159159
// InliningId is in the high bits for better compression in
160160
// SourcePositionTable.
161-
#ifdef DEBUG // also shift this field for above change for ExternalFileIdField
161+
//#ifdef DEBUG // also shift this field for above change for ExternalFileIdField
162162
using InliningIdField = BitField64<int, 37, 16>;
163-
#else
164-
using InliningIdField = BitField64<int, 31, 16>;
165-
#endif
163+
//#else
164+
// using InliningIdField = BitField64<int, 31, 16>;
165+
//#endif
166166
// Leaving the highest bit untouched to allow for signed conversion.
167167
uint64_t value_;
168168
};

‎3rdParty/iresearch/core/index/index_writer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const size_t NON_UPDATE_RECORD = irs::integer_traits<size_t>::const_max; // non-
4949

5050
const irs::column_info_provider_t DEFAULT_COLUMN_INFO = [](const irs::string_ref&) {
5151
// no compression, no encryption
52-
return irs::column_info{ irs::compression::raw::type(), {}, false };
52+
return irs::column_info{ irs::compression::none::type(), {}, false };
5353
};
5454

5555
struct flush_segment_context {

‎3rdParty/iresearch/core/utils/compression.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ void init() {
172172
#ifndef IRESEARCH_DLL
173173
lz4::init();
174174
delta::init();
175-
raw::init();
175+
none::init();
176176
#endif
177177
}
178178

@@ -192,16 +192,16 @@ bool visit(const std::function<bool(const string_ref&)>& visitor) {
192192
// --SECTION-- raw implementation
193193
// -----------------------------------------------------------------------------
194194

195-
/*static*/ void raw::init() {
195+
/*static*/ void none::init() {
196196
#ifndef IRESEARCH_DLL
197197
// match registration below
198-
REGISTER_COMPRESSION(raw, &raw::compressor, &raw::decompressor);
198+
REGISTER_COMPRESSION(none, &none::compressor, &none::decompressor);
199199
#endif
200200
}
201201

202-
DEFINE_COMPRESSION_TYPE(iresearch::compression::raw);
202+
DEFINE_COMPRESSION_TYPE(iresearch::compression::none);
203203

204-
REGISTER_COMPRESSION(raw, &raw::compressor, &raw::decompressor);
204+
REGISTER_COMPRESSION(none, &none::compressor, &none::decompressor);
205205

206206
NS_END // compression
207207
NS_END

‎3rdParty/iresearch/core/utils/compression.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ IRESEARCH_API bool visit(const std::function<bool(const string_ref&)>& visitor);
210210
/// @class raw
211211
/// @brief no compression
212212
////////////////////////////////////////////////////////////////////////////////
213-
struct IRESEARCH_API raw {
213+
struct IRESEARCH_API none {
214214
DECLARE_COMPRESSION_TYPE();
215215

216216
static void init();

‎3rdParty/iresearch/tests/index/index_column_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1969,7 +1969,7 @@ TEST_P(index_column_test_case, read_write_doc_attributes_sparse_column_dense_var
19691969
// sparse_column<dense_block>
19701970
irs::index_writer::init_options options;
19711971
options.column_info = [](const irs::string_ref&) {
1972-
return irs::column_info{ irs::compression::raw::type(), irs::compression::options{}, true };
1972+
return irs::column_info{ irs::compression::none::type(), irs::compression::options{}, true };
19731973
};
19741974

19751975
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
31183118

31193119
irs::index_writer::init_options options;
31203120
options.column_info = [](const irs::string_ref&) {
3121-
return irs::column_info{ irs::compression::raw::type(), irs::compression::options{}, false };
3121+
return irs::column_info{ irs::compression::none::type(), irs::compression::options{}, false };
31223122
};
31233123

31243124
// border case for sparse fixed offset columns, e.g.

‎3rdParty/iresearch/tests/index/sorted_column_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ TEST(sorted_column_test, insert_duplicates) {
160160

161161
writer->prepare(dir, segment);
162162

163-
irs::sorted_column col({ irs::compression::raw::type(), {}, true });
163+
irs::sorted_column col({ irs::compression::none::type(), {}, true });
164164
ASSERT_TRUE(col.empty());
165165
ASSERT_EQ(0, col.size());
166166
ASSERT_EQ(0, col.memory_active());

‎3rdParty/rocksdb/6.2/.travis.yml

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0