Skip to content

Commit bef353a

Browse files
AbelChengAbelCheng
committed
Add FAILED_TASKS(Count) into VIEW_TPW_PJOB
1 parent bc0b5be commit bef353a

File tree

8 files changed

+48
-82
lines changed

8 files changed

+48
-82
lines changed

‎TaskParallelFoundation/ConsoleTest/SampleDatabase/SqlServer/TaskParallelWorkflow.mdf‎

0 Bytes
Binary file not shown.

‎TaskParallelFoundation/ConsoleTest/SampleDatabase/SqlServer/TaskParallelWorkflow_log.LDF‎

0 Bytes
Binary file not shown.

‎TaskParallelFoundation/Databases/Oracle/Oracle.modelproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@
6363
<Content Include="Scripts\1-Tables\15-TPW_SYS_ERROR.sql">
6464
<SubType>Content</SubType>
6565
</Content>
66-
<Content Include="Scripts\2-Views\01-VIEW_TPW_PJOB.sql">
66+
<Content Include="Scripts\2-Views\02-VIEW_TPW_PJOB.sql">
6767
<SubType>Content</SubType>
6868
</Content>
69-
<Content Include="Scripts\2-Views\02-VIEW_TPW_TASK.sql">
69+
<Content Include="Scripts\2-Views\01-VIEW_TPW_TASK.sql">
7070
<SubType>Content</SubType>
7171
</Content>
7272
<Content Include="Scripts\2-Views\03-VIEW_TPW_WK_LOG.sql">

TaskParallelFoundation/Databases/Oracle/Scripts/2-Views/02-VIEW_TPW_TASK.sql renamed to TaskParallelFoundation/Databases/Oracle/Scripts/2-Views/01-VIEW_TPW_TASK.sql

File renamed without changes.

TaskParallelFoundation/Databases/Oracle/Scripts/2-Views/01-VIEW_TPW_PJOB.sql renamed to TaskParallelFoundation/Databases/Oracle/Scripts/2-Views/02-VIEW_TPW_PJOB.sql

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,23 @@ SELECT
77
J.EXPIRY_TIME,
88
J.START_TIME,
99
J.END_TIME,
10+
NVL(F.FAILED_COUNT, 0) AS FAILED_TASKS,
1011
J.USER_APP,
1112
J.USER_NAME,
1213
J.DESCRIPTION_
1314
FROM
15+
(
16+
SELECT
17+
PJOB_ID,
18+
COUNT(*) AS FAILED_COUNT
19+
FROM
20+
XYZ.VIEW_TPW_TASK
21+
WHERE
22+
ERROR_MESSAGE IS NOT NULL
23+
AND TASK_ID > 0
24+
GROUP BY
25+
PJOB_ID
26+
) F,
1427
XYZ.TPW_WF_STATE S,
1528
(
1629
SELECT
@@ -44,7 +57,8 @@ FROM
4457
XYZ.TPW_PJOB_ARCHIVE
4558
) J
4659
WHERE
47-
S.STATE_ID = J.STATE_ID
60+
F.PJOB_ID(+) = J.PJOB_ID
61+
AND S.STATE_ID = J.STATE_ID
4862

4963
----------------------------------------------------------------------------------------------------
5064
--

‎TaskParallelFoundation/Databases/SqlServer/Schema Objects/Schemas/dbo/Views/VIEW_TPW_PJOB.view.sql‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ SELECT
88
J.EXPIRY_TIME,
99
J.START_TIME,
1010
J.END_TIME,
11+
ISNULL(F.FAILED_COUNT, 0) AS FAILED_TASKS,
1112
J.USER_APP,
1213
J.USER_NAME,
1314
J.DESCRIPTION_
1415
FROM
15-
TPW_WF_STATE S,
1616
(
1717
SELECT
1818
PJOB_ID,
@@ -44,8 +44,26 @@ FROM
4444
FROM
4545
TPW_PJOB_ARCHIVE
4646
) J
47-
WHERE
48-
S.STATE_ID = J.STATE_ID;
47+
48+
INNER JOIN
49+
TPW_WF_STATE S
50+
ON (S.STATE_ID = J.STATE_ID)
51+
52+
LEFT JOIN
53+
(
54+
SELECT
55+
PJOB_ID,
56+
COUNT(*) AS FAILED_COUNT
57+
FROM
58+
VIEW_TPW_TASK
59+
WHERE
60+
ERROR_MESSAGE != N''
61+
AND TASK_ID > 0
62+
GROUP BY
63+
PJOB_ID
64+
) F
65+
ON (F.PJOB_ID = J.PJOB_ID)
66+
;
4967

5068
----------------------------------------------------------------------------------------------------
5169
--

