kallithea Changeset - 8df1e9edd68f

Changeset - 8df1e9edd68f

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

FUJIWARA Katsunori - 9 years ago 2017-01-30 11:09:45
foozy@lares.dti.ne.jp

indexers: use correct full repository name, which contains group name, at indexing

Before this revision, searching under the specific repository could
cause unexpected result, because repository names used for indexing didn't
contain the group name.

This issue was introduced by 8b7c0ef62427, which uses
repo.name_unicode as repository name instead of
safe_unicode(repo_name) to reduce unicode conversion cost while
repetition at indexing.

To use correct repository name at indexing, this revision replaces
repo.name_unicode by safe_unicode(repo_name). Reducing cost of repeated
unicode conversion cost while will (and should) be addressed in the
future.

This revision also adds a comment to BaseRepository.name property, to
avoid similar misunderstandings in the future.

3 files changed with 24 insertions and 2 deletions:

kallithea/lib/indexers/daemon.py

kallithea/lib/vcs/backends/base.py

kallithea/tests/functional/test_search_indexing.py

0 comments (0 inline, 0 general)

kallithea/lib/indexers/daemon.py

➞

Show inline comments

@@ @@ -203,7 +203,7 @@ class WhooshIndexingDaemon(object): @@
         writer.add_document(
             fileid=p,
             owner=unicode(repo.contact),
-            repository_rawname=repo.name_unicode,
+            repository_rawname=safe_unicode(repo_name),
             repository=safe_unicode(repo_name),
             path=p,
             content=u_content,
@@ @@ -242,7 +242,7 @@ class WhooshIndexingDaemon(object): @@
                 raw_id=unicode(cs.raw_id),
                 owner=unicode(repo.contact),
                 date=cs._timestamp,
-                repository_rawname=repo.name_unicode,
+                repository_rawname=safe_unicode(repo_name),
                 repository=safe_unicode(repo_name),
                 author=cs.author,
                 message=cs.message,

kallithea/lib/vcs/backends/base.py

➞

Show inline comments

@@ @@ -97,6 +97,9 @@ class BaseRepository(object): @@
     @LazyProperty
     def name(self):
         """
         Return repository name (without group name)
         """
         raise NotImplementedError
     @property

kallithea/tests/functional/test_search_indexing.py

➞

Show inline comments

@@ @@ -125,6 +125,25 @@ class TestSearchControllerIndexing(TestC @@
                                 {'q': q, 'type': searchtype})
         response.mustcontain('>%d results' % hit)
     @parametrize('reponame', [
         (u'indexing_test'),
         (u'indexing_test-fork'),
         (u'group/indexing_test'),
         (u'this-is-it'),
     ])
     @parametrize('searchtype,query,hit', [
         ('content', 'this_should_be_unique_content', 1),
         ('commit', 'this_should_be_unique_commit_log', 1),
         ('path', 'this_should_be_unique_filename.txt', 1),
     ])
     def test_searching_under_repository(self, reponame, searchtype, query, hit):
         self.log_user()
         response = self.app.get(url(controller='search', action='index',
                                     repo_name=reponame),
                                 {'q': query, 'type': searchtype})
         response.mustcontain('>%d results' % hit)
     @parametrize('searchtype,query,hit', [
         ('content', 'this_should_be_unique_content', 1),
         ('commit', 'this_should_be_unique_commit_log', 1),

0 comments (0 inline, 0 general)