Author: rande
Date: 2010-02-17 19:15:06 +0100 (Wed, 17 Feb 2010)
New Revision: 28095
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/indexer/sfLuceneDoctrineIndexerHandler.class.php
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneUpdateModelSystemTask.class.php
plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneService.class.php
Log:
[sfSolrPlugin] remove debugging information
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/indexer/sfLuceneDoctrineIndexerHandler.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/lib/indexer/sfLuceneDoctrineIndexerHandler.class.php
2010-02-17 18:03:27 UTC (rev 28094)
+++
plugins/sfSolrPlugin/branches/sf1.2/lib/indexer/sfLuceneDoctrineIndexerHandler.class.php
2010-02-17 18:15:06 UTC (rev 28095)
@@ -34,14 +34,6 @@
$count = $query->count();
$totalPages = ceil($count / $limit);
-
- // try to reduce the limit usage on php 5.2
- $memory_limit = sfLuceneService::convertBytes(ini_get('memory_limit'));
- $internal_limit = 10485760 * 2 ; // 10Mo
-
- // fetch one object to load all relations
- $consume_memory_query = clone $query;
- $consume_memory_query->limit(1)->fetchOne();
for ($page = $start_page; $page < $totalPages; $page++)
{
Modified:
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneUpdateModelSystemTask.class.php
===================================================================
---
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneUpdateModelSystemTask.class.php
2010-02-17 18:03:27 UTC (rev 28094)
+++
plugins/sfSolrPlugin/branches/sf1.2/lib/task/sfLuceneUpdateModelSystemTask.class.php
2010-02-17 18:15:06 UTC (rev 28095)
@@ -145,7 +145,7 @@
$this->dispatcher->notify(new sfEvent($this, 'command.log', array('',
$final)));
- $command = sprintf('php -d memory_limit=64M %s/symfony
lucene:update-model %s %s %s %s --state=true',
+ $command = sprintf('%s/symfony lucene:update-model %s %s %s %s
--state=true',
$this->configuration->getRootDir(),
$app,
$index,
Modified: plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneService.class.php
===================================================================
--- plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneService.class.php
2010-02-17 18:03:27 UTC (rev 28094)
+++ plugins/sfSolrPlugin/branches/sf1.2/lib/util/sfLuceneService.class.php
2010-02-17 18:15:06 UTC (rev 28095)
@@ -37,41 +37,6 @@
}
/**
- *
- * compute shorthand memory notation into int
- * from http://www.php.net/manual/en/faq.using.php#78405
- *
- * @return int bytes value of the shorthand notation
- */
- public static function convertBytes($value)
- {
-
- if (is_numeric($value))
- {
-
- return $value;
- }
-
- $value_length = strlen($value);
- $qty = substr( $value, 0, $value_length - 1 );
- $unit = strtolower( substr( $value, $value_length - 1 ) );
-
- switch ( $unit ) {
- case 'k':
- $qty *= 1024;
- break;
- case 'm':
- $qty *= 1048576;
- break;
- case 'g':
- $qty *= 1073741824;
- break;
- }
-
- return $qty;
-
- }
- /**
* Simple Search interface
*
* @param string $query The raw query string
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
