Merge pull request #760 from nextcloud/feature/noid/sql-optimization-2

sql optimization on stream_action

lib/Db/CoreRequestBuilder.php

@@ -793,6 +793,24 @@ class CoreRequestBuilder {
 	}
 
 
+	/**
+	 * @param IQueryBuilder $qb
+	 * @param string $alias
+	 */
+	protected function selectStreamActions(IQueryBuilder &$qb, string $alias = 'sa') {
+		if ($qb->getType() !== QueryBuilder::SELECT) {
+			return;
+		}
+
+		$pf = (($alias === '') ? $this->defaultSelectAlias : $alias);
+		$qb->from(self::TABLE_STREAM_ACTIONS, $pf);
+		$qb->selectAlias('sa.id', 'streamaction_id')
+		   ->selectAlias('sa.actor_id', 'streamaction_actor_id')
+		   ->selectAlias('sa.stream_id', 'streamaction_stream_id')
+		   ->selectAlias('sa.values', 'streamaction_values');
+	}
+
+
 	/**
 	 * @param IQueryBuilder $qb
 	 * @param string $fieldActorId

lib/Db/StreamActionsRequest.php

@@ -50,15 +50,24 @@ class StreamActionsRequest extends StreamActionsRequestBuilder {
 	 */
 	public function create(StreamAction $action) {
 		$qb = $this->getStreamActionInsertSql();
+
+		$values = $action->getValues();
+		$liked = $this->getBool(StreamAction::LIKED, $values, false);
+		$boosted = $this->getBool(StreamAction::BOOSTED, $values, false);
+		$replied = $this->getBool(StreamAction::REPLIED, $values, false);
+
 		$qb->setValue('actor_id', $qb->createNamedParameter($action->getActorId()))
 		   ->setValue('actor_id_prim', $qb->createNamedParameter($this->prim($action->getActorId())))
 		   ->setValue('stream_id', $qb->createNamedParameter($action->getStreamId()))
 		   ->setValue('stream_id_prim', $qb->createNamedParameter($this->prim($action->getStreamId())))
 		   ->setValue(
 			   'values', $qb->createNamedParameter(
-			   json_encode($action->getValues(), JSON_UNESCAPED_SLASHES)
+			   json_encode($values, JSON_UNESCAPED_SLASHES)
 		   )
-		   );
+		   )
+		   ->setValue('liked', $qb->createNamedParameter(($liked) ? 1 : 0))
+		   ->setValue('boosted', $qb->createNamedParameter(($boosted) ? 1 : 0))
+		   ->setValue('replied', $qb->createNamedParameter(($replied) ? 1 : 0));
 
 		$qb->execute();
 	}
