Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed some macos ires related warnings and errors (#4196)

This commit is contained in:
Heiko 2018-01-05 14:51:13 +01:00 committed by Jan
parent 2a93560473
commit 78213b3b4a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3rdParty/iresearch/core/utils/container_utils.hpp vendored
View File

@ -54,7 +54,7 @@ std::vector<bucket_size_t> compute_bucket_meta() {
std::vector<bucket_size_t> bucket_meta(num_buckets);
if (!num_buckets) {
return std::move(bucket_meta);
return bucket_meta;
}
bucket_meta[0].size = 1 << skip_bits;
@ -69,7 +69,7 @@ std::vector<bucket_size_t> compute_bucket_meta() {
// all subsequent buckets should have the same meta as the last bucket
bucket_meta.back().next = &(bucket_meta.back());
return std::move(bucket_meta);
return bucket_meta;
}
MSVC_ONLY(__pragma(warning(pop)))

2
arangod/IResearch/IResearchViewBlock.cpp
View File

@ -718,7 +718,7 @@ bool IResearchViewOrderedBlock::next(
return (limit == 0); // exceeded limit
}
size_t IResearchViewOrderedBlock::skip(uint64_t limit) {
size_t IResearchViewOrderedBlock::skip(size_t limit) {
TRI_ASSERT(_filter);
size_t skipped = 0;

2
tests/IResearch/IResearchOrder-test.cpp
View File

@ -600,7 +600,7 @@ SECTION("test_FCall_bm25") {
{
std::string query = "FOR d IN collection FILTER '1' SORT bm25(d, 0.97, 0.07, false, 1) RETURN d";
assertOrderExecutionFail(query, TRI_ERROR_NO_ERROR);
assertOrderExecutionFail(query);
}
// invalid reference (invalid output variable reference)

2
tests/IResearch/StorageEngineMock.h
View File

@ -216,7 +216,7 @@ class StorageEngineMock: public arangodb::StorageEngine {
virtual std::string versionFilename(TRI_voc_tick_t) const override;
virtual void waitForSyncTick(TRI_voc_tick_t tick) override;
virtual void waitForSyncTimeout(double maxWait) override;
virtual arangodb::Result flushWal(bool waitForSync, bool waitForCollector, bool writeShutdownFile);
virtual arangodb::Result flushWal(bool waitForSync, bool waitForCollector, bool writeShutdownFile) override;
virtual void waitUntilDeletion(TRI_voc_tick_t id, bool force, int& status) override;
virtual int writeCreateDatabaseMarker(TRI_voc_tick_t id, VPackSlice const& slice) override;