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

annotate PostgreSQL/Plugins/PostgreSQLIndex.cpp @ 434:23c7af6f671a pg-transactions

DeleteResource does not need the RemainingAncestor table anymore

author	Alain Mazy <am@osimis.io>
date	Wed, 13 Dec 2023 16:52:06 +0100
parents	5964ce6385a5
children	326f8304daa1

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<>
152 063aa53b5917 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 140 diff changeset	33 #include <Logging.h>
063aa53b5917 sync Sebastien Jodogne <s.jodogne@gmail.com> parents: 140 diff changeset	34 #include <OrthancException.h>
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35
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 namespace Orthanc
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	38 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	39 // Some aliases for internal properties
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	40 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	41 static const GlobalProperty GlobalProperty_HasCreateInstance = GlobalProperty_DatabaseInternal1;
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	42 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	43 static const GlobalProperty GlobalProperty_GetLastChangeIndex = GlobalProperty_DatabaseInternal3;
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	44 }
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 namespace OrthancDatabases
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	48 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	49 PostgreSQLIndex::PostgreSQLIndex(OrthancPluginContext* context,
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	50 const PostgreSQLParameters& parameters) :
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	51 IndexBackend(context),
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	52 parameters_(parameters),
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	53 clearAll_(false)
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	54 {
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
255 d663d9e44f8d reintroduction of IDatabaseFactory into DatabaseManager Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	58 IDatabaseFactory* PostgreSQLIndex::CreateDatabaseFactory()
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	59 {
255 d663d9e44f8d reintroduction of IDatabaseFactory into DatabaseManager Sebastien Jodogne <s.jodogne@gmail.com> parents: 241 diff changeset	60 return PostgreSQLDatabase::CreateDatabaseFactory(parameters_);
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	61 }
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
403 91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	64 void PostgreSQLIndex::ConfigureDatabase(DatabaseManager& manager,
91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	65 bool hasIdentifierTags,
91124cc8a8c7 database plugins are informed about the identifier tags Sebastien Jodogne <s.jodogne@gmail.com> parents: 396 diff changeset	66 const std::list<IdentifierTag>& identifierTags)
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	67 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	68 uint32_t expectedVersion = 6;
199 8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	69
8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	70 if (GetContext()) // "GetContext()" can possibly be NULL in the unit tests
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	71 {
199 8cae98f73d53 refactoring Sebastien Jodogne <s.jodogne@gmail.com> parents: 193 diff changeset	72 expectedVersion = OrthancPluginGetExpectedDatabaseVersion(GetContext());
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	73 }
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	74
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	75 // Check the expected version of the database
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	76 if (expectedVersion != 6)
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	77 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	78 LOG(ERROR) << "This database plugin is incompatible with your version of Orthanc "
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	79 << "expecting the DB schema version " << expectedVersion
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	80 << ", but this plugin is only compatible with version 6";
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	81 throw Orthanc::OrthancException(Orthanc::ErrorCode_Plugin);
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
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	84 PostgreSQLDatabase& db = dynamic_cast<PostgreSQLDatabase&>(manager.GetDatabase());
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	85
12 41543239072d transactions for storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	86 if (parameters_.HasLock())
41543239072d transactions for storage area Sebastien Jodogne <s.jodogne@gmail.com> parents: 0 diff changeset	87 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	88 db.AdvisoryLock(POSTGRESQL_LOCK_INDEX);
56 4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	89 }
4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	90
4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	91 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	92 PostgreSQLDatabase::TransientAdvisoryLock lock(db, POSTGRESQL_LOCK_DATABASE_SETUP);
56 4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	93
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	94 if (clearAll_)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	95 {
226 a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore Sebastien Jodogne <s.jodogne@gmail.com> parents: 225 diff changeset	96 db.ClearAll();
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	97 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	98
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99 {
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	100 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	101
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	102 if (!t.GetDatabaseTransaction().DoesTableExist("Resources"))
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	103 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	104 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	105
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	106 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	107 (query, Orthanc::EmbeddedResources::POSTGRESQL_PREPARE_INDEX);
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	108 t.GetDatabaseTransaction().ExecuteMultiLines(query);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	109
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	110 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseSchemaVersion, expectedVersion);
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	111 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabasePatchLevel, 1);
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	112 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_HasTrigramIndex, 0);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	113 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	114
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	115 if (!t.GetDatabaseTransaction().DoesTableExist("Resources"))
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	116 {
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	117 LOG(ERROR) << "Corrupted PostgreSQL database";
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	118 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	119 }
16 9e419261f1c9 mysql storage area working Sebastien Jodogne <s.jodogne@gmail.com> parents: 15 diff changeset	120
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	121 int version = 0;
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	122 if (!LookupGlobalIntegerProperty(version, manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabaseSchemaVersion) \|\|
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	123 version != 6)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	124 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	125 LOG(ERROR) << "PostgreSQL plugin is incompatible with database schema version: " << version;
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	126 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	127 }
56 4f66bc893fc3 Fix Debian issue #906771 Sebastien Jodogne <s.jodogne@gmail.com> parents: 20 diff changeset	128
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	129 int revision;
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	130 if (!LookupGlobalIntegerProperty(revision, manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabasePatchLevel))
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	131 {
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	132 revision = 1;
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	133 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabasePatchLevel, revision);
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	134 }
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	135
418 a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	136 if (revision == 1)
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	137 {
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	138 LOG(WARNING) << "PostgreSQL plugin: adding UNIQUE(publicId) constraint to the 'Resources' table ";
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	139 t.GetDatabaseTransaction().ExecuteMultiLines("ALTER TABLE Resources ADD UNIQUE (publicId);");
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	140
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	141 revision = 2;
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	142 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabasePatchLevel, revision);
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	143 }
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139 Alain Mazy <am@osimis.io> parents: 403 diff changeset	144
432 8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	145 if (revision == 2)
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	146 {
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	147 LOG(WARNING) << "PostgreSQL plugin: adding or replacing ResourceDeletedFunc";
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	148
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	149 std::string query;
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	150 Orthanc::EmbeddedResources::GetFileResource
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	151 (query, Orthanc::EmbeddedResources::POSTGRESQL_RESOURCE_DELETED_FUNC);
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	152 t.GetDatabaseTransaction().ExecuteMultiLines(query);
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	153
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	154 revision = 3;
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	155 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabasePatchLevel, revision);
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	156 }
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	157
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	158 if (revision != 3)
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	159 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	160 LOG(ERROR) << "PostgreSQL plugin is incompatible with database schema revision: " << revision;
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	161 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	162 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	163
77 a2134531473c avoid warnings "An active PostgreSQL transaction was dismissed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	164 t.Commit();
a2134531473c avoid warnings "An active PostgreSQL transaction was dismissed" Sebastien Jodogne <s.jodogne@gmail.com> parents: 74 diff changeset	165 }
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	166
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	167 {
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	168 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	169
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	170 int hasTrigram = 0;
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	171 if (!LookupGlobalIntegerProperty(hasTrigram, manager, MISSING_SERVER_IDENTIFIER,
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	172 Orthanc::GlobalProperty_HasTrigramIndex) \|\|
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	173 hasTrigram != 1)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	174 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	175 /**
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	176 * Apply fix for performance issue (speed up wildcard search
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	177 * by using GIN trigrams). This implements the patch suggested
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	178 * in issue #47, BUT we also keep the original
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	179 * "DicomIdentifiersIndexValues", as it leads to better
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	180 * performance for "strict" searches (i.e. searches involving
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	181 * no wildcard).
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	182 * https://www.postgresql.org/docs/current/static/pgtrgm.html
426 d700c8f9fc24 migration to UCLouvain servers Sebastien Jodogne <s.jodogne@gmail.com> parents: 403 diff changeset	183 * https://orthanc.uclouvain.be/bugs/show_bug.cgi?id=47
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	184 **/
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	185 try
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	186 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	187 // We've observed 9 minutes on DB with 100000 studies
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	188 LOG(WARNING) << "Trying to enable trigram matching on the PostgreSQL database "
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	189 << "to speed up wildcard searches. This may take several minutes";
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	190
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	191 t.GetDatabaseTransaction().ExecuteMultiLines(
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	192 "CREATE EXTENSION IF NOT EXISTS pg_trgm; "
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	193 "CREATE INDEX DicomIdentifiersIndexValues2 ON DicomIdentifiers USING gin(value gin_trgm_ops);");
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	194
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	195 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_HasTrigramIndex, 1);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	196 LOG(WARNING) << "Trigram index has been created";
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	197
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	198 t.Commit();
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	199 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	200 catch (Orthanc::OrthancException&)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	201 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	202 LOG(WARNING) << "Performance warning: Your PostgreSQL server does "
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	203 << "not support trigram matching";
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	204 LOG(WARNING) << "-> Consider installing the \"pg_trgm\" extension on the "
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	205 << "PostgreSQL server, e.g. on Debian: sudo apt install postgresql-contrib";
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	206 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	207 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	208 else
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	209 {
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	210 t.Commit();
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	211 }
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	212 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	213
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	214 {
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	215 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	216
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	217 int property = 0;
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	218 if (!LookupGlobalIntegerProperty(property, manager, MISSING_SERVER_IDENTIFIER,
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	219 Orthanc::GlobalProperty_HasCreateInstance) \|\|
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	220 property != 3)
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	221 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	222 LOG(INFO) << "Installing the CreateInstance extension";
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	223
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	224 if (property == 1)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	225 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	226 // Drop older, experimental versions of this extension
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	227 t.GetDatabaseTransaction().ExecuteMultiLines("DROP FUNCTION CreateInstance("
a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	228 "IN patient TEXT, IN study TEXT, IN series TEXT, in instance TEXT)");
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	229 }
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	230
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	231 // property == 2 was a first version of the CreateInstance -> we need to replace it by the new one
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	232 // property == 3 is a new version (in v5.2) with same signature and CREATE OR UPDATE
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	233 // -> we can replace the previous one without deleting it
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	234 // and we can create it if it has never been created.
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	235 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	236 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	237 (query, Orthanc::EmbeddedResources::POSTGRESQL_CREATE_INSTANCE);
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	238 t.GetDatabaseTransaction().ExecuteMultiLines(query);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	239
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	240 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_HasCreateInstance, 3);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	241 }
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	242
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	243
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	244 if (!LookupGlobalIntegerProperty(property, manager, MISSING_SERVER_IDENTIFIER,
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	245 Orthanc::GlobalProperty_GetTotalSizeIsFast) \|\|
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	246 property != 1)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	247 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	248 LOG(INFO) << "Installing the FastTotalSize extension";
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	249
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	250 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	251 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	252 (query, Orthanc::EmbeddedResources::POSTGRESQL_FAST_TOTAL_SIZE);
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	253 t.GetDatabaseTransaction().ExecuteMultiLines(query);
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	254
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	255 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_GetTotalSizeIsFast, 1);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	256 }
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	257
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	258
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	259 // Installing this extension requires the "GlobalIntegers" table
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	260 // created by the "FastTotalSize" extension
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	261 property = 0;
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	262 if (!LookupGlobalIntegerProperty(property, manager, MISSING_SERVER_IDENTIFIER,
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	263 Orthanc::GlobalProperty_HasFastCountResources) \|\|
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	264 property != 1)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	265 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	266 LOG(INFO) << "Installing the FastCountResources extension";
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	267
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	268 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	269 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	270 (query, Orthanc::EmbeddedResources::POSTGRESQL_FAST_COUNT_RESOURCES);
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	271 t.GetDatabaseTransaction().ExecuteMultiLines(query);
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	272
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	273 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_HasFastCountResources, 1);
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	274 }
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	275
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	276
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	277 // Installing this extension requires the "GlobalIntegers" table
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	278 // created by the "GetLastChangeIndex" extension
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	279 property = 0;
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	280 if (!LookupGlobalIntegerProperty(property, manager, MISSING_SERVER_IDENTIFIER,
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	281 Orthanc::GlobalProperty_GetLastChangeIndex) \|\|
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	282 property != 1)
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	283 {
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	284 LOG(INFO) << "Installing the GetLastChangeIndex extension";
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	285
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	286 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	287 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	288 (query, Orthanc::EmbeddedResources::POSTGRESQL_GET_LAST_CHANGE_INDEX);
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	289 t.GetDatabaseTransaction().ExecuteMultiLines(query);
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	290
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	291 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_GetLastChangeIndex, 1);
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	292 }
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	293
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	294 t.Commit();
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	295 }
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	296
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	297
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	298 {
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	299 // New in release 4.0 to deal with multiple writers
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	300 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	301
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	302 if (!t.GetDatabaseTransaction().DoesTableExist("ServerProperties"))
237 35598014f140 refactoring to remove GlobalProperties.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 226 diff changeset	303 {
241 a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	304 t.GetDatabaseTransaction().ExecuteMultiLines("CREATE TABLE ServerProperties(server VARCHAR(64) NOT NULL, "
a063bbf10a3e simplification of class DatabaseManager::Transaction Sebastien Jodogne <s.jodogne@gmail.com> parents: 237 diff changeset	305 "property INTEGER, value TEXT, PRIMARY KEY(server, property))");
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	306 }
3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	307
266 cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	308 /**
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	309 * PostgreSQL 9.5: "Adding a column with a default requires
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	310 * updating each row of the table (to store the new column
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	311 * value). However, if no default is specified, PostgreSQL is
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	312 * able to avoid the physical update." => We set no default
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	313 * for performance (older entries will be NULL)
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	314 * https://www.postgresql.org/docs/9.5/ddl-alter.html
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	315 **/
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	316 if (!db.DoesColumnExist("Metadata", "revision"))
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	317 {
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	318 t.GetDatabaseTransaction().ExecuteMultiLines("ALTER TABLE Metadata ADD COLUMN revision INTEGER");
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	319 }
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	320
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	321 if (!db.DoesColumnExist("AttachedFiles", "revision"))
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	322 {
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	323 t.GetDatabaseTransaction().ExecuteMultiLines("ALTER TABLE AttachedFiles ADD COLUMN revision INTEGER");
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	324 }
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL Sebastien Jodogne <s.jodogne@gmail.com> parents: 263 diff changeset	325
136 3266785d5627 cleaning up PostgreSQL locks with constants Sebastien Jodogne <s.jodogne@gmail.com> parents: 134 diff changeset	326 t.Commit();
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	327 }
396 7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	328
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	329
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	330 {
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	331 // New in release 5.0 to deal with labels
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	332 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	333
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	334 if (!t.GetDatabaseTransaction().DoesTableExist("Labels"))
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	335 {
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	336 t.GetDatabaseTransaction().ExecuteMultiLines(
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	337 "CREATE TABLE Labels("
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	338 "id BIGINT REFERENCES Resources(internalId) ON DELETE CASCADE,"
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	339 "label TEXT, PRIMARY KEY(id, label));"
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	340 "CREATE INDEX LabelsIndex1 ON LABELS(id);"
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	341 "CREATE INDEX LabelsIndex2 ON LABELS(label);");
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	342 }
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	343
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	344 t.Commit();
7b3acfa95bd8 implementation of list/add/remove labels in postgresql Sebastien Jodogne <s.jodogne@gmail.com> parents: 389 diff changeset	345 }
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	346 }
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	347 }
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	348
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	349
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	350 int64_t PostgreSQLIndex::CreateResource(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	351 const char* publicId,
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	352 OrthancPluginResourceType type)
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	353 {
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	354 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	355 STATEMENT_FROM_HERE, manager,
302 3a52e27a2d80 in GenericFormatter, replaced ${} by ${AUTOINCREMENT} Sebastien Jodogne <s.jodogne@gmail.com> parents: 266 diff changeset	356 "INSERT INTO Resources VALUES(DEFAULT, ${type}, ${id}, NULL) RETURNING internalId");
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	357
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	358 statement.SetParameterType("id", ValueType_Utf8String);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	359 statement.SetParameterType("type", ValueType_Integer64);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	360
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	361 Dictionary args;
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	362 args.SetUtf8Value("id", publicId);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	363 args.SetIntegerValue("type", static_cast<int>(type));
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	364
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	365 statement.Execute(args);
7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	366
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	367 return statement.ReadInteger64(0);
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	368 }
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	369
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	370
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	371 uint64_t PostgreSQLIndex::GetTotalCompressedSize(DatabaseManager& manager)
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	372 {
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	373 // Fast version if extension "./FastTotalSize.sql" is installed
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	374 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	375
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	376 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	377 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	378 STATEMENT_FROM_HERE, manager,
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	379 "SELECT value FROM GlobalIntegers WHERE key = 0");
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	380
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	381 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	382 statement.Execute();
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	383
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	384 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	385 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	386
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	387 // 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	388 //assert(result == IndexBackend::GetTotalCompressedSize(manager));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	389 return result;
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	390 }
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	391
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	392
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	393 uint64_t PostgreSQLIndex::GetTotalUncompressedSize(DatabaseManager& manager)
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	394 {
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	395 // Fast version if extension "./FastTotalSize.sql" is installed
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	396 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	397
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	398 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	399 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	400 STATEMENT_FROM_HERE, manager,
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	401 "SELECT value FROM GlobalIntegers WHERE key = 1");
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	402
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	403 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	404 statement.Execute();
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	405
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	406 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	407 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	408
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	409 // 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	410 // assert(result == IndexBackend::GetTotalUncompressedSize(manager));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	411 return result;
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	412 }
8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	413
431 7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	414 int64_t PostgreSQLIndex::IncrementGlobalProperty(DatabaseManager& manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	415 const char* serverIdentifier,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	416 int32_t property,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	417 int64_t increment)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	418 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	419 if (serverIdentifier == NULL)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	420 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	421 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	422 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	423 else
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	424 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	425 if (strlen(serverIdentifier) == 0)
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	426 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	427 DatabaseManager::CachedStatement statement(
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	428 STATEMENT_FROM_HERE, manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	429 "INSERT INTO GlobalProperties (property, value) VALUES(${property}, ${increment}) "
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	430 " 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	431 " RETURNING CAST(value AS BIGINT)");
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	432
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	433 statement.SetParameterType("property", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	434 statement.SetParameterType("increment", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	435
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	436 Dictionary args;
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	437 args.SetIntegerValue("property", property);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	438 args.SetIntegerValue("increment", increment);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	439
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	440 statement.Execute(args);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	441
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	442 return statement.ReadInteger64(0);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	443 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	444 else
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	445 {
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	446 DatabaseManager::CachedStatement statement(
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	447 STATEMENT_FROM_HERE, manager,
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	448 "INSERT INTO ServerProperties (server, property, value) VALUES(${server}, ${property}, ${increment}) "
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	449 " 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	450 " RETURNING CAST(value AS BIGINT)");
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	451
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	452 statement.SetParameterType("server", ValueType_Utf8String);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	453 statement.SetParameterType("property", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	454 statement.SetParameterType("increment", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	455
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	456 Dictionary args;
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	457 args.SetUtf8Value("server", serverIdentifier);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	458 args.SetIntegerValue("property", property);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	459 args.SetIntegerValue("increment", increment);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	460
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	461 statement.Execute(args);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	462
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	463 return statement.ReadInteger64(0);
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	464 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	465 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	466 }
7c1fe5d6c12c PG: IncrementGlobalProperty Alain Mazy <am@osimis.io> parents: 428 diff changeset	467
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	468 void PostgreSQLIndex::ClearDeletedFiles(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	469 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	470 { // 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	471 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	472 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	473 "CREATE TEMPORARY TABLE IF NOT EXISTS DeletedFiles("
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	474 "uuid VARCHAR(64) NOT NULL,"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	475 "fileType INTEGER, "
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	476 "compressedSize BIGINT, "
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	477 "uncompressedSize BIGINT, "
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	478 "compressionType INTEGER, "
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	479 "uncompressedHash VARCHAR(40),"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	480 "compressedHash VARCHAR(40)"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	481 ");"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	482 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	483 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	484 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	485 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	486 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	487 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	488 "DELETE FROM DeletedFiles;"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	489 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	490
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	491 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	492 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	493 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	494
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	495 void PostgreSQLIndex::ClearDeletedResources(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	496 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	497 { // 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	498 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	499 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	500 "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	501 "resourceType INTEGER NOT NULL,"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	502 "publicId VARCHAR(64) NOT NULL"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	503 ");"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	504 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	505 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	506 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	507 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	508 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	509 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	510 "DELETE FROM DeletedResources;"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	511 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	512
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	513 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	514 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	515
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	516 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	517
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	518 void PostgreSQLIndex::ClearRemainingAncestor(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	519 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	520 { // 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	521 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	522 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	523 "CREATE TEMPORARY TABLE IF NOT EXISTS RemainingAncestor("
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	524 "resourceType INTEGER NOT NULL,"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	525 "publicId VARCHAR(64) NOT NULL"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	526 ")"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	527 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	528
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	529 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	530 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	531 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	532 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	533 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	534 "DELETE FROM RemainingAncestor;"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	535 );
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	536
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	537 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	538 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	539
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	540 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	541
434 23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	542 void PostgreSQLIndex::DeleteResource(IDatabaseBackendOutput& output,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	543 DatabaseManager& manager,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	544 int64_t id)
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	545 {
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	546 ClearDeletedFiles(manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	547 ClearDeletedResources(manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	548
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	549 DatabaseManager::CachedStatement statement(
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	550 STATEMENT_FROM_HERE, manager,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	551 "SELECT * FROM DeleteResource(${id})");
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	552
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	553 statement.SetParameterType("id", ValueType_Integer64);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	554
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	555 Dictionary args;
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	556 args.SetIntegerValue("id", id);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	557
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	558 statement.Execute(args);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	559
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	560 if (statement.IsDone() \|\|
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	561 statement.GetResultFieldsCount() != 2)
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	562 {
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	563 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	564 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	565
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	566 statement.SetResultFieldType(0, ValueType_Integer64);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	567 statement.SetResultFieldType(1, ValueType_Utf8String);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	568
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	569 if (!statement.IsNull(0))
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	570 {
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	571 output.SignalRemainingAncestor(
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	572 statement.ReadString(1),
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	573 static_cast<OrthancPluginResourceType>(statement.ReadInteger32(0)));
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	574 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	575
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	576 SignalDeletedFiles(output, manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	577 SignalDeletedResources(output, manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	578
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	579 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore Alain Mazy <am@osimis.io> parents: 433 diff changeset	580
433 5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources Alain Mazy <am@osimis.io> parents: 432 diff changeset	581
72 8dd29af7c844 new extension: FastTotalSize Sebastien Jodogne <s.jodogne@gmail.com> parents: 71 diff changeset	582
78 2ee166f77501 renamed macro Sebastien Jodogne <s.jodogne@gmail.com> parents: 77 diff changeset	583 #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	584 void PostgreSQLIndex::CreateInstance(OrthancPluginCreateInstanceResult& result,
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	585 DatabaseManager& manager,
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	586 const char* hashPatient,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	587 const char* hashStudy,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	588 const char* hashSeries,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	589 const char* hashInstance)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	590 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	591 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	592 STATEMENT_FROM_HERE, manager,
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	593 "SELECT * FROM CreateInstance(${patient}, ${study}, ${series}, ${instance})");
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	594
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	595 statement.SetParameterType("patient", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	596 statement.SetParameterType("study", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	597 statement.SetParameterType("series", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	598 statement.SetParameterType("instance", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	599
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	600 Dictionary args;
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	601 args.SetUtf8Value("patient", hashPatient);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	602 args.SetUtf8Value("study", hashStudy);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	603 args.SetUtf8Value("series", hashSeries);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	604 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	605
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	606 statement.Execute(args);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	607
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	608 if (statement.IsDone() \|\|
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	609 statement.GetResultFieldsCount() != 8)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	610 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	611 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	612 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	613
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	614 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	615 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	616 statement.SetResultFieldType(i, ValueType_Integer64);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	617 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	618
432 8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern Alain Mazy <am@osimis.io> parents: 431 diff changeset	619 // 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	620
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	621 result.isNewInstance = (statement.ReadInteger64(3) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	622 result.instanceId = statement.ReadInteger64(7);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	623
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	624 if (result.isNewInstance)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	625 {
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	626 result.isNewPatient = (statement.ReadInteger64(0) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	627 result.isNewStudy = (statement.ReadInteger64(1) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	628 result.isNewSeries = (statement.ReadInteger64(2) == 1);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	629 result.patientId = statement.ReadInteger64(4);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	630 result.studyId = statement.ReadInteger64(5);
29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	631 result.seriesId = statement.ReadInteger64(6);
71 d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	632 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 67 diff changeset	633 }
73 aa81c1c80c75 fix compatibility with older sdk Sebastien Jodogne <s.jodogne@gmail.com> parents: 72 diff changeset	634 #endif
79 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
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	637 uint64_t PostgreSQLIndex::GetResourcesCount(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	638 OrthancPluginResourceType resourceType)
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	639 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	640 // Optimized version thanks to the "FastCountResources.sql" extension
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	641
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	642 assert(OrthancPluginResourceType_Patient == 0 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	643 OrthancPluginResourceType_Study == 1 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	644 OrthancPluginResourceType_Series == 2 &&
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	645 OrthancPluginResourceType_Instance == 3);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	646
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	647 uint64_t result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	648
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	649 {
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	650 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	651 STATEMENT_FROM_HERE, manager,
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	652 "SELECT value FROM GlobalIntegers WHERE key = ${key}");
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	653
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	654 statement.SetParameterType("key", ValueType_Integer64);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	655
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	656 Dictionary args;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	657
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	658 // 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	659 args.SetIntegerValue("key", static_cast<int>(resourceType + 2));
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	660
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	661 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	662 statement.Execute(args);
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	663
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	664 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	665 }
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	666
428 4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions Alain Mazy <am@osimis.io> parents: 427 diff changeset	667 // 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	668 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	669
79 cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	670 return result;
cb0aac9bbada optimization for /statistics URI Sebastien Jodogne <s.jodogne@gmail.com> parents: 78 diff changeset	671 }
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	672
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	673
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	674 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	675 {
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	676 DatabaseManager::CachedStatement statement(
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	677 STATEMENT_FROM_HERE, manager,
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	678 "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	679
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	680 statement.SetReadOnly(true);
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	681 statement.Execute();
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	682
263 29d2b76516f6 fix mysql and postgresql builds Sebastien Jodogne <s.jodogne@gmail.com> parents: 255 diff changeset	683 return statement.ReadInteger64(0);
85 1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex Sebastien Jodogne <s.jodogne@gmail.com> parents: 79 diff changeset	684 }
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	685
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	686
225 94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	687 void PostgreSQLIndex::TagMostRecentPatient(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend Sebastien Jodogne <s.jodogne@gmail.com> parents: 221 diff changeset	688 int64_t patient)
90 e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	689 {
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	690 // 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	691 // backward compatibility is necessary
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	692 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance Sebastien Jodogne <s.jodogne@gmail.com> parents: 88 diff changeset	693 }
0 7cea966b6829 initial commit Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	694 }

Mercurial > hg > orthanc-databases

annotate PostgreSQL/Plugins/PostgreSQLIndex.cpp @ 434:23c7af6f671a pg-transactions