orthanc-databases: PostgreSQL/Plugins/PostgreSQLIndex.cpp annotate

annotate PostgreSQL/Plugins/PostgreSQLIndex.cpp @ 571:7453fc5bef1a attach-custom-data

fix

author	Alain Mazy <am@orthanc.team>
date	Thu, 26 Sep 2024 08:55:00 +0200
parents	f18e46d7dbf8
children

rev	line source
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
507 54d518dcd74a updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
54d518dcd74a updated copyright, as Orthanc Team now replaces Osimis Sebastien Jodogne <s.jodogne@gmail.com> parents: 499 diff changeset	6 * Copyright (C) 2024-2024 Orthanc Team SRL, Belgium
459 ecd0b719cff5 update year to 2024 Sebastien Jodogne <s.jodogne@gmail.com> parents: 426 diff changeset	7 * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 *
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * This program is free software: you can redistribute it and/or
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * modify it under the terms of the GNU Affero General Public License
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * as published by the Free Software Foundation, either version 3 of
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * the License, or (at your option) any later version.
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 *
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * This program is distributed in the hope that it will be useful, but
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * WITHOUT ANY WARRANTY; without even the implied warranty of
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * Affero General Public License for more details.
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 *
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * You should have received a copy of the GNU Affero General Public License
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 **/
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "PostgreSQLIndex.h"
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 #include "../../Framework/Plugins/GlobalProperties.h"
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 #include "../../Framework/PostgreSQL/PostgreSQLDatabase.h"
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 #include "../../Framework/PostgreSQL/PostgreSQLTransaction.h"
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	29 #include "PostgreSQLDefinitions.h"
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 #include <EmbeddedResources.h> // Auto-generated file
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
157 275e14f57f1e replacing deprecated std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 152 diff changeset	33 #include <Compatibility.h> // For std::unique_ptr<>
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	34 #include <Toolbox.h>
152 063aa53b5917 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 140 diff changeset	35 #include <Logging.h>
063aa53b5917 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 140 diff changeset	36 #include <OrthancException.h>
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	37
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 namespace Orthanc
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 // Some aliases for internal properties
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	42 static const GlobalProperty GlobalProperty_HasTrigramIndex = GlobalProperty_DatabaseInternal0;
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	43 static const GlobalProperty GlobalProperty_HasCreateInstance = GlobalProperty_DatabaseInternal1;
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	44 static const GlobalProperty GlobalProperty_HasFastCountResources = GlobalProperty_DatabaseInternal2;
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	45 static const GlobalProperty GlobalProperty_GetLastChangeIndex = GlobalProperty_DatabaseInternal3;
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	46 }
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	47
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 namespace OrthancDatabases
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	51 PostgreSQLIndex::PostgreSQLIndex(OrthancPluginContext* context,
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	52 const PostgreSQLParameters& parameters) :
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	53 IndexBackend(context),
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	54 parameters_(parameters),
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	55 clearAll_(false)
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	56 {
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	57 }
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	58
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	59
255 d663d9e44f8d reintroduction of IDatabaseFactory into DatabaseManager Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	60 IDatabaseFactory* PostgreSQLIndex::CreateDatabaseFactory()
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	61 {
255 d663d9e44f8d reintroduction of IDatabaseFactory into DatabaseManager Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	62 return PostgreSQLDatabase::CreateDatabaseFactory(parameters_);
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	63 }
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	64
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	65 void PostgreSQLIndex::ApplyPrepareIndex(DatabaseManager::Transaction& t, DatabaseManager& manager)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	66 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	67 std::string query;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	68
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	69 Orthanc::EmbeddedResources::GetFileResource
448 f2427f94d879 added downgrade script + renames version Alain Mazy <am@osimis.io> parents: 437 diff changeset	70 (query, Orthanc::EmbeddedResources::POSTGRESQL_PREPARE_INDEX);
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	71 t.GetDatabaseTransaction().ExecuteMultiLines(query);
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	72 }
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	73
403 91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	74 void PostgreSQLIndex::ConfigureDatabase(DatabaseManager& manager,
91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	75 bool hasIdentifierTags,
91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	76 const std::list<IdentifierTag>& identifierTags)
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 uint32_t expectedVersion = 6;
199 8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	79
8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	80 if (GetContext()) // "GetContext()" can possibly be NULL in the unit tests
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 {
199 8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	82 expectedVersion = OrthancPluginGetExpectedDatabaseVersion(GetContext());
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	83 }
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	84
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 // Check the expected version of the database
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 if (expectedVersion != 6)
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	88 LOG(ERROR) << "This database plugin is incompatible with your version of Orthanc "
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	89 << "expecting the Orthanc DB schema version " << expectedVersion
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 << ", but this plugin is only compatible with version 6";
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 throw Orthanc::OrthancException(Orthanc::ErrorCode_Plugin);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92 }
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	93
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	94 PostgreSQLDatabase& db = dynamic_cast<PostgreSQLDatabase&>(manager.GetDatabase());
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	95
12 41543239072d transactions for storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	96 if (parameters_.HasLock())
41543239072d transactions for storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	97 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	98 db.AdvisoryLock(POSTGRESQL_LOCK_INDEX);
56 4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	99 }
4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	100
4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	101 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	102 // lock the full DB while checking if it needs to be create/ugraded
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	103 PostgreSQLDatabase::TransientAdvisoryLock lock(db, POSTGRESQL_LOCK_DATABASE_SETUP);
56 4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	104
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	105 if (clearAll_)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	106 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	107 db.ClearAll();
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	108 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	109
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	110 {
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	111 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	112
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	113 if (!t.GetDatabaseTransaction().DoesTableExist("Resources"))
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	114 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	115 LOG(WARNING) << "PostgreSQL is creating the database schema";
16 9e419261f1c9 mysql storage area working Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	116
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	117 ApplyPrepareIndex(t, manager);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	118
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	119 if (!t.GetDatabaseTransaction().DoesTableExist("Resources"))
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	120 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	121 LOG(ERROR) << "Corrupted PostgreSQL database or failed to create the database schema";
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	122 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	123 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	124 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	125 else
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	126 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	127 LOG(WARNING) << "The database schema already exists, checking if it needs to be updated";
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	128
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	129 int version = 0;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	130 if (!LookupGlobalIntegerProperty(version, manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseSchemaVersion) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	131 version != 6)
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	132 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	133 LOG(ERROR) << "PostgreSQL plugin is incompatible with Orthanc database schema version: " << version;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	134 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	135 }
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	136
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	137 bool needToRunUpgradeFromUnknownToV1 = false;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	138 bool needToRunUpgradeV1toV2 = false;
569 f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	139 bool needToRunUpgradeV2toV3 = false;
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	140
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	141 int revision;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	142 if (!LookupGlobalIntegerProperty(revision, manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabasePatchLevel))
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	143 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	144 LOG(WARNING) << "No DatabasePatchLevel found, assuming it's 1";
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	145 revision = 1;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	146 needToRunUpgradeFromUnknownToV1 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	147 needToRunUpgradeV1toV2 = true;
571 7453fc5bef1a fix Alain Mazy <am@orthanc.team> parents: 569 diff changeset	148 needToRunUpgradeV2toV3 = true;
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	149 }
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	150 else if (revision == 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	151 {
499 0974a58fdc76 Fix updates from version plugin version 3.3 to latest version Alain Mazy <am@osimis.io> parents: 473 diff changeset	152 LOG(WARNING) << "DatabasePatchLevel is 1";
0974a58fdc76 Fix updates from version plugin version 3.3 to latest version Alain Mazy <am@osimis.io> parents: 473 diff changeset	153 needToRunUpgradeFromUnknownToV1 = true;
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	154 needToRunUpgradeV1toV2 = true;
569 f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	155 needToRunUpgradeV2toV3 = true;
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	156 }
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	157 else if (revision == 2)
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	158 {
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	159 LOG(WARNING) << "DatabasePatchLevel is 2";
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	160 needToRunUpgradeV2toV3 = true;
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	161 }
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	162
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	163 int hasTrigram = 0;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	164 if (!LookupGlobalIntegerProperty(hasTrigram, manager, MISSING_SERVER_IDENTIFIER,
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	165 Orthanc::GlobalProperty_HasTrigramIndex) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	166 hasTrigram != 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	167 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	168 // We've observed 9 minutes on DB with 100000 studies
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	169 LOG(WARNING) << "The DB schema update will try to enable trigram matching on the PostgreSQL database "
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	170 << "to speed up wildcard searches. This may take several minutes";
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	171 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	172 }
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	173
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	174 int property = 0;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	175 if (!LookupGlobalIntegerProperty(property, manager, MISSING_SERVER_IDENTIFIER,
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	176 Orthanc::GlobalProperty_HasFastCountResources) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	177 property != 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	178 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	179 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	180 }
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	181 if (!LookupGlobalIntegerProperty(property, manager, MISSING_SERVER_IDENTIFIER,
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	182 Orthanc::GlobalProperty_GetTotalSizeIsFast) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	183 property != 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	184 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	185 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	186 }
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	187 if (!LookupGlobalIntegerProperty(property, manager, MISSING_SERVER_IDENTIFIER,
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	188 Orthanc::GlobalProperty_GetLastChangeIndex) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	189 property != 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	190 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	191 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	192 }
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	193
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	194 if (needToRunUpgradeFromUnknownToV1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	195 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	196 LOG(WARNING) << "Upgrading DB schema from unknown to revision 1";
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	197 std::string query;
266 cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	198
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	199 Orthanc::EmbeddedResources::GetFileResource
467 ff84104f7842 renamed v6.2 to REV2 + removed 'default' TransactionMode + renamed 'READ COMMITTED' into 'ReadCommitted' Alain Mazy <am@osimis.io> parents: 460 diff changeset	200 (query, Orthanc::EmbeddedResources::POSTGRESQL_UPGRADE_UNKNOWN_TO_REV1);
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	201 t.GetDatabaseTransaction().ExecuteMultiLines(query);
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	202 }
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	203
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	204 if (needToRunUpgradeV1toV2)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	205 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	206 LOG(WARNING) << "Upgrading DB schema from revision 1 to revision 2";
396 7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	207
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	208 std::string query;
396 7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	209
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	210 Orthanc::EmbeddedResources::GetFileResource
467 ff84104f7842 renamed v6.2 to REV2 + removed 'default' TransactionMode + renamed 'READ COMMITTED' into 'ReadCommitted' Alain Mazy <am@osimis.io> parents: 460 diff changeset	211 (query, Orthanc::EmbeddedResources::POSTGRESQL_UPGRADE_REV1_TO_REV2);
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	212 t.GetDatabaseTransaction().ExecuteMultiLines(query);
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	213
569 f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	214 // apply all idempotent changes that are in the PrepareIndex
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	215 ApplyPrepareIndex(t, manager);
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	216 }
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	217
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	218 if (needToRunUpgradeV2toV3)
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	219 {
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	220 LOG(WARNING) << "Upgrading DB schema from revision 2 to revision 3";
366 cd9521e04249 DatabaseBackendAdapterV4: added support for customData + revision when not already done Alain Mazy <am@osimis.io> parents: 336 diff changeset	221
569 f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	222 std::string query;
366 cd9521e04249 DatabaseBackendAdapterV4: added support for customData + revision when not already done Alain Mazy <am@osimis.io> parents: 336 diff changeset	223
569 f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	224 Orthanc::EmbeddedResources::GetFileResource
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	225 (query, Orthanc::EmbeddedResources::POSTGRESQL_UPGRADE_REV2_TO_REV3);
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	226 t.GetDatabaseTransaction().ExecuteMultiLines(query);
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	227
f18e46d7dbf8 merged find-refactoring -> attach-custom-data Alain Mazy <am@orthanc.team> parents: 366 557 diff changeset	228 // apply all idempotent changes that are in the PrepareIndex (update triggers + set Patch level to 3)
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	229 ApplyPrepareIndex(t, manager);
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	230 }
396 7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	231 }
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	232
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	233 t.Commit();
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	234 }
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	235 }
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	236 }
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	237
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	238
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	239 int64_t PostgreSQLIndex::CreateResource(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	240 const char* publicId,
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	241 OrthancPluginResourceType type)
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	242 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	243 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	244 STATEMENT_FROM_HERE, manager,
302 3a52e27a2d80 in GenericFormatter, replaced ${} by ${AUTOINCREMENT} Sebastien Jodogne <s.jodogne@gmail.com> parents: 266 diff changeset	245 "INSERT INTO Resources VALUES(DEFAULT, ${type}, ${id}, NULL) RETURNING internalId");
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	247 statement.SetParameterType("id", ValueType_Utf8String);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	248 statement.SetParameterType("type", ValueType_Integer64);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	249
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	250 Dictionary args;
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	251 args.SetUtf8Value("id", publicId);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	252 args.SetIntegerValue("type", static_cast<int>(type));
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	253
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	254 statement.Execute(args);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	255
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	256 return statement.ReadInteger64(0);
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	257 }
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	258
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	259
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	260 uint64_t PostgreSQLIndex::GetTotalCompressedSize(DatabaseManager& manager)
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	261 {
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	262 // Fast version if extension "./FastTotalSize.sql" is installed
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	263 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	264
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	265 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	266 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	267 STATEMENT_FROM_HERE, manager,
473 15e609c439d1 Fixed the MaximumStorageSize & MaximumPatientCount. Alain Mazy <am@osimis.io> parents: 467 diff changeset	268 "SELECT * FROM UpdateSingleStatistic(0)");
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	269
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	270 statement.Execute();
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	271
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	272 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	273 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	274
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	275 // disabled because this is not alway true while transactions are being executed in READ COMITTED TRANSACTION. This is however true when no files are being delete/added
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	276 //assert(result == IndexBackend::GetTotalCompressedSize(manager));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	277 return result;
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	278 }
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	279
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	280
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	281 uint64_t PostgreSQLIndex::GetTotalUncompressedSize(DatabaseManager& manager)
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	282 {
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	283 // Fast version if extension "./FastTotalSize.sql" is installed
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	284 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	285
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	286 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	287 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	288 STATEMENT_FROM_HERE, manager,
473 15e609c439d1 Fixed the MaximumStorageSize & MaximumPatientCount. Alain Mazy <am@osimis.io> parents: 467 diff changeset	289 "SELECT * FROM UpdateSingleStatistic(1)");
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	290
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	291 statement.Execute();
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	292
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	293 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	294 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	295
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	296 // disabled because this is not alway true while transactions are being executed in READ COMITTED TRANSACTION. This is however true when no files are being delete/added
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	297 // assert(result == IndexBackend::GetTotalUncompressedSize(manager));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	298 return result;
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	299 }
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	300
431 7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	301 int64_t PostgreSQLIndex::IncrementGlobalProperty(DatabaseManager& manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	302 const char* serverIdentifier,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	303 int32_t property,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	304 int64_t increment)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	305 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	306 if (serverIdentifier == NULL)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	307 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	308 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	309 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	310 else
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	311 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	312 if (strlen(serverIdentifier) == 0)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	313 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	314 DatabaseManager::CachedStatement statement(
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	315 STATEMENT_FROM_HERE, manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	316 "INSERT INTO GlobalProperties (property, value) VALUES(${property}, ${increment}) "
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	317 " ON CONFLICT (property) DO UPDATE SET value = CAST(GlobalProperties.value AS BIGINT) + ${increment}"
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	318 " RETURNING CAST(value AS BIGINT)");
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	319
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	320 statement.SetParameterType("property", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	321 statement.SetParameterType("increment", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	322
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	323 Dictionary args;
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	324 args.SetIntegerValue("property", property);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	325 args.SetIntegerValue("increment", increment);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	326
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	327 statement.Execute(args);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	328
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	329 return statement.ReadInteger64(0);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	330 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	331 else
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	332 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	333 DatabaseManager::CachedStatement statement(
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	334 STATEMENT_FROM_HERE, manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	335 "INSERT INTO ServerProperties (server, property, value) VALUES(${server}, ${property}, ${increment}) "
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	336 " ON CONFLICT (server, property) DO UPDATE SET value = CAST(ServerProperties.value AS BIGINT) + ${increment}"
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	337 " RETURNING CAST(value AS BIGINT)");
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	338
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	339 statement.SetParameterType("server", ValueType_Utf8String);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	340 statement.SetParameterType("property", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	341 statement.SetParameterType("increment", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	342
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	343 Dictionary args;
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	344 args.SetUtf8Value("server", serverIdentifier);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	345 args.SetIntegerValue("property", property);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	346 args.SetIntegerValue("increment", increment);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	347
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	348 statement.Execute(args);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	349
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	350 return statement.ReadInteger64(0);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	351 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	352 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	353 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	354
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	355 void PostgreSQLIndex::UpdateAndGetStatistics(DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	356 int64_t& patientsCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	357 int64_t& studiesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	358 int64_t& seriesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	359 int64_t& instancesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	360 int64_t& compressedSize,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	361 int64_t& uncompressedSize)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	362 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	363 DatabaseManager::CachedStatement statement(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	364 STATEMENT_FROM_HERE, manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	365 "SELECT * FROM UpdateStatistics()");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	366
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	367 statement.Execute();
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	368
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	369 patientsCount = statement.ReadInteger64(0);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	370 studiesCount = statement.ReadInteger64(1);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	371 seriesCount = statement.ReadInteger64(2);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	372 instancesCount = statement.ReadInteger64(3);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	373 compressedSize = statement.ReadInteger64(4);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	374 uncompressedSize = statement.ReadInteger64(5);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	375 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	376
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	377 void PostgreSQLIndex::ClearDeletedFiles(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	378 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	379 { // note: the temporary table lifespan is the session, not the transaction -> that's why we need the IF NOT EXISTS
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	380 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	381 STATEMENT_FROM_HERE, manager,
435 326f8304daa1 new creating temporary tables inside functions Alain Mazy <am@osimis.io> parents: 434 diff changeset	382 "SELECT CreateDeletedFilesTemporaryTable()"
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	383 );
435 326f8304daa1 new creating temporary tables inside functions Alain Mazy <am@osimis.io> parents: 434 diff changeset	384 statement.ExecuteWithoutResult();
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	385 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	386
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	387 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	388
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	389 void PostgreSQLIndex::ClearDeletedResources(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	390 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	391 { // note: the temporary table lifespan is the session, not the transaction -> that's why we need the IF NOT EXISTS
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	392 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	393 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	394 "CREATE TEMPORARY TABLE IF NOT EXISTS DeletedResources("
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	395 "resourceType INTEGER NOT NULL,"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	396 "publicId VARCHAR(64) NOT NULL"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	397 ");"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	398 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	399 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	400 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	401 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	402 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	403 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	404 "DELETE FROM DeletedResources;"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	405 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	406
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	407 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	408 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	409
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	410 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	411
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	412 void PostgreSQLIndex::ClearRemainingAncestor(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	413 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	414 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	415
434 23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	416 void PostgreSQLIndex::DeleteResource(IDatabaseBackendOutput& output,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	417 DatabaseManager& manager,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	418 int64_t id)
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	419 {
435 326f8304daa1 new creating temporary tables inside functions Alain Mazy <am@osimis.io> parents: 434 diff changeset	420 // clearing of temporary table is now implemented in the funcion DeleteResource
434 23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	421 DatabaseManager::CachedStatement statement(
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	422 STATEMENT_FROM_HERE, manager,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	423 "SELECT * FROM DeleteResource(${id})");
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	424
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	425 statement.SetParameterType("id", ValueType_Integer64);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	426
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	427 Dictionary args;
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	428 args.SetIntegerValue("id", id);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	429
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	430 statement.Execute(args);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	431
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	432 if (statement.IsDone() \|\|
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	433 statement.GetResultFieldsCount() != 2)
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	434 {
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	435 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	436 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	437
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	438 statement.SetResultFieldType(0, ValueType_Integer64);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	439 statement.SetResultFieldType(1, ValueType_Utf8String);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	440
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	441 if (!statement.IsNull(0))
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	442 {
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	443 output.SignalRemainingAncestor(
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	444 statement.ReadString(1),
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	445 static_cast<OrthancPluginResourceType>(statement.ReadInteger32(0)));
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	446 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	447
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	448 SignalDeletedFiles(output, manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	449 SignalDeletedResources(output, manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	450 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	451
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	452
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	453
78 2ee166f77501 renamed macro Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	454 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	455 void PostgreSQLIndex::CreateInstance(OrthancPluginCreateInstanceResult& result,
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	456 DatabaseManager& manager,
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	457 const char* hashPatient,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	458 const char* hashStudy,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	459 const char* hashSeries,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	460 const char* hashInstance)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	461 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	462 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	463 STATEMENT_FROM_HERE, manager,
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	464 "SELECT * FROM CreateInstance(${patient}, ${study}, ${series}, ${instance})");
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	465
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	466 statement.SetParameterType("patient", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	467 statement.SetParameterType("study", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	468 statement.SetParameterType("series", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	469 statement.SetParameterType("instance", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	470
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	471 Dictionary args;
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	472 args.SetUtf8Value("patient", hashPatient);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	473 args.SetUtf8Value("study", hashStudy);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	474 args.SetUtf8Value("series", hashSeries);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	475 args.SetUtf8Value("instance", hashInstance);
418 a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	476
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	477 statement.Execute(args);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	478
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	479 if (statement.IsDone() \|\|
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	480 statement.GetResultFieldsCount() != 8)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	481 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	482 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	483 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	484
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	485 for (size_t i = 0; i < 8; i++)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	486 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	487 statement.SetResultFieldType(i, ValueType_Integer64);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	488 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	489
432 8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	490 // LOG(INFO) << statement.ReadInteger64(0) << statement.ReadInteger64(1) << statement.ReadInteger64(2) << statement.ReadInteger64(3);
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	491
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	492 result.isNewInstance = (statement.ReadInteger64(3) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	493 result.instanceId = statement.ReadInteger64(7);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	494
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	495 if (result.isNewInstance)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	496 {
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	497 result.isNewPatient = (statement.ReadInteger64(0) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	498 result.isNewStudy = (statement.ReadInteger64(1) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	499 result.isNewSeries = (statement.ReadInteger64(2) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	500 result.patientId = statement.ReadInteger64(4);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	501 result.studyId = statement.ReadInteger64(5);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	502 result.seriesId = statement.ReadInteger64(6);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	503 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	504 }
73 aa81c1c80c75 fix compatibility with older sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 72 diff changeset	505 #endif
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	506
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	507
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	508 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	509 static void ExecuteSetResourcesContentTags(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	510 DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	511 const std::string& table,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	512 uint32_t count,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	513 const OrthancPluginResourcesContentTags* tags)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	514 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	515 std::string sql;
523 9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	516
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	517 std::vector<std::string> resourceIds;
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	518 std::vector<std::string> groups;
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	519 std::vector<std::string> elements;
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	520 std::vector<std::string> values;
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	521
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	522 Dictionary args;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	523
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	524 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	525 {
523 9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	526 std::string resourceArgName = "r" + boost::lexical_cast<std::string>(i);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	527 std::string groupArgName = "g" + boost::lexical_cast<std::string>(i);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	528 std::string elementArgName = "e" + boost::lexical_cast<std::string>(i);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	529 std::string valueArgName = "v" + boost::lexical_cast<std::string>(i);
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	530
523 9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	531 args.SetIntegerValue(resourceArgName, tags[i].resource);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	532 args.SetInteger32Value(elementArgName, tags[i].element);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	533 args.SetInteger32Value(groupArgName, tags[i].group);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	534 args.SetUtf8Value(valueArgName, tags[i].value);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	535
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	536 std::string insert = ("(${" + resourceArgName + "}, ${" +
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	537 groupArgName + "}, ${" +
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	538 elementArgName + "}, " +
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	539 "${" + valueArgName + "})");
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	540
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	541 if (sql.empty())
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	542 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	543 sql = "INSERT INTO " + table + " VALUES " + insert;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	544 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	545 else
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	546 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	547 sql += ", " + insert;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	548 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	549 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	550
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	551 if (!sql.empty())
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	552 {
523 9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	553 DatabaseManager::CachedStatement statement(STATEMENT_FROM_HERE_DYNAMIC(sql), manager, sql);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	554
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	555 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	556 {
523 9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	557 statement.SetParameterType("r" + boost::lexical_cast<std::string>(i),
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	558 ValueType_Integer64);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	559 statement.SetParameterType("g" + boost::lexical_cast<std::string>(i),
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	560 ValueType_Integer32);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	561 statement.SetParameterType("e" + boost::lexical_cast<std::string>(i),
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	562 ValueType_Integer32);
9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	563 statement.SetParameterType("v" + boost::lexical_cast<std::string>(i),
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	564 ValueType_Utf8String);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	565 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	566
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	567 statement.Execute(args);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	568 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	569 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	570 #endif
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	571
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	572
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	573 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	574 static void ExecuteSetResourcesContentMetadata(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	575 DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	576 bool hasRevisionsSupport,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	577 uint32_t count,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	578 const OrthancPluginResourcesContentMetadata* metadata)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	579 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	580 if (count < 1)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	581 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	582 return;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	583 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	584
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	585 std::vector<std::string> resourceIds;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	586 std::vector<std::string> metadataTypes;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	587 std::vector<std::string> metadataValues;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	588 std::vector<std::string> revisions;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	589
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	590 Dictionary args;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	591
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	592 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	593 {
522 c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	594 std::string resourceArgName = "r" + boost::lexical_cast<std::string>(i);
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	595 std::string typeArgName = "t" + boost::lexical_cast<std::string>(i);
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	596 std::string valueArgName = "v" + boost::lexical_cast<std::string>(i);
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	597
522 c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	598 args.SetIntegerValue(resourceArgName, metadata[i].resource);
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	599 args.SetInteger32Value(typeArgName, metadata[i].metadata);
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	600 args.SetUtf8Value(valueArgName, metadata[i].value);
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	601
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	602 resourceIds.push_back("${" + resourceArgName + "}");
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	603 metadataTypes.push_back("${" + typeArgName + "}");
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	604 metadataValues.push_back("${" + valueArgName + "}");
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	605 revisions.push_back("0");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	606 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	607
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	608 std::string joinedResourceIds;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	609 std::string joinedMetadataTypes;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	610 std::string joinedMetadataValues;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	611 std::string joinedRevisions;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	612
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	613 Orthanc::Toolbox::JoinStrings(joinedResourceIds, resourceIds, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	614 Orthanc::Toolbox::JoinStrings(joinedMetadataTypes, metadataTypes, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	615 Orthanc::Toolbox::JoinStrings(joinedMetadataValues, metadataValues, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	616 Orthanc::Toolbox::JoinStrings(joinedRevisions, revisions, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	617
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	618 std::string sql = std::string("SELECT InsertOrUpdateMetadata(ARRAY[") +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	619 joinedResourceIds + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	620 joinedMetadataTypes + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	621 joinedMetadataValues + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	622 joinedRevisions + "])";
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	623
522 c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	624 DatabaseManager::CachedStatement statement(STATEMENT_FROM_HERE_DYNAMIC(sql), manager, sql);
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	625
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	626 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	627 {
522 c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	628 statement.SetParameterType("v" + boost::lexical_cast<std::string>(i),
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	629 ValueType_Utf8String);
522 c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	630 statement.SetParameterType("r" + boost::lexical_cast<std::string>(i),
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	631 ValueType_Integer64);
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	632 statement.SetParameterType("t" + boost::lexical_cast<std::string>(i),
c49136b34891 use a prepared statement for InsertOrUpdateMetadata Alain Mazy <am@orthanc.team> parents: 507 diff changeset	633 ValueType_Integer32);
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	634 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	635
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	636 statement.Execute(args);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	637 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	638 #endif
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	639
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	640
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	641 void PostgreSQLIndex::SetResourcesContent(DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	642 uint32_t countIdentifierTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	643 const OrthancPluginResourcesContentTags* identifierTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	644 uint32_t countMainDicomTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	645 const OrthancPluginResourcesContentTags* mainDicomTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	646 uint32_t countMetadata,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	647 const OrthancPluginResourcesContentMetadata* metadata)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	648 {
523 9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	649 ExecuteSetResourcesContentTags(manager, "DicomIdentifiers", countIdentifierTags, identifierTags);
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	650
523 9413451fd984 ExecuteSetResourcesContentTags is now using a cached prepared statement Alain Mazy <am@orthanc.team> parents: 522 diff changeset	651 ExecuteSetResourcesContentTags(manager, "MainDicomTags", countMainDicomTags, mainDicomTags);
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	652
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	653 ExecuteSetResourcesContentMetadata(manager, HasRevisionsSupport(), countMetadata, metadata);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	654
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	655 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	656
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	657
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	658 uint64_t PostgreSQLIndex::GetResourcesCount(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	659 OrthancPluginResourceType resourceType)
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	660 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	661 // Optimized version thanks to the "FastCountResources.sql" extension
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	662
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	663 assert(OrthancPluginResourceType_Patient == 0 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	664 OrthancPluginResourceType_Study == 1 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	665 OrthancPluginResourceType_Series == 2 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	666 OrthancPluginResourceType_Instance == 3);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	667
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	668 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	669
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	670 {
473 15e609c439d1 Fixed the MaximumStorageSize & MaximumPatientCount. Alain Mazy <am@osimis.io> parents: 467 diff changeset	671 DatabaseManager::StandaloneStatement statement(
15e609c439d1 Fixed the MaximumStorageSize & MaximumPatientCount. Alain Mazy <am@osimis.io> parents: 467 diff changeset	672 manager,
15e609c439d1 Fixed the MaximumStorageSize & MaximumPatientCount. Alain Mazy <am@osimis.io> parents: 467 diff changeset	673 std::string("SELECT * FROM UpdateSingleStatistic(") + boost::lexical_cast<std::string>(resourceType + 2) + ")"); // For an explanation of the "+ 2" below, check out "PrepareIndex.sql"
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	674
473 15e609c439d1 Fixed the MaximumStorageSize & MaximumPatientCount. Alain Mazy <am@osimis.io> parents: 467 diff changeset	675 statement.Execute();
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	676
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	677 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	678 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	679
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	680 // disabled because this is not alway true while transactions are being executed in READ COMITTED TRANSACTION. This is however true when no files are being delete/added
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	681 assert(result == IndexBackend::GetResourcesCount(manager, resourceType));
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	682
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	683 return result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	684 }
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	685
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	686
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	687 int64_t PostgreSQLIndex::GetLastChangeIndex(DatabaseManager& manager)
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	688 {
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	689 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	690 STATEMENT_FROM_HERE, manager,
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	691 "SELECT value FROM GlobalIntegers WHERE key = 6");
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	692
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	693 statement.SetReadOnly(true);
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	694 statement.Execute();
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	695
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	696 return statement.ReadInteger64(0);
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	697 }
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	698
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	699
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	700 void PostgreSQLIndex::TagMostRecentPatient(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	701 int64_t patient)
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	702 {
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	703 // This behavior is implemented in "CreateInstance()", and no
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	704 // backward compatibility is necessary
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	705 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	706 }
525 451125122692 created branch find-refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 507 diff changeset	707
451125122692 created branch find-refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 507 diff changeset	708
557 d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	709 // #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5)
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	710 // bool PostgreSQLIndex::HasFindSupport() const
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	711 // {
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	712 // // TODO-FIND
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	713 // return false;
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	714 // }
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	715 // #endif
525 451125122692 created branch find-refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 507 diff changeset	716
451125122692 created branch find-refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 507 diff changeset	717
557 d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	718 // #if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 12, 5)
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	719 // void PostgreSQLIndex::ExecuteFind(Orthanc::DatabasePluginMessages::TransactionResponse& response,
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	720 // DatabaseManager& manager,
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	721 // const Orthanc::DatabasePluginMessages::Find_Request& request)
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	722 // {
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	723 // // TODO-FIND
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	724 // throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	725 // }
d8ee2f676a3c wip: started implementing Find in PostgreSQL Alain Mazy <am@orthanc.team> parents: 532 diff changeset	726 // #endif
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	727 }

Mercurial > hg > orthanc-databases

annotate PostgreSQL/Plugins/PostgreSQLIndex.cpp @ 571:7453fc5bef1a attach-custom-data