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

fixed assertion errors

This commit is contained in:
Jan Steemann 2014-08-08 10:53:15 +02:00
parent 5d47e8df44
commit ebf70cb4ba
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arangod/Aql/Types.cpp
View File

@ -231,7 +231,7 @@ Json AqlValue::toJson (TRI_document_collection_t const* document) const {
////////////////////////////////////////////////////////////////////////////////
AqlItemBlock* AqlItemBlock::splice (std::vector<AqlItemBlock*>& blocks) {
TRI_ASSERT(blocks.size() != 0);
TRI_ASSERT(! blocks.empty());
auto it = blocks.begin();
TRI_ASSERT(it != blocks.end());
@ -246,25 +246,34 @@ AqlItemBlock* AqlItemBlock::splice (std::vector<AqlItemBlock*>& blocks) {
TRI_ASSERT((*it)->getNrRegs() == nrRegs);
}
TRI_ASSERT(totalSize > 0);
TRI_ASSERT(nrRegs > 0);
auto res = new AqlItemBlock(totalSize, nrRegs);
size_t pos = 0;
for (it = blocks.begin(); it != blocks.end(); ++it) {
// handle collections
if (it == blocks.begin()) {
// copy collection info over
for (RegisterId col = 0; col < nrRegs; ++col) {
res->getDocumentCollections().at(col)
= (*it)->getDocumentCollections().at(col);
res->setDocumentCollection(col, (*it)->getDocumentCollection(col));
}
}
else {
for (RegisterId col = 0; col < nrRegs; ++col) {
TRI_ASSERT(res->getDocumentCollections().at(col) ==
(*it)->getDocumentCollections().at(col));
TRI_ASSERT(res->getDocumentCollection(col) ==
(*it)->getDocumentCollection(col));
}
}
for (size_t row = 0; row < (*it)->size(); ++row) {
TRI_ASSERT((*it) != res);
size_t const n = (*it)->size();
for (size_t row = 0; row < n; ++row) {
for (RegisterId col = 0; col < nrRegs; ++col) {
res->setValue(pos+row, col, (*it)->getValue(row, col));
(*it)->setValue(row, col, AqlValue());
// copy over value
res->setValue(pos + row, col, (*it)->getValue(row, col));
// delete old value
(*it)->eraseValue(row, col);
}
}
pos += (*it)->size();

4
arangod/Aql/Types.h
View File

@ -353,9 +353,9 @@ namespace triagens {
/// @brief setValue, set the current value of a register
////////////////////////////////////////////////////////////////////////////////
void setValue (size_t index, RegisterId varNr, AqlValue zeug) {
void setValue (size_t index, RegisterId varNr, AqlValue value) {
TRI_ASSERT(_data[index * _nrRegs + varNr].isEmpty());
_data[index * _nrRegs + varNr] = zeug;
_data[index * _nrRegs + varNr] = value;
}
////////////////////////////////////////////////////////////////////////////////