mirror of
https://github.com/ArthurIdema/Zoekeend-Phrase-Indexing.git
synced 2025-10-27 00:34:21 +00:00
Updated the tokenizer
This commit is contained in:
parent
37b17fcbd4
commit
affc0f05e4
4
.gitignore
vendored
4
.gitignore
vendored
@ -5,6 +5,10 @@ cranfield.qrels
|
|||||||
cranfieldoutput
|
cranfieldoutput
|
||||||
/duckdb-fts-main/
|
/duckdb-fts-main/
|
||||||
/trec_eval/
|
/trec_eval/
|
||||||
|
/spreadsheets/
|
||||||
|
*.png
|
||||||
|
plot*
|
||||||
|
*lock*
|
||||||
*.db
|
*.db
|
||||||
*.ciff
|
*.ciff
|
||||||
output*.txt
|
output*.txt
|
||||||
|
|||||||
@ -159,7 +159,6 @@ def create_tokenizer_duckdb(con):
|
|||||||
);
|
);
|
||||||
""")
|
""")
|
||||||
|
|
||||||
|
|
||||||
def create_tokenizer_ciff(con, fts_schema="fts_main_documents"):
|
def create_tokenizer_ciff(con, fts_schema="fts_main_documents"):
|
||||||
con.sql(f"""
|
con.sql(f"""
|
||||||
CREATE TABLE IF NOT EXISTS {fts_schema}.dict (termid BIGINT, term TEXT, df BIGINT);
|
CREATE TABLE IF NOT EXISTS {fts_schema}.dict (termid BIGINT, term TEXT, df BIGINT);
|
||||||
@ -252,15 +251,17 @@ def create_terms_table(con, fts_schema="fts_main_documents", input_schema="main"
|
|||||||
Assumes the table fts_main_documents.dict already exists.
|
Assumes the table fts_main_documents.dict already exists.
|
||||||
Adds a fieldid and termid column for compatibility with fielded search macros.
|
Adds a fieldid and termid column for compatibility with fielded search macros.
|
||||||
"""
|
"""
|
||||||
# Cleanup input text removing special characters
|
# Cleanup input text using the same regex as DuckDB's tokenizer
|
||||||
con.sql(f"""
|
con.sql(f"""
|
||||||
CREATE OR REPLACE TABLE {fts_schema}.cleaned_docs AS
|
CREATE OR REPLACE TABLE {fts_schema}.cleaned_docs AS
|
||||||
SELECT
|
SELECT
|
||||||
did,
|
{input_id},
|
||||||
regexp_replace(content, '[0-9!@#$%^&*()_+={{}}\\[\\]:;<>,.?~\\\\/\\|''''"`-]+', ' ', 'g') AS content
|
regexp_replace(lower(strip_accents(CAST({input_val} AS VARCHAR))),
|
||||||
|
'[0-9!@#$%^&*()_+={{}}\\[\\]:;<>,.?~\\\\/\\|''''"`-]+', ' ', 'g') AS content,
|
||||||
FROM {input_schema}.{input_table}
|
FROM {input_schema}.{input_table}
|
||||||
""")
|
""")
|
||||||
|
|
||||||
|
# Use the ciff tokenizer to find bigrams and unigrams
|
||||||
con.sql(f"""
|
con.sql(f"""
|
||||||
CREATE OR REPLACE TABLE {fts_schema}.terms AS (
|
CREATE OR REPLACE TABLE {fts_schema}.terms AS (
|
||||||
SELECT
|
SELECT
|
||||||
@ -270,7 +271,7 @@ def create_terms_table(con, fts_schema="fts_main_documents", input_schema="main"
|
|||||||
FROM (
|
FROM (
|
||||||
SELECT
|
SELECT
|
||||||
row_number() OVER (ORDER BY (SELECT NULL)) AS docid,
|
row_number() OVER (ORDER BY (SELECT NULL)) AS docid,
|
||||||
unnest({fts_schema}.tokenize({input_val})) AS term
|
unnest({fts_schema}.tokenize(content)) AS term
|
||||||
FROM {fts_schema}.cleaned_docs
|
FROM {fts_schema}.cleaned_docs
|
||||||
) AS t
|
) AS t
|
||||||
JOIN {fts_schema}.dict d ON t.term = d.term
|
JOIN {fts_schema}.dict d ON t.term = d.term
|
||||||
|
|||||||
@ -59,7 +59,7 @@ def create_lm(con, stemmer):
|
|||||||
SELECT docs.name AS docname, LN(MAX(doc_len)) + sum(subscore) AS score FROM subscores, fts_main_documents.docs AS docs WHERE subscores.docid = docs.docid GROUP BY docs.name
|
SELECT docs.name AS docname, LN(MAX(doc_len)) + sum(subscore) AS score FROM subscores, fts_main_documents.docs AS docs WHERE subscores.docid = docs.docid GROUP BY docs.name
|
||||||
),
|
),
|
||||||
postings_cost AS (
|
postings_cost AS (
|
||||||
SELECT COUNT(DISTINCT docid) AS cost FROM qterms
|
SELECT COUNT(*) AS cost FROM term_tf
|
||||||
)
|
)
|
||||||
SELECT docname, score, (SELECT cost FROM postings_cost) AS postings_cost FROM scores
|
SELECT docname, score, (SELECT cost FROM postings_cost) AS postings_cost FROM scores
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user