add yet more log messages, a=chris
add yet more log messages, a=chris
diff --git a/lib/index_archive_bundle.php b/lib/index_archive_bundle.php
index 94fa19b7e..22d02eba7 100644
--- a/lib/index_archive_bundle.php
+++ b/lib/index_archive_bundle.php
@@ -242,9 +242,9 @@ class IndexArchiveBundle implements CrawlConstants
$blocking = false)
{
$current_num_docs = $this->getActiveShard()->num_docs;
- crawlLog("Current shard has ".$current_num_docs." documents.");
+ crawlLog("Current index shard has ".$current_num_docs." documents.");
$memory_limit = metricToInt(ini_get("memory_limit"));
- crawlLog("Memory limit is ".$memory_limit.". Usage is ".
+ crawlLog("Memory Indexer limit is ".$memory_limit.". Usage is ".
memory_get_usage());
if($current_num_docs + $add_num_docs > $this->num_docs_per_generation
diff --git a/lib/index_shard.php b/lib/index_shard.php
index 2a73c9aaa..6db04a42c 100644
--- a/lib/index_shard.php
+++ b/lib/index_shard.php
@@ -1120,6 +1120,7 @@ class IndexShard extends PersistentStructure implements
if($this->word_docs_packed) {
return;
}
+ crawlLog("Merge index shard postings to string to save memory.");
ksort($this->words, SORT_STRING);
$tmp_string = "";
$offset = 0;
@@ -1194,7 +1195,6 @@ class IndexShard extends PersistentStructure implements
$this->word_postings .=
$word_id . packInt($word_id_posts_len). $postings;
}
- unset($this->words[$word_id]);
$i++;
}
if($tmp_string != "") {