8000 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel · gauravkumar37/arangodb@65902af · GitHub 8000
[go: up one dir, main page]
Skip to content

Commit 65902af

Browse files
neunhoefneunhoef
committed
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2 parents 21701b8 + 5d3abc8 commit 65902af

File tree

31 files changed

+53
-53
lines changed

31 files changed

+53
-53
lines changed

‎Documentation/Books/Users/Administration/Sharding/HowTo.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ shell window):
103103
```js
104104
$ arangosh --server.endpoint tcp://localhost:8530
105105
[... some output omitted]
106-
arangosh [_system]> db._listDatabases();
106+
arangosh [_system]> db._databases();
107107
[
108108
"_system"
109109
]

‎Documentation/Books/Users/DataModeling/Databases/WorkingWith.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ endpoint data.
107107

108108

109109
return the list of all existing databases
110-
`db._listDatabases()`
110+
`db._databases()`
111111

112112
Returns the list of all databases. This method can only be used from within
113113
the *_system* database.

‎Documentation/Books/Users/GettingStarted/CollectionsAndDocuments.mdpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ advantage that you can use autocompletion.
6161
> db._query(<query>).toArray() execute an AQL query
6262
> db._useDatabase(<name>) switch database
6363
> db._createDatabase(<name>) create a new database
64-
> db._listDatabases() list existing databases
64+
> db._databases() list existing databases
6565
> help show help pages
6666
> exit
6767
arangosh>

‎Documentation/DocuBlocks/databaseListDatabase.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

33
@brief return the list of all existing databases
4-
`db._listDatabases()`
4+
`db._databases()`
55

66
Returns the list of all databases. This method can only be used from within
77
the *_system* database.

‎arangod/Cluster/ClusterInfo.cpp

Lines changed: 1 addition & 1 deletion
10BC0
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ bool ClusterInfo::doesDatabaseExist(DatabaseID const& databaseID, bool reload) {
370370
/// @brief get list of databases in the cluster
371371
////////////////////////////////////////////////////////////////////////////////
372372

373-
std::vector<DatabaseID> ClusterInfo::listDatabases(bool reload) {
373+
std::vector<DatabaseID> ClusterInfo::databases(bool reload) {
374374
std::vector<DatabaseID> result;
375375

376376
if (reload || !_planProt.isValid ||

‎arangod/Cluster/ClusterInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ class ClusterInfo {
600600
/// @brief get list of databases in the cluster
601601
//////////////////////////////////////////////////////////////////////////////
602602

603-
std::vector<DatabaseID> listDatabases(bool = false);
603+
std::vector<DatabaseID> databases(bool = false);
604604

605605
//////////////////////////////////////////////////////////////////////////////
606606
/// @brief (re-)load the information about our plan

‎arangod/Cluster/HeartbeatThread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ void HeartbeatThread::runCoordinator() {
360360
if (userVersion > 0 && userVersion != oldUserVersion) {
361361
// reload user cache for all databases
362362
std::vector<DatabaseID> dbs =
363-
ClusterInfo::instance()->listDatabases(true);
363+
ClusterInfo::instance()->databases(true);
364364
std::vector<DatabaseID>::iterator i;
365365
bool allOK = true;
366366
for (i = dbs.begin(); i != dbs.end(); ++i) {

‎arangod/Cluster/v8-cluster.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -612,15 +612,15 @@ static void JS_DoesDatabaseExistClusterInfo(
612612
/// @brief get the list of databases in the cluster
613613
////////////////////////////////////////////////////////////////////////////////
614614

615-
static void JS_ListDatabases(v8::FunctionCallbackInfo<v8::Value> const& args) {
615+
static void JS_Databases(v8::FunctionCallbackInfo<v8::Value> const& args) {
616616
TRI_V8_TRY_CATCH_BEGIN(isolate);
617617
v8::HandleScope scope(isolate);
618618

619619
if (args.Length() != 0) {
620-
TRI_V8_THROW_EXCEPTION_USAGE("listDatabases()");
620+
TRI_V8_THROW_EXCEPTION_USAGE("databases()");
621621
}
622622

623-
std::vector<DatabaseID> res = ClusterInfo::instance()->listDatabases(true);
623+
std::vector<DatabaseID> res = ClusterInfo::instance()->databases(true);
624624
v8::Handle<v8::Array> a = v8::Array::New(isolate, (int)res.size());
625625
std::vector<DatabaseID>::iterator it;
626626
int count = 0;
@@ -1988,8 +1988,8 @@ void TRI_InitV8Cluster(v8::Isolate* isolate, v8::Handle<v8::Context> context) {
19881988

19891989
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("doesDatabaseExist"),
19901990
JS_DoesDatabaseExistClusterInfo);
1991-
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("listDatabases"),
1992-
JS_ListDatabases);
1991+
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("databases"),
1992+
JS_Databases);
19931993
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("flush"),
19941994
JS_FlushClusterInfo, true);
19951995
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("getCollectionInfo"),

‎arangod/V8Server/v8-collection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2783,7 +2783,7 @@ static void JS_CompletionsVocbase(
27832783
result->Set(j++, TRI_V8_ASCII_STRING("_exists()"));
27842784
result->Set(j++, TRI_V8_ASCII_STRING("_id"));
27852785
result->Set(j++, TRI_V8_ASCII_STRING("_isSystem()"));
2786-
result->Set(j++, TRI_V8_ASCII_STRING("_listDatabases()"));
2786+
result->Set(j++, TRI_V8_ASCII_STRING("_databases()"));
27872787
result->Set(j++, TRI_V8_ASCII_STRING("_name()"));
27882788
result->Set(j++, TRI_V8_ASCII_STRING("_path()"));
27892789
result->Set(j++, TRI_V8_ASCII_STRING("_query()"));

‎arangod/V8Server/v8-vocbase.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2801,7 +2801,7 @@ static void ListDatabasesCoordinator(
28012801
ClusterInfo* ci = ClusterInfo::instance();
28022802

28032803
if (args.Length() == 0) {
2804-
std::vector<DatabaseID> list = ci->listDatabases(true);
2804+
std::vector<DatabaseID> list = ci->databases(true);
28052805
v8::Handle<v8::Array> result = v8::Array::New(isolate);
28062806
for (size_t i = 0; i < list.size(); ++i) {
28072807
result->Set((uint32_t)i, TRI_V8_STD_STRING(list[i]));
@@ -2860,13 +2860,13 @@ static void ListDatabasesCoordinator(
28602860
/// @brief was docuBlock databaseListDatabase
28612861
////////////////////////////////////////////////////////////////////////////////
28622862

2863-
static void JS_ListDatabases(v8::FunctionCallbackInfo<v8::Value> const& args) {
2863+
static void JS_Databases(v8::FunctionCallbackInfo<v8::Value> const& args) {
28642864
v8::Isolate* isolate = args.GetIsolate();
28652865
v8::HandleScope scope(isolate);
28662866

28672867
uint32_t const argc = args.Length();
28682868
if (argc > 1) {
2869-
TRI_V8_THROW_EXCEPTION_USAGE("db._listDatabases()");
2869+
TRI_V8_THROW_EXCEPTION_USAGE("db._databases()");
28702870
}
28712871

28722872
TRI_vocbase_t* vocbase = GetContextVocBase(isolate);
@@ -3492,8 +3492,8 @@ void TRI_InitV8VocBridge(v8::Isolate* isolate, v8::Handle<v8::Context> context,
34923492
JS_CreateDatabase);
34933493
TRI_AddMethodVocbase(isolate, ArangoNS, TRI_V8_ASCII_STRING("_dropDatabase"),
34943494
JS_DropDatabase);
3495-
TRI_AddMethodVocbase(isolate, ArangoNS, TRI_V8_ASCII_STRING("_listDatabases"),
3496-
JS_ListDatabases);
3495+
TRI_AddMethodVocbase(isolate, ArangoNS, TRI_V8_ASCII_STRING("_databases"),
3496+
JS_Databases);
34973497
TRI_AddMethodVocbase(isolate, ArangoNS, TRI_V8_ASCII_STRING("_useDatabase"),
34983498
JS_UseDatabase);
34993499

0 commit comments

Comments
 (0)
0