diff --git a/catalogue/CMakeLists.txt b/catalogue/CMakeLists.txt index d2d776162ff51563104ce4153027ec6ad226f1eb..9533fc1399355494929b19c8481d14f6d0f0ee3e 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 d15ddfaebba383824905ea057716ee5eaaa15a46..7f4be017a77a4403c95e2acd69091ae3b176a1e6 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 (