‎TaskParallelFoundation/Databases/SqlServer/SqlServer.sqlproj‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -105,108 +105,32 @@
105105
<Folder Include="Scripts" />
106106
<Folder Include="Scripts\Pre-Deployment" />
107107
<Folder Include="Scripts\Post-Deployment" />
108-
<Folder Include="Data Generation Plans" />
109-
<Folder Include="Schema Comparisons" />
110108
<Folder Include="Properties\" />
111109
<Folder Include="Schema Objects\" />
112110
<Folder Include="Schema Objects\Schemas\" />
113111
<Folder Include="Schema Objects\Schemas\dbo\" />
114112
<Folder Include="Schema Objects\Schemas\dbo\Programmability\" />
115-
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Defaults\" />
116113
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Functions\" />
117-
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Rules\" />
118114
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Stored Procedures\" />
119-
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\" />
120-
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\User Defined Data Types\" />
121-
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\User Defined Types CLR\" />
122-
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\User Defined Table Types\" />
123-
<Folder Include="Schema Objects\Schemas\dbo\Programmability\Types\XML Schema Collections\" />
124-
<Folder Include="Schema Objects\Schemas\dbo\Service Broker\" />
125-
<Folder Include="Schema Objects\Schemas\dbo\Service Broker\Queues\" />
126-
<Folder Include="Schema Objects\Schemas\dbo\Synonyms\" />
127115
<Folder Include="Schema Objects\Schemas\dbo\Tables\" />
128116
<Folder Include="Schema Objects\Schemas\dbo\Tables\Constraints\" />
129117
<Folder Include="Schema Objects\Schemas\dbo\Tables\Indexes\" />
130118
<Folder Include="Schema Objects\Schemas\dbo\Tables\Keys\" />
131119
<Folder Include="Schema Objects\Schemas\dbo\Tables\Triggers\" />
132120
<Folder Include="Schema Objects\Schemas\dbo\Tables\Statistics\" />
133121
<Folder Include="Schema Objects\Schemas\dbo\Views\" />
134-
<Folder Include="Schema Objects\Schemas\dbo\Views\Indexes\" />
135-
<Folder Include="Schema Objects\Schemas\dbo\Views\Triggers\" />
136-
<Folder Include="Schema Objects\Schemas\dbo\Views\Statistics\" />
137122
<Folder Include="Schema Objects\Database Level Objects\" />
138-
<Folder Include="Schema Objects\Database Level Objects\Assemblies\" />
139-
<Folder Include="Schema Objects\Database Level Objects\Database Triggers\" />
140123
<Folder Include="Schema Objects\Database Level Objects\Security\" />
141124
<Folder Include="Schema Objects\Database Level Objects\Security\Schemas\" />
142-
<Folder Include="Schema Objects\Database Level Objects\Security\Users\" />
143-
<Folder Include="Schema Objects\Database Level Objects\Security\Certificates\" />
144-
<Folder Include="Schema Objects\Database Level Objects\Security\Asymmetric Keys\" />
145-
<Folder Include="Schema Objects\Database Level Objects\Security\Master Keys\" />
146-
<Folder Include="Schema Objects\Database Level Objects\Security\Signatures\" />
147-
<Folder Include="Schema Objects\Database Level Objects\Security\Symmetric Keys\" />
148-
<Folder Include="Schema Objects\Database Level Objects\Security\Database Encryption Keys\" />
149-
<Folder Include="Schema Objects\Database Level Objects\Security\Database Audit Specification\" />
150-
<Folder Include="Schema Objects\Database Level Objects\Security\Roles\" />
151-
<Folder Include="Schema Objects\Database Level Objects\Security\Roles\Application Roles\" />
152-
<Folder Include="Schema Objects\Database Level Objects\Security\Roles\Database Roles\" />
153-
<Folder Include="Schema Objects\Database Level Objects\Service Broker\" />
154-
<Folder Include="Schema Objects\Database Level Objects\Service Broker\Broker Priorities\" />
155-
<Folder Include="Schema Objects\Database Level Objects\Service Broker\Contracts\" />
156-
<Folder Include="Schema Objects\Database Level Objects\Service Broker\Event Notifications\" />
157-
<Folder Include="Schema Objects\Database Level Objects\Service Broker\Message Types\" />
158-
<Folder Include="Schema Objects\Database Level Objects\Service Broker\Remote Service Binding\" />
159-
<Folder Include="Schema Objects\Database Level Objects\Service Broker\Routes\" />
160-
<Folder Include="Schema Objects\Database Level Objects\Service Broker\Services\" />
161-
<Folder Include="Schema Objects\Database Level Objects\Storage\" />
162-
<Folder Include="Schema Objects\Database Level Objects\Storage\Full Text Stoplists\" />
163-
<Folder Include="Schema Objects\Database Level Objects\Storage\Filegroups\" />
164-
<Folder Include="Schema Objects\Database Level Objects\Storage\Files\" />
165-
<Folder Include="Schema Objects\Database Level Objects\Storage\Full Text Catalogs\" />
166-
<Folder Include="Schema Objects\Database Level Objects\Storage\Partition Functions\" />
167-
<Folder Include="Schema Objects\Database Level Objects\Storage\Partition Schemes\" />
168125
<Folder Include="Schema Objects\Schemas\client\" />
169126
<Folder Include="Schema Objects\Schemas\client\Programmability\" />
170-
<Folder Include="Schema Objects\Schemas\client\Programmability\Defaults\" />
171-
<Folder Include="Schema Objects\Schemas\client\Programmability\Functions\" />
172-
<Folder Include="Schema Objects\Schemas\client\Programmability\Rules\" />
173127
<Folder Include="Schema Objects\Schemas\client\Programmability\Stored Procedures\" />
174-
<Folder Include="Schema Objects\Schemas\client\Programmability\Types\" />
175-
<Folder Include="Schema Objects\Schemas\client\Programmability\Types\User Defined Data Types\" />
176-
<Folder Include="Schema Objects\Schemas\client\Programmability\Types\User Defined Types CLR\" />
177-
<Folder Include="Schema Objects\Schemas\client\Programmability\Types\XML Schema Collections\" />
178-
<Folder Include="Schema Objects\Schemas\client\Synonyms\" />
179-
<Folder Include="Schema Objects\Schemas\client\Tables\" />
180-
<Folder Include="Schema Objects\Schemas\client\Tables\Constraints\" />
181-
<Folder Include="Schema Objects\Schemas\client\Tables\Indexes\" />
182-
<Folder Include="Schema Objects\Schemas\client\Tables\Keys\" />
183-
<Folder Include="Schema Objects\Schemas\client\Tables\Triggers\" />
184-
<Folder Include="Schema Objects\Schemas\client\Tables\Statistics\" />
185128
<Folder Include="Schema Objects\Schemas\client\Views\" />
186-
<Folder Include="Schema Objects\Schemas\client\Views\Indexes\" />
187-
<Folder Include="Schema Objects\Schemas\client\Views\Triggers\" />
188-
<Folder Include="Schema Objects\Schemas\client\Views\Statistics\" />
189129
<Folder Include="Schema Objects\Schemas\test\" />
190130
<Folder Include="Schema Objects\Schemas\test\Programmability\" />
191-
<Folder Include="Schema Objects\Schemas\test\Programmability\Defaults\" />
192-
<Folder Include="Schema Objects\Schemas\test\Programmability\Functions\" />
193-
<Folder Include="Schema Objects\Schemas\test\Programmability\Rules\" />
194131
<Folder Include="Schema Objects\Schemas\test\Programmability\Stored Procedures\" />
195-
<Folder Include="Schema Objects\Schemas\test\Programmability\Types\" />
196-
<Folder Include="Schema Objects\Schemas\test\Programmability\Types\User Defined Data Types\" />
197-
<Folder Include="Schema Objects\Schemas\test\Programmability\Types\User Defined Types CLR\" />
198-
<Folder Include="Schema Objects\Schemas\test\Programmability\Types\XML Schema Collections\" />
199-
<Folder Include="Schema Objects\Schemas\test\Synonyms\" />
200132
<Folder Include="Schema Objects\Schemas\test\Tables\" />
201-
<Folder Include="Schema Objects\Schemas\test\Tables\Constraints\" />
202-
<Folder Include="Schema Objects\Schemas\test\Tables\Indexes\" />
203-
<Folder Include="Schema Objects\Schemas\test\Tables\Keys\" />
204-
<Folder Include="Schema Objects\Schemas\test\Tables\Triggers\" />
205-
<Folder Include="Schema Objects\Schemas\test\Tables\Statistics\" />
206133
<Folder Include="Schema Objects\Schemas\test\Views\" />
207-
<Folder Include="Schema Objects\Schemas\test\Views\Indexes\" />
208-
<Folder Include="Schema Objects\Schemas\test\Views\Triggers\" />
209-
<Folder Include="Schema Objects\Schemas\test\Views\Statistics\" />
210134
</ItemGroup>
211135
<ItemGroup>
212136
<BuildContributorArgument Include="OutDir=$(OutDir)" />

‎TaskParallelFoundation/Databases/SqlServer/SqlServer.sqlproj.vspscc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
""
2+
{
3+
"FILE_VERSION" = "9237"
4+
"ENLISTMENT_CHOICE" = "NEVER"
5+
"PROJECT_FILE_RELATIVE_PATH" = ""
6+
"NUMBER_OF_EXCLUDED_FILES" = "0"
7+
"ORIGINAL_PROJECT_FILE_PATH" = ""
8+
"NUMBER_OF_NESTED_PROJECTS" = "0"
9+
"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER"
10+
}

0 commit comments

Comments
 (0)