From ef2847fa1331199c241c2a9d96a993023722c9c8 Mon Sep 17 00:00:00 2001
From: Cedric CAFFY <cedric.caffy@cern.ch>
Date: Mon, 9 Dec 2019 12:06:58 +0100
Subject: [PATCH] Removed NUMERIC types from catalogue schema
---
catalogue/CMakeLists.txt | 2 --
catalogue/common_catalogue_schema.sql | 18 +++++++++---------
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/catalogue/CMakeLists.txt b/catalogue/CMakeLists.txt
index d2d776162f..9533fc1399 100644
--- a/catalogue/CMakeLists.txt
+++ b/catalogue/CMakeLists.txt
@@ -109,7 +109,6 @@ add_custom_command (OUTPUT sqlite_catalogue_schema.sql mysql_catalogue_schema.sq
| sed 's/UINT16TYPE/INTEGER/g'
| sed 's/UINT32TYPE/INTEGER/g'
| sed 's/UINT64TYPE/INTEGER/g'
- | sed 's/NUMERIC\([^\)]*\)/INTEGER/g'
| sed 's/CHECKSUM_BLOB_TYPE/BLOB\(200\)/g'
> sqlite_catalogue_schema.sql
COMMAND cat
@@ -121,7 +120,6 @@ add_custom_command (OUTPUT sqlite_catalogue_schema.sql mysql_catalogue_schema.sq
| sed 's/UINT16TYPE/SMALLINT UNSIGNED/g'
| sed 's/UINT32TYPE/INT UNSIGNED/g'
| sed 's/UINT64TYPE/BIGINT UNSIGNED/g'
- | sed 's/NUMERIC\([^\)]*\)/BIGINT UNSIGNED/g'
| sed 's/CHECKSUM_BLOB_TYPE/VARBINARY\(200\)/g'
> mysql_catalogue_schema.sql
COMMAND cat
diff --git a/catalogue/common_catalogue_schema.sql b/catalogue/common_catalogue_schema.sql
index d15ddfaebb..7f4be017a7 100644
--- a/catalogue/common_catalogue_schema.sql
+++ b/catalogue/common_catalogue_schema.sql
@@ -246,15 +246,15 @@ CREATE TABLE ACTIVITIES_WEIGHTS (
LAST_UPDATE_TIME UINT64TYPE CONSTRAINT ACTIV_WEIGHTS_LUT_NN NOT NULL
);
CREATE TABLE USAGESTATS (
- GID NUMERIC(6, 0) DEFAULT 0 CONSTRAINT NN_USAGESTATS_GID NOT NULL,
- TIMESTAMP NUMERIC(20, 0) DEFAULT 0 CONSTRAINT NN_USAGESTATS_TS NOT NULL,
- MAXFILEID NUMERIC(20, 0),
- FILECOUNT NUMERIC(20, 0),
- FILESIZE NUMERIC(20, 0),
- SEGCOUNT NUMERIC(20, 0),
- SEGSIZE NUMERIC(20, 0),
- SEG2COUNT NUMERIC(20, 0),
- SEG2SIZE NUMERIC(20, 0),
+ GID UINT32TYPE DEFAULT 0 CONSTRAINT NN_USAGESTATS_GID NOT NULL,
+ TIMESTAMP UINT64TYPE DEFAULT 0 CONSTRAINT NN_USAGESTATS_TS NOT NULL,
+ MAXFILEID UINT64TYPE,
+ FILECOUNT UINT64TYPE,
+ FILESIZE UINT64TYPE,
+ SEGCOUNT UINT64TYPE,
+ SEGSIZE UINT64TYPE,
+ SEG2COUNT UINT64TYPE,
+ SEG2SIZE UINT64TYPE,
CONSTRAINT PK_USAGESTATS_GID_TS PRIMARY KEY (GID, TIMESTAMP)
);
CREATE TABLE EXPERIMENTS (
--
GitLab