backport search in shared files to stable5 #5487

butonic · 2013-10-23T10:35:05Z

backport of #4207

butonic · 2013-10-23T10:39:31Z

@DeepDiver1975 @karlitschek @schiesbn @icewind1991 please review.

karlitschek · 2013-10-23T10:40:15Z

👍

ghost · 2013-10-23T12:09:45Z

Test passed.
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/1733/

butonic · 2013-10-23T12:11:45Z

Found a bug that blocks merging. I'll ping you all again when this can be reviewed further.

butonic · 2013-10-23T12:44:48Z

@DeepDiver1975 @schiesbn @icewind1991 fixed problem, please review by sharing a folder or file to anohter user and try searching in shared files. If you want to be thorough search for something that will give more than 1000 results.

ghost · 2013-10-23T13:29:26Z

Test passed.
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/1738/

DeepDiver1975 · 2013-10-23T22:03:51Z

need to create a few test files ❓

for i in {1..2000}; do dd if=/dev/urandom bs=1 count=1 of=file$i; done

DeepDiver1975 · 2013-10-23T22:27:30Z

🔙

[Thu Oct 24 00:26:30 2013] [error] [client 127.0.0.1] PHP Fatal error:  Uncaught exception 'DatabaseException' with message 'SQLSTATE[HY000]: General error: 1 too many SQL variables' in /home/thomas/Development/owncloud/stable5/lib/db.php:391\nStack trace:\n
#0 /home/thomas/Development/owncloud/stable5/apps/files_sharing/lib/cache.php(240): OC_DB::prepare('SELECT `fileid`...')\n
#1 /home/thomas/Development/owncloud/stable5/lib/files/view.php(1004): OC\\Files\\Cache\\Shared_Cache->search('%fil%')\n
#2 /home/thomas/Development/owncloud/stable5/lib/files/view.php(962): OC\\Files\\View->searchCommon('%fil%', 'search')\n
#3 /home/thomas/Development/owncloud/stable5/lib/files/filesystem.php(558): OC\\Files\\View->search('fil')\n
#4 /home/thomas/Development/owncloud/stable5/lib/search/provider/file.php(5): OC\\Files\\Filesystem::search('fil', true)\n
#5 /home/thomas/Development/owncloud/stable5/lib/search.php(56): OC_Search_Provider_File->search('fil')\n
#6 /home/thomas/Development/owncloud/stable5/search/ajax/search.php(30): OC_Search::search('fil')\n
#7 /home/thomas/Development/owncloud/stable5/lib/route.php(1 in /home/thomas/Development/owncloud/stable5/lib/db.php on line 391, referer: http://localhost/owncloud/stable5/index.php/apps/files

DeepDiver1975 · 2013-10-23T22:39:49Z

reducing the chunk count to 998 finally solved the issue on my installation

bantu · 2013-10-24T22:20:22Z

apps/files_sharing/lib/cache.php

-		$result = $query->execute(array_merge(array($mimetype), $ids));
-		return $result->fetchAll();
+
+		$files = array();


This block is a 98% copy of the block above.

butonic · 2013-10-29T12:37:18Z

@bantu @DeepDiver1975 please review the cleanup

bantu · 2013-10-29T12:56:36Z

apps/files_sharing/lib/cache.php

