change partition keys and columns

duneanalytics · Jan 22, 2025 · 63dced5 · 63dced5
1 parent dc58dd1
commit 63dced5
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 20 deletions.
diff --git a/dbt_subprojects/dex/macros/models/_decoding/evm_event_decoding_base.sql b/dbt_subprojects/dex/macros/models/_decoding/evm_event_decoding_base.sql
@@ -23,7 +23,7 @@ FROM TABLE (
                 topic3,
                 data,
                 tx_hash, 
-                index,
+                index as evt_index,
                 tx_index, 
                 tx_from,
                 tx_to

diff --git a/dbt_subprojects/dex/macros/models/_decoding/uniswap_v2/uniswap_v2_trades.sql b/dbt_subprojects/dex/macros/models/_decoding/uniswap_v2/uniswap_v2_trades.sql
@@ -14,7 +14,7 @@ WITH evt_swap AS (
         , to
         , contract_address
         , tx_hash
-        , index
+        , evt_index
         , amount0In
         , amount0Out
         , amount1In
@@ -42,7 +42,7 @@ WITH evt_swap AS (
         , CASE WHEN amount0In = UINT256 '0' OR amount1Out = UINT256 '0' THEN f.token1 ELSE f.token0 END AS token_sold_address
         , t.contract_address AS project_contract_address
         , t.tx_hash
-        , t.index AS evt_index
+        , t.evt_index
         , f.contract_address as factory_address
         , t.tx_from
         , t.tx_to

diff --git a/dbt_subprojects/dex/macros/models/_decoding/uniswap_v3/uniswap_v3_trades.sql b/dbt_subprojects/dex/macros/models/_decoding/uniswap_v3/uniswap_v3_trades.sql
@@ -22,8 +22,7 @@ WITH evt_swap AS (
         , amount1
         , contract_address
         , tx_hash
-        , index
-        , tx_index
+        , evt_index
         , tx_from
         , tx_to
     FROM {{ Pair_evt_Swap }}
@@ -50,7 +49,7 @@ WITH evt_swap AS (
         , CASE WHEN amount0 < INT256 '0' THEN f.token1 ELSE f.token0 END AS token_sold_address
         , t.contract_address as project_contract_address
         , t.tx_hash
-        , t.index as evt_index
+        , t.evt_index
         , f.contract_address as factory_address
         , t.tx_from
         , t.tx_to

diff --git a/dbt_subprojects/dex/models/automated_trades/dex_automated_base_trades.sql b/dbt_subprojects/dex/models/automated_trades/dex_automated_base_trades.sql
@@ -1,11 +1,11 @@
 {{ config(
     schema = 'dex'
     , alias = 'automated_base_trades'
-    , partition_by = ['block_month', 'blockchain', 'project']
+    , partition_by = ['block_month', 'blockchain']
     , materialized = 'incremental'
     , file_format = 'delta'
     , incremental_strategy = 'merge'
-    , unique_key = ['blockchain', 'project', 'version', 'tx_hash', 'evt_index']
+    , unique_key = ['blockchain', 'block_number', 'index']
     , incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')]
     )
 }}

diff --git a/...omated_trades/multichain/projects/uniswap/uniswap_v2_multichain_automated_base_trades.sql b/...omated_trades/multichain/projects/uniswap/uniswap_v2_multichain_automated_base_trades.sql
@@ -1,11 +1,11 @@
 {{ config(
         schema = 'uniswap_v2_multichain',
         alias = 'automated_base_trades',
-        partition_by = ['block_month'],
+        partition_by = ['block_month', 'blockchain'],
         materialized = 'incremental',
         file_format = 'delta',
         incremental_strategy = 'merge',
-        unique_key = ['blockchain', 'tx_hash', 'evt_index'],
+        unique_key = ['blockchain', 'block_number', 'evt_index'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')]
         )
 }}

diff --git a/...utomated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_factory_evt.sql b/...utomated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_factory_evt.sql
@@ -1,11 +1,11 @@
 {{ config(
         schema = 'uniswap_v2_multichain',
         alias = 'decoded_factory_evt',
-        partition_by = ['block_date'],
+        partition_by = ['block_month', 'blockchain'],
         materialized = 'incremental',
         file_format = 'delta',
         incremental_strategy = 'merge',
-        unique_key = ['tx_hash', 'index'],
+        unique_key = ['blockchain', 'block_number', 'evt_index'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')]
         )
 }}

diff --git a/...omated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_pool_evt_swap.sql b/...omated_trades/multichain/projects/uniswap/uniswap_v2_multichain_decoded_pool_evt_swap.sql
@@ -1,11 +1,11 @@
 {{ config(
         schema = 'uniswap_v2_multichain',
         alias = 'decoded_pool_evt_swap',
-        partition_by = ['block_date'],
+        partition_by = ['block_month', 'blockchain'],
         materialized = 'incremental',
         file_format = 'delta',
         incremental_strategy = 'merge',
-        unique_key = ['tx_hash', 'index'],
+        unique_key = ['blockchain', 'block_number', 'evt_index'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')]
         )
 }}

diff --git a/...omated_trades/multichain/projects/uniswap/uniswap_v3_multichain_automated_base_trades.sql b/...omated_trades/multichain/projects/uniswap/uniswap_v3_multichain_automated_base_trades.sql
@@ -1,11 +1,11 @@
 {{ config(
         schema = 'uniswap_v3_multichain',
         alias = 'automated_base_trades',
-        partition_by = ['block_month'],
+        partition_by = ['block_month', 'blockchain'],
         materialized = 'incremental',
         file_format = 'delta',
         incremental_strategy = 'merge',
-        unique_key = ['blockchain', 'tx_hash', 'evt_index'],
+        unique_key = ['blockchain', 'block_number', 'evt_index'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')]
         )
 }}

diff --git a/...utomated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_factory_evt.sql b/...utomated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_factory_evt.sql
@@ -1,11 +1,11 @@
 {{ config(
         schema = 'uniswap_v3_multichain',
         alias = 'decoded_factory_evt',
-        partition_by = ['block_date'],
+        partition_by = ['block_month', 'blockchain'],
         materialized = 'incremental',
         file_format = 'delta',
         incremental_strategy = 'merge',
-        unique_key = ['blockchain', 'tx_hash', 'index'],
+        unique_key = ['blockchain', 'block_number', 'evt_index'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')]
         )
 }}

diff --git a/...omated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_pool_evt_swap.sql b/...omated_trades/multichain/projects/uniswap/uniswap_v3_multichain_decoded_pool_evt_swap.sql
@@ -1,11 +1,11 @@
 {{ config(
         schema = 'uniswap_v3_multichain',
         alias = 'decoded_pool_evt_swap',
-        partition_by = ['block_date'],
+        partition_by = ['block_month', 'blockchain'],
         materialized = 'incremental',
         file_format = 'delta',
         incremental_strategy = 'merge',
-        unique_key = ['blockchain', 'tx_hash', 'index'],
+        unique_key = ['blockchain', 'block_number', 'evt_index'],
         incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')]
         )
 }}