CR: Adding trailing lines and removing some trailing spaces.

master
Paul Masurel 2019-08-29 09:55:36 +09:00
parent 6dc2b943b4
commit ccd8021ff9
3 changed files with 61 additions and 54 deletions

View File

@ -144,7 +144,6 @@ impl Index {
}; };
let reader = index.reader().map_err(to_pyerr)?; let reader = index.reader().map_err(to_pyerr)?;
println!("reader {}", reader.searcher().segment_readers().len());
obj.init(Index { index, reader }); obj.init(Index { index, reader });
Ok(()) Ok(())
} }
@ -215,6 +214,16 @@ impl Index {
Ok(()) Ok(())
} }
/// Acquires a Searcher from the searcher pool.
///
/// If no searcher is available during the call, note that
/// this call will block until one is made available.
///
/// Searcher are automatically released back into the pool when
/// they are dropped. If you observe this function to block forever
/// you probably should configure the Index to have a larger
/// searcher pool, or you are holding references to previous searcher
/// for ever.
fn searcher(&self) -> Searcher { fn searcher(&self) -> Searcher {
Searcher { Searcher {
inner: self.reader.searcher(), inner: self.reader.searcher(),

View File

@ -3,12 +3,14 @@ import pytest
from tantivy import Document, Index, SchemaBuilder, Schema from tantivy import Document, Index, SchemaBuilder, Schema
def schema(): def schema():
return SchemaBuilder()\ return SchemaBuilder() \
.add_text_field("title", stored=True)\ .add_text_field("title", stored=True) \
.add_text_field("body")\ .add_text_field("body") \
.build() .build()
@pytest.fixture(scope="class") @pytest.fixture(scope="class")
def ram_index(): def ram_index():
# assume all tests will use the same documents for now # assume all tests will use the same documents for now
@ -44,18 +46,15 @@ def ram_index():
"branches that arch over the pool") "branches that arch over the pool")
}) })
writer.add_document(doc) writer.add_document(doc)
writer.add_json("""{ writer.add_json("""{
"title": ["Frankenstein", "The Modern Prometheus"], "title": ["Frankenstein", "The Modern Prometheus"],
"body": "You will rejoice to hear that no disaster has accompanied the commencement of an enterprise which you have regarded with such evil forebodings. I arrived here yesterday, and my first task is to assure my dear sister of my welfare and increasing confidence in the success of my undertaking." "body": "You will rejoice to hear that no disaster has accompanied the commencement of an enterprise which you have regarded with such evil forebodings. I arrived here yesterday, and my first task is to assure my dear sister of my welfare and increasing confidence in the success of my undertaking."
}""") }""")
writer.commit() writer.commit()
index.reload() index.reload()
return index return index
class TestClass(object): class TestClass(object):
def test_simple_search(self, ram_index): def test_simple_search(self, ram_index):
@ -86,7 +85,6 @@ class TestClass(object):
assert len(result) == 1 assert len(result) == 1
def test_and_query_parser_default_fields(self, ram_index): def test_and_query_parser_default_fields(self, ram_index):
query = ram_index.parse_query("winter", default_field_names=["title"]) query = ram_index.parse_query("winter", default_field_names=["title"])
assert repr(query) == """Query(TermQuery(Term(field=0,bytes=[119, 105, 110, 116, 101, 114])))""" assert repr(query) == """Query(TermQuery(Term(field=0,bytes=[119, 105, 110, 116, 101, 114])))"""
@ -98,7 +96,6 @@ class TestClass(object):
"(Should, TermQuery(Term(field=1,bytes=[119, 105, 110, 116, 101, 114])))] " \ "(Should, TermQuery(Term(field=1,bytes=[119, 105, 110, 116, 101, 114])))] " \
"})" "})"
def test_query_errors(self, ram_index): def test_query_errors(self, ram_index):
index = ram_index index = ram_index
# no "bod" field # no "bod" field
@ -106,9 +103,9 @@ class TestClass(object):
index.parse_query("bod:men", ["title", "body"]) index.parse_query("bod:men", ["title", "body"])
PATH_TO_INDEX = "tests/test_index/" PATH_TO_INDEX = "tests/test_index/"
class TestFromDiskClass(object): class TestFromDiskClass(object):
def test_exists(self): def test_exists(self):
@ -126,7 +123,7 @@ class TestFromDiskClass(object):
assert idx.searcher().num_docs == 0 assert idx.searcher().num_docs == 0
# by default this is manual mode # by default this is manual mode
writer = idx.writer(30000000, 1) writer = idx.writer(30000000, 1)
writer.add_document(Document(title="mytitle",body="mybody")) writer.add_document(Document(title="mytitle", body="mybody"))
writer.commit() writer.commit()
assert idx.searcher().num_docs == 0 assert idx.searcher().num_docs == 0
# Manual is the default setting. # Manual is the default setting.
@ -135,7 +132,7 @@ class TestFromDiskClass(object):
idx.reload() idx.reload()
assert idx.searcher().num_docs == 1 assert idx.searcher().num_docs == 1
idx.config_reader("OnCommit", 4) idx.config_reader("OnCommit", 4)
writer.add_document(Document(title="mytitle2",body="mybody2")) writer.add_document(Document(title="mytitle2", body="mybody2"))
writer.commit() writer.commit()
import time import time
for i in range(50): for i in range(50):
@ -146,6 +143,7 @@ class TestFromDiskClass(object):
return return
assert False assert False
class TestSearcher(object): class TestSearcher(object):
def test_searcher_repr(self, ram_index): def test_searcher_repr(self, ram_index):
assert repr(ram_index.searcher()) == "Searcher(num_docs=3, num_segments=1)" assert repr(ram_index.searcher()) == "Searcher(num_docs=3, num_segments=1)"