Mercurial > hg > orthanc-databases

annotate PostgreSQL/Plugins/PostgreSQLIndex.cpp @ 436:f16faa1fdc46 pg-transactions

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
InsertOrUpdateMetadata function + UpdateAndGetStatistics
author Alain Mazy <am@osimis.io>
date Fri, 15 Dec 2023 17:11:26 +0100
parents 326f8304daa1
children d979f25e60cf
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 /**
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 * Orthanc - A Lightweight, RESTful DICOM Store
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 * Department, University Hospital of Liege, Belgium
389
3d6886f3e5b3 upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium
3d6886f3e5b3 upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 359
diff changeset
6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 *
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 * This program is free software: you can redistribute it and/or
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 * modify it under the terms of the GNU Affero General Public License
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 * as published by the Free Software Foundation, either version 3 of
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 * the License, or (at your option) any later version.
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 *
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
13 * This program is distributed in the hope that it will be useful, but
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
16 * Affero General Public License for more details.
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
17 *
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
18 * You should have received a copy of the GNU Affero General Public License
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
20 **/
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
21
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
22
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
23 #include "PostgreSQLIndex.h"
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
24
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
25 #include "../../Framework/Plugins/GlobalProperties.h"
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
26 #include "../../Framework/PostgreSQL/PostgreSQLDatabase.h"
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
27 #include "../../Framework/PostgreSQL/PostgreSQLTransaction.h"
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
28 #include "PostgreSQLDefinitions.h"
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
29
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
30 #include <EmbeddedResources.h> // Auto-generated file
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
31
157
275e14f57f1e replacing deprecated std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 152
diff changeset
32 #include <Compatibility.h> // For std::unique_ptr<>
436
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
33 #include <Toolbox.h>
152
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 140
diff changeset
34 #include <Logging.h>
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 140
diff changeset
35 #include <OrthancException.h>
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
36
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
37
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
38 namespace Orthanc
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
39 {
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
40 // Some aliases for internal properties
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
41 static const GlobalProperty GlobalProperty_HasTrigramIndex = GlobalProperty_DatabaseInternal0;
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
42 static const GlobalProperty GlobalProperty_HasCreateInstance = GlobalProperty_DatabaseInternal1;
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
43 static const GlobalProperty GlobalProperty_HasFastCountResources = GlobalProperty_DatabaseInternal2;
85
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
44 static const GlobalProperty GlobalProperty_GetLastChangeIndex = GlobalProperty_DatabaseInternal3;
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
45 }
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
46
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
47
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
48 namespace OrthancDatabases
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
49 {
226
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
50 PostgreSQLIndex::PostgreSQLIndex(OrthancPluginContext* context,
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
51 const PostgreSQLParameters& parameters) :
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
52 IndexBackend(context),
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
53 parameters_(parameters),
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
54 clearAll_(false)
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
55 {
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
56 }
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
57
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
58
255
d663d9e44f8d reintroduction of IDatabaseFactory into DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 241
diff changeset
59 IDatabaseFactory* PostgreSQLIndex::CreateDatabaseFactory()
226
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
60 {
255
d663d9e44f8d reintroduction of IDatabaseFactory into DatabaseManager
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 241
diff changeset
61 return PostgreSQLDatabase::CreateDatabaseFactory(parameters_);
226
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
62 }
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
63
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
64
403
91124cc8a8c7 database plugins are informed about the identifier tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 396
diff changeset
65 void PostgreSQLIndex::ConfigureDatabase(DatabaseManager& manager,
91124cc8a8c7 database plugins are informed about the identifier tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 396
diff changeset
66 bool hasIdentifierTags,
91124cc8a8c7 database plugins are informed about the identifier tags
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 396
diff changeset
67 const std::list<IdentifierTag>& identifierTags)
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
68 {
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
69 uint32_t expectedVersion = 6;
199
8cae98f73d53 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 193
diff changeset
70
8cae98f73d53 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 193
diff changeset
71 if (GetContext()) // "GetContext()" can possibly be NULL in the unit tests
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
72 {
199
8cae98f73d53 refactoring
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 193
diff changeset
73 expectedVersion = OrthancPluginGetExpectedDatabaseVersion(GetContext());
0
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
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
76 // Check the expected version of the database
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
77 if (expectedVersion != 6)
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
78 {
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
79 LOG(ERROR) << "This database plugin is incompatible with your version of Orthanc "
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
80 << "expecting the DB schema version " << expectedVersion
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
81 << ", but this plugin is only compatible with version 6";
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
82 throw Orthanc::OrthancException(Orthanc::ErrorCode_Plugin);
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
83 }
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
84
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
85 PostgreSQLDatabase& db = dynamic_cast<PostgreSQLDatabase&>(manager.GetDatabase());
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
86
12
41543239072d transactions for storage area
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
87 if (parameters_.HasLock())
41543239072d transactions for storage area
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 0
diff changeset
88 {
226
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
89 db.AdvisoryLock(POSTGRESQL_LOCK_INDEX);
56
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
4f66bc893fc3 Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 20
diff changeset
92 {
226
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
93 PostgreSQLDatabase::TransientAdvisoryLock lock(db, POSTGRESQL_LOCK_DATABASE_SETUP);
436
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
94 bool shouldInstallFastTotalStats2 = false;
56
4f66bc893fc3 Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 20
diff changeset
95
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
96 if (clearAll_)
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
97 {
226
a4918d57435c DatabaseManager doesn't IDatabaseFactory anymore
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 225
diff changeset
98 db.ClearAll();
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
99 }
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
100
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
101 {
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
102 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
103
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
104 if (!t.GetDatabaseTransaction().DoesTableExist("Resources"))
136
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 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
107
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
108 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
109 (query, Orthanc::EmbeddedResources::POSTGRESQL_PREPARE_INDEX);
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
110 t.GetDatabaseTransaction().ExecuteMultiLines(query);
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
111
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
112 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
113 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
114 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
115 }
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
116
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
117 if (!t.GetDatabaseTransaction().DoesTableExist("Resources"))
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
118 {
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
119 LOG(ERROR) << "Corrupted PostgreSQL database";
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
120 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
121 }
16
9e419261f1c9 mysql storage area working
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 15
diff changeset
122
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
123 int version = 0;
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
124 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
125 version != 6)
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
126 {
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
127 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
128 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
129 }
56
4f66bc893fc3 Fix Debian issue #906771
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 20
diff changeset
130
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
131 int revision;
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
132 if (!LookupGlobalIntegerProperty(revision, manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabasePatchLevel))
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
133 {
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
134 revision = 1;
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
135 SetGlobalIntegerProperty(manager, MISSING_SERVER_IDENTIFIER, Orthanc::GlobalProperty_DatabasePatchLevel, revision);
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
136 }
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
137
418
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139
Alain Mazy <am@osimis.io>
parents: 403
diff changeset
138 if (revision == 1)
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139
Alain Mazy <am@osimis.io>
parents: 403
diff changeset
139 {
436
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
140 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
141 LOG(WARNING) << "PostgreSQL plugin: adding UNIQUE(publicId) constraint to the 'Resources' table ";
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
142 t.GetDatabaseTransaction().ExecuteMultiLines("ALTER TABLE Resources ADD UNIQUE (publicId);");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
143 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
144
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
145 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
146 LOG(WARNING) << "PostgreSQL plugin: adding or replacing ResourceDeletedFunc";
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
147
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
148 std::string query;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
149 Orthanc::EmbeddedResources::GetFileResource
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
150 (query, Orthanc::EmbeddedResources::POSTGRESQL_RESOURCE_DELETED_FUNC);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
151 t.GetDatabaseTransaction().ExecuteMultiLines(query);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
152 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
153
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
154 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
155 LOG(WARNING) << "PostgreSQL plugin: adding or replacing InsertOrUpdateMetadata";
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
156
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
157 std::string query;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
158 Orthanc::EmbeddedResources::GetFileResource
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
159 (query, Orthanc::EmbeddedResources::POSTGRESQL_INSERT_UPDATE_METADATA);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
160 t.GetDatabaseTransaction().ExecuteMultiLines(query);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
161 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
162
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
163 shouldInstallFastTotalStats2 = true;
418
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139
Alain Mazy <am@osimis.io>
parents: 403
diff changeset
164
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139
Alain Mazy <am@osimis.io>
parents: 403
diff changeset
165 revision = 2;
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139
Alain Mazy <am@osimis.io>
parents: 403
diff changeset
166 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
167 }
a7f0f27fe33c wip: advisory lock around CreateInstance: not ok see WO-139
Alain Mazy <am@osimis.io>
parents: 403
diff changeset
168
436
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
169 if (revision != 2)
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
170 {
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
171 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
172 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
173 }
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
174
77
a2134531473c avoid warnings "An active PostgreSQL transaction was dismissed"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
175 t.Commit();
a2134531473c avoid warnings "An active PostgreSQL transaction was dismissed"
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 74
diff changeset
176 }
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
177
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
178 {
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
179 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
180
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
181 int hasTrigram = 0;
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
182 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
183 Orthanc::GlobalProperty_HasTrigramIndex) ||
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
184 hasTrigram != 1)
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
185 {
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 * 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
188 * 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
189 * 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
190 * "DicomIdentifiersIndexValues", as it leads to better
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
191 * 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
192 * no wildcard).
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
193 * 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
194 * 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
195 **/
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
196 try
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
197 {
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
198 // 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
199 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
200 << "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
201
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
202 t.GetDatabaseTransaction().ExecuteMultiLines(
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
203 "CREATE EXTENSION IF NOT EXISTS pg_trgm; "
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
204 "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
205
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
206 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
207 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
208
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
209 t.Commit();
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
210 }
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
211 catch (Orthanc::OrthancException&)
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 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
214 << "not support trigram matching";
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
215 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
216 << "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
217 }
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
218 }
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
219 else
90
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
220 {
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
221 t.Commit();
90
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
222 }
136
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
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
225 {
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
226 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
227
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
228 int property = 0;
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
229 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
230 Orthanc::GlobalProperty_HasCreateInstance) ||
428
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions
Alain Mazy <am@osimis.io>
parents: 427
diff changeset
231 property != 3)
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
232 {
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
233 LOG(INFO) << "Installing the CreateInstance extension";
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
234
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
235 if (property == 1)
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
236 {
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
237 // Drop older, experimental versions of this extension
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
238 t.GetDatabaseTransaction().ExecuteMultiLines("DROP FUNCTION CreateInstance("
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
239 "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
240 }
90
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
241
428
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions
Alain Mazy <am@osimis.io>
parents: 427
diff changeset
242 // 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
243 // 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
244 // -> 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
245 // 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
246 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
247 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
248 (query, Orthanc::EmbeddedResources::POSTGRESQL_CREATE_INSTANCE);
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
249 t.GetDatabaseTransaction().ExecuteMultiLines(query);
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
250
428
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions
Alain Mazy <am@osimis.io>
parents: 427
diff changeset
251 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
252 }
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
253
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
254 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
255 Orthanc::GlobalProperty_GetTotalSizeIsFast) ||
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
256 property != 1)
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
257 {
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
258 LOG(INFO) << "Installing the FastTotalSize extension";
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
259
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
260 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
261 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
262 (query, Orthanc::EmbeddedResources::POSTGRESQL_FAST_TOTAL_SIZE);
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
263 t.GetDatabaseTransaction().ExecuteMultiLines(query);
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
264
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
265 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
266 }
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
267
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
268
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
269 // Installing this extension requires the "GlobalIntegers" table
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
270 // created by the "FastTotalSize" extension
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
271 property = 0;
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
272 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
273 Orthanc::GlobalProperty_HasFastCountResources) ||
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
274 property != 1)
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
275 {
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
276 LOG(INFO) << "Installing the FastCountResources extension";
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
277
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
278 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
279 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
280 (query, Orthanc::EmbeddedResources::POSTGRESQL_FAST_COUNT_RESOURCES);
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
281 t.GetDatabaseTransaction().ExecuteMultiLines(query);
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
282
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
283 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
284 }
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
285
85
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
286
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
287 // Installing this extension requires the "GlobalIntegers" table
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
288 // created by the "GetLastChangeIndex" extension
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
289 property = 0;
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
290 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
291 Orthanc::GlobalProperty_GetLastChangeIndex) ||
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
292 property != 1)
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
293 {
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
294 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
295
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
296 std::string query;
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
297 Orthanc::EmbeddedResources::GetFileResource
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
298 (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
299 t.GetDatabaseTransaction().ExecuteMultiLines(query);
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
300
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
301 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
302 }
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
303
436
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
304 if (shouldInstallFastTotalStats2)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
305 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
306 LOG(WARNING) << "PostgreSQL plugin: installing FastTotalStats2 to replace FastTotalSize and FastCountResources";
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
307
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
308 std::string query;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
309 Orthanc::EmbeddedResources::GetFileResource
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
310 (query, Orthanc::EmbeddedResources::POSTGRESQL_FAST_TOTAL_STATS_2);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
311 t.GetDatabaseTransaction().ExecuteMultiLines(query);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
312 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
313
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
314 t.Commit();
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
315 }
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
316
85
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
317
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
318 {
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
319 // 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
320 DatabaseManager::Transaction t(manager, TransactionType_ReadWrite);
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
321
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
322 if (!t.GetDatabaseTransaction().DoesTableExist("ServerProperties"))
237
35598014f140 refactoring to remove GlobalProperties.cpp
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 226
diff changeset
323 {
241
a063bbf10a3e simplification of class DatabaseManager::Transaction
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 237
diff changeset
324 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
325 "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
326 }
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
327
266
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
328 /**
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
329 * 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
330 * 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
331 * 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
332 * 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
333 * 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
334 * 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
335 **/
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
336 if (!db.DoesColumnExist("Metadata", "revision"))
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
337 {
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
338 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
339 }
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
340
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
341 if (!db.DoesColumnExist("AttachedFiles", "revision"))
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
342 {
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
343 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
344 }
cc7af42d4f23 Store revisions for metadata and attachments in PostgreSQL
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 263
diff changeset
345
136
3266785d5627 cleaning up PostgreSQL locks with constants
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 134
diff changeset
346 t.Commit();
85
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
347 }
396
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
348
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
349
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
350 {
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
351 // 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
352 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
353
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
354 if (!t.GetDatabaseTransaction().DoesTableExist("Labels"))
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
355 {
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
356 t.GetDatabaseTransaction().ExecuteMultiLines(
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
357 "CREATE TABLE Labels("
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
358 "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
359 "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
360 "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
361 "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
362 }
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
363
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
364 t.Commit();
7b3acfa95bd8 implementation of list/add/remove labels in postgresql
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 389
diff changeset
365 }
85
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
366 }
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
367 }
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
368
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
369
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
370 int64_t PostgreSQLIndex::CreateResource(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
371 const char* publicId,
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
372 OrthancPluginResourceType type)
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
373 {
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
374 DatabaseManager::CachedStatement statement(
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
375 STATEMENT_FROM_HERE, manager,
302
3a52e27a2d80 in GenericFormatter, replaced ${} by ${AUTOINCREMENT}
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 266
diff changeset
376 "INSERT INTO Resources VALUES(DEFAULT, ${type}, ${id}, NULL) RETURNING internalId");
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
377
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
378 statement.SetParameterType("id", ValueType_Utf8String);
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
379 statement.SetParameterType("type", ValueType_Integer64);
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
380
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
381 Dictionary args;
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
382 args.SetUtf8Value("id", publicId);
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
383 args.SetIntegerValue("type", static_cast<int>(type));
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
384
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
385 statement.Execute(args);
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
386
263
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
387 return statement.ReadInteger64(0);
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
388 }
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
389
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
390
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
391 uint64_t PostgreSQLIndex::GetTotalCompressedSize(DatabaseManager& manager)
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
392 {
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
393 // Fast version if extension "./FastTotalSize.sql" is installed
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
394 uint64_t result;
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
395
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
396 {
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
397 DatabaseManager::CachedStatement statement(
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
398 STATEMENT_FROM_HERE, manager,
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
399 "SELECT value FROM GlobalIntegers WHERE key = 0");
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
400
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
401 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
402 statement.Execute();
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
403
263
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
404 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
405 }
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
406
428
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions
Alain Mazy <am@osimis.io>
parents: 427
diff changeset
407 // 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
408 //assert(result == IndexBackend::GetTotalCompressedSize(manager));
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
409 return result;
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
410 }
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
411
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
412
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
413 uint64_t PostgreSQLIndex::GetTotalUncompressedSize(DatabaseManager& manager)
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
414 {
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
415 // Fast version if extension "./FastTotalSize.sql" is installed
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
416 uint64_t result;
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
417
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
418 {
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
419 DatabaseManager::CachedStatement statement(
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
420 STATEMENT_FROM_HERE, manager,
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
421 "SELECT value FROM GlobalIntegers WHERE key = 1");
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
422
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
423 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
424 statement.Execute();
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
425
263
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
426 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
427 }
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
428
428
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions
Alain Mazy <am@osimis.io>
parents: 427
diff changeset
429 // 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
430 // assert(result == IndexBackend::GetTotalUncompressedSize(manager));
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
431 return result;
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
432 }
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
433
431
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
434 int64_t PostgreSQLIndex::IncrementGlobalProperty(DatabaseManager& manager,
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
435 const char* serverIdentifier,
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
436 int32_t property,
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
437 int64_t increment)
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
438 {
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
439 if (serverIdentifier == NULL)
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
440 {
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
441 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
442 }
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
443 else
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
444 {
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
445 if (strlen(serverIdentifier) == 0)
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
446 {
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
447 DatabaseManager::CachedStatement statement(
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
448 STATEMENT_FROM_HERE, manager,
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
449 "INSERT INTO GlobalProperties (property, value) VALUES(${property}, ${increment}) "
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
450 " 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
451 " RETURNING CAST(value AS BIGINT)");
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
452
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.SetIntegerValue("property", property);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
458 args.SetIntegerValue("increment", increment);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
459
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
460 statement.Execute(args);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
461
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
462 return statement.ReadInteger64(0);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
463 }
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
464 else
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 DatabaseManager::CachedStatement statement(
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
467 STATEMENT_FROM_HERE, manager,
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
468 "INSERT INTO ServerProperties (server, property, value) VALUES(${server}, ${property}, ${increment}) "
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
469 " 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
470 " RETURNING CAST(value AS BIGINT)");
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
471
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
472 statement.SetParameterType("server", ValueType_Utf8String);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
473 statement.SetParameterType("property", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
474 statement.SetParameterType("increment", ValueType_Integer64);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
475
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
476 Dictionary args;
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
477 args.SetUtf8Value("server", serverIdentifier);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
478 args.SetIntegerValue("property", property);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
479 args.SetIntegerValue("increment", increment);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
480
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
481 statement.Execute(args);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
482
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
483 return statement.ReadInteger64(0);
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
484 }
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
485 }
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
486 }
7c1fe5d6c12c PG: IncrementGlobalProperty
Alain Mazy <am@osimis.io>
parents: 428
diff changeset
487
436
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
488 void PostgreSQLIndex::UpdateAndGetStatistics(DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
489 int64_t& patientsCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
490 int64_t& studiesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
491 int64_t& seriesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
492 int64_t& instancesCount,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
493 int64_t& compressedSize,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
494 int64_t& uncompressedSize)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
495 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
496 DatabaseManager::CachedStatement statement(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
497 STATEMENT_FROM_HERE, manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
498 "SELECT * FROM UpdateStatistics()");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
499
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
500 statement.Execute();
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
501
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
502 patientsCount = statement.ReadInteger64(0);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
503 studiesCount = statement.ReadInteger64(1);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
504 seriesCount = statement.ReadInteger64(2);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
505 instancesCount = statement.ReadInteger64(3);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
506 compressedSize = statement.ReadInteger64(4);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
507 uncompressedSize = statement.ReadInteger64(5);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
508 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
509
433
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
510 void PostgreSQLIndex::ClearDeletedFiles(DatabaseManager& manager)
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 { // 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
513 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
514 STATEMENT_FROM_HERE, manager,
435
326f8304daa1 new creating temporary tables inside functions
Alain Mazy <am@osimis.io>
parents: 434
diff changeset
515 "SELECT CreateDeletedFilesTemporaryTable()"
433
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
516 );
435
326f8304daa1 new creating temporary tables inside functions
Alain Mazy <am@osimis.io>
parents: 434
diff changeset
517 statement.ExecuteWithoutResult();
433
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
518 }
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 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
521
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
522 void PostgreSQLIndex::ClearDeletedResources(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
523 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
524 { // 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
525 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
526 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
527 "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
528 "resourceType INTEGER NOT NULL,"
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
529 "publicId VARCHAR(64) NOT NULL"
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 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
533 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
534 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
535 DatabaseManager::CachedStatement statement(
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
536 STATEMENT_FROM_HERE, manager,
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
537 "DELETE FROM DeletedResources;"
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 statement.Execute();
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
541 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
542
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
543 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
544
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
545 void PostgreSQLIndex::ClearRemainingAncestor(DatabaseManager& manager)
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
546 {
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
547 }
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
548
434
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
549 void PostgreSQLIndex::DeleteResource(IDatabaseBackendOutput& output,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
550 DatabaseManager& manager,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
551 int64_t id)
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
552 {
435
326f8304daa1 new creating temporary tables inside functions
Alain Mazy <am@osimis.io>
parents: 434
diff changeset
553 // clearing of temporary table is now implemented in the funcion DeleteResource
434
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
554 DatabaseManager::CachedStatement statement(
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
555 STATEMENT_FROM_HERE, manager,
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
556 "SELECT * FROM DeleteResource(${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.SetParameterType("id", ValueType_Integer64);
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 Dictionary args;
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
561 args.SetIntegerValue("id", id);
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 statement.Execute(args);
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 if (statement.IsDone() ||
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
566 statement.GetResultFieldsCount() != 2)
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
567 {
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
568 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
569 }
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 statement.SetResultFieldType(0, ValueType_Integer64);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
572 statement.SetResultFieldType(1, ValueType_Utf8String);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
573
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
574 if (!statement.IsNull(0))
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 output.SignalRemainingAncestor(
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
577 statement.ReadString(1),
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
578 static_cast<OrthancPluginResourceType>(statement.ReadInteger32(0)));
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
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
581 SignalDeletedFiles(output, manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
582 SignalDeletedResources(output, manager);
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
583 }
23c7af6f671a DeleteResource does not need the RemainingAncestor table anymore
Alain Mazy <am@osimis.io>
parents: 433
diff changeset
584
433
5964ce6385a5 use temporary tables for DeletedFiles, RemainingAncestor and DeletedResources
Alain Mazy <am@osimis.io>
parents: 432
diff changeset
585
72
8dd29af7c844 new extension: FastTotalSize
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 71
diff changeset
586
78
2ee166f77501 renamed macro
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 77
diff changeset
587 #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
588 void PostgreSQLIndex::CreateInstance(OrthancPluginCreateInstanceResult& result,
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
589 DatabaseManager& manager,
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
590 const char* hashPatient,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
591 const char* hashStudy,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
592 const char* hashSeries,
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
593 const char* hashInstance)
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 DatabaseManager::CachedStatement statement(
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
596 STATEMENT_FROM_HERE, manager,
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
597 "SELECT * FROM CreateInstance(${patient}, ${study}, ${series}, ${instance})");
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
598
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
599 statement.SetParameterType("patient", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
600 statement.SetParameterType("study", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
601 statement.SetParameterType("series", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
602 statement.SetParameterType("instance", ValueType_Utf8String);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
603
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
604 Dictionary args;
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
605 args.SetUtf8Value("patient", hashPatient);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
606 args.SetUtf8Value("study", hashStudy);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
607 args.SetUtf8Value("series", hashSeries);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
608 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
609
428
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions
Alain Mazy <am@osimis.io>
parents: 427
diff changeset
610 statement.Execute(args);
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
611
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
612 if (statement.IsDone() ||
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
613 statement.GetResultFieldsCount() != 8)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
614 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
615 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
616 }
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 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
619 {
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
620 statement.SetResultFieldType(i, ValueType_Integer64);
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
621 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
622
432
8b7c1c423367 new 'TransactionMode' config + rewrote ResourceDeletedFunc to avoid IF/THEN/ELSE pattern
Alain Mazy <am@osimis.io>
parents: 431
diff changeset
623 // 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
624
263
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
625 result.isNewInstance = (statement.ReadInteger64(3) == 1);
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
626 result.instanceId = statement.ReadInteger64(7);
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
627
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
628 if (result.isNewInstance)
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
629 {
263
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
630 result.isNewPatient = (statement.ReadInteger64(0) == 1);
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
631 result.isNewStudy = (statement.ReadInteger64(1) == 1);
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
632 result.isNewSeries = (statement.ReadInteger64(2) == 1);
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
633 result.patientId = statement.ReadInteger64(4);
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
634 result.studyId = statement.ReadInteger64(5);
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
635 result.seriesId = statement.ReadInteger64(6);
71
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
636 }
d40c5fecd160 new extension implemented for PostgreSQL: CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 67
diff changeset
637 }
73
aa81c1c80c75 fix compatibility with older sdk
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 72
diff changeset
638 #endif
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
436
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
641 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
642 static void ExecuteSetResourcesContentTags(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
643 DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
644 const std::string& table,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
645 const std::string& variablePrefix,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
646 uint32_t count,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
647 const OrthancPluginResourcesContentTags* tags)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
648 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
649 std::string sql;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
650 Dictionary args;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
651
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
652 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
653 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
654 std::string name = variablePrefix + boost::lexical_cast<std::string>(i);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
655
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
656 args.SetUtf8Value(name, tags[i].value);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
657
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
658 std::string insert = ("(" + boost::lexical_cast<std::string>(tags[i].resource) + ", " +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
659 boost::lexical_cast<std::string>(tags[i].group) + ", " +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
660 boost::lexical_cast<std::string>(tags[i].element) + ", " +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
661 "${" + name + "})");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
662
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
663 if (sql.empty())
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
664 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
665 sql = "INSERT INTO " + table + " VALUES " + insert;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
666 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
667 else
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
668 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
669 sql += ", " + insert;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
670 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
671 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
672
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
673 if (!sql.empty())
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
674 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
675 DatabaseManager::StandaloneStatement statement(manager, sql);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
676
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
677 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
678 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
679 statement.SetParameterType(variablePrefix + boost::lexical_cast<std::string>(i),
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
680 ValueType_Utf8String);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
681 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
682
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
683 statement.Execute(args);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
684 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
685 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
686 #endif
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
687
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
688
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
689 #if ORTHANC_PLUGINS_HAS_DATABASE_CONSTRAINT == 1
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
690 static void ExecuteSetResourcesContentMetadata(
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
691 DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
692 bool hasRevisionsSupport,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
693 uint32_t count,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
694 const OrthancPluginResourcesContentMetadata* metadata)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
695 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
696 if (count < 1)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
697 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
698 return;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
699 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
700
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
701 std::vector<std::string> resourceIds;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
702 std::vector<std::string> metadataTypes;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
703 std::vector<std::string> metadataValues;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
704 std::vector<std::string> revisions;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
705
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
706 Dictionary args;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
707
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
708 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
709 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
710 std::string argName = "m" + boost::lexical_cast<std::string>(i);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
711
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
712 args.SetUtf8Value(argName, metadata[i].value);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
713
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
714 resourceIds.push_back(boost::lexical_cast<std::string>(metadata[i].resource));
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
715 metadataTypes.push_back(boost::lexical_cast<std::string>(metadata[i].metadata));
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
716 metadataValues.push_back("${" + argName + "}");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
717 revisions.push_back("0");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
718 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
719
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
720 std::string joinedResourceIds;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
721 std::string joinedMetadataTypes;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
722 std::string joinedMetadataValues;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
723 std::string joinedRevisions;
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
724
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
725 Orthanc::Toolbox::JoinStrings(joinedResourceIds, resourceIds, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
726 Orthanc::Toolbox::JoinStrings(joinedMetadataTypes, metadataTypes, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
727 Orthanc::Toolbox::JoinStrings(joinedMetadataValues, metadataValues, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
728 Orthanc::Toolbox::JoinStrings(joinedRevisions, revisions, ",");
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
729
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
730 std::string sql = std::string("SELECT InsertOrUpdateMetadata(ARRAY[") +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
731 joinedResourceIds + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
732 joinedMetadataTypes + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
733 joinedMetadataValues + "], ARRAY[" +
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
734 joinedRevisions + "])";
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
735
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
736 DatabaseManager::StandaloneStatement statement(manager, sql);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
737
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
738 for (uint32_t i = 0; i < count; i++)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
739 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
740 statement.SetParameterType("m" + boost::lexical_cast<std::string>(i),
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
741 ValueType_Utf8String);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
742 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
743
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
744 statement.Execute(args);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
745 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
746 #endif
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
747
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
748
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
749 void PostgreSQLIndex::SetResourcesContent(DatabaseManager& manager,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
750 uint32_t countIdentifierTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
751 const OrthancPluginResourcesContentTags* identifierTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
752 uint32_t countMainDicomTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
753 const OrthancPluginResourcesContentTags* mainDicomTags,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
754 uint32_t countMetadata,
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
755 const OrthancPluginResourcesContentMetadata* metadata)
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
756 {
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
757 ExecuteSetResourcesContentTags(manager, "DicomIdentifiers", "i",
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
758 countIdentifierTags, identifierTags);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
759
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
760 ExecuteSetResourcesContentTags(manager, "MainDicomTags", "t",
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
761 countMainDicomTags, mainDicomTags);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
762
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
763 ExecuteSetResourcesContentMetadata(manager, HasRevisionsSupport(), countMetadata, metadata);
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
764
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
765 }
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
766
f16faa1fdc46 InsertOrUpdateMetadata function + UpdateAndGetStatistics
Alain Mazy <am@osimis.io>
parents: 435
diff changeset
767
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
768 uint64_t PostgreSQLIndex::GetResourcesCount(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
769 OrthancPluginResourceType resourceType)
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
770 {
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
771 // Optimized version thanks to the "FastCountResources.sql" extension
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
772
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
773 assert(OrthancPluginResourceType_Patient == 0 &&
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
774 OrthancPluginResourceType_Study == 1 &&
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
775 OrthancPluginResourceType_Series == 2 &&
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
776 OrthancPluginResourceType_Instance == 3);
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
777
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
778 uint64_t result;
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
779
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
780 {
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
781 DatabaseManager::CachedStatement statement(
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
782 STATEMENT_FROM_HERE, manager,
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
783 "SELECT value FROM GlobalIntegers WHERE key = ${key}");
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
784
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
785 statement.SetParameterType("key", ValueType_Integer64);
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
786
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
787 Dictionary args;
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
788
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
789 // 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
790 args.SetIntegerValue("key", static_cast<int>(resourceType + 2));
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
791
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
792 statement.SetReadOnly(true);
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
793 statement.Execute(args);
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
794
263
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
795 result = static_cast<uint64_t>(statement.ReadInteger64(0));
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
796 }
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
797
428
4d0bacbd0fba rewrote CreateInstance to make it compatible with READ COMMITED transactions
Alain Mazy <am@osimis.io>
parents: 427
diff changeset
798 // 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
799 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
800
79
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
801 return result;
cb0aac9bbada optimization for /statistics URI
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 78
diff changeset
802 }
85
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
803
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
804
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
805 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
806 {
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
807 DatabaseManager::CachedStatement statement(
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
808 STATEMENT_FROM_HERE, manager,
85
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
809 "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
810
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
811 statement.SetReadOnly(true);
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
812 statement.Execute();
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
813
263
29d2b76516f6 fix mysql and postgresql builds
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 255
diff changeset
814 return statement.ReadInteger64(0);
85
1012fe77241c new extension implemented for PostgreSQL and SQLite: GetLastChangeIndex
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 79
diff changeset
815 }
90
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
816
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
817
225
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
818 void PostgreSQLIndex::TagMostRecentPatient(DatabaseManager& manager,
94c9908e6aca removed DatabaseManager member out of class IndexBackend
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 221
diff changeset
819 int64_t patient)
90
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
820 {
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
821 // 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
822 // backward compatibility is necessary
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
823 throw Orthanc::OrthancException(Orthanc::ErrorCode_Database);
e61587582cef moved extension TagMostRecentPatient into stored procedure CreateInstance
Sebastien Jodogne <s.jodogne@gmail.com>
parents: 88
diff changeset
824 }
0
7cea966b6829 initial commit
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
825 }