Skip to content

Commit 6481a99

Browse files
committed
Fixed incorrect table names in queue processes.
1 parent a805a1b commit 6481a99

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

020_DIRECT_Framework/Direct_Framework/Scripts/Queue_Job_Batch.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ EXEC @ReturnCode = msdb.dbo.sp_add_jobstep @job_id=@jobId, @step_name=N'Continuo
4141
@os_run_priority=0, @subsystem=N'TSQL',
4242
@command=N'CREATE PROCEDURE #runningJobs @NUM_JOBS int OUTPUT AS
4343
(
44-
SELECT @NUM_JOBS = (SELECT COUNT(*) FROM [900_Direct_Framework].dbo.OMD_MODULE_INSTANCE WHERE EXECUTION_STATUS_CODE=''E'')
44+
SELECT @NUM_JOBS = (SELECT COUNT(*) FROM [900_Direct_Framework].omd.MODULE_INSTANCE WHERE EXECUTION_STATUS_CODE=''E'')
4545
)
4646
GO
4747
--Only execute the queue order when the number of executing ETLs is smaller than the maximum concurrency parameters
@@ -83,7 +83,7 @@ BEGIN
8383
8484
( -- Select the Batch that hasn''t run the longest (oldest age)
8585
SELECT *
86-
FROM [900_Direct_Framework].[dbo].[vw_QUEUE_BATCH_PROCESSING]
86+
FROM [900_Direct_Framework].[omd_processing].[vw_QUEUE_BATCH_PROCESSING]
8787
) ETL_QUERY
8888
ORDER BY END_DATETIME ASC
8989
@@ -100,7 +100,7 @@ BEGIN
100100
END TRY
101101
BEGIN CATCH
102102
SET @JOBNAME = SUBSTRING(@JOBNAME,1,LEN(@JOBNAME)-5)
103-
SET @SQL_STRING = N''UPDATE [900_Direct_Framework].dbo.OMD_BATCH SET INACTIVE_INDICATOR=''''Y'''' WHERE BATCH_CODE=''''''+@JOBNAME+''''''''
103+
SET @SQL_STRING = N''UPDATE [900_Direct_Framework].omd.BATCH SET INACTIVE_INDICATOR=''''Y'''' WHERE BATCH_CODE=''''''+@JOBNAME+''''''''
104104
SET @PRINT_MSG = ''ERROR EXECUTING JOB: ''+@JOBNAME+''.dtsx. DEACTIVATE QUERY: ''+@SQL_STRING+''''
105105
RAISERROR (@PRINT_MSG, 0, 1) WITH NOWAIT
106106
EXECUTE sp_executesql @SQL_STRING

020_DIRECT_Framework/Direct_Framework/Scripts/Queue_Job_Module.sql

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ EXEC @ReturnCode = msdb.dbo.sp_add_jobstep @job_id=@jobId, @step_name=N'Continuo
4242
@os_run_priority=0, @subsystem=N'TSQL',
4343
@command=N'CREATE PROCEDURE #runningJobs @NUM_JOBS int OUTPUT AS
4444
(
45-
SELECT @NUM_JOBS = (SELECT COUNT(*) FROM [900_Direct_Framework].dbo.OMD_MODULE_INSTANCE WHERE EXECUTION_STATUS_CODE=''E'')
45+
SELECT @NUM_JOBS = (SELECT COUNT(*) FROM [900_Direct_Framework].omd.MODULE_INSTANCE WHERE EXECUTION_STATUS_CODE=''E'')
4646
)
4747
GO
4848
--Only execute the queue order when the number of executing ETLs is smaller than the maximum concurrency parameters
@@ -84,7 +84,7 @@ BEGIN
8484
8585
( -- Select the Module that hasn''t run the longest (oldest age)
8686
SELECT *
87-
FROM [900_Direct_Framework].[dbo].[vw_QUEUE_MODULE_PROCESSING]
87+
FROM [900_Direct_Framework].[omd_processing].[vw_QUEUE_MODULE_PROCESSING]
8888
) ETL_QUERY
8989
ORDER BY END_DATETIME ASC
9090
@@ -101,7 +101,7 @@ BEGIN
101101
END TRY
102102
BEGIN CATCH
103103
SET @JOBNAME = SUBSTRING(@JOBNAME,1,LEN(@JOBNAME)-5)
104-
SET @SQL_STRING = N''UPDATE [900_Direct_Framework].dbo.OMD_MODULE SET INACTIVE_INDICATOR=''''Y'''' WHERE MODULE_CODE=''''''+@JOBNAME+''''''''
104+
SET @SQL_STRING = N''UPDATE [900_Direct_Framework].omd.MODULE SET INACTIVE_INDICATOR=''''Y'''' WHERE MODULE_CODE=''''''+@JOBNAME+''''''''
105105
SET @PRINT_MSG = ''ERROR EXECUTING JOB: ''+@JOBNAME+''.dtsx. DEACTIVATE QUERY: ''+@SQL_STRING+''''
106106
RAISERROR (@PRINT_MSG, 0, 1) WITH NOWAIT
107107
EXECUTE sp_executesql @SQL_STRING
@@ -112,7 +112,7 @@ BEGIN
112112
END
113113
DROP PROCEDURE #runningJobs',
114114
@database_name=N'master',
115-
@output_file_name=N'D:\Logs\Test_Job_Lbm_Master',
115+
@output_file_name=N'D:\Logs\Job_Master',
116116
@flags=2
117117
IF (@@ERROR <> 0 OR @ReturnCode <> 0) GOTO QuitWithRollback
118118
EXEC @ReturnCode = msdb.dbo.sp_update_job @job_id = @jobId, @start_step_id = 1
@@ -125,5 +125,4 @@ QuitWithRollback:
125125
IF (@@TRANCOUNT > 0) ROLLBACK TRANSACTION
126126
EndSave:
127127

128-
GO
129-
128+
GO

0 commit comments

Comments
 (0)