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

Merge branch 'devel' of github.com:arangodb/arangodb into devel

This commit is contained in:
Michael Hackstein 2017-04-28 14:25:43 +02:00
parent 9ec440d0c2 d76e85efea
commit 3b3b3e9f52
2 changed files with 81 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arangod/RocksDBEngine/RocksDBRestReplicationHandler.cpp
View File

@ -624,7 +624,11 @@ void RocksDBRestReplicationHandler::handleCommandLoggerFollow() {
builder.close();
auto data = builder.slice();
if (result.ok()) {
if (result.fail()) {
generateError(rest::ResponseCode::SERVER_ERROR, result.errorNumber(), result.errorMessage());
return;
}
bool const checkMore =
(result.maxTick() > 0 && result.maxTick() < latestSequenceNumber());
@ -684,7 +688,7 @@ void RocksDBRestReplicationHandler::handleCommandLoggerFollow() {
}
}
}
}
}
////////////////////////////////////////////////////////////////////////////////
@ -695,7 +699,30 @@ void RocksDBRestReplicationHandler::handleCommandLoggerFollow() {
////////////////////////////////////////////////////////////////////////////////
void RocksDBRestReplicationHandler::handleCommandDetermineOpenTransactions() {
generateResult(rest::ResponseCode::OK, VelocyPackHelper::EmptyArrayValue());
bool useVpp = false;
if (_request->transportType() == Endpoint::TransportType::VPP) {
useVpp = true;
}
//_response->setHeaderNC(TRI_REPLICATION_HEADER_LASTTICK, StringUtils::itoa(dump._lastFoundTick));
_response->setHeaderNC(TRI_REPLICATION_HEADER_LASTTICK, "0");
_response->setContentType(rest::ContentType::DUMP);
//_response->setHeaderNC(TRI_REPLICATION_HEADER_FROMPRESENT, dump._fromTickIncluded ? "true" : "false");
_response->setHeaderNC(TRI_REPLICATION_HEADER_FROMPRESENT, "true");
VPackSlice slice = VelocyPackHelper::EmptyArrayValue();
if (useVpp) {
_response->addPayload(slice, &VPackOptions::Defaults, false);
} else {
HttpResponse* httpResponse =
dynamic_cast<HttpResponse*>(_response.get());
if (httpResponse == nullptr) {
THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL,
"invalid response type");
}
httpResponse->body().appendText(slice.toJson());
}
_response->setResponseCode(rest::ResponseCode::OK);
}
////////////////////////////////////////////////////////////////////////////////

4
js/server/tests/replication/replication-ongoing.js
View File

@ -321,7 +321,9 @@ function ReplicationSuite() {
},
function(state) {
var idx = db._collection(cn).getIndexes();
var col = db._collection(cn);
assertNotNull(col, "collection does not exist");
var idx = col.getIndexes();
assertEqual(2, idx.length);
assertEqual("primary", idx[0].type);
assertEqual("hash", idx[1].type);