Skip to content

Commit

Permalink
Merge branch 'hotfix/23.09-hotfix7'
Browse files Browse the repository at this point in the history
  • Loading branch information
myrho committed Nov 14, 2023
2 parents 869a540 + b1a5763 commit f8b6371
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions gsrest/db/cassandra.py
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def build_select_address_txs_statement(network: str, table_prefix: str,
"AND is_outgoing = %(is_outgoing)s ")

# conditional where clause, loop independent
query += wc(f"{table_prefix}_id_secondary_group in %(s_d_group)s",
query += wc(f"{table_prefix}_id_secondary_group = %(s_d_group)s",
eth_like)

query += wc(f"{tx_id_col} >= %(tx_id_lower_bound)s", with_lower_bound)
Expand Down Expand Up @@ -1896,17 +1896,21 @@ async def list_address_txs_ordered(
with_upper_bound=has_upper_bound,
fetch_size=fs_junk)

if not is_eth_like(network) and item_id_secondary_group is None:
item_id_secondary_group = [0]

# prepare parameters for the query junks one for each direction
# and asset tuple
params_junks = [{
"id": item_id,
"g_id": item_id_group,
"tx_id_lower_bound": tx_id_lower_bound,
"tx_id_upper_bound": page,
"s_d_group": item_id_secondary_group,
"s_d_group": s_d_group,
"currency": asset,
"is_outgoing": is_outgoing
} for is_outgoing, asset in product(directions, include_assets)]
} for is_outgoing, asset, s_d_group in product(directions, include_assets,
item_id_secondary_group)]

# run one query per direction and asset
aws = [
Expand Down

0 comments on commit f8b6371

Please sign in to comment.