Page MenuHomestyx hydra
Files F236416

No OneTemporary
Actions

View Options

diff --git a/resources/sql/autopatches/20161124.search.01.stopwords.sql b/resources/sql/autopatches/20161124.search.01.stopwords.sql
new file mode 100644
index 0000000000..8cbf2dc50b
--- /dev/null
+++ b/resources/sql/autopatches/20161124.search.01.stopwords.sql
@@ -0,0 +1,3 @@
+CREATE TABLE {$NAMESPACE}_search.stopwords (
+ value VARCHAR(32) NOT NULL COLLATE {$COLLATE_SORT}
+) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
diff --git a/src/applications/search/storage/PhabricatorSearchSchemaSpec.php b/src/applications/search/storage/PhabricatorSearchSchemaSpec.php
index 4e9e739016..10d16e60b5 100644
--- a/src/applications/search/storage/PhabricatorSearchSchemaSpec.php
+++ b/src/applications/search/storage/PhabricatorSearchSchemaSpec.php
@@ -1,10 +1,18 @@
<?php
final class PhabricatorSearchSchemaSpec
extends PhabricatorConfigSchemaSpec {
public function buildSchemata() {
$this->buildEdgeSchemata(new PhabricatorProfilePanelConfiguration());
+
+ $this->buildRawSchema(
+ 'search',
+ PhabricatorSearchDocument::STOPWORDS_TABLE,
+ array(
+ 'value' => 'sort32',
+ ),
+ array());
}
}
diff --git a/src/applications/search/storage/document/PhabricatorSearchDocument.php b/src/applications/search/storage/document/PhabricatorSearchDocument.php
index 28080944b3..1016872572 100644
--- a/src/applications/search/storage/document/PhabricatorSearchDocument.php
+++ b/src/applications/search/storage/document/PhabricatorSearchDocument.php
@@ -1,56 +1,58 @@
<?php
final class PhabricatorSearchDocument extends PhabricatorSearchDAO {
protected $documentType;
protected $documentTitle;
protected $documentCreated;
protected $documentModified;
+ const STOPWORDS_TABLE = 'stopwords';
+
protected function getConfiguration() {
return array(
self::CONFIG_TIMESTAMPS => false,
self::CONFIG_IDS => self::IDS_MANUAL,
self::CONFIG_COLUMN_SCHEMA => array(
'documentType' => 'text4',
'documentTitle' => 'text255',
'documentCreated' => 'epoch',
'documentModified' => 'epoch',
),
self::CONFIG_KEY_SCHEMA => array(
'key_phid' => null,
'PRIMARY' => array(
'columns' => array('phid'),
'unique' => true,
),
'documentCreated' => array(
'columns' => array('documentCreated'),
),
'key_type' => array(
'columns' => array('documentType', 'documentCreated'),
),
),
) + parent::getConfiguration();
}
public function getIDKey() {
return 'phid';
}
public static function newQueryCompiler() {
$table = new self();
$conn = $table->establishConnection('r');
$compiler = new PhutilSearchQueryCompiler();
$operators = queryfx_one(
$conn,
'SELECT @@ft_boolean_syntax AS syntax');
if ($operators) {
$compiler->setOperators($operators['syntax']);
}
return $compiler;
}
}
diff --git a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php
index b4e6e280a5..e0b8d884c5 100644
--- a/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php
+++ b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php
@@ -1,96 +1,149 @@
<?php
final class PhabricatorStorageManagementUpgradeWorkflow
extends PhabricatorStorageManagementWorkflow {
protected function didConstruct() {
$this
->setName('upgrade')
->setExamples('**upgrade** [__options__]')
->setSynopsis(pht('Upgrade database schemata.'))
->setArguments(
array(
array(
'name' => 'apply',
'param' => 'patch',
'help' => pht(
'Apply __patch__ explicitly. This is an advanced feature for '.
'development and debugging; you should not normally use this '.
'flag. This skips adjustment.'),
),
array(
'name' => 'no-quickstart',
'help' => pht(
'Build storage patch-by-patch from scratch, even if it could '.
'be loaded from the quickstart template.'),
),
array(
'name' => 'init-only',
'help' => pht(
'Initialize storage only; do not apply patches or adjustments.'),
),
array(
'name' => 'no-adjust',
'help' => pht(
'Do not apply storage adjustments after storage upgrades.'),
),
));
}
public function didExecute(PhutilArgumentParser $args) {
$console = PhutilConsole::getConsole();
$patches = $this->getPatches();
if (!$this->isDryRun() && !$this->isForce()) {
$console->writeOut(
phutil_console_wrap(
pht(
'Before running storage upgrades, you should take down the '.
'Phabricator web interface and stop any running Phabricator '.
'daemons (you can disable this warning with %s).',
'--force')));
if (!phutil_console_confirm(pht('Are you ready to continue?'))) {
$console->writeOut("%s\n", pht('Cancelled.'));
return 1;
}
}
$apply_only = $args->getArg('apply');
if ($apply_only) {
if (empty($patches[$apply_only])) {
throw new PhutilArgumentUsageException(
pht(
"%s argument '%s' is not a valid patch. ".
"Use '%s' to show patch status.",
'--apply',
$apply_only,
'./bin/storage status'));
}
}
$no_quickstart = $args->getArg('no-quickstart');
$init_only = $args->getArg('init-only');
$no_adjust = $args->getArg('no-adjust');
$apis = $this->getMasterAPIs();
$this->upgradeSchemata($apis, $apply_only, $no_quickstart, $init_only);
+ if ($apply_only || $init_only) {
+ echo tsprintf(
+ "%s\n",
+ pht('Declining to synchronize static tables.'));
+ } else {
+ echo tsprintf(
+ "%s\n",
+ pht('Synchronizing static tables...'));
+ $this->synchronizeSchemata();
+ }
+
if ($no_adjust || $init_only || $apply_only) {
$console->writeOut(
"%s\n",
pht('Declining to apply storage adjustments.'));
} else {
foreach ($apis as $api) {
$err = $this->adjustSchemata($api, false);
if ($err) {
return $err;
}
}
}
return 0;
}
+ private function synchronizeSchemata() {
+ // Synchronize the InnoDB fulltext stopwords table from the stopwords file
+ // on disk.
+
+ $table = new PhabricatorSearchDocument();
+ $conn = $table->establishConnection('w');
+ $table_ref = PhabricatorSearchDocument::STOPWORDS_TABLE;
+
+ $stopwords_database = queryfx_all(
+ $conn,
+ 'SELECT value FROM %T',
+ $table_ref);
+ $stopwords_database = ipull($stopwords_database, 'value', 'value');
+
+ $stopwords_path = phutil_get_library_root('phabricator');
+ $stopwords_path = $stopwords_path.'/../resources/sql/stopwords.txt';
+ $stopwords_file = Filesystem::readFile($stopwords_path);
+ $stopwords_file = phutil_split_lines($stopwords_file, false);
+ $stopwords_file = array_fuse($stopwords_file);
+
+ $rem_words = array_diff_key($stopwords_database, $stopwords_file);
+ if ($rem_words) {
+ queryfx(
+ $conn,
+ 'DELETE FROM %T WHERE value IN (%Ls)',
+ $table_ref,
+ $rem_words);
+ }
+
+ $add_words = array_diff_key($stopwords_file, $stopwords_database);
+ if ($add_words) {
+ foreach ($add_words as $word) {
+ queryfx(
+ $conn,
+ 'INSERT IGNORE INTO %T (value) VALUES (%s)',
+ $table_ref,
+ $word);
+ }
+ }
+ }
+
+
}

File Metadata

Mime Type
text/x-diff
Expires
Tue, Jul 29, 10:03 AM (3 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
188468
Default Alt Text
(7 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)