Merge pull request #53 from bennyaustin/rename-notebook-params

renamed notebook params to generic compute
bennyaustin · Sep 6, 2024 · 18169e2 · 18169e2
2 parents 338181c + 64afcca
commit 18169e2
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 60 deletions.
diff --git a/elt-framework/ControlDB/ELT/Stored Procedures/GetTransformDefinition_L1.sql b/elt-framework/ControlDB/ELT/Stored Procedures/GetTransformDefinition_L1.sql
@@ -15,8 +15,8 @@ AS
 
 
 			--Databricks
-			, TD.[NotebookName]
-			, TD.[NotebookPath]
+			, TD.[ComputeName]
+			, TD.[ComputePath]
 
 			--Custom
 			, TD.[CustomParameters]

diff --git a/elt-framework/ControlDB/ELT/Stored Procedures/GetTransformDefinition_L2.sql b/elt-framework/ControlDB/ELT/Stored Procedures/GetTransformDefinition_L2.sql
@@ -14,8 +14,8 @@ AS
 			, TD.[L1TransformID]
 
 			--Databricks
-			, TD.[NotebookName]
-			, TD.[NotebookPath]
+			, TD.[ComputeName]
+			, TD.[ComputePath]
 
 			--Custom
 			, TD.[CustomParameters]

diff --git a/elt-framework/ControlDB/ELT/Stored Procedures/GetTransformInstance_L1.sql b/elt-framework/ControlDB/ELT/Stored Procedures/GetTransformInstance_L1.sql
@@ -11,8 +11,8 @@ begin
 			L1TI.[L1TransformInstanceID]
 			, L1TI.[L1TransformID]
 			, L1TI.[IngestID]	
-			, L1TI.[NotebookName]
-			, L1TI.[NotebookPath]
+			, L1TI.[ComputeName]
+			, L1TI.[ComputePath]
 			, L1TI.[CustomParameters]
 			, L1TI.[InputRawFileSystem]
 			, L1TI.[InputRawFileFolder]

diff --git a/elt-framework/ControlDB/ELT/Stored Procedures/GetTransformInstance_L2.sql b/elt-framework/ControlDB/ELT/Stored Procedures/GetTransformInstance_L2.sql
@@ -15,8 +15,8 @@ begin
 			, L2TI.[L2TransformID]
 			, L2TI.[IngestID]
 			, L2TI.[L1TransformID]
-			, L2TI.[NotebookPath]
-			, L2TI.[NotebookName]
+			, L2TI.[ComputePath]
+			, L2TI.[ComputeName]
 			, L2TI.[CustomParameters]
 			, L2TD.[InputType]
 			, L2TI.[InputFileSystem]

diff --git a/elt-framework/ControlDB/ELT/Stored Procedures/InsertTransformInstance_L1.sql b/elt-framework/ControlDB/ELT/Stored Procedures/InsertTransformInstance_L1.sql
@@ -5,8 +5,8 @@
 	@IngestID int,
 
 	--Databricks Notebook
-	@NotebookName varchar(100) = null,
-	@NotebookPath varchar(200) = null,
+	@ComputeName varchar(100) = null,
+	@ComputePath varchar(200) = null,
 
 	--Custom
 	@CustomParameters varchar(max) = null,
