Merge pull request #271 from owncloud/239_webdav_999_files

fixes #239 - query the database in chunks of 200
remotes/origin/stable5
Lukas Reschke 13 years ago
commit 8b03b683df
  1. 26
      lib/connector/sabre/directory.php

@ -116,7 +116,6 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
* @return Sabre_DAV_INode[] * @return Sabre_DAV_INode[]
*/ */
public function getChildren() { public function getChildren() {
$folder_content = OC_Files::getDirectoryContent($this->path); $folder_content = OC_Files::getDirectoryContent($this->path);
$paths = array(); $paths = array();
foreach($folder_content as $info) { foreach($folder_content as $info) {
@ -124,15 +123,22 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
} }
$properties = array_fill_keys($paths, array()); $properties = array_fill_keys($paths, array());
if(count($paths)>0) { if(count($paths)>0) {
$placeholders = join(',', array_fill(0, count($paths), '?')); //
$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ?' . ' AND `propertypath` IN ('.$placeholders.')' ); // the number of arguments within IN conditions are limited in most databases
array_unshift($paths, OC_User::getUser()); // prepend userid // we chunk $paths into arrays of 200 items each to meet this criteria
$result = $query->execute( $paths ); //
while($row = $result->fetchRow()) { $chunks = array_chunk($paths, 200, false);
$propertypath = $row['propertypath']; foreach ($chunks as $pack) {
$propertyname = $row['propertyname']; $placeholders = join(',', array_fill(0, count($pack), '?'));
$propertyvalue = $row['propertyvalue']; $query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ?' . ' AND `propertypath` IN ('.$placeholders.')' );
$properties[$propertypath][$propertyname] = $propertyvalue; array_unshift($pack, OC_User::getUser()); // prepend userid
$result = $query->execute( $pack );
while($row = $result->fetchRow()) {
$propertypath = $row['propertypath'];
$propertyname = $row['propertyname'];
$propertyvalue = $row['propertyvalue'];
$properties[$propertypath][$propertyname] = $propertyvalue;
}
} }
} }

Loading…
Cancel
Save