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/arangodb/arangodb into agency

This commit is contained in:
Kaveh Vahedipour 2016-03-29 14:13:12 +02:00
parent 7959f01d4a 26e871c051
commit 0257162f82
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Agency/AgencyCommon.h
View File

@ -90,7 +90,7 @@ struct constituent_t { // Constituent type
typedef std::vector<constituent_t> constituency_t; // Constituency type
typedef uint32_t state_t; // State type
typedef std::chrono::duration<double> duration_t; // Duration type
typedef std::chrono::duration<long,std::ratio<1,1000>> duration_t; // Duration type
using query_t = std::shared_ptr<arangodb::velocypack::Builder>;

2
arangod/Agency/Agent.h
View File

@ -104,7 +104,7 @@ public:
void reportIn (id_t id, index_t idx);
/// @brief Wait for slaves to confirm appended entries
bool waitFor (index_t last_entry, duration_t timeout = duration_t(2.0));
bool waitFor (index_t last_entry, duration_t timeout = duration_t(2000));
/// @brief Convencience size of agency
size_t size() const;

2
arangod/Agency/Constituent.cpp
View File

@ -66,7 +66,7 @@ Constituent::~Constituent() {
duration_t Constituent::sleepFor (double min_t, double max_t) {
dist_t dis(min_t, max_t);
return duration_t(dis(_gen));
return duration_t((long)std::round(dis(_gen)*1000.0));
}
term_t Constituent::term() const {

8
js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js
View File

@ -899,6 +899,14 @@
render: function() {
$(this.el).html(this.template.render({}));
if (this.type === 2) {
this.type = "document";
}
else if (this.type === 3) {
this.type = "edge";
}
this.tableView.setElement($(this.table)).drawLoading();
this.collectionContext = this.collectionsStore.getPosition(