From 4740a9973efde130bf1204da4d6000f36b3db8cd Mon Sep 17 00:00:00 2001 From: Simon <simon.eismann@uni-wuerzburg.de> Date: Tue, 25 Jul 2017 14:51:05 +0200 Subject: [PATCH] fixed MediaStore queries --- .../DQL-Queries/DMLListEntitiesQuery.dql | 2 -- MediaStore/DQL-Queries/DMLListMetrics.dql | 3 --- MediaStore/DQL-Queries/DMLSelectMetrics.dql | 18 ++++++++++++++---- MediaStore/DQL-Queries/default.properties | 9 ++------- 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 MediaStore/DQL-Queries/DMLListEntitiesQuery.dql delete mode 100644 MediaStore/DQL-Queries/DMLListMetrics.dql diff --git a/MediaStore/DQL-Queries/DMLListEntitiesQuery.dql b/MediaStore/DQL-Queries/DMLListEntitiesQuery.dql deleted file mode 100644 index 7f1aa98..0000000 --- a/MediaStore/DQL-Queries/DMLListEntitiesQuery.dql +++ /dev/null @@ -1,2 +0,0 @@ -LIST ENTITIES -USING dml@'/MediaStore/default.properties'; \ No newline at end of file diff --git a/MediaStore/DQL-Queries/DMLListMetrics.dql b/MediaStore/DQL-Queries/DMLListMetrics.dql deleted file mode 100644 index 4fa62d5..0000000 --- a/MediaStore/DQL-Queries/DMLListMetrics.dql +++ /dev/null @@ -1,3 +0,0 @@ -LIST METRICS (RESOURCE '_v3TAwA1REeWRk4cwFY6DiA' AS res1, - SERVICE 'UploadSCA_ID' AS svc1) -USING dml@'/MediaStore/default.properties'; \ No newline at end of file diff --git a/MediaStore/DQL-Queries/DMLSelectMetrics.dql b/MediaStore/DQL-Queries/DMLSelectMetrics.dql index ead4172..5524909 100644 --- a/MediaStore/DQL-Queries/DMLSelectMetrics.dql +++ b/MediaStore/DQL-Queries/DMLSelectMetrics.dql @@ -1,4 +1,14 @@ -SELECT res1.utilization, svc1.avgResponseTime -FOR RESOURCE '_v3TAwA1REeWRk4cwFY6DiA' AS res1, - SERVICE 'UploadSCA_ID' AS svc1 -USING dml@'/MediaStore/default.properties'; \ No newline at end of file +SELECT DBServer_HDD.utilization, UploadSCA.avgResponseTime +FOR SERVICE 'UploadSCA_ID' AS UploadSCA, + SERVICE '_gxHCUA3hEeWKC634F1E2dQ' AS defaultUsageScenario, + SERVICE 'DownloadSCA_id' AS DownloadSCA, + SERVICE '_i7MecJapEeaocfbVsP-bZA' AS watermark, + SERVICE '_H718EJapEeaocfbVsP-bZA' AS queryDB, + SERVICE '_Iu3w8JaoEeaocfbVsP-bZA' AS upload, + SERVICE '_cPcDAJanEeaocfbVsP-bZA' AS download, + SERVICE '_LBjzAJatEeaocfbVsP-bZA' AS addFile, + RESOURCE '_VG2d4SCpEeWxOb4Q3eQjzQ' AS DBServer_HDD, + RESOURCE '_be1ToSCpEeWxOb4Q3eQjzQ' AS DBServer_CPU, + RESOURCE '_tjH08SCoEeWxOb4Q3eQjzQ' AS AppServer_HDD, + RESOURCE '_BoF_ISCpEeWxOb4Q3eQjzQ' AS AppServer_CPU +USING dml@'default.properties'; \ No newline at end of file diff --git a/MediaStore/DQL-Queries/default.properties b/MediaStore/DQL-Queries/default.properties index 7a056e7..1a9ce8a 100644 --- a/MediaStore/DQL-Queries/default.properties +++ b/MediaStore/DQL-Queries/default.properties @@ -1,7 +1,2 @@ -## Model Instance -dml.files.usageprofile=/MediaStore/default.usageprofile -dml.files.system=/MediaStore/default.system -dml.files.resourcelandscape=/MediaStore/default.resourcelandscape -dml.files.repository=/MediaStore/default.repository -dml.files.deployment=/MediaStore/default.deployment -#dml.outputdirectory=/MediaStore/results/ \ No newline at end of file +dml.files.usageprofile=/../DML-Model/default.usageprofile +dml.files.deployment=/../DML-Model/default.deployment \ No newline at end of file -- GitLab