From 6de981a64464bbea353601fe4ec057c12acceed6 Mon Sep 17 00:00:00 2001
From: Steven Murray <steven.murray@cern.ch>
Date: Fri, 1 Apr 2016 16:40:07 +0200
Subject: [PATCH] Removed minimum files and bytes from the use of mount policy
within the catalogue
---
catalogue/SqliteCatalogue.cpp | 8 --------
1 file changed, 8 deletions(-)
diff --git a/catalogue/SqliteCatalogue.cpp b/catalogue/SqliteCatalogue.cpp
index 5eb0292b3a..f107341094 100644
--- a/catalogue/SqliteCatalogue.cpp
+++ b/catalogue/SqliteCatalogue.cpp
@@ -2101,8 +2101,6 @@ cta::common::dataStructures::MountPolicy cta::catalogue::SqliteCatalogue::
const char *const sql =
"SELECT "
"ARCHIVE_PRIORITY AS ARCHIVE_PRIORITY,"
- "MIN_ARCHIVE_FILES_QUEUED AS MIN_ARCHIVE_FILES_QUEUED,"
- "MIN_ARCHIVE_BYTES_QUEUED AS MIN_ARCHIVE_BYTES_QUEUED,"
"MIN_ARCHIVE_REQUEST_AGE AS MIN_ARCHIVE_REQUEST_AGE,"
"MAX_DRIVES_ALLOWED AS MAX_DRIVES_ALLOWED "
@@ -2117,8 +2115,6 @@ cta::common::dataStructures::MountPolicy cta::catalogue::SqliteCatalogue::
nameToIdx = stmt->getColumnNameToIdx();
common::dataStructures::MountPolicy policy;
policy.priority = stmt->columnUint64(nameToIdx["ARCHIVE_PRIORITY"]);
- policy.minFilesQueued = stmt->columnUint64(nameToIdx["MIN_ARCHIVE_FILES_QUEUED"]);
- policy.minBytesQueued = stmt->columnUint64(nameToIdx["MIN_ARCHIVE_BYTES_QUEUED"]);
policy.minRequestAge = stmt->columnUint64(nameToIdx["MIN_ARCHIVE_REQUEST_AGE"]);
policy.maxDrives = stmt->columnUint64(nameToIdx["MAX_DRIVES_ALLOWED"]);
return policy;
@@ -2138,8 +2134,6 @@ cta::common::dataStructures::MountPolicy cta::catalogue::SqliteCatalogue::
const char *const sql =
"SELECT "
"RETRIEVE_PRIORITY AS RETRIEVE_PRIORITY,"
- "MIN_RETRIEVE_FILES_QUEUED AS MIN_RETRIEVE_FILES_QUEUED,"
- "MIN_RETRIEVE_BYTES_QUEUED AS MIN_RETRIEVE_BYTES_QUEUED,"
"MIN_RETRIEVE_REQUEST_AGE AS MIN_RETRIEVE_REQUEST_AGE,"
"MAX_DRIVES_ALLOWED AS MAX_DRIVES_ALLOWED "
@@ -2154,8 +2148,6 @@ cta::common::dataStructures::MountPolicy cta::catalogue::SqliteCatalogue::
nameToIdx = stmt->getColumnNameToIdx();
common::dataStructures::MountPolicy policy;
policy.priority = stmt->columnUint64(nameToIdx["RETRIEVE_PRIORITY"]);
- policy.minFilesQueued = stmt->columnUint64(nameToIdx["MIN_RETRIEVE_FILES_QUEUED"]);
- policy.minBytesQueued = stmt->columnUint64(nameToIdx["MIN_RETRIEVE_BYTES_QUEUED"]);
policy.minRequestAge = stmt->columnUint64(nameToIdx["MIN_RETRIEVE_REQUEST_AGE"]);
policy.maxDrives = stmt->columnUint64(nameToIdx["MAX_DRIVES_ALLOWED"]);
return policy;
--
GitLab