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

annotate PostgreSQL/Plugins/PostgreSQLIndex.cpp @ 452:6780dd8b0a66 pg-transactions

fix latency measure for ODBC

author	Alain Mazy <am@osimis.io>
date	Thu, 18 Jan 2024 10:04:43 +0100
parents	c437ec7be2b0
children	f0976163dbe1

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
389 3d6886f3e5b3 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
3d6886f3e5b3 upgrade to year 2023 Sebastien Jodogne <s.jodogne@gmail.com> parents: 359 diff changeset	6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 *
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * This program is free software: you can redistribute it and/or
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * modify it under the terms of the GNU Affero General Public License
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * as published by the Free Software Foundation, either version 3 of
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 * the License, or (at your option) any later version.
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 *
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * 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	14 * WITHOUT ANY WARRANTY; without even the implied warranty of
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * Affero General Public License for more details.
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 *
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * 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	19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
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 #include "PostgreSQLIndex.h"
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25 #include "../../Framework/Plugins/GlobalProperties.h"
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 #include "../../Framework/PostgreSQL/PostgreSQLDatabase.h"
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 #include "../../Framework/PostgreSQL/PostgreSQLTransaction.h"
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	28 #include "PostgreSQLDefinitions.h"
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 #include <EmbeddedResources.h> // Auto-generated file
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31
157 275e14f57f1e replacing deprecated std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 152 diff changeset	32 #include <Compatibility.h> // For std::unique_ptr<>
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	33 #include <Toolbox.h>
152 063aa53b5917 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 140 diff changeset	34 #include <Logging.h>
063aa53b5917 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 140 diff changeset	35 #include <OrthancException.h>
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
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 namespace Orthanc
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 // Some aliases for internal properties
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	41 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	42 static const GlobalProperty GlobalProperty_HasCreateInstance = GlobalProperty_DatabaseInternal1;
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	43 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	44 static const GlobalProperty GlobalProperty_GetLastChangeIndex = GlobalProperty_DatabaseInternal3;
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	45 }
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 namespace OrthancDatabases
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	49 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	50 PostgreSQLIndex::PostgreSQLIndex(OrthancPluginContext* context,
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	51 const PostgreSQLParameters& parameters) :
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	52 IndexBackend(context),
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	53 parameters_(parameters),
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	54 clearAll_(false)
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	55 {
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
255 d663d9e44f8d reintroduction of IDatabaseFactory into DatabaseManager Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	59 IDatabaseFactory* PostgreSQLIndex::CreateDatabaseFactory()
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	60 {
255 d663d9e44f8d reintroduction of IDatabaseFactory into DatabaseManager Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	61 return PostgreSQLDatabase::CreateDatabaseFactory(parameters_);
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	62 }
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	63
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	64 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	65 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	66 std::string query;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	67
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	68 Orthanc::EmbeddedResources::GetFileResource
448 f2427f94d879 added downgrade script + renames version Alain Mazy <am@osimis.io> parents: 437 diff changeset	69 (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	70 t.GetDatabaseTransaction().ExecuteMultiLines(query);
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	71 }
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	72
403 91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	73 void PostgreSQLIndex::ConfigureDatabase(DatabaseManager& manager,
91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	74 bool hasIdentifierTags,
91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	75 const std::list<IdentifierTag>& identifierTags)
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 uint32_t expectedVersion = 6;
199 8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	78
8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	79 if (GetContext()) // "GetContext()" can possibly be NULL in the unit tests
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 {
199 8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	81 expectedVersion = OrthancPluginGetExpectedDatabaseVersion(GetContext());
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	82 }
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 // Check the expected version of the database
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85 if (expectedVersion != 6)
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	86 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	87 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	88 << "expecting the Orthanc DB schema version " << expectedVersion
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	89 << ", but this plugin is only compatible with version 6";
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	90 throw Orthanc::OrthancException(Orthanc::ErrorCode_Plugin);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	91 }
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	92
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	93 PostgreSQLDatabase& db = dynamic_cast<PostgreSQLDatabase&>(manager.GetDatabase());
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	94
12 41543239072d transactions for storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	95 if (parameters_.HasLock())
41543239072d transactions for storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	96 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	97 db.AdvisoryLock(POSTGRESQL_LOCK_INDEX);
56 4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	98 }
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 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	101 // 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	102 PostgreSQLDatabase::TransientAdvisoryLock lock(db, POSTGRESQL_LOCK_DATABASE_SETUP);
56 4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	103
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	104 if (clearAll_)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	105 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	106 db.ClearAll();
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	107 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	108
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	109 {
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	110 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	111
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	112 if (!t.GetDatabaseTransaction().DoesTableExist("Resources"))
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	113 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	114 LOG(WARNING) << "PostgreSQL is creating the database schema";
56 4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	115
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	116 ApplyPrepareIndex(t, manager);
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	117
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	118 if (!t.GetDatabaseTransaction().DoesTableExist("Resources"))
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	119 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	120 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	121 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	122 }
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 else
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	125 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	126 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	127
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	128 int version = 0;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	129 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	130 version != 6)
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	131 {
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	132 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	133 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	134 }
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	135
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	136 bool needToRunUpgradeFromUnknownToV1 = false;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	137 bool needToRunUpgradeV1toV2 = false;
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	138
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	139 int revision;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	140 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	141 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	142 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	143 revision = 1;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	144 needToRunUpgradeFromUnknownToV1 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	145 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	146 }
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	147 else if (revision == 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	148 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	149 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	150 }
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	151
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	152 int hasTrigram = 0;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	153 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	154 Orthanc::GlobalProperty_HasTrigramIndex) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	155 hasTrigram != 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	156 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	157 // 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	158 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	159 << "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	160 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	161 }
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	162
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	163 int property = 0;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	164 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	165 Orthanc::GlobalProperty_HasFastCountResources) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	166 property != 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 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	169 }
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	170 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	171 Orthanc::GlobalProperty_GetTotalSizeIsFast) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	172 property != 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	173 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	174 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	175 }
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	176 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	177 Orthanc::GlobalProperty_GetLastChangeIndex) \|\|
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	178 property != 1)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	179 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	180 needToRunUpgradeV1toV2 = true;
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	181 }
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	182
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	183 if (needToRunUpgradeFromUnknownToV1)
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 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	186 std::string query;
266 cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	187
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	188 Orthanc::EmbeddedResources::GetFileResource
448 f2427f94d879 added downgrade script + renames version Alain Mazy <am@osimis.io> parents: 437 diff changeset	189 (query, Orthanc::EmbeddedResources::POSTGRESQL_UPGRADE_UNKNOWN_TO_V6_1);
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	190 t.GetDatabaseTransaction().ExecuteMultiLines(query);
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	191 }
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	192
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	193 if (needToRunUpgradeV1toV2)
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	194 {
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	195 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	196
437 d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	197 std::string query;
396 7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 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
448 f2427f94d879 added downgrade script + renames version Alain Mazy <am@osimis.io> parents: 437 diff changeset	200 (query, Orthanc::EmbeddedResources::POSTGRESQL_UPGRADE_V6_1_TO_V6_2);
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 // apply all idempotent changes that are in the PrepareIndexV2
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	204 ApplyPrepareIndex(t, manager);
d979f25e60cf Re-organized DB creation/upgrade into standalone files Alain Mazy <am@osimis.io> parents: 436 diff changeset	205 }
396 7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	206 }
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	207
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	208 t.Commit();
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	209 }
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	210 }
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	211 }
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	212
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	213
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	214 int64_t PostgreSQLIndex::CreateResource(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	215 const char* publicId,
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	216 OrthancPluginResourceType type)
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	217 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	218 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	219 STATEMENT_FROM_HERE, manager,
302 3a52e27a2d80 in GenericFormatter, replaced ${} by ${AUTOINCREMENT} Sebastien Jodogne <s.jodogne@gmail.com> parents: 266 diff changeset	220 "INSERT INTO Resources VALUES(DEFAULT, ${type}, ${id}, NULL) RETURNING internalId");
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	221
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	222 statement.SetParameterType("id", ValueType_Utf8String);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	223 statement.SetParameterType("type", ValueType_Integer64);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	224
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	225 Dictionary args;
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	226 args.SetUtf8Value("id", publicId);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	227 args.SetIntegerValue("type", static_cast<int>(type));
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	228
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	229 statement.Execute(args);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	230
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	231 return statement.ReadInteger64(0);
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	232 }
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	233
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	234
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	235 uint64_t PostgreSQLIndex::GetTotalCompressedSize(DatabaseManager& manager)
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	236 {
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	237 // Fast version if extension "./FastTotalSize.sql" is installed
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	238 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	239
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	240 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	241 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	242 STATEMENT_FROM_HERE, manager,
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	243 "SELECT value FROM GlobalIntegers WHERE key = 0");
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	244
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	245 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	246 statement.Execute();
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	247
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	248 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	249 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	250
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	251 // 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	252 //assert(result == IndexBackend::GetTotalCompressedSize(manager));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	253 return result;
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	254 }
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	255
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	256
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	257 uint64_t PostgreSQLIndex::GetTotalUncompressedSize(DatabaseManager& manager)
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	258 {
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	259 // Fast version if extension "./FastTotalSize.sql" is installed
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	260 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	261
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	262 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	263 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	264 STATEMENT_FROM_HERE, manager,
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	265 "SELECT value FROM GlobalIntegers WHERE key = 1");
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	266
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	267 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	268 statement.Execute();
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	269
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	270 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	271 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	272
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	273 // 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	274 // assert(result == IndexBackend::GetTotalUncompressedSize(manager));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	275 return result;
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	276 }
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	277
431 7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	278 int64_t PostgreSQLIndex::IncrementGlobalProperty(DatabaseManager& manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	279 const char* serverIdentifier,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	280 int32_t property,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	281 int64_t increment)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	282 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	283 if (serverIdentifier == NULL)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	284 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	285 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	286 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	287 else
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	288 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	289 if (strlen(serverIdentifier) == 0)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	290 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	291 DatabaseManager::CachedStatement statement(
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	292 STATEMENT_FROM_HERE, manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	293 "INSERT INTO GlobalProperties (property, value) VALUES(${property}, ${increment}) "
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	294 " 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	295 " RETURNING CAST(value AS BIGINT)");
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	296
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	297 statement.SetParameterType("property", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	298 statement.SetParameterType("increment", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	299
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	300 Dictionary args;
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	301 args.SetIntegerValue("property", property);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	302 args.SetIntegerValue("increment", increment);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	303
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	304 statement.Execute(args);
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 return statement.ReadInteger64(0);
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 else
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 DatabaseManager::CachedStatement statement(
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	311 STATEMENT_FROM_HERE, manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	312 "INSERT INTO ServerProperties (server, property, value) VALUES(${server}, ${property}, ${increment}) "
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	313 " 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	314 " RETURNING CAST(value AS BIGINT)");
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	315
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	316 statement.SetParameterType("server", ValueType_Utf8String);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	317 statement.SetParameterType("property", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	318 statement.SetParameterType("increment", ValueType_Integer64);
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 Dictionary args;
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	321 args.SetUtf8Value("server", serverIdentifier);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	322 args.SetIntegerValue("property", property);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	323 args.SetIntegerValue("increment", increment);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	324
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	325 statement.Execute(args);
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 return statement.ReadInteger64(0);
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 }
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
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	332 void PostgreSQLIndex::UpdateAndGetStatistics(DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	333 int64_t& patientsCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	334 int64_t& studiesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	335 int64_t& seriesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	336 int64_t& instancesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	337 int64_t& compressedSize,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	338 int64_t& uncompressedSize)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	339 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	340 DatabaseManager::CachedStatement statement(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	341 STATEMENT_FROM_HERE, manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	342 "SELECT * FROM UpdateStatistics()");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	343
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	344 statement.Execute();
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	345
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	346 patientsCount = statement.ReadInteger64(0);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	347 studiesCount = statement.ReadInteger64(1);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	348 seriesCount = statement.ReadInteger64(2);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	349 instancesCount = statement.ReadInteger64(3);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	350 compressedSize = statement.ReadInteger64(4);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	351 uncompressedSize = statement.ReadInteger64(5);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	352 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	353
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	354 void PostgreSQLIndex::ClearDeletedFiles(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	355 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	356 { // 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	357 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	358 STATEMENT_FROM_HERE, manager,
435 326f8304daa1 new creating temporary tables inside functions Alain Mazy <am@osimis.io> parents: 434 diff changeset	359 "SELECT CreateDeletedFilesTemporaryTable()"
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	360 );
435 326f8304daa1 new creating temporary tables inside functions Alain Mazy <am@osimis.io> parents: 434 diff changeset	361 statement.ExecuteWithoutResult();
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	362 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	363
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	364 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	365
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	366 void PostgreSQLIndex::ClearDeletedResources(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	367 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	368 { // 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	369 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	370 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	371 "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	372 "resourceType INTEGER NOT NULL,"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	373 "publicId VARCHAR(64) NOT NULL"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	374 ");"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	375 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	376 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	377 }
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 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	380 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	381 "DELETE FROM DeletedResources;"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	382 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	383
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	384 statement.Execute();
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::ClearRemainingAncestor(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 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	392
434 23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	393 void PostgreSQLIndex::DeleteResource(IDatabaseBackendOutput& output,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	394 DatabaseManager& manager,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	395 int64_t id)
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	396 {
435 326f8304daa1 new creating temporary tables inside functions Alain Mazy <am@osimis.io> parents: 434 diff changeset	397 // 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	398 DatabaseManager::CachedStatement statement(
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	399 STATEMENT_FROM_HERE, manager,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	400 "SELECT * FROM DeleteResource(${id})");
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	401
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	402 statement.SetParameterType("id", ValueType_Integer64);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	403
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	404 Dictionary args;
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	405 args.SetIntegerValue("id", id);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	406
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	407 statement.Execute(args);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	408
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	409 if (statement.IsDone() \|\|
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	410 statement.GetResultFieldsCount() != 2)
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	411 {
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	412 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	413 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	414
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	415 statement.SetResultFieldType(0, ValueType_Integer64);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	416 statement.SetResultFieldType(1, ValueType_Utf8String);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	417
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	418 if (!statement.IsNull(0))
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	419 {
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	420 output.SignalRemainingAncestor(
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	421 statement.ReadString(1),
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	422 static_cast<OrthancPluginResourceType>(statement.ReadInteger32(0)));
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	423 }
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 SignalDeletedFiles(output, manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	426 SignalDeletedResources(output, manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	427 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	428
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	429
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	430
78 2ee166f77501 renamed macro Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	431 #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	432 void PostgreSQLIndex::CreateInstance(OrthancPluginCreateInstanceResult& result,
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	433 DatabaseManager& manager,
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	434 const char* hashPatient,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	435 const char* hashStudy,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	436 const char* hashSeries,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	437 const char* hashInstance)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	438 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	439 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	440 STATEMENT_FROM_HERE, manager,
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	441 "SELECT * FROM CreateInstance(${patient}, ${study}, ${series}, ${instance})");
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	442
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	443 statement.SetParameterType("patient", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	444 statement.SetParameterType("study", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	445 statement.SetParameterType("series", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	446 statement.SetParameterType("instance", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	447
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	448 Dictionary args;
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	449 args.SetUtf8Value("patient", hashPatient);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	450 args.SetUtf8Value("study", hashStudy);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	451 args.SetUtf8Value("series", hashSeries);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	452 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	453
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	454 statement.Execute(args);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	455
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	456 if (statement.IsDone() \|\|
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	457 statement.GetResultFieldsCount() != 8)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	458 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	459 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	460 }
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 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	463 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	464 statement.SetResultFieldType(i, ValueType_Integer64);
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
432 8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	467 // 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	468
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	469 result.isNewInstance = (statement.ReadInteger64(3) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	470 result.instanceId = statement.ReadInteger64(7);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	471
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	472 if (result.isNewInstance)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	473 {
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	474 result.isNewPatient = (statement.ReadInteger64(0) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	475 result.isNewStudy = (statement.ReadInteger64(1) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	476 result.isNewSeries = (statement.ReadInteger64(2) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	477 result.patientId = statement.ReadInteger64(4);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	478 result.studyId = statement.ReadInteger64(5);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	479 result.seriesId = statement.ReadInteger64(6);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	480 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	481 }
73 aa81c1c80c75 fix compatibility with older sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 72 diff changeset	482 #endif
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	483
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	484
436 f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	485 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	486 static void ExecuteSetResourcesContentTags(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	487 DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	488 const std::string& table,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	489 const std::string& variablePrefix,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	490 uint32_t count,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	491 const OrthancPluginResourcesContentTags* tags)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	492 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	493 std::string sql;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	494 Dictionary args;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	495
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	496 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	497 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	498 std::string name = variablePrefix + boost::lexical_cast<std::string>(i);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	499
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	500 args.SetUtf8Value(name, tags[i].value);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	501
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	502 std::string insert = ("(" + boost::lexical_cast<std::string>(tags[i].resource) + ", " +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	503 boost::lexical_cast<std::string>(tags[i].group) + ", " +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	504 boost::lexical_cast<std::string>(tags[i].element) + ", " +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	505 "${" + name + "})");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	506
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	507 if (sql.empty())
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	508 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	509 sql = "INSERT INTO " + table + " VALUES " + insert;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	510 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	511 else
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	512 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	513 sql += ", " + insert;
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 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	516
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	517 if (!sql.empty())
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	518 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	519 DatabaseManager::StandaloneStatement statement(manager, sql);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	520
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	521 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	522 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	523 statement.SetParameterType(variablePrefix + boost::lexical_cast<std::string>(i),
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	524 ValueType_Utf8String);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	525 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	526
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	527 statement.Execute(args);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	528 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	529 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	530 #endif
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	531
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	532
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	533 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	534 static void ExecuteSetResourcesContentMetadata(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	535 DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	536 bool hasRevisionsSupport,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	537 uint32_t count,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	538 const OrthancPluginResourcesContentMetadata* metadata)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	539 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	540 if (count < 1)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	541 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	542 return;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	543 }
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 std::vector<std::string> resourceIds;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	546 std::vector<std::string> metadataTypes;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	547 std::vector<std::string> metadataValues;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	548 std::vector<std::string> revisions;
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 Dictionary args;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	551
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	552 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	553 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	554 std::string argName = "m" + boost::lexical_cast<std::string>(i);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	555
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	556 args.SetUtf8Value(argName, metadata[i].value);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	557
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	558 resourceIds.push_back(boost::lexical_cast<std::string>(metadata[i].resource));
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	559 metadataTypes.push_back(boost::lexical_cast<std::string>(metadata[i].metadata));
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	560 metadataValues.push_back("${" + argName + "}");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	561 revisions.push_back("0");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	562 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	563
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	564 std::string joinedResourceIds;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	565 std::string joinedMetadataTypes;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	566 std::string joinedMetadataValues;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	567 std::string joinedRevisions;
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 Orthanc::Toolbox::JoinStrings(joinedResourceIds, resourceIds, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	570 Orthanc::Toolbox::JoinStrings(joinedMetadataTypes, metadataTypes, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	571 Orthanc::Toolbox::JoinStrings(joinedMetadataValues, metadataValues, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	572 Orthanc::Toolbox::JoinStrings(joinedRevisions, revisions, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	573
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	574 std::string sql = std::string("SELECT InsertOrUpdateMetadata(ARRAY[") +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	575 joinedResourceIds + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	576 joinedMetadataTypes + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	577 joinedMetadataValues + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	578 joinedRevisions + "])";
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 DatabaseManager::StandaloneStatement statement(manager, sql);
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 for (uint32_t i = 0; i < count; i++)
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 statement.SetParameterType("m" + boost::lexical_cast<std::string>(i),
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	585 ValueType_Utf8String);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	586 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	587
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	588 statement.Execute(args);
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 #endif
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
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	593 void PostgreSQLIndex::SetResourcesContent(DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	594 uint32_t countIdentifierTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	595 const OrthancPluginResourcesContentTags* identifierTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	596 uint32_t countMainDicomTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	597 const OrthancPluginResourcesContentTags* mainDicomTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	598 uint32_t countMetadata,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	599 const OrthancPluginResourcesContentMetadata* metadata)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	600 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	601 ExecuteSetResourcesContentTags(manager, "DicomIdentifiers", "i",
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	602 countIdentifierTags, identifierTags);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	603
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	604 ExecuteSetResourcesContentTags(manager, "MainDicomTags", "t",
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	605 countMainDicomTags, mainDicomTags);
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 ExecuteSetResourcesContentMetadata(manager, HasRevisionsSupport(), countMetadata, metadata);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	608
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	609 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	610
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics Alain Mazy <am@osimis.io> parents: 435 diff changeset	611
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	612 uint64_t PostgreSQLIndex::GetResourcesCount(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	613 OrthancPluginResourceType resourceType)
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	614 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	615 // Optimized version thanks to the "FastCountResources.sql" extension
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	616
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	617 assert(OrthancPluginResourceType_Patient == 0 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	618 OrthancPluginResourceType_Study == 1 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	619 OrthancPluginResourceType_Series == 2 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	620 OrthancPluginResourceType_Instance == 3);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	621
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	622 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	623
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	624 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	625 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	626 STATEMENT_FROM_HERE, manager,
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	627 "SELECT value FROM GlobalIntegers WHERE key = ${key}");
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	628
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	629 statement.SetParameterType("key", ValueType_Integer64);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	630
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	631 Dictionary args;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	632
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	633 // For an explanation of the "+ 2" below, check out "FastCountResources.sql"
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	634 args.SetIntegerValue("key", static_cast<int>(resourceType + 2));
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	635
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	636 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	637 statement.Execute(args);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	638
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	639 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	640 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	641
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	642 // 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	643 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	644
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	645 return result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	646 }
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	647
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	648
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	649 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	650 {
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	651 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	652 STATEMENT_FROM_HERE, manager,
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	653 "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	654
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	655 statement.SetReadOnly(true);
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	656 statement.Execute();
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	657
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	658 return statement.ReadInteger64(0);
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	659 }
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	660
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	661
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	662 void PostgreSQLIndex::TagMostRecentPatient(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	663 int64_t patient)
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	664 {
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	665 // 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	666 // backward compatibility is necessary
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	667 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	668 }
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	669 }

Mercurial > hg > orthanc-databases

annotate PostgreSQL/Plugins/PostgreSQLIndex.cpp @ 452:6780dd8b0a66 pg-transactions