Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
9fb44e3
add propagator batching
icewind1991 May 20, 2016
cc67ad4
use propagator batching in the scanner
icewind1991 May 26, 2016
11900ba
add tests for propagator batching
icewind1991 Jun 2, 2016
fce19d2
fix mtime propagation on sqlite
icewind1991 Jun 2, 2016
1b5368b
Wrap publicwebdav in sharePermission mask
rullzer Jun 6, 2016
7c040c0
Show the path relative to the requesting user
rullzer Jun 7, 2016
2e2ece7
Fix unit tests
rullzer Jun 7, 2016
72c5535
Extend unit tests
rullzer Jun 7, 2016
c5a6c8b
Use array_merge when reading cached groups members
Jun 8, 2016
fbdec59
Extract CLASS property from calendar object and store it in the database
DeepDiver1975 Apr 19, 2016
f013cfc
Add migration step
DeepDiver1975 Apr 19, 2016
287e417
Bump dav app version and fix variable rename
DeepDiver1975 May 31, 2016
369c3b5
Implement classification migration as repair step
DeepDiver1975 May 31, 2016
082f456
Added unit testing for the migration step
DeepDiver1975 May 31, 2016
bfcd1dc
Filter confidential calendar objects in shared calendars
DeepDiver1975 May 31, 2016
cf06b17
Use the correct realm for basic authentication - fixes #23427
DeepDiver1975 Jun 9, 2016
7d51fd0
Add repair step to clean old calendar/contact shares
rullzer Jun 8, 2016
1399e87
DAV now returns file name with Content-Disposition header
Jun 9, 2016
232d735
Do not leak the login name - fixes #25047
DeepDiver1975 Jun 9, 2016
059778b
Add unit test for LDAP multi group caching
Jun 9, 2016
e8a66f8
[tx-robot] updated from transifex
Jun 10, 2016
7b3dc80
Check 2FA state for raw php files too
ChristophWurst Jun 10, 2016
5435455
Merge pull request #25043 from owncloud/webdav-download-mimetype
Jun 10, 2016
6660488
Merge pull request #25048 from owncloud/email-login-leak
Jun 10, 2016
67c3a97
Merge pull request #25046 from owncloud/fix-the-realm
Jun 10, 2016
d81dac2
Merge pull request #25025 from owncloud/clear_old_calendar_shares
Jun 10, 2016
1abe5b0
Merge pull request #25024 from owncloud/ldap-cachedgroupsbymember
Jun 10, 2016
c45b7b0
Allow empty host when installing on oracle via CLI (#25034)
butonic Jun 10, 2016
68c3b23
Merge pull request #24080 from owncloud/support-calendar-class-property
Jun 10, 2016
a0d8702
Merge pull request #25051 from owncloud/2fa-raw-php-files
Jun 10, 2016
1b66db7
Repair job to fix permissions for avatars
rullzer May 30, 2016
6022528
Add not-null columns for oracle
nickvergessen Jun 2, 2016
28d9ad2
Empty string is null on oracle
rullzer Jun 3, 2016
77caa0e
Use capped cache for encryption's user access list
Jun 10, 2016
c668588
map oracle driver options to params (#23938)
butonic Jun 10, 2016
57b999f
Merge pull request #24990 from owncloud/fix_24868
Jun 10, 2016
372213b
Add developer documentation, website and bug to the applist (#25041)
nickvergessen Jun 10, 2016
c14198b
fetchall appconfig entries (#23835)
butonic Jun 10, 2016
ffb2838
Merge pull request #25055 from owncloud/enc-cappedcache-getaccesslist
Jun 10, 2016
14fde66
Merge pull request #25003 from owncloud/fix_ocs_path_response
Jun 10, 2016
21de838
Merge pull request #24898 from owncloud/avatar_repair
Jun 10, 2016
52a0c93
Merge pull request #24863 from owncloud/propagator-batching
Jun 10, 2016
42c66ef
Merge branch 'master' of https://github.com/owncloud/core into downst…
blizzz Jun 11, 2016
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
Prev Previous commit
Next Next commit
use propagator batching in the scanner
  • Loading branch information
icewind1991 committed Jun 2, 2016
commit cc67ad4dda201b13109f378da31e66ec5fae0546
4 changes: 4 additions & 0 deletions lib/private/Files/Utils/Scanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ public function backgroundScan($dir) {
$this->triggerPropagator($storage, $path);
});

$storage->getPropagator()->beginBatch();
$scanner->backgroundScan();
$storage->getPropagator()->commitBatch();
}
}

Expand Down Expand Up @@ -182,12 +184,14 @@ public function scan($dir = '') {
$this->db->beginTransaction();
}
try {
$storage->getPropagator()->beginBatch();
$scanner->scan($relativePath, \OC\Files\Cache\Scanner::SCAN_RECURSIVE, \OC\Files\Cache\Scanner::REUSE_ETAG | \OC\Files\Cache\Scanner::REUSE_SIZE);
$cache = $storage->getCache();
if ($cache instanceof Cache) {
// only re-calculate for the root folder we scanned, anything below that is taken care of by the scanner
$cache->correctFolderSize($relativePath);
}
$storage->getPropagator()->commitBatch();
} catch (StorageNotAvailableException $e) {
$this->logger->error('Storage ' . $storage->getId() . ' not available');
$this->logger->logException($e);
Expand Down