Skip to content

Use index and increase array limit #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sekrett wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use index and increase array limit #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8e89c9
Use index and increase array limit
sekrett Dec 18, 2022
d772983
Fix searching
sekrett Dec 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions postfixparser/webui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
RqlQuery = rethinkdb.query.ast.RqlQuery
QueryOrTable = Union[Table, RqlQuery]

skip_keys = ['limit', 'offset', 'page']


@app.route('/', methods=['GET'])
async def index():
Expand Down Expand Up @@ -157,7 +159,7 @@ async def api_emails():
_sm = await _process_filters(query=_sm, frm=frm)

_sm, res = await _paginate_query(_sm, frm, rt_conn=conn, rt_query=r_q, order_by=order_by, order_dir=order_dir)
_sm = await _sm.run(conn)
_sm = await _sm.run(conn, array_limit=10000000)

sm = []
if type(_sm) is list:
Expand Down Expand Up @@ -197,16 +199,18 @@ async def _paginate_query(query: QueryOrTable, frm: Mapping, rt_conn: DefaultCon
# if order_by in dict(settings.rethink_tables)['sent_mail']:
# _sm = _sm.order_by(index=r_order)
# else:
query = query.order_by(r_order).skip(offset).limit(limit)
if empty(frm.keys() - skip_keys, itr=True):
query = query.order_by(index=r_order)
else:
query = query.order_by(r_order)
query = query.skip(offset).limit(limit)
return query, res


async def _process_filters(query: QueryOrTable, frm: Mapping, skip_keys: List[str] = None) -> QueryOrTable:
async def _process_filters(query: QueryOrTable, frm: Mapping) -> QueryOrTable:
if empty(frm, itr=True):
return query

skip_keys = ['limit', 'offset', 'page'] if not skip_keys else skip_keys

for fkey, fval in frm.items():
if fkey in skip_keys:
continue
Expand Down