upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 09:42:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 57

Merge pull request #52932 from nextcloud/tests/noid/speed-up-comments-test

Browse source 
test: Speed up comments test
This commit is contained in:
Joas Schilling 2025-05-21 08:26:30 +02:00 committed by GitHub
commit ba6c370101
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/private/DB/Adapter.php
View file

@ -28,25 +28,11 @@ class Adapter {
/**
* @param string $table name
*
* @return int id of last insert statement, 0 in case there was no INSERT before or it failed to get the ID
* @return int id of last insert statement
* @throws Exception
*/
public function lastInsertId($table, bool $allowRetry = true): int {
$return = $this->conn->realLastInsertId($table);
if ($return === 0 && $allowRetry) {
/**
* During a reconnect we are losing the connection and when the
* realLastInsertId call is the one triggering the reconnect, it
* does not return the ID. But inside the reconnect, we were able
* to save the last insert id, so calling it a second time is going
* to be successful.
* We can not return the result on the initial call, as we are already
* way deeper in the stack performing the actual database query on
* the doctrine driver.
*/
return $this->lastInsertId($table, false);
}
return $return;
public function lastInsertId($table) {
return (int)$this->conn->realLastInsertId($table);
}
/**

2
lib/private/DB/AdapterOCI8.php
View file

@ -8,7 +8,7 @@
namespace OC\DB;
class AdapterOCI8 extends Adapter {
public function lastInsertId($table, bool $allowRetry = true): int {
public function lastInsertId($table) {
if (is_null($table)) {
throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
}

2
lib/private/DB/AdapterPgSql.php
View file

@ -9,7 +9,7 @@ namespace OC\DB;
class AdapterPgSql extends Adapter {
public function lastInsertId($table, bool $allowRetry = true): int {
public function lastInsertId($table) {
$result = $this->conn->executeQuery('SELECT lastval()');
$val = $result->fetchOne();
$result->free();

29
lib/private/DB/Connection.php
View file

@ -92,8 +92,6 @@ class Connection extends PrimaryReadReplicaConnection {
protected ShardConnectionManager $shardConnectionManager;
protected AutoIncrementHandler $autoIncrementHandler;
protected bool $isShardingEnabled;
protected bool $disableReconnect = false;
protected int $lastInsertId = 0;
public const SHARD_PRESETS = [
'filecache' => [
@ -512,9 +510,9 @@ class Connection extends PrimaryReadReplicaConnection {
* because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
* columns or sequences.
*
* @param ?string $name Name of the sequence object from which the ID should be returned.
* @param string $seqName Name of the sequence object from which the ID should be returned.
*
* @return int the last inserted ID, 0 in case there was no INSERT before or it failed to get the ID
* @return int the last inserted ID.
* @throws Exception
*/
public function lastInsertId($name = null): int {
@ -528,13 +526,8 @@ class Connection extends PrimaryReadReplicaConnection {
* @internal
* @throws Exception
*/
public function realLastInsertId($seqName = null): int {
if ($this->lastInsertId !== 0) {
$lastInsertId = $this->lastInsertId;
$this->lastInsertId = 0;
return $lastInsertId;
}
return (int)parent::lastInsertId($seqName);
public function realLastInsertId($seqName = null) {
return parent::lastInsertId($seqName);
}
/**
@ -903,23 +896,11 @@ class Connection extends PrimaryReadReplicaConnection {
if (
!isset($this->lastConnectionCheck[$this->getConnectionName()]) ||
time() <= $this->lastConnectionCheck[$this->getConnectionName()] + 30 ||
$this->isTransactionActive() ||
$this->disableReconnect
$this->isTransactionActive()
) {
return;
}
if ($this->getDatabaseProvider() === IDBConnection::PLATFORM_MYSQL) {
/**
* Before reconnecting we save the lastInsertId, so that if the reconnect
* happens between the INSERT executeStatement() and the getLastInsertId call
* we are able to return the correct result after all.
*/
$this->disableReconnect = true;
$this->lastInsertId = (int)parent::lastInsertId();
$this->disableReconnect = false;
}
try {
$this->_conn->query($this->getDriver()->getDatabasePlatform()->getDummySelectSQL());
$this->lastConnectionCheck[$this->getConnectionName()] = time();

2
tests/lib/Comments/ManagerTest.php
View file

@ -1073,6 +1073,7 @@ class ManagerTest extends TestCase {
* @return array<string, IComment>
*/
private function proccessComments(array $data): array {
$this->connection->beginTransaction();
/** @var array<string, IComment> $comments */
$comments = [];
foreach ($data as $comment) {
@ -1088,6 +1089,7 @@ class ManagerTest extends TestCase {
$comment = $this->testSave($message, $actorId, $verb, $parentId, $id);
$comments[$comment->getMessage() . '#' . $comment->getActorId()] = $comment;
}
$this->connection->commit();
return $comments;
}