@@ -68,8 +68,8 @@ DECLARE @localdate as datetime	= CONVERT(datetime,CONVERT(datetimeoffset, getdat
 				[L1TransformID]
 				,[IngestInstanceID]
 				,[IngestID]
-				,[NotebookName]
-				,[NotebookPath]
+				,[ComputeName]
+				,[ComputePath]
 				,[CustomParameters]
 				,[InputRawFileSystem]
 				,[InputRawFileFolder]
@@ -99,8 +99,8 @@ DECLARE @localdate as datetime	= CONVERT(datetime,CONVERT(datetimeoffset, getdat
 				@L1TransformID
 				,@IngestInstanceID
 				,@IngestID
-				,@NotebookName
-				,@NotebookPath
+				,@ComputeName
+				,@ComputePath
 				,@CustomParameters
 				,@InputRawFileSystem
 				,@InputRawFileFolder

diff --git a/elt-framework/ControlDB/ELT/Stored Procedures/InsertTransformInstance_L2.sql b/elt-framework/ControlDB/ELT/Stored Procedures/InsertTransformInstance_L2.sql
@@ -5,8 +5,8 @@
 	@L1TransformID int,
 
 	--Databricks Notebook
-	@NotebookName varchar(100) = null,
-	@NotebookPath varchar(200) = null,
+	@ComputeName varchar(100) = null,
+	@ComputePath varchar(200) = null,
 
 	--Custom
 	@CustomParameters varchar(max) = null,
@@ -80,8 +80,8 @@ DECLARE @localdate as datetime	= CONVERT(datetime,CONVERT(datetimeoffset, getdat
 				 [L2TransformID]
 				,[IngestID]
 				,[L1TransformID]
-				,[NotebookPath]
-				,[NotebookName]
+				,[ComputePath]
+				,[ComputeName]
 				,[CustomParameters]
 				,[InputFileSystem]
 				,[InputFileFolder]
@@ -114,8 +114,8 @@ DECLARE @localdate as datetime	= CONVERT(datetime,CONVERT(datetimeoffset, getdat
 				@L2TransformID,
 				@IngestID,
 				@L1TransformID,
-				@NotebookPath,
-				@NotebookName,
+				@ComputePath,
+				@ComputeName,
 				@CustomParameters,
 				@InputFileSystem,
 				@InputFileFolder,

diff --git a/elt-framework/ControlDB/ELT/Tables/L1TransformDefinition.sql b/elt-framework/ControlDB/ELT/Tables/L1TransformDefinition.sql
@@ -2,8 +2,8 @@
 (
 	[L1TransformID] int not null identity,
 	[IngestID] int not null,
-	[NotebookPath] varchar(200) null,
-	[NotebookName] varchar(100) null,
+	[ComputePath] varchar(200) null,
+	[ComputeName] varchar(100) null,
 	[CustomParameters] varchar(max) null,
 	[InputRawFileSystem] varchar(50) not null,
 	[InputRawFileFolder] varchar(200) not null,

diff --git a/elt-framework/ControlDB/ELT/Tables/L1TransformInstance.sql b/elt-framework/ControlDB/ELT/Tables/L1TransformInstance.sql
@@ -4,8 +4,8 @@
 	[L1TransformID] int not null,
 	[IngestInstanceID] int null,
 	[IngestID] int not null,
-	[NotebookName] varchar(100) null,
-	[NotebookPath] varchar(200) null,
+	[ComputeName] varchar(100) null,
+	[ComputePath] varchar(200) null,
 	[CustomParameters] varchar(max) null,
 	[InputRawFileSystem] varchar(50) not null,
 	[InputRawFileFolder] varchar(200) not null,

diff --git a/elt-framework/ControlDB/ELT/Tables/L2TransformDefinition.sql b/elt-framework/ControlDB/ELT/Tables/L2TransformDefinition.sql
@@ -3,8 +3,8 @@
 	[L2TransformID] int not null identity,
 	[IngestID] int null,
 	[L1TransformID] int null,
-	[NotebookPath] varchar(200) null,
-	[NotebookName] varchar(100) null,
+	[ComputePath] varchar(200) null,
+	[ComputeName] varchar(100) null,
 	[CustomParameters] varchar(max) null,
 	[InputType] varchar(15) null,
 	[InputFileSystem] varchar(50) null,

diff --git a/elt-framework/ControlDB/ELT/Tables/L2TransformInstance.sql b/elt-framework/ControlDB/ELT/Tables/L2TransformInstance.sql
@@ -4,8 +4,8 @@
 	[L2TransformID] int null,
 	[IngestID] int null,
 	[L1TransformID] int null,
-	[NotebookPath] varchar(200) null,
-	[NotebookName] varchar(100) null,
+	[ComputePath] varchar(200) null,
+	[ComputeName] varchar(100) null,
 	[CustomParameters] varchar(max) null,
 	[InputFileSystem] varchar(50) null,
 	[InputFileFolder] varchar(200) null,

diff --git a/...lDB/Post Deployment Script/datasources/RestAPI/L1TransformDefinition/L1T_AzureRestAPI.sql b/...lDB/Post Deployment Script/datasources/RestAPI/L1TransformDefinition/L1T_AzureRestAPI.sql
@@ -10,8 +10,8 @@ IF OBJECT_ID('tempdb..#AzureRestAPI_L1') IS NOT NULL DROP TABLE #AzureRestAPI_L1
 CREATE TABLE #AzureRestAPI_L1
 (
 	[IngestID] int not null,
-	[NotebookPath] varchar(200) null,
-	[NotebookName] varchar(100) null,
+	[ComputePath] varchar(200) null,
+	[ComputeName] varchar(100) null,
 	[CustomParameters] varchar(max) null,
 	[InputRawFileSystem] varchar(50) not null,
 	[InputRawFileFolder] varchar(200) not null,
@@ -36,8 +36,8 @@ CREATE TABLE #AzureRestAPI_L1
 --Insert Into Temp Table
 INSERT INTO #AzureRestAPI_L1
 	SELECT  [IngestID]
-	,'L1Transform' AS [NotebookPath]
-	,'L1Transform-Generic-Synapse' AS [NotebookName]
+	,'L1Transform' AS [ComputePath]
+	,'L1Transform-Generic-Synapse' AS [ComputeName]
 	, NULL AS [CustomParameters]
 	,[DestinationRawFileSystem] AS [InputRawFileSystem]
 	,[DestinationRawFolder] AS [InputRawFileFolder]
@@ -76,8 +76,8 @@ ON src.[InputRawFileSystem] = tgt.[InputRawFileSystem]
  AND src.[OutputL1CuratedFile] = tgt.[OutputL1CuratedFile]
 WHEN MATCHED THEN
     UPDATE SET tgt.[IngestID] =src.[IngestID],
-			tgt.[NotebookPath] =src.[NotebookPath],
-			tgt.[NotebookName] =src.[NotebookName],
+			tgt.[ComputePath] =src.[ComputePath],
+			tgt.[ComputeName] =src.[ComputeName],
 			tgt.[CustomParameters] =src.[CustomParameters],
 			tgt.[InputRawFileSystem] =src.[InputRawFileSystem],
 			tgt.[InputRawFileFolder] =src.[InputRawFileFolder],
@@ -101,8 +101,8 @@ WHEN MATCHED THEN
             tgt.[ModifiedTimestamp] = GetDate()
 WHEN NOT MATCHED BY TARGET THEN
     INSERT([IngestID],
-			[NotebookPath],
-			[NotebookName],
+			[ComputePath],
+			[ComputeName],
 			[CustomParameters],
 			[InputRawFileSystem],
 			[InputRawFileFolder],
@@ -125,8 +125,8 @@ WHEN NOT MATCHED BY TARGET THEN
             [CreatedBy],
 	        [CreatedTimestamp] )
     VALUES (src.[IngestID],
-			src.[NotebookPath],
-			src.[NotebookName],
+			src.[ComputePath],
+			src.[ComputeName],
 			src.[CustomParameters],
 			src.[InputRawFileSystem],
 			src.[InputRawFileFolder],

diff --git a/...B/Post Deployment Script/datasources/RestAPI/L1TransformDefinition/L1T_PurviewRestAPI.sql b/...B/Post Deployment Script/datasources/RestAPI/L1TransformDefinition/L1T_PurviewRestAPI.sql
@@ -10,8 +10,8 @@ IF OBJECT_ID('tempdb..#PurviewRestAPI_L1') IS NOT NULL DROP TABLE #PurviewRestAP
 CREATE TABLE #PurviewRestAPI_L1
 (
 	[IngestID] int not null,
-	[NotebookPath] varchar(200) null,
-	[NotebookName] varchar(100) null,
+	[ComputePath] varchar(200) null,
+	[ComputeName] varchar(100) null,
 	[CustomParameters] varchar(max) null,
 	[InputRawFileSystem] varchar(50) not null,
 	[InputRawFileFolder] varchar(200) not null,
@@ -36,8 +36,8 @@ CREATE TABLE #PurviewRestAPI_L1
 --Insert Into Temp Table
 INSERT INTO #PurviewRestAPI_L1
 	SELECT  [IngestID]
-	,'L1Transform' AS [NotebookPath]
-	,'L1Transform-Generic-Synapse' AS [NotebookName]
+	,'L1Transform' AS [ComputePath]
+	,'L1Transform-Generic-Synapse' AS [ComputeName]
 	, NULL AS [CustomParameters]
 	,[DestinationRawFileSystem] AS [InputRawFileSystem]
 	,[DestinationRawFolder] AS [InputRawFileFolder]
@@ -78,8 +78,8 @@ ON src.[InputRawFileSystem] = tgt.[InputRawFileSystem]
  AND src.[OutputL1CuratedFile] = tgt.[OutputL1CuratedFile]
 WHEN MATCHED THEN
     UPDATE SET tgt.[IngestID] =src.[IngestID],
-			tgt.[NotebookPath] =src.[NotebookPath],
-			tgt.[NotebookName] =src.[NotebookName],
+			tgt.[ComputePath] =src.[ComputePath],
+			tgt.[ComputeName] =src.[ComputeName],
 			tgt.[CustomParameters] =src.[CustomParameters],
 			tgt.[InputRawFileSystem] =src.[InputRawFileSystem],
 			tgt.[InputRawFileFolder] =src.[InputRawFileFolder],
@@ -103,8 +103,8 @@ WHEN MATCHED THEN
             tgt.[ModifiedTimestamp] = GetDate()
 WHEN NOT MATCHED BY TARGET THEN
     INSERT([IngestID],
-			[NotebookPath],
-			[NotebookName],
+			[ComputePath],
+			[ComputeName],
 			[CustomParameters],
 			[InputRawFileSystem],
 			[InputRawFileFolder],
@@ -127,8 +127,8 @@ WHEN NOT MATCHED BY TARGET THEN
             [CreatedBy],
 	        [CreatedTimestamp] )
     VALUES (src.[IngestID],
-			src.[NotebookPath],
-			src.[NotebookName],
+			src.[ComputePath],
+			src.[ComputeName],
 			src.[CustomParameters],
 			src.[InputRawFileSystem],
 			src.[InputRawFileFolder],

diff --git a/...nt Script/datasources/UploadFiles/L1TransformDefinition/L1T_CustomFormRecognizerModel.sql b/...nt Script/datasources/UploadFiles/L1TransformDefinition/L1T_CustomFormRecognizerModel.sql
@@ -10,8 +10,8 @@ IF OBJECT_ID('tempdb..#CFRM_L1') IS NOT NULL DROP TABLE #CFRM_L1;
 CREATE TABLE #CFRM_L1
 (
 	[IngestID] int not null,
-	[NotebookPath] varchar(200) null,
-	[NotebookName] varchar(100) null,
+	[ComputePath] varchar(200) null,
+	[ComputeName] varchar(100) null,
 	[InputRawFileSystem] varchar(50) not null,
 	[InputRawFileFolder] varchar(200) not null,
 	[InputRawFile] varchar(200) not null,
@@ -30,8 +30,8 @@ CREATE TABLE #CFRM_L1
 --Insert Into Temp Table
 INSERT INTO #CFRM_L1
 	SELECT  [IngestID]
-	,'L1Transform' AS [NotebookPath]
-	,'L1Transform-ReStatement' AS [NotebookName]
+	,'L1Transform' AS [ComputePath]
+	,'L1Transform-ReStatement' AS [ComputeName]
 	,[DestinationRawFileSystem] AS [InputRawFileSystem]
 	,[DestinationRawFolder] AS [InputRawFileFolder]
 	,[DestinationRawFile] AS [InputRawFile]
@@ -51,8 +51,8 @@ INSERT INTO #CFRM_L1
 
 	UNION
 	SELECT  [IngestID]
-	,'L1Transform' AS [NotebookPath]
-	,'L1Transform-SEC-Form10Q' AS [NotebookName]
+	,'L1Transform' AS [ComputePath]
+	,'L1Transform-SEC-Form10Q' AS [ComputeName]
 	,[DestinationRawFileSystem] AS [InputRawFileSystem]
 	,[DestinationRawFolder] AS [InputRawFileFolder]
 	,[DestinationRawFile] AS [InputRawFile]
@@ -81,8 +81,8 @@ ON src.[InputRawFileSystem] = tgt.[InputRawFileSystem]
  AND src.[OutputL1CuratedFile] = tgt.[OutputL1CuratedFile]
 WHEN MATCHED THEN
     UPDATE SET tgt.[IngestID] =src.[IngestID],
-			tgt.[NotebookPath] =src.[NotebookPath],
-			tgt.[NotebookName] =src.[NotebookName],
+			tgt.[ComputePath] =src.[ComputePath],
+			tgt.[ComputeName] =src.[ComputeName],
 			tgt.[InputRawFileSystem] =src.[InputRawFileSystem],
 			tgt.[InputRawFileFolder] =src.[InputRawFileFolder],
 			tgt.[InputRawFile] =src.[InputRawFile],
@@ -100,8 +100,8 @@ WHEN MATCHED THEN
             tgt.[ModifiedTimestamp] = GetDate()
 WHEN NOT MATCHED BY TARGET THEN
     INSERT([IngestID],
-			[NotebookPath],
-			[NotebookName],
+			[ComputePath],
+			[ComputeName],
 			[InputRawFileSystem],
 			[InputRawFileFolder],
 			[InputRawFile],
@@ -114,8 +114,8 @@ WHEN NOT MATCHED BY TARGET THEN
             [CreatedBy],
 	        [CreatedTimestamp] )
     VALUES (src.[IngestID],
-			src.[NotebookPath],
-			src.[NotebookName],
+			src.[ComputePath],
+			src.[ComputeName],
 			src.[InputRawFileSystem],
 			src.[InputRawFileFolder],
 			src.[InputRawFile],