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

fixed for short names in frontend shard view

This commit is contained in:
Kaveh Vahedipour 2017-01-11 16:31:19 +01:00
parent e4345d1949
commit fe48bcb982
4 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/Cluster/ClusterInfo.cpp
View File

@ -2637,3 +2637,13 @@ std::shared_ptr<VPackBuilder> ClusterInfo::getCurrent() {
READ_LOCKER(readLocker, _currentProt.lock);
return _current;
}
std::unordered_map<ServerID, std::string> ClusterInfo::getServerAliases() {
READ_LOCKER(readLocker, _serversProt.lock);
std::unordered_map<std::string,std::string> ret;
for (const auto& i : _serverAliases) {
ret.emplace(i.second,i.first);
}
return ret;
}

2
arangod/Cluster/ClusterInfo.h
View File

@ -499,6 +499,8 @@ class ClusterInfo {
std::vector<std::string> const& getFailedServers() { MUTEX_LOCKER(guard, _failedServersMutex); return _failedServers; }
void setFailedServers(std::vector<std::string> const& failedServers) { MUTEX_LOCKER(guard, _failedServersMutex); _failedServers = failedServers; }
std::unordered_map<ServerID, std::string> getServerAliases();
private:
//////////////////////////////////////////////////////////////////////////////

15
arangod/Cluster/v8-cluster.cpp
View File

@ -745,16 +745,24 @@ static void JS_GetCollectionInfoClusterInfo(
result->Set(TRI_V8_ASCII_STRING("shardKeys"), shardKeys);
auto shardMap = ci->shardIds();
auto serverAliases = ClusterInfo::instance()->getServerAliases();
v8::Handle<v8::Object> shardIds = v8::Object::New(isolate);
v8::Handle<v8::Object> shardShorts = v8::Object::New(isolate);
for (auto const& p : *shardMap) {
v8::Handle<v8::Array> list = v8::Array::New(isolate, (int)p.second.size());
v8::Handle<v8::Array> shorts = v8::Array::New(isolate, (int)p.second.size());
uint32_t pos = 0;
for (auto const& s : p.second) {
try{
shorts->Set(pos, TRI_V8_STD_STRING(serverAliases.at(s)));
} catch (...) {}
list->Set(pos++, TRI_V8_STD_STRING(s));
}
shardIds->Set(TRI_V8_STD_STRING(p.first), list);
shardShorts->Set(TRI_V8_STD_STRING(p.first), shorts);
}
result->Set(TRI_V8_ASCII_STRING("shards"), shardIds);
result->Set(TRI_V8_ASCII_STRING("shardShorts"), shardShorts);
VPackBuilder tmp;
ci->getIndexesVPack(tmp, false);
v8::Handle<v8::Value> indexes = TRI_VPackToV8(isolate, tmp.slice());
@ -816,11 +824,18 @@ static void JS_GetCollectionInfoCurrentClusterInfo(
auto servers = cic->servers(shardID);
v8::Handle<v8::Array> list =
v8::Array::New(isolate, static_cast<int>(servers.size()));
v8::Handle<v8::Array> shorts =
v8::Array::New(isolate, static_cast<int>(servers.size()));
auto serverAliases = ClusterInfo::instance()->getServerAliases();
uint32_t pos = 0;
for (auto const& s : servers) {
try {
shorts->Set(pos, TRI_V8_STD_STRING(serverAliases.at(s)));
} catch (...) {}
list->Set(pos++, TRI_V8_STD_STRING(s));
}
result->Set(TRI_V8_ASCII_STRING("servers"), list);
result->Set(TRI_V8_ASCII_STRING("shorts"), shorts);
TRI_V8_RETURN(result);
TRI_V8_TRY_CATCH_END

4
js/server/modules/@arangodb/cluster.js
View File

@ -1772,9 +1772,9 @@ function shardDistribution () {
for (var j = 0; j < shardNames.length; ++j) {
collInfoCurrent[shardNames[j]] =
global.ArangoClusterInfo.getCollectionInfoCurrent(
dbName, collName, shardNames[j]).servers;
dbName, collName, shardNames[j]).shorts;
}
result[collName] = {Plan: format(collInfo.shards),
result[collName] = {Plan: format(collInfo.shardShorts),
Current: format(collInfoCurrent)};
}