1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 00:42:41 +01:00

Add an option to switch tokenizers to use "ondemand" instead of "preloaded"

datasources

Summary:
The open source Phabricator has like 3,500 user accounts now and it takes a
while to pull/render them. Add an option to switch to ondemand for large
installs.

I'll follow up with a patch at some point to address a couple of name things:

  - Denormalize last names into a keyed column (although this evidences some
bias toward the western world).
  - Force all usernames to lowercase (sorry Girish, Makinde).

Also this patch is so clean it's crazy.

Didn't bother with other object types for now, I'm planning to dedicate a few
days to Projects at some point and I'll flesh out some auxiliary features like
this when I do that.

Test Plan: Switched to ondemand, verified data was queried dynamically. Switched
back, verified data was preloaded.

Reviewers: jungejason, nh, tuomaspelkonen, aran

Reviewed By: nh

CC: aran, epriestley, nh

Differential Revision: 923
This commit is contained in:
epriestley 2011-09-13 11:00:17 -07:00
parent 1c1f749eba
commit d0b6602e29
6 changed files with 67 additions and 32 deletions

View file

@ -402,6 +402,20 @@ return array(
// You can enable traces for development to make it easier to debug problems. // You can enable traces for development to make it easier to debug problems.
'phabricator.show-stack-traces' => false, 'phabricator.show-stack-traces' => false,
// Tokenizers are UI controls which let the user select other users, email
// addresses, project names, etc., by typing the first few letters and having
// the control autocomplete from a list. They can load their data in two ways:
// either in a big chunk up front, or as the user types. By default, the data
// is loaded in a big chunk. This is simpler and performs better for small
// datasets. However, if you have a very large number of users or projects,
// (in the ballpark of more than a thousand), loading all that data may become
// slow enough that it's worthwhile to query on demand instead. This makes
// the typeahead slightly less responsive but overall performance will be much
// better if you have a ton of stuff. You can figure out which setting is
// best for your install by changing this setting and then playing with a
// user tokenizer (like the user selectors in Maniphest or Differential) and
// seeing which setting loads faster and feels better.
'tokenizer.ondemand' => false,
// -- Files ----------------------------------------------------------------- // // -- Files ----------------------------------------------------------------- //

View file

@ -332,7 +332,7 @@ celerity_register_resource_map(array(
), ),
'javelin-behavior-aphront-basic-tokenizer' => 'javelin-behavior-aphront-basic-tokenizer' =>
array( array(
'uri' => '/res/5e183bd5/rsrc/js/application/core/behavior-tokenizer.js', 'uri' => '/res/9be30797/rsrc/js/application/core/behavior-tokenizer.js',
'type' => 'js', 'type' => 'js',
'requires' => 'requires' =>
array( array(
@ -340,8 +340,9 @@ celerity_register_resource_map(array(
1 => 'javelin-typeahead', 1 => 'javelin-typeahead',
2 => 'javelin-tokenizer', 2 => 'javelin-tokenizer',
3 => 'javelin-typeahead-preloaded-source', 3 => 'javelin-typeahead-preloaded-source',
4 => 'javelin-dom', 4 => 'javelin-typeahead-ondemand-source',
5 => 'javelin-stratcom', 5 => 'javelin-dom',
6 => 'javelin-stratcom',
), ),
'disk' => '/rsrc/js/application/core/behavior-tokenizer.js', 'disk' => '/rsrc/js/application/core/behavior-tokenizer.js',
), ),
@ -1418,6 +1419,22 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/3dbf4083/javelin.pkg.js', 'uri' => '/res/pkg/3dbf4083/javelin.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'4aa8c13f' =>
array(
'name' => 'typeahead.pkg.js',
'symbols' =>
array(
0 => 'javelin-typeahead',
1 => 'javelin-typeahead-normalizer',
2 => 'javelin-typeahead-source',
3 => 'javelin-typeahead-preloaded-source',
4 => 'javelin-typeahead-ondemand-source',
5 => 'javelin-tokenizer',
6 => 'javelin-behavior-aphront-basic-tokenizer',
),
'uri' => '/res/pkg/4aa8c13f/typeahead.pkg.js',
'type' => 'js',
),
'7bf96a66' => '7bf96a66' =>
array( array(
'name' => 'differential.pkg.css', 'name' => 'differential.pkg.css',
@ -1465,22 +1482,6 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/982ad44b/differential.pkg.js', 'uri' => '/res/pkg/982ad44b/differential.pkg.js',
'type' => 'js', 'type' => 'js',
), ),
'ac869011' =>
array(
'name' => 'typeahead.pkg.js',
'symbols' =>
array(
0 => 'javelin-typeahead',
1 => 'javelin-typeahead-normalizer',
2 => 'javelin-typeahead-source',
3 => 'javelin-typeahead-preloaded-source',
4 => 'javelin-typeahead-ondemand-source',
5 => 'javelin-tokenizer',
6 => 'javelin-behavior-aphront-basic-tokenizer',
),
'uri' => '/res/pkg/ac869011/typeahead.pkg.js',
'type' => 'js',
),
'f6422902' => 'f6422902' =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
@ -1527,7 +1528,7 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => '7bf96a66', 'differential-table-of-contents-css' => '7bf96a66',
'diffusion-commit-view-css' => '03ef179e', 'diffusion-commit-view-css' => '03ef179e',
'javelin-behavior' => '3dbf4083', 'javelin-behavior' => '3dbf4083',
'javelin-behavior-aphront-basic-tokenizer' => 'ac869011', 'javelin-behavior-aphront-basic-tokenizer' => '4aa8c13f',
'javelin-behavior-aphront-form-disable-on-submit' => '95c67dcd', 'javelin-behavior-aphront-form-disable-on-submit' => '95c67dcd',
'javelin-behavior-differential-diff-radios' => '982ad44b', 'javelin-behavior-differential-diff-radios' => '982ad44b',
'javelin-behavior-differential-edit-inline-comments' => '982ad44b', 'javelin-behavior-differential-edit-inline-comments' => '982ad44b',
@ -1543,12 +1544,12 @@ celerity_register_resource_map(array(
'javelin-mask' => '95c67dcd', 'javelin-mask' => '95c67dcd',
'javelin-request' => '3dbf4083', 'javelin-request' => '3dbf4083',
'javelin-stratcom' => '3dbf4083', 'javelin-stratcom' => '3dbf4083',
'javelin-tokenizer' => 'ac869011', 'javelin-tokenizer' => '4aa8c13f',
'javelin-typeahead' => 'ac869011', 'javelin-typeahead' => '4aa8c13f',
'javelin-typeahead-normalizer' => 'ac869011', 'javelin-typeahead-normalizer' => '4aa8c13f',
'javelin-typeahead-ondemand-source' => 'ac869011', 'javelin-typeahead-ondemand-source' => '4aa8c13f',
'javelin-typeahead-preloaded-source' => 'ac869011', 'javelin-typeahead-preloaded-source' => '4aa8c13f',
'javelin-typeahead-source' => 'ac869011', 'javelin-typeahead-source' => '4aa8c13f',
'javelin-uri' => '3dbf4083', 'javelin-uri' => '3dbf4083',
'javelin-util' => '3dbf4083', 'javelin-util' => '3dbf4083',
'javelin-vector' => '3dbf4083', 'javelin-vector' => '3dbf4083',

View file

@ -25,6 +25,9 @@ class PhabricatorTypeaheadCommonDatasourceController
public function processRequest() { public function processRequest() {
$request = $this->getRequest();
$query = $request->getStr('q');
$need_users = false; $need_users = false;
$need_all_users = false; $need_all_users = false;
$need_lists = false; $need_lists = false;
@ -70,7 +73,16 @@ class PhabricatorTypeaheadCommonDatasourceController
} }
if ($need_users) { if ($need_users) {
$users = id(new PhabricatorUser())->loadAll(); if ($query) {
// TODO: We probably need to split last names here. Workaround until
// we get that up and running is to not enable server-side datasources.
$users = id(new PhabricatorUser())->loadAllWhere(
'(userName LIKE %> OR realName LIKE %>)',
$query,
$query);
} else {
$users = id(new PhabricatorUser())->loadAll();
}
foreach ($users as $user) { foreach ($users as $user) {
if (!$need_all_users) { if (!$need_all_users) {
if ($user->getIsSystemAgent()) { if ($user->getIsSystemAgent()) {

View file

@ -58,10 +58,11 @@ class AphrontFormTokenizerControl extends AphrontFormControl {
if (!$this->disableBehavior) { if (!$this->disableBehavior) {
Javelin::initBehavior('aphront-basic-tokenizer', array( Javelin::initBehavior('aphront-basic-tokenizer', array(
'id' => $id, 'id' => $id,
'src' => $this->datasource, 'src' => $this->datasource,
'value' => $values, 'value' => $values,
'limit' => $this->limit, 'limit' => $this->limit,
'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
)); ));
} }

View file

@ -7,6 +7,7 @@
phutil_require_module('phabricator', 'infrastructure/celerity/api'); phutil_require_module('phabricator', 'infrastructure/celerity/api');
phutil_require_module('phabricator', 'infrastructure/env');
phutil_require_module('phabricator', 'infrastructure/javelin/api'); phutil_require_module('phabricator', 'infrastructure/javelin/api');
phutil_require_module('phabricator', 'view/control/tokenizer'); phutil_require_module('phabricator', 'view/control/tokenizer');
phutil_require_module('phabricator', 'view/form/control/base'); phutil_require_module('phabricator', 'view/form/control/base');

View file

@ -4,6 +4,7 @@
* javelin-typeahead * javelin-typeahead
* javelin-tokenizer * javelin-tokenizer
* javelin-typeahead-preloaded-source * javelin-typeahead-preloaded-source
* javelin-typeahead-ondemand-source
* javelin-dom * javelin-dom
* javelin-stratcom * javelin-stratcom
*/ */
@ -11,7 +12,12 @@
JX.behavior('aphront-basic-tokenizer', function(config) { JX.behavior('aphront-basic-tokenizer', function(config) {
var root = JX.$(config.id); var root = JX.$(config.id);
var datasource = new JX.TypeaheadPreloadedSource(config.src); var datasource;
if (config.ondemand) {
datasource = new JX.TypeaheadOnDemandSource(config.src);
} else {
datasource = new JX.TypeaheadPreloadedSource(config.src);
}
var typeahead = new JX.Typeahead( var typeahead = new JX.Typeahead(
root, root,