From ffcb52abdd44534f5452baec4d764011a18e9687 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Mon, 15 Mar 2021 16:14:04 +0100 Subject: [PATCH] Fixed tables --- .../persistence/PersistencePostgreSQLTest.java | 7 ++++++- src/test/resources/JobUsageRecordTable.sql | 2 +- src/test/resources/PortletUsageRecordTable.sql | 2 +- src/test/resources/ServiceUsageRecordTable.sql | 2 +- src/test/resources/StorageStatusRecordTable.sql | 2 +- src/test/resources/StorageUsageRecordTable.sql | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java b/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java index 2ad55ca..7208c9a 100644 --- a/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java +++ b/src/test/java/org/gcube/documentstore/persistence/PersistencePostgreSQLTest.java @@ -139,7 +139,12 @@ public class PersistencePostgreSQLTest extends ContextTest { Assert.assertTrue(persistenceBackend instanceof PersistencePostgreSQL); PersistencePostgreSQL persistencePostgreSQL = (PersistencePostgreSQL) persistenceBackend; persistencePostgreSQL.newConnection(); - for(int i=0; i<10; i++) { + for(int i=0; i<1000000; i++) { + if(i%10000 == 0) { + persistencePostgreSQL.commitAndClose(); + persistencePostgreSQL.newConnection(); + } + UsageRecord usageRecord = getTestAggregatedJobUsageRecord(); persistencePostgreSQL.insert(usageRecord); diff --git a/src/test/resources/JobUsageRecordTable.sql b/src/test/resources/JobUsageRecordTable.sql index bb03fbe..39c24ea 100644 --- a/src/test/resources/JobUsageRecordTable.sql +++ b/src/test/resources/JobUsageRecordTable.sql @@ -1,6 +1,6 @@ -- CREATE TYPE operation_result AS ENUM ('SUCCESS', 'FAILED'); CREATE TABLE "jobusagerecord"( - id TEXT NOT NULL, + id UUID NOT NULL PRIMARY KEY, consumer_id TEXT NOT NULL, creation_time TIMESTAMP WITH TIME ZONE NOT NULL, scope TEXT NOT NULL, diff --git a/src/test/resources/PortletUsageRecordTable.sql b/src/test/resources/PortletUsageRecordTable.sql index 482fddd..7a06331 100644 --- a/src/test/resources/PortletUsageRecordTable.sql +++ b/src/test/resources/PortletUsageRecordTable.sql @@ -1,6 +1,6 @@ -- CREATE TYPE operation_result AS ENUM ('SUCCESS', 'FAILED'); CREATE TABLE "portletusagerecord"( - id TEXT NOT NULL, + id UUID NOT NULL PRIMARY KEY, consumer_id TEXT NOT NULL, creation_time TIMESTAMP WITH TIME ZONE NOT NULL, scope TEXT NOT NULL, diff --git a/src/test/resources/ServiceUsageRecordTable.sql b/src/test/resources/ServiceUsageRecordTable.sql index 762c991..f0a9169 100644 --- a/src/test/resources/ServiceUsageRecordTable.sql +++ b/src/test/resources/ServiceUsageRecordTable.sql @@ -1,6 +1,6 @@ CREATE TYPE operation_result AS ENUM ('SUCCESS', 'FAILED'); CREATE TABLE "serviceusagerecord"( - id TEXT NOT NULL, + id UUID NOT NULL PRIMARY KEY, consumer_id TEXT NOT NULL, creation_time TIMESTAMP WITH TIME ZONE NOT NULL, scope TEXT NOT NULL, diff --git a/src/test/resources/StorageStatusRecordTable.sql b/src/test/resources/StorageStatusRecordTable.sql index 33366dc..db51a0d 100644 --- a/src/test/resources/StorageStatusRecordTable.sql +++ b/src/test/resources/StorageStatusRecordTable.sql @@ -1,7 +1,7 @@ -- CREATE TYPE operation_result AS ENUM ('SUCCESS', 'FAILED'); -- CREATE TYPE data_type AS ENUM ('STORAGE', 'TREE', 'GEO', 'DATABASE', 'LOCAL', 'OTHER'); CREATE TABLE "storagestatusrecord"( - id TEXT NOT NULL, + id UUID NOT NULL PRIMARY KEY, consumer_id TEXT NOT NULL, creation_time TIMESTAMP WITH TIME ZONE NOT NULL, scope TEXT NOT NULL, diff --git a/src/test/resources/StorageUsageRecordTable.sql b/src/test/resources/StorageUsageRecordTable.sql index 47d85de..d306526 100644 --- a/src/test/resources/StorageUsageRecordTable.sql +++ b/src/test/resources/StorageUsageRecordTable.sql @@ -2,7 +2,7 @@ CREATE TYPE operation_type AS ENUM ('CREATE', 'READ', 'UPDATE', 'DELETE'); CREATE TYPE data_type AS ENUM ('STORAGE', 'TREE', 'GEO', 'DATABASE', 'LOCAL', 'OTHER'); CREATE TABLE "storageusagerecord"( - id TEXT NOT NULL, + id UUID NOT NULL PRIMARY KEY, consumer_id TEXT NOT NULL, creation_time TIMESTAMP WITH TIME ZONE NOT NULL, scope TEXT NOT NULL,