@@ -74,13 +83,22 @@ class StreamActionsRequest extends StreamActionsRequestBuilder {
 	public function update(StreamAction $action): int {
 		$qb = $this->getStreamActionUpdateSql();
 
-		$values = json_encode($action->getValues(), JSON_UNESCAPED_SLASHES);
-		$qb->set('values', $qb->createNamedParameter($values));
+		$values = $action->getValues();
+		$liked = $this->getBool(StreamAction::LIKED, $values, false);
+		$boosted = $this->getBool(StreamAction::BOOSTED, $values, false);
+		$replied = $this->getBool(StreamAction::REPLIED, $values, false);
+
+		$qb->set('values', $qb->createNamedParameter(json_encode($values, JSON_UNESCAPED_SLASHES)))
+		   ->set('liked', $qb->createNamedParameter(($liked) ? 1 : 0))
+		   ->set('boosted', $qb->createNamedParameter(($boosted) ? 1 : 0))
+		   ->set('replied', $qb->createNamedParameter(($replied) ? 1 : 0));
 
 		$this->limitToActorId($qb, $action->getActorId());
 		$this->limitToStreamId($qb, $action->getStreamId());
 
-		return $qb->execute();
+		$count = $qb->execute();
+
+		return $count;
 	}
 
 

lib/Db/StreamRequest.php

@@ -44,7 +44,6 @@ use OCA\Social\Model\ActivityPub\ACore;
 use OCA\Social\Model\ActivityPub\Actor\Person;
 use OCA\Social\Model\ActivityPub\Internal\SocialAppNotification;
 use OCA\Social\Model\ActivityPub\Object\Document;
-use OCA\Social\Model\ActivityPub\Object\Like;
 use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Model\ActivityPub\Stream;
 use OCA\Social\Service\ConfigService;
@@ -502,21 +501,29 @@ class StreamRequest extends StreamRequestBuilder {
 	 *
 	 * @param int $since
 	 * @param int $limit
-	 * @param bool $localOnly
 	 *
 	 * @return Stream[]
 	 * @throws DateTimeException
 	 */
-	public function getTimelineLiked(int $since = 0, int $limit = 5, bool $localOnly = true): array {
+	public function getTimelineLiked(int $since = 0, int $limit = 5): array {
+		if ($this->viewer === null) {
+			return [];
+		}
+
+		$actorId = $this->viewer->getId();
+
 		$qb = $this->getStreamSelectSql();
+		$this->limitToType($qb, Note::TYPE);
 		$this->limitPaginate($qb, $since, $limit);
 
-		$this->limitToType($qb, Note::TYPE);
+		$expr = $qb->expr();
+		$this->selectCacheActors($qb, 'ca');
+		$qb->andWhere($expr->eq('s.attributed_to_prim', 'ca.id_prim'));
 
-		$this->leftJoinStreamAction($qb);
-		$this->leftJoinCacheActors($qb, 'attributed_to');
-		$this->leftJoinActions($qb, Like::TYPE);
-		$this->filterDBField($qb, 'id', '', false, 'a');
+		$this->selectStreamActions($qb, 'sa');
+		$qb->andWhere($expr->eq('sa.stream_id_prim', 's.id_prim'));
+		$qb->andWhere($expr->eq('sa.actor_id_prim', $qb->createNamedParameter($this->prim($actorId))));
+		$qb->andWhere($expr->eq('sa.liked', $qb->createNamedParameter(1)));
 
 		return $this->getStreamsFromRequest($qb);
 	}

lib/Migration/Version0002Date20190916000002.php

@@ -114,7 +114,7 @@ class Version0002Date20190916000002 extends SimpleMigrationStep {
 
 		$table = $schema->getTable('social_a2_stream_action');
 		if (!$table->hasIndex('sa')) {
-			$table->addIndex(['stream_id_prim', 'actor_id_prim'], 'sa');
+			$table->addUniqueIndex(['stream_id_prim', 'actor_id_prim'], 'sa');
 		}
 
 		return $schema;

lib/Migration/Version0002Date20190925000001.php

@@ -0,0 +1,167 @@
+<?php
+declare(strict_types=1);
+
+
+/**
+ * Nextcloud - Social Support
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Maxence Lange <maxence@artificial-owl.com>
+ * @copyright 2018, Maxence Lange <maxence@artificial-owl.com>
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCA\Social\Migration;
+
+
+use Closure;
+use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+use Doctrine\DBAL\Schema\SchemaException;
+use Exception;
+use OCP\DB\ISchemaWrapper;
+use OCP\IDBConnection;
+use OCP\Migration\IOutput;
+use OCP\Migration\SimpleMigrationStep;
+
+
+/**
+ * Class Version0002Date20190925000001
+ *
+ * @package OCA\Social\Migration
+ */
+class Version0002Date20190925000001 extends SimpleMigrationStep {
+
+
+	/** @var IDBConnection */
+	private $connection;
+
+
+	/**
+	 * @param IDBConnection $connection
+	 */
+	public function __construct(IDBConnection $connection) {
+		$this->connection = $connection;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @return ISchemaWrapper
+	 * @throws SchemaException
+	 */
+	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options
+	): ISchemaWrapper {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		$table = $schema->getTable('social_a2_stream_action');
+		if (!$table->hasColumn('liked')) {
+			$table->addColumn('liked', 'boolean');
+		}
+		if (!$table->hasColumn('boosted')) {
+			$table->addColumn('boosted', 'boolean');
+		}
+		if (!$table->hasColumn('replied')) {
+			$table->addColumn('replied', 'boolean');
+		}
+
+		return $schema;
+	}
+
+
+	/**
+	 * @param IOutput $output
+	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+	 * @param array $options
+	 *
+	 * @throws Exception
+	 */
+	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
+		/** @var ISchemaWrapper $schema */
+		$schema = $schemaClosure();
+
+		$this->fillTableStreamActions($schema);
+	}
+
+	/**
+	 * @param ISchemaWrapper $schema
+	 */
+	private function fillTableStreamActions(ISchemaWrapper $schema) {
+
+		$start = 0;
+		$limit = 1000;
+		while (true) {
+			$qb = $this->connection->getQueryBuilder();
+			$qb->select('id', 'actor_id', 'stream_id', 'values')
+			   ->from('social_a2_stream_action')
+			   ->setMaxResults(1000)
+			   ->setFirstResult($start);
+
+			$cursor = $qb->execute();
+			$count = 0;
+			while ($data = $cursor->fetch()) {
+				$count++;
+
+				$this->updateStreamActions($data);
+			}
+			$cursor->closeCursor();
+
+			$start += $count;
+			if ($count < $limit) {
+				break;
+			}
+		}
+	}
+
+
+	/**
+	 * @param array $data
+	 */
+	private function updateStreamActions(array $data) {
+		$update = $this->connection->getQueryBuilder();
+		$update->update('social_a2_stream_action');
+
+		$id = $data['id'];
+		$actorId = $data['actor_id'];
+		$streamId = $data['stream_id'];
+
+		$values = json_decode($data['values'], true);
+		$liked = (array_key_exists('liked', $values) && ($values['liked'])) ? 1 : 0;
+		$boosted = (array_key_exists('boosted', $values) && $values['boosted']) ? 1 : 0;
+		$replied = (array_key_exists('replied', $values) && $values['replied']) ? 1 : 0;
+
+		$update->set('actor_id_prim', $update->createNamedParameter(hash('sha512', $actorId)));
+		$update->set('stream_id_prim', $update->createNamedParameter(hash('sha512', $streamId)));
+		$update->set('liked', $update->createNamedParameter($liked));
+		$update->set('boosted', $update->createNamedParameter($boosted));
+		$update->setValue('replied', $update->createNamedParameter($replied));
+
+		$expr = $update->expr();
+		$update->where($expr->eq('id', $update->createNamedParameter($id)));
+		try {
+			$update->execute();
+		} catch (UniqueConstraintViolationException $e) {
+		}
+	}
+
+}

lib/Model/StreamAction.php

@@ -48,6 +48,11 @@ class StreamAction implements JsonSerializable {
 	use TStringTools;
 
 
+	const LIKED = 'liked';
+	const BOOSTED = 'boosted';
+	const REPLIED = 'replied';
+
+
 	/** @var integer */
 	private $id = 0;
 

lib/Service/BoostService.php

@@ -34,7 +34,6 @@ use daita\MySmallPhpTools\Traits\TStringTools;
 use Exception;
 use OCA\Social\AP;
 use OCA\Social\Db\StreamRequest;
-use OCA\Social\Exceptions\ItemNotFoundException;
 use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Exceptions\StreamNotFoundException;
@@ -44,6 +43,7 @@ use OCA\Social\Model\ActivityPub\Actor\Person;
 use OCA\Social\Model\ActivityPub\Object\Announce;
 use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Model\ActivityPub\Stream;
+use OCA\Social\Model\StreamAction;
 
 
 /**
@@ -143,7 +143,7 @@ class BoostService {
 
 		$interface->save($announce);
 
-		$this->streamActionService->setActionBool($actor->getId(), $postId, 'boosted', true);
+		$this->streamActionService->setActionBool($actor->getId(), $postId, StreamAction::BOOSTED, true);
 		$this->signatureService->signObject($actor, $announce);
 
 		$token = $this->activityService->request($announce);
@@ -205,7 +205,7 @@ class BoostService {
 		} catch (StreamNotFoundException $e) {
 		}
 
-		$this->streamActionService->setActionBool($actor->getId(), $postId, 'boosted', false);
+		$this->streamActionService->setActionBool($actor->getId(), $postId, StreamAction::BOOSTED, false);
 
 		return $undo;
 	}

lib/Service/LikeService.php

@@ -40,13 +40,13 @@ use OCA\Social\Exceptions\ItemUnknownException;
 use OCA\Social\Exceptions\SocialAppConfigException;
 use OCA\Social\Exceptions\StreamNotFoundException;
 use OCA\Social\Model\ActivityPub\ACore;
-use OCA\Social\Model\ActivityPub\Object\Like;
 use OCA\Social\Model\ActivityPub\Activity\Undo;
 use OCA\Social\Model\ActivityPub\Actor\Person;
-use OCA\Social\Model\ActivityPub\Object\Announce;
+use OCA\Social\Model\ActivityPub\Object\Like;
 use OCA\Social\Model\ActivityPub\Object\Note;
 use OCA\Social\Model\ActivityPub\Stream;
 use OCA\Social\Model\InstancePath;
+use OCA\Social\Model\StreamAction;
 
 
 /**
@@ -139,7 +139,7 @@ class LikeService {
 		$interface = AP::$activityPub->getInterfaceFromType(Like::TYPE);
 		$interface->save($like);
 
-		$this->streamActionService->setActionBool($actor->getId(), $postId, 'liked', true);
+		$this->streamActionService->setActionBool($actor->getId(), $postId, StreamAction::LIKED, true);
 		$token = $this->activityService->request($like);
 
 		return $like;
@@ -198,7 +198,7 @@ class LikeService {
 		} catch (ItemNotFoundException $e) {
 		}
 
-		$this->streamActionService->setActionBool($actor->getId(), $postId, 'liked', false);
+		$this->streamActionService->setActionBool($actor->getId(), $postId, StreamAction::LIKED, false);
 
 		return $undo;
 	}