1
0
Fork 0
This commit is contained in:
jsteemann 2016-01-08 01:17:44 +01:00
parent 9f0576c65f
commit 64c5b21074
5 changed files with 4 additions and 12 deletions

View File

@ -39,6 +39,7 @@ EnumerateListBlock::EnumerateListBlock(ExecutionEngine* engine,
_index(0),
_thisBlock(0),
_seen(0),
_docVecSize(0),
_collection(nullptr),
_inVarRegId(ExecutionNode::MaxRegisterId) {
auto it = en->getRegisterPlan()->varInfo.find(en->_inVariable->id);
@ -136,10 +137,7 @@ AqlItemBlock* EnumerateListBlock::getSome(size_t, size_t atMost) {
break;
}
case AqlValue::SHAPED: {
throwArrayExpectedException();
}
case AqlValue::SHAPED:
case AqlValue::EMPTY: {
throwArrayExpectedException();
}

View File

@ -128,7 +128,7 @@ class AsyncJobManager {
public:
AsyncJobManager(callback_fptr);
explicit AsyncJobManager(callback_fptr);
~AsyncJobManager();

View File

@ -1532,9 +1532,6 @@ int RestReplicationHandler::processRestoreCollectionCoordinator(
uint64_t const id = ci->uniqid(1 + numberOfShards);
toMerge.add("shards", VPackValue(VPackValueType::Object));
for (uint64_t i = 0; i < numberOfShards; ++i) {
// determine responsible server
std::string serverId = dbServers[i % dbServers.size()];
// shard id
toMerge.add(
VPackValue(std::string("s" + StringUtils::itoa(id + 1 + i))));

View File

@ -314,7 +314,7 @@ int main(int argc, char* argv[]) {
BaseClient.password());
// must stay here in order to establish the connection
std::string const versionString = client.getServerVersion();
client.getServerVersion();
if (!connection->isConnected()) {
cerr << "Could not connect to endpoint '" << BaseClient.endpointString()

View File

@ -669,9 +669,6 @@ static int ProcessInputDirectory(std::string& errorMsg) {
std::string const cname =
triagens::basics::VelocyPackHelper::getStringValue(parameters, "name",
"");
std::string const cid =
triagens::basics::VelocyPackHelper::getStringValue(parameters, "cid",
"");
int type = triagens::basics::VelocyPackHelper::getNumericValue<int>(
parameters, "type", 2);