@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Support the Ferret engine in Diffusion
Summary: Ref T12819. More ferret engine support.
Test Plan: Indexed and searched commits and repositories.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T12819
Differential Revision: https://secure.phabricator.com/D18572
+105
-1
+9
resources/sql/autopatches/20170907.ferret.31.repo.doc.sql
+9
resources/sql/autopatches/20170907.ferret.31.repo.doc.sql
···
1
+
CREATE TABLE {$NAMESPACE}_repository.repository_repository_fdocument (
2
+
id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
3
+
objectPHID VARBINARY(64) NOT NULL,
4
+
isClosed BOOL NOT NULL,
5
+
authorPHID VARBINARY(64),
6
+
ownerPHID VARBINARY(64),
7
+
epochCreated INT UNSIGNED NOT NULL,
8
+
epochModified INT UNSIGNED NOT NULL
9
+
) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
+8
resources/sql/autopatches/20170907.ferret.32.repo.field.sql
+8
resources/sql/autopatches/20170907.ferret.32.repo.field.sql
···
1
+
CREATE TABLE {$NAMESPACE}_repository.repository_repository_ffield (
2
+
id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
3
+
documentID INT UNSIGNED NOT NULL,
4
+
fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
5
+
rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
6
+
termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
7
+
normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
8
+
) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
+5
resources/sql/autopatches/20170907.ferret.33.repo.ngrams.sql
+5
resources/sql/autopatches/20170907.ferret.33.repo.ngrams.sql
+9
resources/sql/autopatches/20170907.ferret.34.commit.doc.sql
+9
resources/sql/autopatches/20170907.ferret.34.commit.doc.sql
···
1
+
CREATE TABLE {$NAMESPACE}_repository.repository_commit_fdocument (
2
+
id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
3
+
objectPHID VARBINARY(64) NOT NULL,
4
+
isClosed BOOL NOT NULL,
5
+
authorPHID VARBINARY(64),
6
+
ownerPHID VARBINARY(64),
7
+
epochCreated INT UNSIGNED NOT NULL,
8
+
epochModified INT UNSIGNED NOT NULL
9
+
) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
+8
resources/sql/autopatches/20170907.ferret.35.commit.field.sql
+8
resources/sql/autopatches/20170907.ferret.35.commit.field.sql
···
1
+
CREATE TABLE {$NAMESPACE}_repository.repository_commit_ffield (
2
+
id INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
3
+
documentID INT UNSIGNED NOT NULL,
4
+
fieldKey VARCHAR(4) NOT NULL COLLATE {$COLLATE_TEXT},
5
+
rawCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
6
+
termCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT},
7
+
normalCorpus LONGTEXT NOT NULL COLLATE {$COLLATE_SORT}
8
+
) ENGINE=InnoDB, COLLATE {$COLLATE_TEXT};
+5
resources/sql/autopatches/20170907.ferret.36.commit.ngrams.sql
+5
resources/sql/autopatches/20170907.ferret.36.commit.ngrams.sql
+6
src/__phutil_library_map__.php
+6
src/__phutil_library_map__.php
···
652
652
'DiffusionCommitEditConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionCommitEditConduitAPIMethod.php',
653
653
'DiffusionCommitEditController' => 'applications/diffusion/controller/DiffusionCommitEditController.php',
654
654
'DiffusionCommitEditEngine' => 'applications/diffusion/editor/DiffusionCommitEditEngine.php',
655
+
'DiffusionCommitFerretEngine' => 'applications/repository/search/DiffusionCommitFerretEngine.php',
655
656
'DiffusionCommitFulltextEngine' => 'applications/repository/search/DiffusionCommitFulltextEngine.php',
656
657
'DiffusionCommitHasPackageEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasPackageEdgeType.php',
657
658
'DiffusionCommitHasRevisionEdgeType' => 'applications/diffusion/edge/DiffusionCommitHasRevisionEdgeType.php',
···
3807
3808
'PhabricatorRepositoryDiscoveryEngine' => 'applications/repository/engine/PhabricatorRepositoryDiscoveryEngine.php',
3808
3809
'PhabricatorRepositoryEditor' => 'applications/repository/editor/PhabricatorRepositoryEditor.php',
3809
3810
'PhabricatorRepositoryEngine' => 'applications/repository/engine/PhabricatorRepositoryEngine.php',
3811
+
'PhabricatorRepositoryFerretEngine' => 'applications/repository/search/PhabricatorRepositoryFerretEngine.php',
3810
3812
'PhabricatorRepositoryFulltextEngine' => 'applications/repository/search/PhabricatorRepositoryFulltextEngine.php',
3811
3813
'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php',
3812
3814
'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php',
···
5673
5675
'DiffusionCommitEditConduitAPIMethod' => 'PhabricatorEditEngineAPIMethod',
5674
5676
'DiffusionCommitEditController' => 'DiffusionController',
5675
5677
'DiffusionCommitEditEngine' => 'PhabricatorEditEngine',
5678
+
'DiffusionCommitFerretEngine' => 'PhabricatorFerretEngine',
5676
5679
'DiffusionCommitFulltextEngine' => 'PhabricatorFulltextEngine',
5677
5680
'DiffusionCommitHasPackageEdgeType' => 'PhabricatorEdgeType',
5678
5681
'DiffusionCommitHasRevisionEdgeType' => 'PhabricatorEdgeType',
···
9308
9311
'PhabricatorSpacesInterface',
9309
9312
'PhabricatorConduitResultInterface',
9310
9313
'PhabricatorFulltextInterface',
9314
+
'PhabricatorFerretInterface',
9311
9315
),
9312
9316
'PhabricatorRepositoryAuditRequest' => array(
9313
9317
'PhabricatorRepositoryDAO',
···
9328
9332
'PhabricatorCustomFieldInterface',
9329
9333
'PhabricatorApplicationTransactionInterface',
9330
9334
'PhabricatorFulltextInterface',
9335
+
'PhabricatorFerretInterface',
9331
9336
'PhabricatorConduitResultInterface',
9332
9337
'PhabricatorDraftInterface',
9333
9338
),
···
9350
9355
'PhabricatorRepositoryDiscoveryEngine' => 'PhabricatorRepositoryEngine',
9351
9356
'PhabricatorRepositoryEditor' => 'PhabricatorApplicationTransactionEditor',
9352
9357
'PhabricatorRepositoryEngine' => 'Phobject',
9358
+
'PhabricatorRepositoryFerretEngine' => 'PhabricatorFerretEngine',
9353
9359
'PhabricatorRepositoryFulltextEngine' => 'PhabricatorFulltextEngine',
9354
9360
'PhabricatorRepositoryGitCommitChangeParserWorker' => 'PhabricatorRepositoryCommitChangeParserWorker',
9355
9361
'PhabricatorRepositoryGitCommitMessageParserWorker' => 'PhabricatorRepositoryCommitMessageParserWorker',
+18
src/applications/repository/search/DiffusionCommitFerretEngine.php
+18
src/applications/repository/search/DiffusionCommitFerretEngine.php
···
1
+
<?php
2
+
3
+
final class DiffusionCommitFerretEngine
4
+
extends PhabricatorFerretEngine {
5
+
6
+
public function getApplicationName() {
7
+
return 'repository';
8
+
}
9
+
10
+
public function getScopeName() {
11
+
return 'commit';
12
+
}
13
+
14
+
public function newSearchEngine() {
15
+
return new PhabricatorCommitSearchEngine();
16
+
}
17
+
18
+
}
+18
src/applications/repository/search/PhabricatorRepositoryFerretEngine.php
+18
src/applications/repository/search/PhabricatorRepositoryFerretEngine.php
···
1
+
<?php
2
+
3
+
final class PhabricatorRepositoryFerretEngine
4
+
extends PhabricatorFerretEngine {
5
+
6
+
public function getApplicationName() {
7
+
return 'repository';
8
+
}
9
+
10
+
public function getScopeName() {
11
+
return 'repository';
12
+
}
13
+
14
+
public function newSearchEngine() {
15
+
return new PhabricatorRepositorySearchEngine();
16
+
}
17
+
18
+
}
+10
-1
src/applications/repository/storage/PhabricatorRepository.php
+10
-1
src/applications/repository/storage/PhabricatorRepository.php
···
16
16
PhabricatorProjectInterface,
17
17
PhabricatorSpacesInterface,
18
18
PhabricatorConduitResultInterface,
19
-
PhabricatorFulltextInterface {
19
+
PhabricatorFulltextInterface,
20
+
PhabricatorFerretInterface {
20
21
21
22
/**
22
23
* Shortest hash we'll recognize in raw "a829f32" form.
···
2631
2632
2632
2633
public function newFulltextEngine() {
2633
2634
return new PhabricatorRepositoryFulltextEngine();
2635
+
}
2636
+
2637
+
2638
+
/* -( PhabricatorFerretInterface )----------------------------------------- */
2639
+
2640
+
2641
+
public function newFerretEngine() {
2642
+
return new PhabricatorRepositoryFerretEngine();
2634
2643
}
2635
2644
2636
2645
}
+9
src/applications/repository/storage/PhabricatorRepositoryCommit.php
+9
src/applications/repository/storage/PhabricatorRepositoryCommit.php
···
15
15
PhabricatorCustomFieldInterface,
16
16
PhabricatorApplicationTransactionInterface,
17
17
PhabricatorFulltextInterface,
18
+
PhabricatorFerretInterface,
18
19
PhabricatorConduitResultInterface,
19
20
PhabricatorDraftInterface {
20
21
···
709
710
710
711
public function newFulltextEngine() {
711
712
return new DiffusionCommitFulltextEngine();
713
+
}
714
+
715
+
716
+
/* -( PhabricatorFerretInterface )----------------------------------------- */
717
+
718
+
719
+
public function newFerretEngine() {
720
+
return new DiffusionCommitFerretEngine();
712
721
}
713
722
714
723