Mercurial > hg > orthanc-databases
annotate Resources/Orthanc/Databases/ISqlLookupFormatter.cpp @ 433:5964ce6385a5 pg-transactions
use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Wed, 13 Dec 2023 15:48:56 +0100 |
| parents | c1b0f3c4e1f5 |
| children | ecd0b719cff5 |
| rev | line source |
|---|---|
| 152 | 1 /** |
| 2 * Orthanc - A Lightweight, RESTful DICOM Store | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 405 | 5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
| 6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium | |
| 152 | 7 * |
| 8 * This program is free software: you can redistribute it and/or | |
| 9 * modify it under the terms of the GNU General Public License as | |
| 10 * published by the Free Software Foundation, either version 3 of the | |
| 11 * License, or (at your option) any later version. | |
| 12 * | |
| 13 * This program is distributed in the hope that it will be useful, but | |
| 14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 16 * General Public License for more details. | |
| 17 * | |
| 18 * You should have received a copy of the GNU General Public License | |
| 19 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 20 **/ | |
| 21 | |
| 22 | |
| 23 #if !defined(ORTHANC_BUILDING_SERVER_LIBRARY) | |
| 24 # error Macro ORTHANC_BUILDING_SERVER_LIBRARY must be defined | |
| 25 #endif | |
| 26 | |
| 27 #if ORTHANC_BUILDING_SERVER_LIBRARY == 1 | |
| 28 # include "../PrecompiledHeadersServer.h" | |
| 29 #endif | |
| 30 | |
| 31 #include "ISqlLookupFormatter.h" | |
| 32 | |
| 33 #if ORTHANC_BUILDING_SERVER_LIBRARY == 1 | |
| 34 # include "../../../OrthancFramework/Sources/OrthancException.h" | |
| 425 | 35 # include "../../../OrthancFramework/Sources/Toolbox.h" |
| 152 | 36 #else |
| 37 # include <OrthancException.h> | |
| 425 | 38 # include <Toolbox.h> |
| 152 | 39 #endif |
| 40 | |
| 41 #include "DatabaseConstraint.h" | |
| 42 | |
| 170 | 43 #include <boost/lexical_cast.hpp> |
| 405 | 44 #include <list> |
| 170 | 45 |
| 46 | |
| 152 | 47 namespace Orthanc |
| 48 { | |
| 49 static std::string FormatLevel(ResourceType level) | |
| 50 { | |
| 51 switch (level) | |
| 52 { | |
| 53 case ResourceType_Patient: | |
| 54 return "patients"; | |
| 55 | |
| 56 case ResourceType_Study: | |
| 57 return "studies"; | |
| 58 | |
| 59 case ResourceType_Series: | |
| 60 return "series"; | |
| 61 | |
| 62 case ResourceType_Instance: | |
| 63 return "instances"; | |
| 64 | |
| 65 default: | |
| 66 throw OrthancException(ErrorCode_InternalError); | |
| 67 } | |
| 68 } | |
| 69 | |
| 70 | |
| 71 static bool FormatComparison(std::string& target, | |
| 72 ISqlLookupFormatter& formatter, | |
| 73 const DatabaseConstraint& constraint, | |
|
354
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
74 size_t index, |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
75 bool escapeBrackets) |
| 152 | 76 { |
| 77 std::string tag = "t" + boost::lexical_cast<std::string>(index); | |
| 78 | |
| 79 std::string comparison; | |
| 80 | |
| 81 switch (constraint.GetConstraintType()) | |
| 82 { | |
| 83 case ConstraintType_Equal: | |
| 84 case ConstraintType_SmallerOrEqual: | |
| 85 case ConstraintType_GreaterOrEqual: | |
| 86 { | |
| 87 std::string op; | |
| 88 switch (constraint.GetConstraintType()) | |
| 89 { | |
| 90 case ConstraintType_Equal: | |
| 91 op = "="; | |
| 92 break; | |
| 93 | |
| 94 case ConstraintType_SmallerOrEqual: | |
| 95 op = "<="; | |
| 96 break; | |
| 97 | |
| 98 case ConstraintType_GreaterOrEqual: | |
| 99 op = ">="; | |
| 100 break; | |
| 101 | |
| 102 default: | |
| 103 throw OrthancException(ErrorCode_InternalError); | |
| 104 } | |
| 105 | |
| 106 std::string parameter = formatter.GenerateParameter(constraint.GetSingleValue()); | |
| 107 | |
| 108 if (constraint.IsCaseSensitive()) | |
| 109 { | |
| 110 comparison = tag + ".value " + op + " " + parameter; | |
| 111 } | |
| 112 else | |
| 113 { | |
| 114 comparison = "lower(" + tag + ".value) " + op + " lower(" + parameter + ")"; | |
| 115 } | |
| 116 | |
| 117 break; | |
| 118 } | |
| 119 | |
| 120 case ConstraintType_List: | |
| 121 { | |
| 122 for (size_t i = 0; i < constraint.GetValuesCount(); i++) | |
| 123 { | |
| 124 if (!comparison.empty()) | |
| 125 { | |
| 126 comparison += ", "; | |
| 127 } | |
| 128 | |
| 129 std::string parameter = formatter.GenerateParameter(constraint.GetValue(i)); | |
| 130 | |
| 131 if (constraint.IsCaseSensitive()) | |
| 132 { | |
| 133 comparison += parameter; | |
| 134 } | |
| 135 else | |
| 136 { | |
| 137 comparison += "lower(" + parameter + ")"; | |
| 138 } | |
| 139 } | |
| 140 | |
| 141 if (constraint.IsCaseSensitive()) | |
| 142 { | |
| 143 comparison = tag + ".value IN (" + comparison + ")"; | |
| 144 } | |
| 145 else | |
| 146 { | |
| 147 comparison = "lower(" + tag + ".value) IN (" + comparison + ")"; | |
| 148 } | |
| 149 | |
| 150 break; | |
| 151 } | |
| 152 | |
| 153 case ConstraintType_Wildcard: | |
| 154 { | |
| 155 const std::string value = constraint.GetSingleValue(); | |
| 156 | |
| 157 if (value == "*") | |
| 158 { | |
| 159 if (!constraint.IsMandatory()) | |
| 160 { | |
| 161 // Universal constraint on an optional tag, ignore it | |
| 162 return false; | |
| 163 } | |
| 164 } | |
| 165 else | |
| 166 { | |
| 167 std::string escaped; | |
| 168 escaped.reserve(value.size()); | |
| 169 | |
| 170 for (size_t i = 0; i < value.size(); i++) | |
| 171 { | |
| 172 if (value[i] == '*') | |
| 173 { | |
| 174 escaped += "%"; | |
| 175 } | |
| 176 else if (value[i] == '?') | |
| 177 { | |
| 178 escaped += "_"; | |
| 179 } | |
| 180 else if (value[i] == '%') | |
| 181 { | |
| 182 escaped += "\\%"; | |
| 183 } | |
| 184 else if (value[i] == '_') | |
| 185 { | |
| 186 escaped += "\\_"; | |
| 187 } | |
| 188 else if (value[i] == '\\') | |
| 189 { | |
| 190 escaped += "\\\\"; | |
| 191 } | |
|
354
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
192 else if (escapeBrackets && value[i] == '[') |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
193 { |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
194 escaped += "\\["; |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
195 } |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
196 else if (escapeBrackets && value[i] == ']') |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
197 { |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
198 escaped += "\\]"; |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
199 } |
| 152 | 200 else |
| 201 { | |
| 202 escaped += value[i]; | |
| 203 } | |
| 204 } | |
| 205 | |
| 206 std::string parameter = formatter.GenerateParameter(escaped); | |
| 207 | |
| 208 if (constraint.IsCaseSensitive()) | |
| 209 { | |
| 210 comparison = (tag + ".value LIKE " + parameter + " " + | |
| 211 formatter.FormatWildcardEscape()); | |
| 212 } | |
| 213 else | |
| 214 { | |
| 215 comparison = ("lower(" + tag + ".value) LIKE lower(" + | |
| 216 parameter + ") " + formatter.FormatWildcardEscape()); | |
| 217 } | |
| 218 } | |
| 219 | |
| 220 break; | |
| 221 } | |
| 222 | |
| 223 default: | |
| 224 return false; | |
| 225 } | |
| 226 | |
| 227 if (constraint.IsMandatory()) | |
| 228 { | |
| 229 target = comparison; | |
| 230 } | |
| 231 else if (comparison.empty()) | |
| 232 { | |
| 233 target = tag + ".value IS NULL"; | |
| 234 } | |
| 235 else | |
| 236 { | |
| 237 target = tag + ".value IS NULL OR " + comparison; | |
| 238 } | |
| 239 | |
| 240 return true; | |
| 241 } | |
| 242 | |
| 243 | |
| 244 static void FormatJoin(std::string& target, | |
| 245 const DatabaseConstraint& constraint, | |
| 246 size_t index) | |
| 247 { | |
| 248 std::string tag = "t" + boost::lexical_cast<std::string>(index); | |
| 249 | |
| 250 if (constraint.IsMandatory()) | |
| 251 { | |
| 252 target = " INNER JOIN "; | |
| 253 } | |
| 254 else | |
| 255 { | |
| 256 target = " LEFT JOIN "; | |
| 257 } | |
| 258 | |
| 259 if (constraint.IsIdentifier()) | |
| 260 { | |
| 261 target += "DicomIdentifiers "; | |
| 262 } | |
| 263 else | |
| 264 { | |
| 265 target += "MainDicomTags "; | |
| 266 } | |
| 267 | |
| 268 target += (tag + " ON " + tag + ".id = " + FormatLevel(constraint.GetLevel()) + | |
| 269 ".internalId AND " + tag + ".tagGroup = " + | |
| 270 boost::lexical_cast<std::string>(constraint.GetTag().GetGroup()) + | |
| 271 " AND " + tag + ".tagElement = " + | |
| 272 boost::lexical_cast<std::string>(constraint.GetTag().GetElement())); | |
| 273 } | |
| 405 | 274 |
| 275 | |
| 276 static std::string Join(const std::list<std::string>& values, | |
| 277 const std::string& prefix, | |
| 278 const std::string& separator) | |
| 279 { | |
| 280 if (values.empty()) | |
| 281 { | |
| 282 return ""; | |
| 283 } | |
| 284 else | |
| 285 { | |
| 286 std::string s = prefix; | |
| 287 | |
| 288 bool first = true; | |
| 289 for (std::list<std::string>::const_iterator it = values.begin(); it != values.end(); ++it) | |
| 290 { | |
| 291 if (first) | |
| 292 { | |
| 293 first = false; | |
| 294 } | |
| 295 else | |
| 296 { | |
| 297 s += separator; | |
| 298 } | |
| 299 | |
| 300 s += *it; | |
| 301 } | |
| 302 | |
| 303 return s; | |
| 304 } | |
| 305 } | |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
306 |
| 425 | 307 static bool FormatComparison2(std::string& target, |
| 308 ISqlLookupFormatter& formatter, | |
| 309 const DatabaseConstraint& constraint, | |
| 310 bool escapeBrackets) | |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
311 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
312 std::string comparison; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
313 std::string tagFilter = ("tagGroup = " + boost::lexical_cast<std::string>(constraint.GetTag().GetGroup()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
314 + " AND tagElement = " + boost::lexical_cast<std::string>(constraint.GetTag().GetElement())); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
315 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
316 switch (constraint.GetConstraintType()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
317 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
318 case ConstraintType_Equal: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
319 case ConstraintType_SmallerOrEqual: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
320 case ConstraintType_GreaterOrEqual: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
321 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
322 std::string op; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
323 switch (constraint.GetConstraintType()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
324 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
325 case ConstraintType_Equal: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
326 op = "="; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
327 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
328 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
329 case ConstraintType_SmallerOrEqual: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
330 op = "<="; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
331 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
332 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
333 case ConstraintType_GreaterOrEqual: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
334 op = ">="; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
335 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
336 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
337 default: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
338 throw OrthancException(ErrorCode_InternalError); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
339 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
340 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
341 std::string parameter = formatter.GenerateParameter(constraint.GetSingleValue()); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
342 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
343 if (constraint.IsCaseSensitive()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
344 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
345 comparison = " AND value " + op + " " + parameter; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
346 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
347 else |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
348 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
349 comparison = " AND lower(value) " + op + " lower(" + parameter + ")"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
350 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
351 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
352 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
353 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
354 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
355 case ConstraintType_List: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
356 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
357 std::vector<std::string> comparisonValues; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
358 for (size_t i = 0; i < constraint.GetValuesCount(); i++) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
359 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
360 std::string parameter = formatter.GenerateParameter(constraint.GetValue(i)); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
361 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
362 if (constraint.IsCaseSensitive()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
363 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
364 comparisonValues.push_back(parameter); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
365 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
366 else |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
367 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
368 comparisonValues.push_back("lower(" + parameter + ")"); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
369 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
370 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
371 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
372 std::string values; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
373 Toolbox::JoinStrings(values, comparisonValues, ", "); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
374 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
375 if (constraint.IsCaseSensitive()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
376 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
377 comparison = " AND value IN (" + values + ")"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
378 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
379 else |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
380 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
381 comparison = " AND lower(value) IN (" + values + ")"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
382 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
383 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
384 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
385 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
386 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
387 case ConstraintType_Wildcard: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
388 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
389 const std::string value = constraint.GetSingleValue(); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
390 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
391 if (value == "*") |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
392 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
393 if (!constraint.IsMandatory()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
394 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
395 // Universal constraint on an optional tag, ignore it |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
396 return false; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
397 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
398 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
399 else |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
400 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
401 std::string escaped; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
402 escaped.reserve(value.size()); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
403 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
404 for (size_t i = 0; i < value.size(); i++) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
405 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
406 if (value[i] == '*') |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
407 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
408 escaped += "%"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
409 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
410 else if (value[i] == '?') |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
411 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
412 escaped += "_"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
413 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
414 else if (value[i] == '%') |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
415 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
416 escaped += "\\%"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
417 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
418 else if (value[i] == '_') |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
419 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
420 escaped += "\\_"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
421 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
422 else if (value[i] == '\\') |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
423 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
424 escaped += "\\\\"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
425 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
426 else if (escapeBrackets && value[i] == '[') |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
427 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
428 escaped += "\\["; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
429 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
430 else if (escapeBrackets && value[i] == ']') |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
431 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
432 escaped += "\\]"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
433 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
434 else |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
435 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
436 escaped += value[i]; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
437 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
438 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
439 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
440 std::string parameter = formatter.GenerateParameter(escaped); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
441 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
442 if (constraint.IsCaseSensitive()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
443 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
444 comparison = " AND value LIKE " + parameter + " " + formatter.FormatWildcardEscape(); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
445 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
446 else |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
447 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
448 comparison = " AND lower(value) LIKE lower(" + parameter + ") " + formatter.FormatWildcardEscape(); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
449 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
450 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
451 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
452 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
453 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
454 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
455 default: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
456 return false; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
457 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
458 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
459 if (constraint.IsMandatory()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
460 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
461 target = tagFilter + comparison; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
462 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
463 else if (comparison.empty()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
464 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
465 target = tagFilter + " AND value IS NULL"; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
466 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
467 else |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
468 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
469 target = tagFilter + " AND value IS NULL OR " + comparison; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
470 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
471 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
472 return true; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
473 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
474 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
475 |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
476 void ISqlLookupFormatter::GetLookupLevels(ResourceType& lowerLevel, ResourceType& upperLevel, const ResourceType& queryLevel, const std::vector<DatabaseConstraint>& lookup) |
| 152 | 477 { |
| 478 assert(ResourceType_Patient < ResourceType_Study && | |
| 479 ResourceType_Study < ResourceType_Series && | |
| 480 ResourceType_Series < ResourceType_Instance); | |
| 481 | |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
482 lowerLevel = queryLevel; |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
483 upperLevel = queryLevel; |
| 152 | 484 |
| 485 for (size_t i = 0; i < lookup.size(); i++) | |
| 486 { | |
| 487 ResourceType level = lookup[i].GetLevel(); | |
| 488 | |
| 489 if (level < upperLevel) | |
| 490 { | |
| 491 upperLevel = level; | |
| 492 } | |
| 493 | |
| 494 if (level > lowerLevel) | |
| 495 { | |
| 496 lowerLevel = level; | |
| 497 } | |
| 498 } | |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
499 } |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
500 |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
501 |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
502 void ISqlLookupFormatter::Apply(std::string& sql, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
503 ISqlLookupFormatter& formatter, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
504 const std::vector<DatabaseConstraint>& lookup, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
505 ResourceType queryLevel, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
506 const std::set<std::string>& labels, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
507 LabelsConstraint labelsConstraint, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
508 size_t limit) |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
509 { |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
510 ResourceType lowerLevel, upperLevel; |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
511 GetLookupLevels(lowerLevel, upperLevel, queryLevel, lookup); |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
512 |
| 152 | 513 assert(upperLevel <= queryLevel && |
| 514 queryLevel <= lowerLevel); | |
| 515 | |
|
354
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
516 const bool escapeBrackets = formatter.IsEscapeBrackets(); |
|
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
517 |
| 152 | 518 std::string joins, comparisons; |
| 519 | |
| 520 size_t count = 0; | |
| 521 | |
| 522 for (size_t i = 0; i < lookup.size(); i++) | |
| 523 { | |
| 524 std::string comparison; | |
| 525 | |
|
354
2a3bbb4104fa
fix changeset 389c037387ea
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
353
diff
changeset
|
526 if (FormatComparison(comparison, formatter, lookup[i], count, escapeBrackets)) |
| 152 | 527 { |
| 528 std::string join; | |
| 529 FormatJoin(join, lookup[i], count); | |
| 530 joins += join; | |
| 531 | |
| 532 if (!comparison.empty()) | |
| 533 { | |
| 534 comparisons += " AND " + comparison; | |
| 535 } | |
| 536 | |
| 537 count ++; | |
| 538 } | |
| 539 } | |
| 540 | |
| 541 sql = ("SELECT " + | |
| 542 FormatLevel(queryLevel) + ".publicId, " + | |
| 543 FormatLevel(queryLevel) + ".internalId" + | |
| 544 " FROM Resources AS " + FormatLevel(queryLevel)); | |
| 545 | |
| 546 for (int level = queryLevel - 1; level >= upperLevel; level--) | |
| 547 { | |
| 548 sql += (" INNER JOIN Resources " + | |
| 549 FormatLevel(static_cast<ResourceType>(level)) + " ON " + | |
| 550 FormatLevel(static_cast<ResourceType>(level)) + ".internalId=" + | |
| 551 FormatLevel(static_cast<ResourceType>(level + 1)) + ".parentId"); | |
| 552 } | |
| 553 | |
| 554 for (int level = queryLevel + 1; level <= lowerLevel; level++) | |
| 555 { | |
| 556 sql += (" INNER JOIN Resources " + | |
| 557 FormatLevel(static_cast<ResourceType>(level)) + " ON " + | |
| 558 FormatLevel(static_cast<ResourceType>(level - 1)) + ".internalId=" + | |
| 559 FormatLevel(static_cast<ResourceType>(level)) + ".parentId"); | |
| 560 } | |
| 405 | 561 |
| 562 std::list<std::string> where; | |
| 563 where.push_back(FormatLevel(queryLevel) + ".resourceType = " + | |
| 564 formatter.FormatResourceType(queryLevel) + comparisons); | |
| 565 | |
| 566 if (!labels.empty()) | |
| 567 { | |
| 568 /** | |
| 569 * "In SQL Server, NOT EXISTS and NOT IN predicates are the best | |
| 570 * way to search for missing values, as long as both columns in | |
| 571 * question are NOT NULL." | |
| 572 * https://explainextended.com/2009/09/15/not-in-vs-not-exists-vs-left-join-is-null-sql-server/ | |
| 573 **/ | |
| 574 | |
| 575 std::list<std::string> formattedLabels; | |
| 576 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it) | |
| 577 { | |
| 578 formattedLabels.push_back(formatter.GenerateParameter(*it)); | |
| 579 } | |
| 580 | |
| 581 std::string condition; | |
| 582 switch (labelsConstraint) | |
| 583 { | |
| 584 case LabelsConstraint_Any: | |
| 585 condition = "> 0"; | |
| 586 break; | |
| 587 | |
| 588 case LabelsConstraint_All: | |
| 589 condition = "= " + boost::lexical_cast<std::string>(labels.size()); | |
| 590 break; | |
| 591 | |
| 592 case LabelsConstraint_None: | |
| 593 condition = "= 0"; | |
| 594 break; | |
| 595 | |
| 596 default: | |
| 597 throw OrthancException(ErrorCode_ParameterOutOfRange); | |
| 598 } | |
| 152 | 599 |
| 405 | 600 where.push_back("(SELECT COUNT(1) FROM Labels AS selectedLabels WHERE selectedLabels.id = " + FormatLevel(queryLevel) + |
| 601 ".internalId AND selectedLabels.label IN (" + Join(formattedLabels, "", ", ") + ")) " + condition); | |
| 602 } | |
| 603 | |
| 604 sql += joins + Join(where, " WHERE ", " AND "); | |
| 152 | 605 |
| 606 if (limit != 0) | |
| 607 { | |
| 608 sql += " LIMIT " + boost::lexical_cast<std::string>(limit); | |
| 609 } | |
| 610 } | |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
611 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
612 |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
613 void ISqlLookupFormatter::ApplySingleLevel(std::string& sql, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
614 ISqlLookupFormatter& formatter, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
615 const std::vector<DatabaseConstraint>& lookup, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
616 ResourceType queryLevel, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
617 const std::set<std::string>& labels, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
618 LabelsConstraint labelsConstraint, |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
619 size_t limit |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
620 ) |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
621 { |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
622 ResourceType lowerLevel, upperLevel; |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
623 GetLookupLevels(lowerLevel, upperLevel, queryLevel, lookup); |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
624 |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
625 assert(upperLevel == queryLevel && |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
626 queryLevel == lowerLevel); |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
627 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
628 const bool escapeBrackets = formatter.IsEscapeBrackets(); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
629 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
630 std::vector<std::string> mainDicomTagsComparisons, dicomIdentifiersComparisons; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
631 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
632 for (size_t i = 0; i < lookup.size(); i++) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
633 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
634 std::string comparison; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
635 |
| 425 | 636 if (FormatComparison2(comparison, formatter, lookup[i], escapeBrackets)) |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
637 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
638 if (!comparison.empty()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
639 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
640 if (lookup[i].IsIdentifier()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
641 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
642 dicomIdentifiersComparisons.push_back(comparison); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
643 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
644 else |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
645 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
646 mainDicomTagsComparisons.push_back(comparison); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
647 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
648 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
649 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
650 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
651 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
652 sql = ("SELECT publicId, internalId " |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
653 "FROM Resources " |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
654 "WHERE resourceType = " + formatter.FormatResourceType(queryLevel) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
655 + " "); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
656 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
657 if (dicomIdentifiersComparisons.size() > 0) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
658 { |
| 416 | 659 for (std::vector<std::string>::const_iterator it = dicomIdentifiersComparisons.begin(); it < dicomIdentifiersComparisons.end(); ++it) |
| 660 { | |
| 661 sql += (" AND internalId IN (SELECT id FROM DicomIdentifiers WHERE " + *it + ") "); | |
| 662 } | |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
663 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
664 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
665 if (mainDicomTagsComparisons.size() > 0) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
666 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
667 std::string comparisons; |
| 416 | 668 for (std::vector<std::string>::const_iterator it = mainDicomTagsComparisons.begin(); it < mainDicomTagsComparisons.end(); ++it) |
| 669 { | |
| 670 sql += (" AND internalId IN (SELECT id FROM MainDicomTags WHERE " + *it + ") "); | |
| 671 } | |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
672 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
673 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
674 if (!labels.empty()) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
675 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
676 /** |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
677 * "In SQL Server, NOT EXISTS and NOT IN predicates are the best |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
678 * way to search for missing values, as long as both columns in |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
679 * question are NOT NULL." |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
680 * https://explainextended.com/2009/09/15/not-in-vs-not-exists-vs-left-join-is-null-sql-server/ |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
681 **/ |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
682 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
683 std::list<std::string> formattedLabels; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
684 for (std::set<std::string>::const_iterator it = labels.begin(); it != labels.end(); ++it) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
685 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
686 formattedLabels.push_back(formatter.GenerateParameter(*it)); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
687 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
688 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
689 std::string condition; |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
690 std::string inOrNotIn; |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
691 switch (labelsConstraint) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
692 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
693 case LabelsConstraint_Any: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
694 condition = "> 0"; |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
695 inOrNotIn = "IN"; |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
696 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
697 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
698 case LabelsConstraint_All: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
699 condition = "= " + boost::lexical_cast<std::string>(labels.size()); |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
700 inOrNotIn = "IN"; |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
701 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
702 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
703 case LabelsConstraint_None: |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
704 condition = "> 0"; |
|
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
705 inOrNotIn = "NOT IN"; |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
706 break; |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
707 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
708 default: |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
709 throw OrthancException(ErrorCode_ParameterOutOfRange); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
710 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
711 |
|
415
7e123f047771
LookupResources optimization continued
Alain Mazy <am@osimis.io>
parents:
414
diff
changeset
|
712 sql += (" AND internalId " + inOrNotIn + " (SELECT id" |
|
414
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
713 " FROM (SELECT id, COUNT(1) AS labelsCount " |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
714 "FROM Labels " |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
715 "WHERE label IN (" + Join(formattedLabels, "", ", ") + ") GROUP BY id" |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
716 ") AS temp " |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
717 " WHERE labelsCount " + condition + ")"); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
718 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
719 |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
720 if (limit != 0) |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
721 { |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
722 sql += " LIMIT " + boost::lexical_cast<std::string>(limit); |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
723 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
724 } |
|
f2d3b5c5a68d
Optimizing tools/find at studies level only. Integ Tests are ok with PG
Alain Mazy <am@osimis.io>
parents:
406
diff
changeset
|
725 |
| 152 | 726 } |