ignore metadata if table is empty

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
nextcloud · Nov 14, 2023 · 3af12b2 · 3af12b2
1 parent f313b12
commit 3af12b2
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 10 deletions.
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
@@ -178,7 +178,7 @@ public function get($file) {
 		} elseif (!$data) {
 			return $data;
 		} else {
-			$data['metadata'] = $metadataQuery->extractMetadata($data)->asArray();
+			$data['metadata'] = $metadataQuery?->extractMetadata($data)->asArray() ?? [];
 			return self::cacheEntryFromData($data, $this->mimetypeLoader);
 		}
 	}
@@ -250,7 +250,7 @@ public function getFolderContentsById($fileId) {
 			$result->closeCursor();
 
 			return array_map(function (array $data) use ($metadataQuery) {
-				$data['metadata'] = $metadataQuery->extractMetadata($data)->asArray();
+				$data['metadata'] = $metadataQuery?->extractMetadata($data)->asArray() ?? [];
 				return self::cacheEntryFromData($data, $this->mimetypeLoader);
 			}, $files);
 		}

diff --git a/lib/private/Files/Cache/CacheQueryBuilder.php b/lib/private/Files/Cache/CacheQueryBuilder.php
@@ -135,9 +135,14 @@ public function whereParentInParameter(string $parameter) {
 		return $this;
 	}
 
-	public function selectMetadata(): IMetadataQuery {
+	/**
+	 * join metadata to current query builder and returns an helper
+	 *
+	 * @return IMetadataQuery|null NULL if no metadata have never been generated
+	 */
+	public function selectMetadata(): ?IMetadataQuery {
 		$metadataQuery = $this->filesMetadataManager->getMetadataQuery($this, $this->alias, 'fileid');
-		$metadataQuery->retrieveMetadata();
+		$metadataQuery?->retrieveMetadata();
 		return $metadataQuery;
 	}
 }
diff --git a/lib/private/Files/Cache/QuerySearchHelper.php b/lib/private/Files/Cache/QuerySearchHelper.php
@@ -67,6 +67,12 @@ protected function getQueryBuilder() {
 		);
 	}
 
+	/**
+	 * @param CacheQueryBuilder $query
+	 * @param ISearchQuery $searchQuery
+	 * @param array $caches
+	 * @param IMetadataQuery|null $metadataQuery
+	 */
 	protected function applySearchConstraints(
 		CacheQueryBuilder $query,
 		ISearchQuery $searchQuery,
@@ -189,7 +195,12 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array
 		$files = $result->fetchAll();
 
 		$rawEntries = array_map(function (array $data) use ($metadataQuery) {
-			$data['metadata'] = $metadataQuery->extractMetadata($data)->asArray();
+			// migrate to null safe ...
+			if ($metadataQuery === null) {
+				$data['metadata'] = [];
+			} else {
+				$data['metadata'] = $metadataQuery->extractMetadata($data)->asArray();
+			}
 			return Cache::cacheEntryFromData($data, $this->mimetypeLoader);
 		}, $files);
 

diff --git a/lib/private/Files/Cache/SearchBuilder.php b/lib/private/Files/Cache/SearchBuilder.php
@@ -243,7 +243,11 @@ private function validateComparison(ISearchComparison $operator) {
 	}
 
 
-	private function getExtraOperatorField(ISearchComparison $operator, IMetadataQuery $metadataQuery): array {
+	private function getExtraOperatorField(ISearchComparison $operator, ?IMetadataQuery $metadataQuery): array {
+		if (null === $metadataQuery) {
+			throw new \InvalidArgumentException('IMetadataQuery is null while calling getExtraOperatorField');
+		}
+
 		$field = $operator->getField();
 		$value = $operator->getValue();
 		$type = $operator->getType();

diff --git a/lib/private/FilesMetadata/FilesMetadataManager.php b/lib/private/FilesMetadata/FilesMetadataManager.php
@@ -213,15 +213,19 @@ public function deleteMetadata(int $fileId): void {
 	 * @param string $fileIdField alias of the field that contains file ids
 	 *
 	 * @inheritDoc
-	 * @return IMetadataQuery
+	 * @return IMetadataQuery|null
 	 * @see IMetadataQuery
 	 * @since 28.0.0
 	 */
 	public function getMetadataQuery(
 		IQueryBuilder $qb,
 		string $fileTableAlias,
 		string $fileIdField
-	): IMetadataQuery {
+	): ?IMetadataQuery {
+		// we don't want to join metadata table if never filled
+		if ($this->config->getAppValue('core', self::CONFIG_KEY, '') === '') {
+			return null;
+		}
 		return new MetadataQuery($qb, $this->getKnownMetadata(), $fileTableAlias, $fileIdField);
 	}
 

diff --git a/lib/public/FilesMetadata/IFilesMetadataManager.php b/lib/public/FilesMetadata/IFilesMetadataManager.php
@@ -105,15 +105,15 @@ public function deleteMetadata(int $fileId): void;
 	 * @param string $fileTableAlias alias of the table that contains data about files
 	 * @param string $fileIdField alias of the field that contains file ids
 	 *
-	 * @return IMetadataQuery
+	 * @return IMetadataQuery|null NULL if table are not set yet or never used
 	 * @see IMetadataQuery
 	 * @since 28.0.0
 	 */
 	public function getMetadataQuery(
 		IQueryBuilder $qb,
 		string $fileTableAlias,
 		string $fileIdField
-	): IMetadataQuery;
+	): ?IMetadataQuery;
 
 	/**
 	 * returns all type of metadata currently available.