+	 * @param string $wherevalue
+	 * @return array
+	 */
+	private function searchWithWhere ($sqlwhere, $wherevalue, $chunksize = self::MAX_SQL_CHUNK_SIZE) {


No space. searchWithWhere ($sqlwhere

ghost · 2013-10-29T13:23:02Z

Test failed.
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/1824/

ghost · 2013-10-29T13:23:07Z

Test passed.
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/1825/

- extract method, - introduce MAX CHUNK SIZE const with 999 (reduce this by the number of additional query parameters), - fix whitespace

MTRichards · 2013-10-29T14:52:22Z

@DeepDiver1975 @bantu @karlitschek more eyes?

karlitschek · 2013-10-29T14:53:17Z

👍

ghost · 2013-10-29T15:47:26Z

Test passed.
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/1835/

butonic · 2013-10-29T17:41:46Z

@bantu @DeepDiver1975 cleaned up the last whitespace changes.

DeepDiver1975 · 2013-10-30T13:17:18Z

I'm getting this error on Oracle:
[Error message: Unable to bind to missing placeholder: 999]

And it looks like errors are not properly handled:

[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP Fatal error:  Call to undefined method MDB2_Error::fetchRow() in /home/deepdiver/Development/ownCloud/stable5/apps/files_sharing/lib/cache.php on line 292, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP Stack trace:, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   1. {main}() /home/deepdiver/Development/ownCloud/stable5/index.php:0, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   2. OC::handleRequest() /home/deepdiver/Development/ownCloud/stable5/index.php:28, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   3. OC_Router->match($url = *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/lib/base.php:629, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   4. call_user_func(*uninitialized*, *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/lib/router.php:127, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   5. __lambda_func($param = *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/lib/router.php:127, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   6. require_once() /home/deepdiver/Development/ownCloud/stable5/lib/route.php(113) : runtime-created function:1, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   7. OC_Search::search($query = *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/search/ajax/search.php:30, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   8. OC_Search_Provider_File->search($query = *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/lib/search.php:56, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP   9. OC\\Files\\Filesystem::search($query = *uninitialized*, *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/lib/search/provider/file.php:5, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP  10. OC\\Files\\View->search($query = *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/lib/files/filesystem.php:558, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP  11. OC\\Files\\View->searchCommon($query = *uninitialized*, $method = *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/lib/files/view.php:962, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP  12. OC\\Files\\Cache\\Shared_Cache->search($pattern = *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/lib/files/view.php:1004, referer: http://localhost/oc/stable5/index.php/apps/files
[Wed Oct 30 14:01:19 2013] [error] [client ::1] PHP  13. OC\\Files\\Cache\\Shared_Cache->searchWithWhere($sqlwhere = *uninitialized*, $wherevalue = *uninitialized*, $chunksize = *uninitialized*) /home/deepdiver/Development/ownCloud/stable5/apps/files_sharing/lib/cache.php:231, referer: http://localhost/oc/stable5/index.php/apps/files

butonic · 2013-10-30T14:03:39Z

@DeepDiver1975 seems I was counting the wrong array. also need to fix this in master

ghost · 2013-10-30T14:43:29Z

Test passed.
Refer to this link for build results: https://ci.owncloud.org/job/pull-request-analyser/1850/

MTRichards · 2013-10-30T15:16:03Z

@karlitschek @DeepDiver1975 eyes please!

schiessle · 2013-10-30T16:37:57Z

I tested it, works as expected 👍

…s_to_stable5 backport search in shared files to stable5

MTRichards · 2013-10-30T17:01:35Z

@bboule

DeepDiver1975 · 2013-10-30T17:03:52Z

just to confirm: retested on oracle and it works

backport search in shared files to stable5

38a78ad

OC5 does not have executeAudited

1e5257c

bantu reviewed Oct 24, 2013
View reviewed changes

bantu reviewed Oct 29, 2013
View reviewed changes

cleanup PR

149679c

- extract method, - introduce MAX CHUNK SIZE const with 999 (reduce this by the number of additional query parameters), - fix whitespace

fix placholder counting

a75017b

butonic mentioned this pull request Oct 30, 2013

count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected #5626

Merged

karlitschek pushed a commit that referenced this pull request Oct 30, 2013

Merge pull request #5487 from owncloud/backport_search_in_shared_file…

c251ccf

…s_to_stable5 backport search in shared files to stable5

karlitschek merged commit c251ccf into stable5 Oct 30, 2013

karlitschek deleted the backport_search_in_shared_files_to_stable5 branch October 30, 2013 16:42

lock bot locked as resolved and limited conversation to collaborators Aug 26, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

backport search in shared files to stable5 #5487

backport search in shared files to stable5 #5487

butonic commented Oct 23, 2013

butonic commented Oct 23, 2013

karlitschek commented Oct 23, 2013

ghost commented Oct 23, 2013

butonic commented Oct 23, 2013

butonic commented Oct 23, 2013

ghost commented Oct 23, 2013

DeepDiver1975 commented Oct 23, 2013

DeepDiver1975 commented Oct 23, 2013

DeepDiver1975 commented Oct 23, 2013

bantu Oct 24, 2013

butonic commented Oct 29, 2013

bantu Oct 29, 2013

ghost commented Oct 29, 2013

ghost commented Oct 29, 2013

MTRichards commented Oct 29, 2013

karlitschek commented Oct 29, 2013

ghost commented Oct 29, 2013

butonic commented Oct 29, 2013

DeepDiver1975 commented Oct 30, 2013

butonic commented Oct 30, 2013

ghost commented Oct 30, 2013

MTRichards commented Oct 30, 2013

schiessle commented Oct 30, 2013

MTRichards commented Oct 30, 2013

DeepDiver1975 commented Oct 30, 2013

backport search in shared files to stable5 #5487

backport search in shared files to stable5 #5487

Conversation

butonic commented Oct 23, 2013

butonic commented Oct 23, 2013

karlitschek commented Oct 23, 2013

ghost commented Oct 23, 2013

butonic commented Oct 23, 2013

butonic commented Oct 23, 2013

ghost commented Oct 23, 2013

DeepDiver1975 commented Oct 23, 2013

DeepDiver1975 commented Oct 23, 2013

DeepDiver1975 commented Oct 23, 2013

bantu Oct 24, 2013

Choose a reason for hiding this comment

butonic commented Oct 29, 2013

bantu Oct 29, 2013

Choose a reason for hiding this comment

ghost commented Oct 29, 2013

ghost commented Oct 29, 2013

MTRichards commented Oct 29, 2013

karlitschek commented Oct 29, 2013

ghost commented Oct 29, 2013

butonic commented Oct 29, 2013

DeepDiver1975 commented Oct 30, 2013

butonic commented Oct 30, 2013

ghost commented Oct 30, 2013

MTRichards commented Oct 30, 2013

schiessle commented Oct 30, 2013

MTRichards commented Oct 30, 2013

DeepDiver1975 commented Oct 30, 2013