[go: up one dir, main page]

Menu

Commit [r475]  Maximize  Restore  History

v2.0.38-pre4: count() refactoring, keys() queries, bugfixes

+ re-factored count-query evaluation from ConcHolder.(h|cpp) into QCount.(h|cpp)
- removed some redundant CQueryResult fields from CConcHolder (m_SortOrder, m_bSortByString)
+ re-factored CConcHolder::GetHits(): added variant for pre-parsed queries
+ removed implicit space-separation in CQCountKeyExprList; we already have globalCountKeyDelim=\002, which is ugly but more useful
+ fixed bug setting Result.m_AllHitsCount in ConvertCountsToHits()
- we were getting m_AllHitsCount=512 (== Limit == m_pIndexator->m_MaxCachedHitsCount) for subcorpora with more real count-hits
+ added keys() query type: extract tuples to query from a count()-query
- pretty ugly: it needs to evaluate the count()-query in CQKeys::Compile() in order to generate a proxy query
(in general CQWith-conjunction of CQTokSet queries)
- currently over-generates, since the key attributes are queried independently

mukau 2015-05-12

changed /ddc/trunk/Changes
changed /ddc/trunk/configure.ac
changed /ddc/trunk/src/ConcordLib/ConcHolder.cpp
changed /ddc/trunk/src/ConcordLib/ConcHolder.h
changed /ddc/trunk/src/ConcordLib/QCount.cpp
changed /ddc/trunk/src/ConcordLib/QCount.h
changed /ddc/trunk/src/ConcordLib/QueryCompiler.cpp
changed /ddc/trunk/src/ConcordLib/QueryCompiler.h
changed /ddc/trunk/src/ConcordLib/QueryOptions.cpp
changed /ddc/trunk/src/ConcordLib/QueryOptions.h
changed /ddc/trunk/src/ConcordLib/yyQLexer.cpp
changed /ddc/trunk/src/ConcordLib/yyQLexer.h
changed /ddc/trunk/src/ConcordLib/yyQLexer.l
changed /ddc/trunk/src/ConcordLib/yyQParser.cpp
changed /ddc/trunk/src/ConcordLib/yyQParser.h
changed /ddc/trunk/src/ConcordLib/yyQParser.output
changed /ddc/trunk/src/ConcordLib/yyQParser.y
changed /ddc/trunk/src/common/utilit.cpp
changed /ddc/trunk/src/common/utilit.h