mirror of https://gitee.com/bigwinds/arangodb
fix compile warnings (#8743)
This commit is contained in:
parent
fe58c54b2d
commit
13b2d40aef
|
@ -42,7 +42,7 @@ namespace {
|
|||
|
||||
void eraseRow(SharedAqlItemBlockPtr& block, size_t row) {
|
||||
arangodb::aql::RegisterId const nrRegs = block->getNrRegs();
|
||||
for (size_t i = 0; i < nrRegs; i++) {
|
||||
for (arangodb::aql::RegisterId i = 0; i < nrRegs; i++) {
|
||||
block->destroyValue(row, i);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,7 +35,7 @@ size_t ExecutorExpressionContext::numRegisters() const {
|
|||
}
|
||||
|
||||
AqlValue const& ExecutorExpressionContext::getRegisterValue(size_t i) const {
|
||||
return _inputRow.getValue(i);
|
||||
return _inputRow.getValue(static_cast<arangodb::aql::RegisterId>(i));
|
||||
}
|
||||
|
||||
Variable const* ExecutorExpressionContext::getVariable(size_t i) const {
|
||||
|
|
|
@ -42,7 +42,7 @@ bool InputAqlItemRow::internalBlockIs(SharedAqlItemBlockPtr const& other) const
|
|||
SharedAqlItemBlockPtr InputAqlItemRow::cloneToBlock(AqlItemBlockManager& manager,
|
||||
std::unordered_set<RegisterId> const& registers,
|
||||
size_t newNrRegs) const {
|
||||
SharedAqlItemBlockPtr block = manager.requestBlock(1, newNrRegs);
|
||||
SharedAqlItemBlockPtr block = manager.requestBlock(1, static_cast<RegisterId>(newNrRegs));
|
||||
if (isInitialized()) {
|
||||
std::unordered_set<AqlValue> cache;
|
||||
TRI_ASSERT(getNrRegisters() <= newNrRegs);
|
||||
|
|
|
@ -121,11 +121,11 @@ GeneralServer::IoContext::~IoContext() { stop(); }
|
|||
void GeneralServer::IoContext::stop() { _asioIoContext.stop(); }
|
||||
|
||||
GeneralServer::IoContext& GeneralServer::selectIoContext() {
|
||||
uint32_t low = _contexts[0]._clients.load();
|
||||
uint64_t low = _contexts[0]._clients.load();
|
||||
size_t lowpos = 0;
|
||||
|
||||
for (size_t i = 1; i < _contexts.size(); ++i) {
|
||||
uint32_t x = _contexts[i]._clients.load();
|
||||
uint64_t x = _contexts[i]._clients.load();
|
||||
if (x < low) {
|
||||
low = x;
|
||||
lowpos = i;
|
||||
|
|
|
@ -933,7 +933,7 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
|
|||
bool created;
|
||||
auto unused = physical->createIndex(payloadSlice, /*restore*/ true, created);
|
||||
TRI_ASSERT(unused != nullptr);
|
||||
} catch (basics::Exception const& e) {
|
||||
} catch (basics::Exception const&) {
|
||||
LOG_TOPIC("92fdf", WARN, arangodb::Logger::ENGINES)
|
||||
<< "cannot create index " << indexId << ", collection "
|
||||
<< collectionId << " in database " << databaseId;
|
||||
|
|
|
@ -233,7 +233,7 @@ class MMFilesFlushMarker final: public arangodb::MMFilesWalMarker {
|
|||
TRI_voc_fid_t fid() const override final { return 0; }
|
||||
|
||||
uint32_t size() const override final {
|
||||
return sizeof(MMFilesMarker) + sizeof(TRI_voc_tick_t) + _slice.byteSize();
|
||||
return static_cast<uint32_t>(sizeof(MMFilesMarker) + sizeof(TRI_voc_tick_t) + _slice.byteSize());
|
||||
}
|
||||
|
||||
arangodb::velocypack::Slice const& slice() const noexcept { return _slice; }
|
||||
|
|
|
@ -57,7 +57,7 @@ int compareIndexedValues(arangodb::velocypack::Slice const& lhs,
|
|||
++rhsIter;
|
||||
}
|
||||
|
||||
return lLength - rLength;
|
||||
return static_cast<int>(lLength - rLength);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
@ -112,5 +112,5 @@ int RocksDBVPackComparator::compareIndexValues(rocksdb::Slice const& lhs,
|
|||
}
|
||||
}
|
||||
|
||||
return lSize - rSize;
|
||||
return static_cast<int>(lSize - rSize);
|
||||
}
|
||||
|
|
|
@ -152,7 +152,7 @@ class RocksDBReplicationContext {
|
|||
bool fail() const { return _result.fail(); }
|
||||
int errorNumber() const { return _result.errorNumber(); }
|
||||
std::string errorMessage() const { return _result.errorMessage(); }
|
||||
bool is(uint64_t code) const { return _result.is(code); }
|
||||
bool is(int code) const { return _result.is(code); }
|
||||
|
||||
// access methods
|
||||
Result const& result() const& { return _result; }
|
||||
|
|
|
@ -770,7 +770,7 @@ namespace {
|
|||
return true;
|
||||
}
|
||||
|
||||
int dist = std::distance(begin, end);
|
||||
auto dist = std::distance(begin, end);
|
||||
bool notF1 = first.isNone() || (dist == 1 && !first.isObject());
|
||||
bool notF2 = second.isNone() || (dist == 1 && !second.isObject());
|
||||
if (notF1 != notF2) {
|
||||
|
|
Loading…
Reference in New Issue