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

renamed method

This commit is contained in:
jsteemann 2016-07-18 18:07:11 +02:00
parent 7653b922b3
commit 8cf7fc889d
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Agency/Agent.cpp
View File

@ -339,7 +339,7 @@ bool Agent::load() {
DatabaseFeature* database =
ApplicationServer::getFeature<DatabaseFeature>("Database");
auto vocbase = database->vocbase();
auto vocbase = database->systemDatabase();
if (vocbase == nullptr) {
LOG_TOPIC(FATAL, Logger::AGENCY) << "could not determine _system database";
FATAL_ERROR_EXIT();

2
arangod/Cluster/DBServerAgencySync.cpp
View File

@ -97,7 +97,7 @@ DBServerAgencySyncResult DBServerAgencySync::execute() {
DatabaseFeature* database =
ApplicationServer::getFeature<DatabaseFeature>("Database");
TRI_vocbase_t* const vocbase = database->vocbase();
TRI_vocbase_t* const vocbase = database->systemDatabase();
DBServerAgencySyncResult result;
if (vocbase == nullptr) {

4
arangod/RestServer/BootstrapFeature.cpp
View File

@ -113,7 +113,7 @@ static void raceForClusterBootstrap() {
LOG_TOPIC(DEBUG, Logger::STARTUP)
<< "raceForClusterBootstrap: race won, we do the bootstrap";
auto vocbase = DatabaseFeature::DATABASE->vocbase();
auto vocbase = DatabaseFeature::DATABASE->systemDatabase();
V8DealerFeature::DEALER->loadJavascriptFiles(vocbase, "server/bootstrap/cluster-bootstrap.js", 0);
LOG_TOPIC(DEBUG, Logger::STARTUP)
@ -134,7 +134,7 @@ static void raceForClusterBootstrap() {
}
void BootstrapFeature::start() {
auto vocbase = DatabaseFeature::DATABASE->vocbase();
auto vocbase = DatabaseFeature::DATABASE->systemDatabase();
auto ss = ServerState::instance();
if (ss->isCoordinator()) {

2
arangod/RestServer/CheckVersionFeature.cpp
View File

@ -107,7 +107,7 @@ void CheckVersionFeature::checkVersion() {
// run version check
LOG(TRACE) << "starting version check";
auto* vocbase = DatabaseFeature::DATABASE->vocbase();
auto* vocbase = DatabaseFeature::DATABASE->systemDatabase();
// enter context and isolate
{

2
arangod/RestServer/ConsoleFeature.cpp
View File

@ -56,7 +56,7 @@ void ConsoleFeature::start() {
auto database = ApplicationServer::getFeature<DatabaseFeature>("Database");
_consoleThread.reset(
new ConsoleThread(ApplicationFeature::server(), database->vocbase()));
new ConsoleThread(ApplicationFeature::server(), database->systemDatabase()));
_consoleThread->start();
}

2
arangod/RestServer/DatabaseFeature.h
View File

@ -42,7 +42,7 @@ class DatabaseFeature final : public application_features::ApplicationFeature {
void unprepare() override final;
public:
TRI_vocbase_t* vocbase() const { return _vocbase; }
TRI_vocbase_t* systemDatabase() const { return _vocbase; }
bool ignoreDatafileErrors() const { return _ignoreDatafileErrors; }
bool isInitiallyEmpty() const { return _isInitiallyEmpty; }
bool checkVersion() const { return _checkVersion; }

2
arangod/RestServer/ScriptFeature.cpp
View File

@ -70,7 +70,7 @@ int ScriptFeature::runScript(std::vector<std::string> const& scripts) {
auto database = ApplicationServer::getFeature<DatabaseFeature>("Database");
V8Context* context =
V8DealerFeature::DEALER->enterContext(database->vocbase(), true);
V8DealerFeature::DEALER->enterContext(database->systemDatabase(), true);
if (context == nullptr) {
LOG(FATAL) << "cannot acquire V8 context";

2
arangod/RestServer/UnitTestsFeature.cpp
View File

@ -63,7 +63,7 @@ int UnitTestsFeature::runUnitTests(std::vector<std::string> const& unitTests) {
DatabaseFeature* database =
ApplicationServer::getFeature<DatabaseFeature>("Database");
V8Context* context =
V8DealerFeature::DEALER->enterContext(database->vocbase(), true);
V8DealerFeature::DEALER->enterContext(database->systemDatabase(), true);
if (context == nullptr) {
LOG(FATAL) << "cannot acquire V8 context";

4
arangod/RestServer/UpgradeFeature.cpp
View File

@ -124,7 +124,7 @@ void UpgradeFeature::start() {
void UpgradeFeature::changeAdminPassword(std::string const& defaultPassword) {
LOG(TRACE) << "starting to restore admin user";
auto* systemVocbase = DatabaseFeature::DATABASE->vocbase();
auto* systemVocbase = DatabaseFeature::DATABASE->systemDatabase();
// enter context and isolate
{
@ -184,7 +184,7 @@ void UpgradeFeature::upgradeDatabase(std::string const& defaultPassword) {
LOG(TRACE) << "starting database init/upgrade";
auto* server = DatabasesFeature::SERVER;
auto* systemVocbase = DatabaseFeature::DATABASE->vocbase();
auto* systemVocbase = DatabaseFeature::DATABASE->systemDatabase();
// enter context and isolate
{

4
arangod/V8Server/V8DealerFeature.cpp
View File

@ -219,7 +219,7 @@ void V8DealerFeature::start() {
DatabaseFeature* database =
ApplicationServer::getFeature<DatabaseFeature>("Database");
loadJavascript(database->vocbase(), "server/initialize.js");
loadJavascript(database->systemDatabase(), "server/initialize.js");
startGarbageCollection();
}
@ -681,7 +681,7 @@ void V8DealerFeature::applyContextUpdates() {
auto vocbase = p.second;
if (vocbase == nullptr) {
vocbase = DatabaseFeature::DATABASE->vocbase();
vocbase = DatabaseFeature::DATABASE->systemDatabase();
}
V8Context* context = V8DealerFeature::DEALER->enterContext(

2
arangod/VocBase/AuthInfo.cpp
View File

@ -215,7 +215,7 @@ bool AuthInfo::populate(VPackSlice const& slice) {
void AuthInfo::reload() {
insertInitial();
TRI_vocbase_t* vocbase = DatabaseFeature::DATABASE->vocbase();
TRI_vocbase_t* vocbase = DatabaseFeature::DATABASE->systemDatabase();
if (vocbase == nullptr) {
LOG(DEBUG) << "system database is unknown, cannot load authentication "