UPdate Native

Author: DenisCarriere

src/sql/transfers_native/tvm.sql

@@ -7,33 +7,24 @@ arrayFilter(x -> x != '', {to_address:Array(String)}) AS to_addresses,
 (length(tx_ids) > 0) AS has_tx_hash,
 (length(from_addresses) > 0) AS has_from,
 (length(to_addresses) > 0) AS has_to,
-{start_time:UInt64} = 1420070400 AS no_start_time,
-{end_time:UInt64} = 2524608000 AS no_end_time,
-{start_block:UInt64} = 0 AS no_start_block,
-{end_block:UInt64} = 9999999999 AS no_end_block,
 
 tx_hash_timestamps AS (
     SELECT (minute, timestamp)
     FROM native_transfer
     WHERE has_tx_hash AND tx_hash IN {transaction_id:Array(String)}
     GROUP BY minute, timestamp
 ),
+/* minute filters */
 from_minutes AS (
     SELECT minute
     FROM native_transfer
-    WHERE
-        has_from
-        AND `from` IN {from_address:Array(String)}
-        AND (no_start_time OR minute >= toRelativeMinuteNum(toDateTime({start_time:UInt64})))
+    WHERE has_from AND `from` IN {from_address:Array(String)}
     GROUP BY minute
 ),
 to_minutes AS (
     SELECT minute
     FROM native_transfer
-    WHERE
-        has_to
-        AND `to` IN {to_address:Array(String)}
-        AND (no_start_time OR minute >= toRelativeMinuteNum(toDateTime({start_time:UInt64})))
+    WHERE has_to AND `to` IN {to_address:Array(String)}
     GROUP BY minute
 )
 SELECT
@@ -62,18 +53,19 @@ SELECT
 FROM native_transfer AS t
 WHERE
     /* filter by timestamp and block_num early to reduce data scanned */
-        (no_start_time OR timestamp >= toDateTime({start_time:UInt64}))
-    AND (no_end_time OR timestamp <= toDateTime({end_time:UInt64}))
-    AND (no_start_block OR block_num >= {start_block:UInt64})
-    AND (no_end_block OR block_num <= {end_block:UInt64})
+        ({start_time:UInt64} = 1420070400 OR timestamp >= toDateTime({start_time:UInt64}))
+    AND ({end_time:UInt64} = 2524608000 OR timestamp <= toDateTime({end_time:UInt64}))
+    AND ({start_block:UInt64} = 0 OR block_num >= {start_block:UInt64})
+    AND ({end_block:UInt64} = 9999999999 OR block_num <= {end_block:UInt64})
+
+    /* transaction ID filter */
+    AND ( NOT has_tx_hash OR (minute, timestamp) IN tx_hash_timestamps AND tx_hash IN {transaction_id:Array(String)} )
 
     /* timestamp filters */
-    AND (NOT has_tx_hash OR (minute, timestamp) IN tx_hash_timestamps)
     AND (NOT has_from OR minute IN from_minutes)
     AND (NOT has_to OR minute IN to_minutes)
 
     /* direct filters */
-    AND (NOT has_tx_hash OR tx_hash IN {transaction_id:Array(String)})
     AND (NOT has_from OR `from` IN {from_address:Array(String)})
     AND (NOT has_to OR `to` IN {to_address:Array(String)})
 ORDER BY minute DESC, timestamp DESC, block_num DESC, tx_index DESC