Page MenuHomePhabricator
Files F18024295

D18497.id.diff
No OneTemporary
Actions

D18497.id.diff
View Options

diff --git a/resources/sql/autopatches/20170830.ferret.01.unique.sql b/resources/sql/autopatches/20170830.ferret.01.unique.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20170830.ferret.01.unique.sql
@@ -0,0 +1,4 @@
+TRUNCATE TABLE {$NAMESPACE}_maniphest.maniphest_task_ffield;
+
+ALTER TABLE {$NAMESPACE}_maniphest.maniphest_task_ffield
+ ADD UNIQUE KEY `key_documentfield` (documentID, fieldKey);
diff --git a/src/applications/search/constants/PhabricatorSearchDocumentFieldType.php b/src/applications/search/constants/PhabricatorSearchDocumentFieldType.php
--- a/src/applications/search/constants/PhabricatorSearchDocumentFieldType.php
+++ b/src/applications/search/constants/PhabricatorSearchDocumentFieldType.php
@@ -5,5 +5,6 @@
const FIELD_TITLE = 'titl';
const FIELD_BODY = 'body';
const FIELD_COMMENT = 'cmnt';
+ const FIELD_ALL = 'full';
}
diff --git a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
--- a/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
+++ b/src/applications/search/engineextension/PhabricatorFerretFulltextEngineExtension.php
@@ -31,25 +31,52 @@
$stemmer = new PhutilSearchStemmer();
- $ferret_fields = array();
- $ngrams_source = array();
+ $key_all = PhabricatorSearchDocumentFieldType::FIELD_ALL;
+
+ $empty_template = array(
+ 'raw' => array(),
+ 'normal' => array(),
+ );
+
+ $ferret_corpus_map = array(
+ $key_all => $empty_template,
+ );
+
foreach ($document->getFieldData() as $field) {
list($key, $raw_corpus) = $field;
-
if (!strlen($raw_corpus)) {
continue;
}
$normal_corpus = $stemmer->stemCorpus($raw_corpus);
+ if (!isset($ferret_corpus_map[$key])) {
+ $ferret_corpus_map[$key] = $empty_template;
+ }
+
+ $ferret_corpus_map[$key]['raw'][] = $raw_corpus;
+ $ferret_corpus_map[$key]['normal'][] = $normal_corpus;
+
+ $ferret_corpus_map[$key_all]['raw'][] = $raw_corpus;
+ $ferret_corpus_map[$key_all]['normal'][] = $normal_corpus;
+ }
+
+ $ferret_fields = array();
+ foreach ($ferret_corpus_map as $key => $fields) {
+ $raw_corpus = $fields['raw'];
+ $raw_corpus = implode("\n", $raw_corpus);
+
+ $normal_corpus = $fields['normal'];
+ $normal_corpus = implode("\n", $normal_corpus);
+
$ferret_fields[] = $engine->newFieldObject()
->setFieldKey($key)
->setRawCorpus($raw_corpus)
->setNormalCorpus($normal_corpus);
-
- $ngrams_source[] = $raw_corpus;
}
- $ngrams_source = implode(' ', $ngrams_source);
+
+ $ngrams_source = $ferret_corpus_map[$key_all]['raw'];
+ $ngrams_source = implode("\n", $ngrams_source);
$ngrams = id(new PhabricatorNgramEngine())
->getNgramsFromString($ngrams_source, 'index');
diff --git a/src/applications/search/ferret/PhabricatorFerretField.php b/src/applications/search/ferret/PhabricatorFerretField.php
--- a/src/applications/search/ferret/PhabricatorFerretField.php
+++ b/src/applications/search/ferret/PhabricatorFerretField.php
@@ -20,8 +20,9 @@
'normalCorpus' => 'sort',
),
self::CONFIG_KEY_SCHEMA => array(
- 'key_document' => array(
+ 'key_documentfield' => array(
'columns' => array('documentID', 'fieldKey'),
+ 'unique' => true,
),
),
) + parent::getConfiguration();

File Metadata

Mime Type
text/plain
Expires
Sun, Aug 3, 9:18 PM (4 w, 1 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
8483951
Default Alt Text
D18497.id.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility