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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-10-27 13:30:50 +01:00
parent 7a2f45ab1a 7ca33e7b73
commit ed1dc769ff
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangod/Aql/ExecutionBlock.cpp
View File

@ -4402,14 +4402,6 @@ size_t DistributeBlock::sendToClient (AqlValue val) {
if (val._type == AqlValue::JSON) { if (val._type == AqlValue::JSON) {
json = val._json->json(); json = val._json->json();
} }
/*
// TODO: if the DistributeBlock is supposed to run on coordinators only, it
// cannot have any AqlValues of type SHAPED. These are only present when there
// are physical collections
else if (val._type == AqlValue::SHAPED) {
json = val.toJson(_trx, _collection->documentCollection()).json();
}
*/
else { else {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_FAILED, THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_FAILED,
"DistributeBlock: can only send JSON or SHAPED"); "DistributeBlock: can only send JSON or SHAPED");