8000 Update abseil-cpp to avoid big parsing in compile time cost (#17841) · hicder/arangodb@aff3f9c · GitHub
[go: up one dir, main page]
Skip to content

Commit aff3f9c

Browse files
MBkktMBkkt
authored
Update abseil-cpp to avoid big parsing in compile time cost (arangodb#17841)
* Update abseil-cpp to avoid big parsing in compile time cost * Update abseil-cpp to avoid big parsing in compile time cost * Update iresearch * Make direct abseil include last to avoid false positive cost check. Please remove it before merge, but after Manuel checks! * Patch s2 to avoid missing include * Fix missing include * IResearch now use compare instead of less! * Fix missing include: remove strange code from search * Fix missing include: remove strange code from search * update iresearch * update iresearch * Fix missing include * update abseil * Fix format * Fix format * Fix format * Update iresearch * Update abseil * Fix mistake * Revert "Make direct abseil include last to avoid false positive cost check." This reverts commit fe80afa * Revert "Make direct abseil include last to avoid false positive cost check." This reverts commit fe80afa * Update iresearch * Fix comparer usage * Revert "Make direct abseil include last to avoid false positive cost check." This reverts commit fe80afa * fix * Revert "Make direct abseil include last to avoid false positive cost check." This reverts commit fe80afa * Revert "Make direct abseil include last to avoid false positive cost check." This reverts commit fe80afa
1 parent 6c4a42e commit aff3f9c

31 files changed

+95
-79
lines changed

‎3rdParty/abseil-cpp

Submodule abseil-cpp updated 68 files

‎3rdParty/iresearch

Submodule iresearch updated 202 files

‎3rdParty/s2geometry/master/src/s2/s2polygon.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <cmath>
2323
#include <cstddef>
2424
#include <memory>
25+
#include <map>
2526
#include <stack>
2627
#include <utility>
2728
#include <vector>

‎arangod/Aql/IResearchViewExecutor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1680,8 +1680,8 @@ bool IResearchViewMergeExecutor<ExecutionTraits>::MinHeapContext::operator()(
16801680
size_t const lhs, size_t const rhs) const {
16811681
assert(lhs < _segments->size());
16821682
assert(rhs < _segments->size());
1683-
return _less((*_segments)[rhs].sortValue->value,
1684-
(*_segments)[lhs].sortValue->value);
1683+
return _less.Compare((*_segments)[rhs].sortValue->value,
1684+
(*_segments)[lhs].sortValue->value) < 0;
16851685
}
16861686

16871687
template<typename ExecutionTraits>

‎arangod/Cluster/ClusterFeature.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323

2424
#pragma once
2525

26+
#include <unordered_set>
27+
2628
#include "Basics/Common.h"
2729

2830
#include "Basics/Mutex.h"

‎arangod/Cluster/ClusterMethods.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
#include <random>
9191
#include <vector>
9292

93+
#include <absl/strings/str_cat.h>
94+
9395
using namespace arangodb;
9496
using namespace arangodb::basics;
9597
using namespace arangodb::futures;

‎arangod/GeoIndex/Covering.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323

2424
#pragma once
2525

26+
#include <deque>
27+
#include <vector>
28+
#include <unordered_set>
29+
2630
#include <s2/s2cap.h>
2731
#include <s2/s2cell_id.h>
2832
#include <s2/s2region.h>
2933
#include <s2/s2region_coverer.h>
3034

31-
#include <deque>
32-
#include <vector>
33-
3435
#include "Geo/GeoParams.h"
3536
#include "Geo/Utils.h"
3637
#include "VocBase/Identifiers/LocalDocumentId.h"

‎arangod/GeoIndex/Near.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <queue>
2727
#include <type_traits>
2828
#include <vector>
29+
#include <unordered_set>
2930

3031
#include <s2/s2cap.h>
3132
#include <s2/s2cell_id.h>

‎arangod/IResearch/AqlHelper.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
#include "utils/string.hpp"
3737
#include "Cluster/ClusterInfo.h"
3838

39+
#include <absl/strings/numbers.h>
40+
3941
#if defined(__GNUC__)
4042
#pragma GCC diagnostic push
4143
#if (__GNUC__ >= 7)

‎arangod/IResearch/IResearchDataStore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ class IResearchDataStore {
439439

440440
virtual void invalidateQueryCache(TRI_vocbase_t*) = 0;
441441

442-
virtual irs::comparer const* getComparator() const noexcept = 0;
442+
virtual irs::Comparer const* getComparator() const noexcept = 0;
443443

444444
StorageEngine* _engine{nullptr};
445445

0 commit comments

Comments
 (0)
0