Mercurial > p > roundup > code
diff test/db_test_base.py @ 6915:9ff091537f43
postgresql native-fts; more indexer tests
1) Make postgresql native-fts actually work.
2) Add simple stopword filtering to sqlite native-fts indexer.
3) Add more tests for indexer_common get_indexer
Details:
1) roundup/backends/indexer_postgresql_fts.py:
ignore ValueError raised if we try to index a string with a null
character in it. This could happen due to an incorrect text/ mime
type on a file that has nulls in it.
Replace ValueError raised by postgresql with customized
IndexerQueryError if a search string has a null in it.
roundup/backends/rdbms_common.py:
Make postgresql native-fts work. When specified it was using using
whatever was returned from get_indexer(). However loading the
native-fts indexer backend failed because there was no connection to
the postgresql database when this call was made.
Simple solution, move the call after the open_connection call in
Database::__init__().
However the open_connection call creates the schema for the
database if it is not there. The schema builds tables for
indexer=native type indexing. As part of the build it looks at the
indexer to see the min/max size of the indexed tokens. No indexer
define, we get a crash.
So it's a a chicken/egg issue. I solved it by setting the indexer
to the Indexer from indexer_common which has the min/max token size
info. I also added a no-op save_indexer to this Indexer class. I
claim save_indexer() isn't needed as a commit() on the db does all
the saving required. Then after open_connection is called, I call
get_indexer to retrieve the correct indexer and
indexer_postgresql_fts woks since the conn connection property is
defined.
roundup/backends/indexer_common.py:
add save_index() method for indexer. It does nothing but is needed
in rdbms backends during schema initialization.
2) roundup/backends/indexer_sqlite_fts.py:
when this indexer is used, the indexer test in DBTest on the word
"the" fail. This is due to missing stopword filtering. Implement
basic stopword filtering for bare stopwords (like 'the') to make the
test pass. Note: this indexer is not currently automatically run by
the CI suite, it was found during manual testing. However there is a
FIXME to extract the indexer tests from DBTest and run it using this
backend.
roundup/configuration.py, roundup/doc/admin_guide.txt:
update doc on stopword use for sqlite native-fts.
test/db_test_base.py:
DBTest::testStringBinary creates a file with nulls in it. It was
breaking postgresql with native-fts indexer. Changed test to assign
mime type application/octet-stream that prevents it from being
processed by any text search indexer.
add test to exclude indexer searching in specific props. This code
path was untested before.
test/test_indexer.py:
add test to call find with no words. Untested code path.
add test to index and find a string with a null \x00 byte. it was
tested inadvertently by testStringBinary but this makes it explicit
and moves it to indexer testing. (one version each for: generic,
postgresql and mysql)
Renamed Get_IndexerAutoSelectTest to Get_IndexerTest and renamed
autoselect tests to include autoselect. Added tests for an invalid
indexer and using native-fts with anydbm (unsupported combo) to make
sure the code does something useful if the validation in
configuration.py is broken.
test/test_liveserver.py:
add test to load an issue
add test using text search (fts) to find the issue
add tests to find issue using postgresql native-fts
test/test_postgresql.py, test/test_sqlite.py:
added explanation on how to setup integration test using native-fts.
added code to clean up test environment if native-fts test is run.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Mon, 05 Sep 2022 16:25:20 -0400 |
| parents | 8ab98de22df0 |
| children | 4169f27f15f6 |
line wrap: on
line diff
--- a/test/db_test_base.py Sun Sep 04 08:42:16 2022 -0400 +++ b/test/db_test_base.py Mon Sep 05 16:25:20 2022 -0400 @@ -415,7 +415,10 @@ bstr = b'\x00\xF0\x34\x33' # random binary data # test set & retrieve (this time for file contents) - nid = self.db.file.create(content=bstr) + # Since it has null in it, set it to a binary mime type + # so indexer's don't try to index it. + nid = self.db.file.create(content=bstr, + type="application/octet-stream") print(nid) print(repr(self.db.file.get(nid, 'content'))) print(repr(self.db.file.get(nid, 'binary_content'))) @@ -1523,6 +1526,32 @@ # unindexed stopword self.assertEqual(self.db.indexer.search(['the'], self.db.issue), {}) + def testIndexerSearchingIgnoreProps(self): + f1 = self.db.file.create(content='hello', type="text/plain") + # content='world' has the wrong content-type and won't be indexed + f2 = self.db.file.create(content='world', type="text/frozz", + comment='blah blah') + i1 = self.db.issue.create(files=[f1, f2], title="flebble plop") + i2 = self.db.issue.create(title="flebble the frooz") + self.db.commit() + + # filter out hits that are in the titpe prop of issues + self.assertEqual(self.db.indexer.search(['frooz'], self.db.issue, + ignore={('issue', 'title'): True}), + {}) + + # filter out hits in the title prop of content. Note the returned + # match is in a file not an issue, so ignore has no effect. + # also there is no content property for issue. + self.assertEqual(self.db.indexer.search(['hello'], self.db.issue, + ignore={('issue', 'content'): True}), + {f1: {'files': ['1']}}) + + # filter out file content property hit leaving no results + self.assertEqual(self.db.indexer.search(['hello'], self.db.issue, + ignore={('file', 'content'): True}), + {}) + def testIndexerSearchingLink(self): m1 = self.db.msg.create(content="one two") i1 = self.db.issue.create(messages=[m1])
