Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implements search on null/notnull metadata #41459

Merged
merged 5 commits into from
Nov 23, 2023
Merged

implements search on null/notnull metadata #41459

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7467422
implements search on null/notnull metadata
ArtificialOwl Nov 15, 2023
b0109b4
Update 3rdparty
artonge Nov 16, 2023
33ac1c0
Fix param name after Sabre\CalDAV update
artonge Nov 16, 2023
a93af13
Fix is-define operator
artonge Nov 16, 2023
fbe92d4
fixing test
ArtificialOwl Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty
Open in desktop
Submodule 3rdparty updated 27 files
+1 −1 composer.json
+18 −21 composer.lock
+1 −0 composer/autoload_classmap.php
+1 −4 composer/autoload_psr4.php
+4 −18 composer/autoload_static.php
+19 −22 composer/installed.json
+8 −8 composer/installed.php
+1 −0 icewind/searchdav/src/DAV/QueryParser.php
+2 −2 sabre/dav/lib/CalDAV/Backend/AbstractBackend.php
+1 −1 sabre/dav/lib/CalDAV/Backend/PDO.php
+1 −1 sabre/dav/lib/CalDAV/Backend/SyncSupport.php
+6 −6 sabre/dav/lib/CalDAV/Calendar.php
+2 −2 sabre/dav/lib/CalDAV/CalendarHome.php
+0 −7 sabre/dav/lib/CalDAV/Schedule/IMipPlugin.php
+4 −5 sabre/dav/lib/CalDAV/Schedule/Plugin.php
+1 −1 sabre/dav/lib/CalDAV/Xml/Filter/PropFilter.php
+7 −7 sabre/dav/lib/CardDAV/AddressBook.php
+2 −2 sabre/dav/lib/CardDAV/AddressBookHome.php
+1 −1 sabre/dav/lib/CardDAV/Backend/PDO.php
+1 −1 sabre/dav/lib/CardDAV/Backend/SyncSupport.php
+8 −1 sabre/dav/lib/CardDAV/Xml/Request/AddressBookMultiGetReport.php
+36 −0 sabre/dav/lib/DAV/INodeByPath.php
+1 −1 sabre/dav/lib/DAV/Sync/ISyncCollection.php
+18 −12 sabre/dav/lib/DAV/Tree.php
+1 −1 sabre/dav/lib/DAV/Version.php
+30 −16 sabre/dav/lib/DAV/Xml/Element/Response.php
+1 −1 sabre/dav/lib/DAVACL/PrincipalBackend/BackendInterface.php
4 changes: 2 additions & 2 deletions apps/dav/lib/CalDAV/CachedSubscription.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,11 @@ public function getMultipleChildren(array $paths):array {

/**
* @param string $name
* @param null|resource|string $calendarData
* @param null|resource|string $data
* @return null|string
* @throws MethodNotAllowed
*/
public function createFile($name, $calendarData = null) {
public function createFile($name, $data = null) {
throw new MethodNotAllowed('Creating objects in cached subscription is not allowed');
}

Expand Down
31 changes: 22 additions & 9 deletions apps/dav/lib/Files/FileSearchBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\Search\ISearchComparison;
use OCP\Files\Search\ISearchOperator;
use OCP\Files\Search\ISearchOrder;
use OCP\Files\Search\ISearchQuery;
Expand Down Expand Up @@ -367,22 +368,30 @@ private function transformSearchOperation(Operator $operator) {
if (count($operator->arguments) !== 2) {
throw new \InvalidArgumentException('Invalid number of arguments for ' . $trimmedType . ' operation');
}
if (!($operator->arguments[0] instanceof SearchPropertyDefinition)) {
throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
}
if (!($operator->arguments[1] instanceof Literal)) {
throw new \InvalidArgumentException('Invalid argument 2 for ' . $trimmedType . ' operation, expected literal');
}

$value = $operator->arguments[1]->value;
case Operator::OPERATION_IS_DEFINED:
if (!($operator->arguments[0] instanceof SearchPropertyDefinition)) {
throw new \InvalidArgumentException('Invalid argument 1 for ' . $trimmedType . ' operation, expected property');
}
$property = $operator->arguments[0];
$value = $this->castValue($property, $operator->arguments[1]->value);

if (str_starts_with($property->name, FilesPlugin::FILE_METADATA_PREFIX)) {
return new SearchComparison($trimmedType, substr($property->name, strlen(FilesPlugin::FILE_METADATA_PREFIX)), $value, IMetadataQuery::EXTRA);
$field = substr($property->name, strlen(FilesPlugin::FILE_METADATA_PREFIX));
$extra = IMetadataQuery::EXTRA;
} else {
return new SearchComparison($trimmedType, $this->mapPropertyNameToColumn($property), $value);
$field = $this->mapPropertyNameToColumn($property);
}

// no break
return new SearchComparison(
$trimmedType,
$field,
$this->castValue($property, $value ?? ''),
$extra ?? ''
);

case Operator::OPERATION_IS_COLLECTION:
return new SearchComparison('eq', 'mimetype', ICacheEntry::DIRECTORY_MIMETYPE);
default:
Expand Down Expand Up @@ -416,7 +425,11 @@ private function mapPropertyNameToColumn(SearchPropertyDefinition $property) {
}

private function castValue(SearchPropertyDefinition $property, $value) {
switch ($property->dataType) {
if ($value === '') {
return '';
}

switch ($property->dataType) {
case SearchPropertyDefinition::DATATYPE_BOOLEAN:
return $value === 'yes';
case SearchPropertyDefinition::DATATYPE_DECIMAL:
Expand Down
2 changes: 2 additions & 0 deletions lib/private/Files/Cache/SearchBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class SearchBuilder {
ISearchComparison::COMPARE_GREATER_THAN_EQUAL => 'gte',
ISearchComparison::COMPARE_LESS_THAN => 'lt',
ISearchComparison::COMPARE_LESS_THAN_EQUAL => 'lte',
ISearchComparison::COMPARE_DEFINED => 'isNotNull',
];

protected static $searchOperatorNegativeMap = [
Expand All @@ -57,6 +58,7 @@ class SearchBuilder {
ISearchComparison::COMPARE_GREATER_THAN_EQUAL => 'lt',
ISearchComparison::COMPARE_LESS_THAN => 'gte',
ISearchComparison::COMPARE_LESS_THAN_EQUAL => 'gt',
ISearchComparison::COMPARE_DEFINED => 'isNull',
];

public const TAG_FAVORITE = '_$!<Favorite>!$_';
Expand Down
1 change: 1 addition & 0 deletions lib/public/Files/Search/ISearchComparison.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ interface ISearchComparison extends ISearchOperator {
public const COMPARE_LESS_THAN_EQUAL = 'lte';
public const COMPARE_LIKE = 'like';
public const COMPARE_LIKE_CASE_SENSITIVE = 'clike';
public const COMPARE_DEFINED = 'is-defined';

public const HINT_PATH_EQ_HASH = 'path_eq_hash'; // transform `path = "$path"` into `path_hash = md5("$path")`, on by default

Expand Down
Loading