Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 16 additions & 4 deletions usaspending_api/etl/management/commands/load_query_to_delta.py
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,10 @@
partition_column="appropriation_account_balances_id",
partition_column_type="numeric",
delta_table_create_sql=account_balances_schema,
delta_table_create_options={"delta.enableChangeDataFeed": True},
delta_table_create_options={
"delta.enableChangeDataFeed": True,
"delta.enableDeletionVectors": True
},
column_names=list(),
delta_table_create_partitions=[
"reporting_fiscal_year",
Expand All @@ -299,7 +302,10 @@
partition_column="financial_accounts_by_awards_id",
partition_column_type="numeric",
delta_table_create_sql=award_financial_schema,
delta_table_create_options={"delta.enableChangeDataFeed": True},
delta_table_create_options={
"delta.enableChangeDataFeed": True,
"delta.enableDeletionVectors": True
},
column_names=list(),
delta_table_create_partitions=[
"reporting_fiscal_year",
Expand All @@ -314,7 +320,10 @@
partition_column_type="numeric",
is_partition_column_unique=False,
delta_table_create_sql=object_class_program_activity_schema,
delta_table_create_options={"delta.enableChangeDataFeed": True},
delta_table_create_options={
"delta.enableChangeDataFeed": True,
"delta.enableDeletionVectors": True
},
column_names=list(),
delta_table_create_partitions=[
"reporting_fiscal_year",
Expand All @@ -329,7 +338,10 @@
partition_column_type="numeric",
is_partition_column_unique=True,
delta_table_create_sql=transaction_download_schema,
delta_table_create_options={"delta.enableChangeDataFeed": True},
delta_table_create_options={
"delta.enableChangeDataFeed": True,
"delta.enableDeletionVectors": True
},
column_names=list(),
delta_table_create_partitions=[
"awarding_agency_code",
Expand Down
18 changes: 12 additions & 6 deletions usaspending_api/etl/tests/integration/test_load_to_from_delta.py
Original file line number Diff line number Diff line change
Expand Up @@ -988,18 +988,21 @@ def test_incremental_load_table_to_delta_for_award_search(
.select(["award_id", "_change_type", "_commit_version"])
.toPandas()
)

# With deletion vectors, the "true" delete process happens on table update
# So it will happen after the inserts instead of before
expected = pd.DataFrame(
{
"award_id": [4, 4, 1, 3, 2, 4],
"award_id": [4, 1, 3, 2, 4, 4],
"_change_type": [
"delete",
"insert",
"insert",
"insert",
"insert",
"insert",
"delete",
],
"_commit_version": [2, 3, 1, 1, 1, 1],
"_commit_version": [3, 1, 1, 1, 1, 2],
}
)
pd.testing.assert_frame_equal(result, expected)
Expand Down Expand Up @@ -1086,20 +1089,23 @@ def test_incremental_load_table_to_delta_for_transaction_search(
.select(["transaction_id", "_change_type", "_commit_version"])
.toPandas()
)

# With deletion vectors, the "true" delete process happens on table update
# So it will happen after the inserts instead of before
expected = pd.DataFrame(
{
"transaction_id": [4, 4, 1, 2, 434, 3, 4, 5],
"transaction_id": [4, 1, 2, 434, 3, 4, 5, 4],
"_change_type": [
"delete",
"insert",
"insert",
"insert",
"insert",
"insert",
"insert",
"insert",
"delete",
],
"_commit_version": [2, 3, 1, 1, 1, 1, 1, 1],
"_commit_version": [3, 1, 1, 1, 1, 1, 1, 2],
}
)
pd.testing.assert_frame_equal(result, expected)
Expand Down
5 changes: 4 additions & 1 deletion usaspending_api/search/delta_models/award_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -471,5 +471,8 @@
)
USING DELTA
LOCATION 's3a://{{SPARK_S3_BUCKET}}/{{DELTA_LAKE_S3_PATH}}/{{DESTINATION_DATABASE}}/{{DESTINATION_TABLE}}'
TBLPROPERTIES (delta.enableChangeDataFeed = true)
TBLPROPERTIES (
delta.enableChangeDataFeed = true,
delta.enableDeletionVectors = true
)
"""
Original file line number Diff line number Diff line change
Expand Up @@ -888,5 +888,8 @@
)
USING DELTA
LOCATION 's3a://{{SPARK_S3_BUCKET}}/{{DELTA_LAKE_S3_PATH}}/{{DESTINATION_DATABASE}}/{{DESTINATION_TABLE}}'
TBLPROPERTIES (delta.enableChangeDataFeed = true)
TBLPROPERTIES (
delta.enableChangeDataFeed = true,
delta.enableDeletionVectors = true
)
"""
Loading