X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDatabase.php;h=946c82f5c5776c48ebd63e5160f683564a712cc2;hb=d4a5a8051ad34a7be72238967afb3e6b140afdc8;hp=032a282030a7b3bdbc1f0a5e892195361ff4f033;hpb=259fe7fcf2bff0a4c21503fc626c8078d18cd87c;p=friendica.git diff --git a/src/Database/Database.php b/src/Database/Database.php index 032a282030..946c82f5c5 100644 --- a/src/Database/Database.php +++ b/src/Database/Database.php @@ -55,15 +55,15 @@ class Database /** * @var IManageConfigValues */ - protected $config; + protected $config = null; /** * @var Profiler */ - protected $profiler; + protected $profiler = null; /** * @var LoggerInterface */ - protected $logger; + protected $logger = null; protected $server_info = ''; /** @var PDO|mysqli */ protected $connection; @@ -80,21 +80,39 @@ class Database protected $dbaDefinition; /** @var ViewDefinition */ protected $viewDefinition; + /** @var string|null */ + private $currentTable; - public function __construct(IManageConfigValues $config, Profiler $profiler, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) + public function __construct(IManageConfigValues $config, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) { // We are storing these values for being able to perform a reconnect - $this->config = $config; - $this->profiler = $profiler; + $this->config = $config; $this->dbaDefinition = $dbaDefinition; $this->viewDefinition = $viewDefinition; - // Temporary NullLogger until we can fetch the logger class from the config + // Use dummy values - necessary for the first factory call of the logger itself $this->logger = new NullLogger(); + $this->profiler = new Profiler($config); $this->connect(); } + /** + * @param IManageConfigValues $config + * @param Profiler $profiler + * @param LoggerInterface $logger + * + * @return void + * + * @todo Make this method obsolete - use a clean pattern instead ... + */ + public function setDependency(IManageConfigValues $config, Profiler $profiler, LoggerInterface $logger) + { + $this->logger = $logger; + $this->profiler = $profiler; + $this->config = $config; + } + /** * Tries to connect to database * @@ -196,21 +214,6 @@ class Database $this->testmode = $test; } - /** - * Sets the logger for DBA - * - * @note this is necessary because if we want to load the logger configuration - * from the DB, but there's an error, we would print out an exception. - * So the logger gets updated after the logger configuration can be retrieved - * from the database - * - * @param LoggerInterface $logger - */ - public function setLogger(LoggerInterface $logger) - { - $this->logger = $logger; - } - /** * Sets the profiler for DBA * @@ -502,7 +505,7 @@ class Database */ public function p(string $sql) { - + $this->currentTable = null; $this->profiler->startRecording('database'); $stamp1 = microtime(true); @@ -525,7 +528,7 @@ class Database if ((substr_count($sql, '?') != count($args)) && (count($args) > 0)) { // Question: Should we continue or stop the query here? - $this->logger->warning('Query parameters mismatch.', ['query' => $sql, 'args' => $args, 'callstack' => System::callstack()]); + $this->logger->warning('Query parameters mismatch.', ['query' => $sql, 'args' => $args]); } $sql = DBA::cleanQuery($sql); @@ -699,7 +702,6 @@ class Database $this->logger->error('DB Error', [ 'code' => $errorno, 'error' => $error, - 'callstack' => System::callstack(8), 'params' => $this->replaceParameters($sql, $args), ]); @@ -749,8 +751,8 @@ class Database @file_put_contents( $this->config->get('system', 'db_log'), DateTimeFormat::utcNow() . "\t" . $duration . "\t" . - basename($backtrace[1]["file"]) . "\t" . - $backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" . + basename($backtrace[1]['file']) . "\t" . + $backtrace[1]['line'] . "\t" . $backtrace[2]['function'] . "\t" . substr($this->replaceParameters($sql, $args), 0, 4000) . "\n", FILE_APPEND ); @@ -766,7 +768,7 @@ class Database * * @param string $sql SQL statement * - * @return boolean Was the query successfull? False is returned only if an error occurred + * @return boolean Was the query successful? False is returned only if an error occurred * @throws \Exception */ public function e(string $sql): bool @@ -807,7 +809,6 @@ class Database $this->logger->error('DB Error', [ 'code' => $errorno, 'error' => $error, - 'callstack' => System::callstack(8), 'params' => $this->replaceParameters($sql, $params), ]); @@ -972,8 +973,8 @@ class Database switch ($this->driver) { case self::PDO: $columns = $stmt->fetch(PDO::FETCH_ASSOC); - if (!empty($stmt->table) && is_array($columns)) { - $columns = $this->castFields($stmt->table, $columns); + if (!empty($this->currentTable) && is_array($columns)) { + $columns = $this->castFields($this->currentTable, $columns); } break; case self::MYSQLI: @@ -1289,7 +1290,7 @@ class Database $condition_string = DBA::buildCondition($conditions); $sql = "DELETE FROM " . $table_string . " " . $condition_string; - $this->logger->debug($this->replaceParameters($sql, $conditions), ['callstack' => System::callstack(6)]); + $this->logger->debug($this->replaceParameters($sql, $conditions)); return $this->e($sql, $conditions); } @@ -1320,7 +1321,7 @@ class Database * @param array|boolean $old_fields array with the old field values that are about to be replaced (true = update on duplicate, false = don't update identical fields) * @param array $params Parameters: "ignore" If set to "true" then the update is done with the ignore parameter * - * @return boolean was the update successfull? + * @return boolean was the update successful? * @throws \Exception * @todo Implement "bool $update_on_duplicate" to avoid mixed type for $old_fields */ @@ -1356,6 +1357,15 @@ class Database } $fields = $this->castFields($table, $fields); + $direct_fields = []; + + foreach ($fields as $key => $value) { + if (is_numeric($key)) { + $direct_fields[] = $value; + unset($fields[$key]); + } + } + $table_string = DBA::buildTableString([$table]); @@ -1368,7 +1378,8 @@ class Database } $sql = "UPDATE " . $ignore . $table_string . " SET " - . implode(" = ?, ", array_map([DBA::class, 'quoteIdentifier'], array_keys($fields))) . " = ?" + . ((count($fields) > 0) ? implode(" = ?, ", array_map([DBA::class, 'quoteIdentifier'], array_keys($fields))) . " = ?" : "") + . ((count($direct_fields) > 0) ? ((count($fields) > 0) ? " , " : "") . implode(" , ", $direct_fields) : "") . $condition_string; // Combines the updated fields parameter values with the condition parameter values @@ -1509,8 +1520,8 @@ class Database $result = $this->p($sql, $condition); - if (($this->driver == self::PDO) && !empty($result) && is_string($table)) { - $result->table = $table; + if ($this->driver == self::PDO && !empty($result)) { + $this->currentTable = $table; } return $result; @@ -1757,6 +1768,37 @@ class Database return (['list' => $statelist, 'amount' => $processes]); } + /** + * Optimizes tables + * + * @param string $table a given table + * + * @return bool True, if successfully optimized, otherwise false + * @throws \Exception + */ + public function optimizeTable(string $table): bool + { + return $this->e("OPTIMIZE TABLE " . DBA::buildTableString([$table])) !== false; + } + + /** + * Kill sleeping database processes + * + * @return void + */ + public function deleteSleepingProcesses() + { + $processes = $this->p("SHOW FULL PROCESSLIST"); + while ($process = $this->fetch($processes)) { + if (($process['Command'] != 'Sleep') || ($process['Time'] < 300) || ($process['db'] != $this->databaseName())) { + continue; + } + + $this->e("KILL ?", $process['Id']); + } + $this->close($processes); + } + /** * Fetch a database variable *