Skip to content

Develop delta raw #185

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

Merged
MattPCollins merged 3 commits into from
Jan 6, 2026
Merged

Develop delta raw #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a6b8d7
Add support for Delta tables in raw
MattPCollins Jan 5, 2026
38d355a
Improve flexibility of datasets with cross-storage locations and merg…
MattPCollins Jan 5, 2026
ec6f222
Update test case
MattPCollins Jan 6, 2026
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
7 changes: 5 additions & 2 deletions src/azure.databricks/python/notebooks/ingest/ingestpayload/CheckPayloadExecution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

# COMMAND ----------

[table_name, load_type, load_action, load_action_text, version_number, raw_storage_name, raw_container_name, raw_secret, raw_last_load_date, raw_schema_name, raw_file_type, datetime_folder_hierarchy, cleansed_storage_name, cleansed_container_name, cleansed_secret, cleansed_last_load_date, cleansed_schema_name, pk_list, partition_list, columns_list, columns_type_list, columns_format_list, metadata_column_list, metadata_column_type_list, metadata_column_format_list, total_column_list, total_column_type_list, total_column_format_list] = get_merge_payload_variables(payload)
[table_name, load_type, load_action, load_action_text, version_number, raw_storage_name, raw_container_name, raw_secret, raw_last_load_date, raw_schema_name, raw_file_type, datetime_folder_hierarchy, cleansed_storage_name, cleansed_container_name, cleansed_secret, cleansed_last_load_date, cleansed_schema_name, filter_condition, pk_list, partition_list, columns_list, columns_type_list, columns_format_list, metadata_column_list, metadata_column_type_list, metadata_column_format_list, total_column_list, total_column_type_list, total_column_format_list] = get_merge_payload_variables(payload)

# COMMAND ----------

Expand Down Expand Up @@ -136,4 +136,7 @@

# COMMAND ----------

compare_raw_load_vs_last_cleansed_date(raw_last_load_date = raw_last_load_date,cleansed_last_load_date =cleansed_last_load_date)
if raw_file_type == 'delta':
pass
else:
compare_raw_load_vs_last_cleansed_date(raw_last_load_date = raw_last_load_date,cleansed_last_load_date =cleansed_last_load_date)
38 changes: 23 additions & 15 deletions src/azure.databricks/python/notebooks/ingest/ingestpayload/IngestExecution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

# COMMAND ----------

[table_name, load_type, load_action, load_action_text, version_number, raw_storage_name, raw_container_name, raw_secret, raw_last_load_date, raw_schema_name, raw_file_type, datetime_folder_hierarchy, cleansed_storage_name, cleansed_container_name, cleansed_secret, cleansed_last_load_date, cleansed_schema_name, pk_list, partition_list, columns_list, columns_type_list, columns_format_list, metadata_column_list, metadata_column_type_list, metadata_column_format_list, total_column_list, total_column_type_list, total_column_format_list] = get_merge_payload_variables(payload)
[table_name, load_type, load_action, load_action_text, version_number, raw_storage_name, raw_container_name, raw_secret, raw_last_load_date, raw_schema_name, raw_file_type, datetime_folder_hierarchy, cleansed_storage_name, cleansed_container_name, cleansed_secret, cleansed_last_load_date, cleansed_schema_name, filter_condition, pk_list, partition_list, columns_list, columns_type_list, columns_format_list, metadata_column_list, metadata_column_type_list, metadata_column_format_list, total_column_list, total_column_type_list, total_column_format_list] = get_merge_payload_variables(payload)


# COMMAND ----------
Expand All @@ -86,22 +86,30 @@
# MAGIC #Get dataset from raw

# COMMAND ----------
if raw_file_type != "delta":
# Spark Read extended options. When switching versions of dataset, this is a required option.
options = {
'header':'True',
"mergeSchema": "true"
}

# Spark Read extended options. When switching versions of dataset, this is a required option.
options = {
'header':'True',
"mergeSchema": "true"
}
#different options for specifying, based on how we save abfss folder hierarchy.
file_full_path = f"{raw_abfss_path}/{raw_schema_name}/{table_name}/version={version_number}/{load_action_text}/{datetime_folder_hierarchy}/{table_name}.{raw_file_type}"
print(file_full_path)

#different options for specifying, based on how we save abfss folder hierarchy.
file_full_path = f"{raw_abfss_path}/{raw_schema_name}/{table_name}/version={version_number}/{load_action_text}/{datetime_folder_hierarchy}/{table_name}.{raw_file_type}"
print(file_full_path)

# assuming json,csv, parquet
df = spark.read \
.options(**options) \
.format(raw_file_type) \
.load(file_full_path)
# assuming json,csv, parquet
df = spark.read \
.options(**options) \
.format(raw_file_type) \
.load(file_full_path)

elif raw_file_type == "delta":
file_full_path = f"{raw_abfss_path}/{raw_schema_name}/{table_name}"
df = spark.read.format("delta").load(file_full_path)

# apply incremental loading filter
if load_action == "I":
df = spark.sql(f"SELECT * FROM {{df}} {filter_condition}",df=df)

# display(df)

Expand Down
4 changes: 3 additions & 1 deletion src/azure.databricks/python/notebooks/ingest/utils/ConfigurePayloadVariables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ def get_merge_payload_variables(payload: dict()) -> list():

cleansed_schema_name = payload["CleansedSchemaName"]

filter_condition = payload["FilterCondition"]

# Semantic checks for these required in the IngestChecks notebook?
pk_list = payload["CleansedPkList"].split(",")
partition_list = payload["CleansedPartitionFields"].split(",") if payload["CleansedPartitionFields"] != "" else []
Expand All @@ -45,6 +47,6 @@ def get_merge_payload_variables(payload: dict()) -> list():
# totalColumnTypeList = columnsTypeList
# totalColumnFormatList = columnsFormatList

output = [table_name, load_type, load_action, load_action_text, version_number, raw_storage_name, raw_container_name, raw_secret, raw_last_load_date, raw_schema_name, raw_file_type, datetime_folder_hierarchy, cleansed_storage_name, cleansed_container_name, cleansed_secret, cleansed_last_load_date, cleansed_schema_name, pk_list, partition_list, columns_list, columns_type_list, columns_format_list, metadata_column_list, metadata_column_type_list, metadata_column_format_list, total_column_list, total_column_type_list, total_column_format_list]
output = [table_name, load_type, load_action, load_action_text, version_number, raw_storage_name, raw_container_name, raw_secret, raw_last_load_date, raw_schema_name, raw_file_type, datetime_folder_hierarchy, cleansed_storage_name, cleansed_container_name, cleansed_secret, cleansed_last_load_date, cleansed_schema_name, filter_condition, pk_list, partition_list, columns_list, columns_type_list, columns_format_list, metadata_column_list, metadata_column_type_list, metadata_column_format_list, total_column_list, total_column_type_list, total_column_format_list]

return output
Loading