Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert debugs

Browse Source
This commit is contained in:
Jake Barnby
2024-03-07 14:52:13 +01:00
parent b857fa3cdc
commit c7753dd14b
8 changed files with 110 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/cli.php
+14 -14
View File
@@ -104,17 +104,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
if (isset($databases[$databaseName])) {
$database = $databases[$databaseName];
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
return $database;
}
@@ -128,17 +128,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$databases[$databaseName] = $database;
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
$database
->setMetadata('host', \gethostname())
app/controllers/api/projects.php
+8 -8
View File
@@ -130,7 +130,7 @@ App::post('/v1/projects')
}
$databaseOverride = App::getEnv('_APP_DATABASE_OVERRIDE');
$index = array_search($databaseOverride, $databases);
$index = \array_search($databaseOverride, $databases);
if ($index !== false) {
$database = $databases[$index];
} else {
@@ -199,17 +199,17 @@ App::post('/v1/projects')
$dbForProject = new Database($pools->get($database)->pop()->getResource(), $cache);
// if ($database === DATABASE_SHARED_TABLES) {
if ($database === DATABASE_SHARED_TABLES) {
$dbForProject
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $dbForProject
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
} else {
$dbForProject
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
$dbForProject->create();
app/init.php
+18 -18
View File
@@ -1135,19 +1135,19 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
->setMetadata('project', $project->getId())
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
//if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
return null;
// return $database;
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
return $database;
}, ['pools', 'dbForConsole', 'cache', 'project']);
App::setResource('dbForConsole', function (Group $pools, Cache $cache) {
@@ -1183,17 +1183,17 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
->setMetadata('project', $project->getId())
->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
});
if (isset($databases[$databaseName])) {
@@ -1210,8 +1210,8 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$database = new Database($dbAdapter, $cache);
$databases[$databaseName] = $database;
$configure($database);
return null;
// return $database;
return $database;
};
}, ['pools', 'dbForConsole', 'cache']);
app/realtime.php
+7 -7
View File
@@ -78,17 +78,17 @@ function getProjectDB(Document $project): Database
$database = new Database($dbAdapter, getCache());
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
return $database;
}
app/worker.php
+21 -21
View File
@@ -75,17 +75,17 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
->setMetadata('host', \gethostname())
->setMetadata('project', $project->getId());
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
return $database;
}, ['cache', 'register', 'message', 'dbForConsole']);
@@ -114,17 +114,17 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
if (isset($databases[$databaseName])) {
$database = $databases[$databaseName];
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
return $database;
}
@@ -138,17 +138,17 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
$databases[$databaseName] = $database;
// if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
if ($project->getAttribute('database') === DATABASE_SHARED_TABLES) {
$database
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
// } else {
// $database
// ->setShareTables(false)
// ->setTenant(null)
// ->setNamespace('_' . $project->getInternalId());
// }
} else {
$database
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
return $database;
};
src/Appwrite/Platform/Tasks/DeleteOrphanedProjects.php
+14 -3
View File
@@ -83,15 +83,26 @@ class DeleteOrphanedProjects extends Action
}
try {
$db = $project->getAttribute('database');
$database = $project->getAttribute('database');
$adapter = $pools
->get($db)
->get($database)
->pop()
->getResource();
$dbForProject = new Database($adapter, $cache);
$dbForProject->setDatabase('appwrite');
$dbForProject->setNamespace('_' . $project->getInternalId());
if ($database === DATABASE_SHARED_TABLES) {
$dbForProject
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$dbForProject
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
$collectionsCreated = 0;
$cnt++;
src/Appwrite/Platform/Tasks/GetMigrationStats.php
+14 -3
View File
@@ -95,15 +95,26 @@ class GetMigrationStats extends Action
Console::info("Getting stats for {$project->getId()}");
try {
$db = $project->getAttribute('database');
$database = $project->getAttribute('database');
$adapter = $pools
->get($db)
->get($database)
->pop()
->getResource();
$dbForProject = new Database($adapter, $cache);
$dbForProject->setDatabase('appwrite');
$dbForProject->setNamespace('_' . $project->getInternalId());
if ($database === DATABASE_SHARED_TABLES) {
$dbForProject
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$dbForProject
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
/** Get Project ID */
$stats['Project ID'] = $project->getId();
src/Appwrite/Platform/Workers/Hamster.php
+14 -3
View File
@@ -115,15 +115,26 @@ class Hamster extends Action
Console::log("Getting stats for Project {$project->getId()}");
try {
$db = $project->getAttribute('database');
$database = $project->getAttribute('database');
$adapter = $pools
->get($db)
->get($database)
->pop()
->getResource();
$dbForProject = new Database($adapter, $cache);
$dbForProject->setDatabase('appwrite');
$dbForProject->setNamespace('_' . $project->getInternalId());
if ($database === DATABASE_SHARED_TABLES) {
$dbForProject
->setShareTables(true)
->setTenant($project->getInternalId())
->setNamespace('');
} else {
$dbForProject
->setShareTables(false)
->setTenant(null)
->setNamespace('_' . $project->getInternalId());
}
$statsPerProject = [];