diff --git a/database/journaldb.sql b/database/journaldb.sql index b60ea46235..d40e19ef3b 100644 --- a/database/journaldb.sql +++ b/database/journaldb.sql @@ -232,31 +232,31 @@ CREATE TABLE `logfile` ( `file_size` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT 'Log file''s size in bytes', `sha256_checksum` char(44) NOT NULL COMMENT 'An SHA256 hash of the log file (Note: known to be 44 characters long)', `archive_etag` varchar(64) NOT NULL COMMENT 'Object storage''s MD5 hash of the log file (Note: room left for possible implementation changes)', - `logtag` varchar(48) NOT NULL COMMENT 'A link back to CFEngine', `source_system_id` smallint(5) unsigned NOT NULL COMMENT 'Log file''s source system (references source_system.id)', `category_id` smallint(5) unsigned NOT NULL DEFAULT 0 COMMENT 'Log file''s category (references category.id)', `uncompressed_file_size` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s uncompressed file size', `epoch_hour` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s epoch logdate', `epoch_expires` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s epoch expiration', `epoch_archived` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s epoch archived', - `logtag_id` bigint(20) unsigned NOT NULL COMMENT 'Log file''s foreign key to logtag', `ci_id` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s foreign key to ci table', + `logtag_id` bigint(20) unsigned NOT NULL COMMENT 'Log file''s foreign key to logtag', + `object_format_id` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s foreign key to object_format table', PRIMARY KEY (`id`), UNIQUE KEY `uix_logfile_object_hash` (`object_key_hash`), KEY `bucket_id` (`bucket_id`), KEY `category_id` (`category_id`), KEY `ix_logfile_expiration` (`expiration`), KEY `ix_logfile__source_system_id` (`source_system_id`), - KEY `cix_logfile_logdate_host_id_logtag` (`logdate`,`host_id`,`logtag`), - KEY `cix_logfile_host_id_logtag_logdate` (`host_id`,`logtag`,`logdate`), - KEY `cix_logfile_epoch_hour_host_id_logtag` (`epoch_hour`,`host_id`,`logtag`), KEY `ix_logfile_epoch_expires` (`epoch_expires`), + KEY `fk_logfile__ci_id` (`ci_id`), KEY `fk_logfile__logtag_id` (`logtag_id`), KEY `cix_logfile_epoch_hour_host_id_logtag_id` (`epoch_hour`,`host_id`,`logtag_id`), KEY `cix_logfile_logdate_host_id_logtag_id` (`logdate`,`host_id`,`logtag_id`), - KEY `fk_logfile__ci_id` (`ci_id`), + KEY `fk_logfile__object_format_id` (`object_format_id`), + KEY `fk_logfile__host_id` (`host_id`), CONSTRAINT `fk_logfile__ci_id` FOREIGN KEY (`ci_id`) REFERENCES `ci` (`id`), CONSTRAINT `fk_logfile__logtag_id` FOREIGN KEY (`logtag_id`) REFERENCES `logtag` (`id`), + CONSTRAINT `fk_logfile__object_format_id` FOREIGN KEY (`object_format_id`) REFERENCES `object_format` (`id`), CONSTRAINT `fk_logfile__source_system_id` FOREIGN KEY (`source_system_id`) REFERENCES `source_system` (`id`), CONSTRAINT `logfile_ibfk_1` FOREIGN KEY (`bucket_id`) REFERENCES `bucket` (`id`), CONSTRAINT `logfile_ibfk_2` FOREIGN KEY (`host_id`) REFERENCES `host` (`id`), @@ -324,6 +324,30 @@ LOCK TABLES `metadata_value` WRITE; /*!40000 ALTER TABLE `metadata_value` ENABLE KEYS */; UNLOCK TABLES; +-- +-- Table structure for table `object_format` +-- + +DROP TABLE IF EXISTS `object_format`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `object_format` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID for object_format', + `name` varchar(255) NOT NULL COMMENT 'object_format of the logfile records', + PRIMARY KEY (`id`), + UNIQUE KEY `uix_object_format` (`name`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='Contains object_format values that are identified using the ID'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `object_format` +-- + +LOCK TABLES `object_format` WRITE; +/*!40000 ALTER TABLE `object_format` DISABLE KEYS */; +/*!40000 ALTER TABLE `object_format` ENABLE KEYS */; +UNLOCK TABLES; + -- -- Table structure for table `restore_job` -- @@ -384,4 +408,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-08-06 11:56:20 +-- Dump completed on 2026-02-23 14:57:42 diff --git a/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/Indexes.java b/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/Indexes.java index be2a9514a6..f32962d91f 100644 --- a/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/Indexes.java +++ b/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/Indexes.java @@ -89,13 +89,12 @@ public class Indexes { public static final Index HOST_UIX_HOST_NAME = Indexes0.HOST_UIX_HOST_NAME; public static final Index LOGFILE_BUCKET_ID = Indexes0.LOGFILE_BUCKET_ID; public static final Index LOGFILE_CATEGORY_ID = Indexes0.LOGFILE_CATEGORY_ID; - public static final Index LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG = Indexes0.LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG; public static final Index LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG_ID = Indexes0.LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG_ID; - public static final Index LOGFILE_CIX_LOGFILE_HOST_ID_LOGTAG_LOGDATE = Indexes0.LOGFILE_CIX_LOGFILE_HOST_ID_LOGTAG_LOGDATE; - public static final Index LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG = Indexes0.LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG; public static final Index LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG_ID = Indexes0.LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG_ID; public static final Index LOGFILE_FK_LOGFILE__CI_ID = Indexes0.LOGFILE_FK_LOGFILE__CI_ID; + public static final Index LOGFILE_FK_LOGFILE__HOST_ID = Indexes0.LOGFILE_FK_LOGFILE__HOST_ID; public static final Index LOGFILE_FK_LOGFILE__LOGTAG_ID = Indexes0.LOGFILE_FK_LOGFILE__LOGTAG_ID; + public static final Index LOGFILE_FK_LOGFILE__OBJECT_FORMAT_ID = Indexes0.LOGFILE_FK_LOGFILE__OBJECT_FORMAT_ID; public static final Index LOGFILE_IX_LOGFILE_EPOCH_EXPIRES = Indexes0.LOGFILE_IX_LOGFILE_EPOCH_EXPIRES; public static final Index LOGFILE_IX_LOGFILE_EXPIRATION = Indexes0.LOGFILE_IX_LOGFILE_EXPIRATION; public static final Index LOGFILE_IX_LOGFILE__SOURCE_SYSTEM_ID = Indexes0.LOGFILE_IX_LOGFILE__SOURCE_SYSTEM_ID; @@ -118,13 +117,12 @@ private static class Indexes0 { public static Index HOST_UIX_HOST_NAME = Internal.createIndex("uix_host_name", Host.HOST, new OrderField[] { Host.HOST.NAME }, true); public static Index LOGFILE_BUCKET_ID = Internal.createIndex("bucket_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.BUCKET_ID }, false); public static Index LOGFILE_CATEGORY_ID = Internal.createIndex("category_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.CATEGORY_ID }, false); - public static Index LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG = Internal.createIndex("cix_logfile_epoch_hour_host_id_logtag", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.EPOCH_HOUR, Logfile.LOGFILE.HOST_ID, Logfile.LOGFILE.LOGTAG }, false); public static Index LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG_ID = Internal.createIndex("cix_logfile_epoch_hour_host_id_logtag_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.EPOCH_HOUR, Logfile.LOGFILE.HOST_ID, Logfile.LOGFILE.LOGTAG_ID }, false); - public static Index LOGFILE_CIX_LOGFILE_HOST_ID_LOGTAG_LOGDATE = Internal.createIndex("cix_logfile_host_id_logtag_logdate", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.HOST_ID, Logfile.LOGFILE.LOGTAG, Logfile.LOGFILE.LOGDATE }, false); - public static Index LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG = Internal.createIndex("cix_logfile_logdate_host_id_logtag", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.LOGDATE, Logfile.LOGFILE.HOST_ID, Logfile.LOGFILE.LOGTAG }, false); public static Index LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG_ID = Internal.createIndex("cix_logfile_logdate_host_id_logtag_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.LOGDATE, Logfile.LOGFILE.HOST_ID, Logfile.LOGFILE.LOGTAG_ID }, false); public static Index LOGFILE_FK_LOGFILE__CI_ID = Internal.createIndex("fk_logfile__ci_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.CI_ID }, false); + public static Index LOGFILE_FK_LOGFILE__HOST_ID = Internal.createIndex("fk_logfile__host_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.HOST_ID }, false); public static Index LOGFILE_FK_LOGFILE__LOGTAG_ID = Internal.createIndex("fk_logfile__logtag_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.LOGTAG_ID }, false); + public static Index LOGFILE_FK_LOGFILE__OBJECT_FORMAT_ID = Internal.createIndex("fk_logfile__object_format_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.OBJECT_FORMAT_ID }, false); public static Index LOGFILE_IX_LOGFILE_EPOCH_EXPIRES = Internal.createIndex("ix_logfile_epoch_expires", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.EPOCH_EXPIRES }, false); public static Index LOGFILE_IX_LOGFILE_EXPIRATION = Internal.createIndex("ix_logfile_expiration", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.EXPIRATION }, false); public static Index LOGFILE_IX_LOGFILE__SOURCE_SYSTEM_ID = Internal.createIndex("ix_logfile__source_system_id", Logfile.LOGFILE, new OrderField[] { Logfile.LOGFILE.SOURCE_SYSTEM_ID }, false); diff --git a/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/Keys.java b/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/Keys.java index 4bbd001228..12f8bfdae0 100644 --- a/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/Keys.java +++ b/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/Keys.java @@ -119,8 +119,8 @@ public class Keys { public static final ForeignKey CORRUPTED_ARCHIVE_IBFK_1 = ForeignKeys0.CORRUPTED_ARCHIVE_IBFK_1; public static final ForeignKey LOGFILE_IBFK_1 = ForeignKeys0.LOGFILE_IBFK_1; public static final ForeignKey LOGFILE_IBFK_2 = ForeignKeys0.LOGFILE_IBFK_2; - public static final ForeignKey FK_LOGFILE__LOGTAG_ID = ForeignKeys0.FK_LOGFILE__LOGTAG_ID; public static final ForeignKey FK_LOGFILE__CI_ID = ForeignKeys0.FK_LOGFILE__CI_ID; + public static final ForeignKey FK_LOGFILE__LOGTAG_ID = ForeignKeys0.FK_LOGFILE__LOGTAG_ID; // ------------------------------------------------------------------------- // [#1459] distribute members to avoid static initialisers > 64kb @@ -152,7 +152,7 @@ private static class ForeignKeys0 { public static final ForeignKey CORRUPTED_ARCHIVE_IBFK_1 = Internal.createForeignKey(com.teragrep.pth_06.jooq.generated.journaldb.Keys.KEY_LOGFILE_PRIMARY, CorruptedArchive.CORRUPTED_ARCHIVE, "corrupted_archive_ibfk_1", CorruptedArchive.CORRUPTED_ARCHIVE.LOGFILE_ID); public static final ForeignKey LOGFILE_IBFK_1 = Internal.createForeignKey(com.teragrep.pth_06.jooq.generated.journaldb.Keys.KEY_BUCKET_PRIMARY, Logfile.LOGFILE, "logfile_ibfk_1", Logfile.LOGFILE.BUCKET_ID); public static final ForeignKey LOGFILE_IBFK_2 = Internal.createForeignKey(com.teragrep.pth_06.jooq.generated.journaldb.Keys.KEY_HOST_PRIMARY, Logfile.LOGFILE, "logfile_ibfk_2", Logfile.LOGFILE.HOST_ID); - public static final ForeignKey FK_LOGFILE__LOGTAG_ID = Internal.createForeignKey(com.teragrep.pth_06.jooq.generated.journaldb.Keys.KEY_LOGTAG_PRIMARY, Logfile.LOGFILE, "fk_logfile__logtag_id", Logfile.LOGFILE.LOGTAG_ID); public static final ForeignKey FK_LOGFILE__CI_ID = Internal.createForeignKey(com.teragrep.pth_06.jooq.generated.journaldb.Keys.KEY_CI_PRIMARY, Logfile.LOGFILE, "fk_logfile__ci_id", Logfile.LOGFILE.CI_ID); + public static final ForeignKey FK_LOGFILE__LOGTAG_ID = Internal.createForeignKey(com.teragrep.pth_06.jooq.generated.journaldb.Keys.KEY_LOGTAG_PRIMARY, Logfile.LOGFILE, "fk_logfile__logtag_id", Logfile.LOGFILE.LOGTAG_ID); } } diff --git a/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/tables/Logfile.java b/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/tables/Logfile.java index b99820fce1..78b48c1984 100644 --- a/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/tables/Logfile.java +++ b/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/tables/Logfile.java @@ -91,7 +91,7 @@ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Logfile extends TableImpl { - private static final long serialVersionUID = 709950499; + private static final long serialVersionUID = 1627470629; /** * The reference instance of journaldb.logfile @@ -166,11 +166,6 @@ public Class getRecordType() { */ public final TableField ARCHIVE_ETAG = createField(DSL.name("archive_etag"), org.jooq.impl.SQLDataType.VARCHAR(64).nullable(false), this, "Object storage's MD5 hash of the log file (Note: room left for possible implementation changes)"); - /** - * The column journaldb.logfile.logtag. A link back to CFEngine - */ - public final TableField LOGTAG = createField(DSL.name("logtag"), org.jooq.impl.SQLDataType.VARCHAR(48).nullable(false), this, "A link back to CFEngine"); - /** * The column journaldb.logfile.source_system_id. Log file's source system (references source_system.id) */ @@ -201,15 +196,20 @@ public Class getRecordType() { */ public final TableField EPOCH_ARCHIVED = createField(DSL.name("epoch_archived"), org.jooq.impl.SQLDataType.BIGINTUNSIGNED.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINTUNSIGNED)), this, "Log file's epoch archived"); + /** + * The column journaldb.logfile.ci_id. Log file's foreign key to ci table + */ + public final TableField CI_ID = createField(DSL.name("ci_id"), org.jooq.impl.SQLDataType.BIGINTUNSIGNED.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINTUNSIGNED)), this, "Log file's foreign key to ci table"); + /** * The column journaldb.logfile.logtag_id. Log file's foreign key to logtag */ public final TableField LOGTAG_ID = createField(DSL.name("logtag_id"), org.jooq.impl.SQLDataType.BIGINTUNSIGNED.nullable(false), this, "Log file's foreign key to logtag"); /** - * The column journaldb.logfile.ci_id. Log file's foreign key to ci table + * The column journaldb.logfile.object_format_id. Log file's foreign key to object_format table */ - public final TableField CI_ID = createField(DSL.name("ci_id"), org.jooq.impl.SQLDataType.BIGINTUNSIGNED.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINTUNSIGNED)), this, "Log file's foreign key to ci table"); + public final TableField OBJECT_FORMAT_ID = createField(DSL.name("object_format_id"), org.jooq.impl.SQLDataType.BIGINTUNSIGNED.defaultValue(org.jooq.impl.DSL.field("NULL", org.jooq.impl.SQLDataType.BIGINTUNSIGNED)), this, "Log file's foreign key to object_format table"); /** * Create a journaldb.logfile table reference @@ -251,7 +251,7 @@ public Schema getSchema() { @Override public List getIndexes() { - return Arrays.asList(Indexes.LOGFILE_BUCKET_ID, Indexes.LOGFILE_CATEGORY_ID, Indexes.LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG, Indexes.LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG_ID, Indexes.LOGFILE_CIX_LOGFILE_HOST_ID_LOGTAG_LOGDATE, Indexes.LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG, Indexes.LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG_ID, Indexes.LOGFILE_FK_LOGFILE__CI_ID, Indexes.LOGFILE_FK_LOGFILE__LOGTAG_ID, Indexes.LOGFILE_IX_LOGFILE_EPOCH_EXPIRES, Indexes.LOGFILE_IX_LOGFILE_EXPIRATION, Indexes.LOGFILE_IX_LOGFILE__SOURCE_SYSTEM_ID, Indexes.LOGFILE_PRIMARY, Indexes.LOGFILE_UIX_LOGFILE_OBJECT_HASH); + return Arrays.asList(Indexes.LOGFILE_BUCKET_ID, Indexes.LOGFILE_CATEGORY_ID, Indexes.LOGFILE_CIX_LOGFILE_EPOCH_HOUR_HOST_ID_LOGTAG_ID, Indexes.LOGFILE_CIX_LOGFILE_LOGDATE_HOST_ID_LOGTAG_ID, Indexes.LOGFILE_FK_LOGFILE__CI_ID, Indexes.LOGFILE_FK_LOGFILE__HOST_ID, Indexes.LOGFILE_FK_LOGFILE__LOGTAG_ID, Indexes.LOGFILE_FK_LOGFILE__OBJECT_FORMAT_ID, Indexes.LOGFILE_IX_LOGFILE_EPOCH_EXPIRES, Indexes.LOGFILE_IX_LOGFILE_EXPIRATION, Indexes.LOGFILE_IX_LOGFILE__SOURCE_SYSTEM_ID, Indexes.LOGFILE_PRIMARY, Indexes.LOGFILE_UIX_LOGFILE_OBJECT_HASH); } @Override @@ -271,7 +271,7 @@ public List> getKeys() { @Override public List> getReferences() { - return Arrays.>asList(Keys.LOGFILE_IBFK_1, Keys.LOGFILE_IBFK_2, Keys.FK_LOGFILE__LOGTAG_ID, Keys.FK_LOGFILE__CI_ID); + return Arrays.>asList(Keys.LOGFILE_IBFK_1, Keys.LOGFILE_IBFK_2, Keys.FK_LOGFILE__CI_ID, Keys.FK_LOGFILE__LOGTAG_ID); } public Bucket bucket() { @@ -282,14 +282,14 @@ public Host host() { return new Host(this, Keys.LOGFILE_IBFK_2); } - public Logtag logtag() { - return new Logtag(this, Keys.FK_LOGFILE__LOGTAG_ID); - } - public Ci ci() { return new Ci(this, Keys.FK_LOGFILE__CI_ID); } + public Logtag logtag() { + return new Logtag(this, Keys.FK_LOGFILE__LOGTAG_ID); + } + @Override public Logfile as(String alias) { return new Logfile(DSL.name(alias), this); @@ -321,7 +321,7 @@ public Logfile rename(Name name) { // ------------------------------------------------------------------------- @Override - public Row21 fieldsRow() { + public Row21 fieldsRow() { return (Row21) super.fieldsRow(); } } diff --git a/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/tables/records/LogfileRecord.java b/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/tables/records/LogfileRecord.java index 352ad1d520..e25c575091 100644 --- a/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/tables/records/LogfileRecord.java +++ b/src/main/java/com/teragrep/pth_06/jooq/generated/journaldb/tables/records/LogfileRecord.java @@ -76,9 +76,9 @@ comments = "This class is generated by jOOQ" ) @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class LogfileRecord extends UpdatableRecordImpl implements Record21 { +public class LogfileRecord extends UpdatableRecordImpl implements Record21 { - private static final long serialVersionUID = -1181491508; + private static final long serialVersionUID = -1790657226; /** * Setter for journaldb.logfile.id. @@ -248,101 +248,101 @@ public String getArchiveEtag() { return (String) get(11); } - /** - * Setter for journaldb.logfile.logtag. A link back to CFEngine - */ - public void setLogtag(String value) { - set(12, value); - } - - /** - * Getter for journaldb.logfile.logtag. A link back to CFEngine - */ - public String getLogtag() { - return (String) get(12); - } - /** * Setter for journaldb.logfile.source_system_id. Log file's source system (references source_system.id) */ public void setSourceSystemId(UShort value) { - set(13, value); + set(12, value); } /** * Getter for journaldb.logfile.source_system_id. Log file's source system (references source_system.id) */ public UShort getSourceSystemId() { - return (UShort) get(13); + return (UShort) get(12); } /** * Setter for journaldb.logfile.category_id. Log file's category (references category.id) */ public void setCategoryId(UShort value) { - set(14, value); + set(13, value); } /** * Getter for journaldb.logfile.category_id. Log file's category (references category.id) */ public UShort getCategoryId() { - return (UShort) get(14); + return (UShort) get(13); } /** * Setter for journaldb.logfile.uncompressed_file_size. Log file's uncompressed file size */ public void setUncompressedFileSize(ULong value) { - set(15, value); + set(14, value); } /** * Getter for journaldb.logfile.uncompressed_file_size. Log file's uncompressed file size */ public ULong getUncompressedFileSize() { - return (ULong) get(15); + return (ULong) get(14); } /** * Setter for journaldb.logfile.epoch_hour. Log file's epoch logdate */ public void setEpochHour(ULong value) { - set(16, value); + set(15, value); } /** * Getter for journaldb.logfile.epoch_hour. Log file's epoch logdate */ public ULong getEpochHour() { - return (ULong) get(16); + return (ULong) get(15); } /** * Setter for journaldb.logfile.epoch_expires. Log file's epoch expiration */ public void setEpochExpires(ULong value) { - set(17, value); + set(16, value); } /** * Getter for journaldb.logfile.epoch_expires. Log file's epoch expiration */ public ULong getEpochExpires() { - return (ULong) get(17); + return (ULong) get(16); } /** * Setter for journaldb.logfile.epoch_archived. Log file's epoch archived */ public void setEpochArchived(ULong value) { - set(18, value); + set(17, value); } /** * Getter for journaldb.logfile.epoch_archived. Log file's epoch archived */ public ULong getEpochArchived() { + return (ULong) get(17); + } + + /** + * Setter for journaldb.logfile.ci_id. Log file's foreign key to ci table + */ + public void setCiId(ULong value) { + set(18, value); + } + + /** + * Getter for journaldb.logfile.ci_id. Log file's foreign key to ci table + */ + public ULong getCiId() { return (ULong) get(18); } @@ -361,16 +361,16 @@ public ULong getLogtagId() { } /** - * Setter for journaldb.logfile.ci_id. Log file's foreign key to ci table + * Setter for journaldb.logfile.object_format_id. Log file's foreign key to object_format table */ - public void setCiId(ULong value) { + public void setObjectFormatId(ULong value) { set(20, value); } /** - * Getter for journaldb.logfile.ci_id. Log file's foreign key to ci table + * Getter for journaldb.logfile.object_format_id. Log file's foreign key to object_format table */ - public ULong getCiId() { + public ULong getObjectFormatId() { return (ULong) get(20); } @@ -388,12 +388,12 @@ public Record1 key() { // ------------------------------------------------------------------------- @Override - public Row21 fieldsRow() { + public Row21 fieldsRow() { return (Row21) super.fieldsRow(); } @Override - public Row21 valuesRow() { + public Row21 valuesRow() { return (Row21) super.valuesRow(); } @@ -458,38 +458,38 @@ public Field field12() { } @Override - public Field field13() { - return Logfile.LOGFILE.LOGTAG; + public Field field13() { + return Logfile.LOGFILE.SOURCE_SYSTEM_ID; } @Override public Field field14() { - return Logfile.LOGFILE.SOURCE_SYSTEM_ID; + return Logfile.LOGFILE.CATEGORY_ID; } @Override - public Field field15() { - return Logfile.LOGFILE.CATEGORY_ID; + public Field field15() { + return Logfile.LOGFILE.UNCOMPRESSED_FILE_SIZE; } @Override public Field field16() { - return Logfile.LOGFILE.UNCOMPRESSED_FILE_SIZE; + return Logfile.LOGFILE.EPOCH_HOUR; } @Override public Field field17() { - return Logfile.LOGFILE.EPOCH_HOUR; + return Logfile.LOGFILE.EPOCH_EXPIRES; } @Override public Field field18() { - return Logfile.LOGFILE.EPOCH_EXPIRES; + return Logfile.LOGFILE.EPOCH_ARCHIVED; } @Override public Field field19() { - return Logfile.LOGFILE.EPOCH_ARCHIVED; + return Logfile.LOGFILE.CI_ID; } @Override @@ -499,7 +499,7 @@ public Field field20() { @Override public Field field21() { - return Logfile.LOGFILE.CI_ID; + return Logfile.LOGFILE.OBJECT_FORMAT_ID; } @Override @@ -563,38 +563,38 @@ public String component12() { } @Override - public String component13() { - return getLogtag(); + public UShort component13() { + return getSourceSystemId(); } @Override public UShort component14() { - return getSourceSystemId(); + return getCategoryId(); } @Override - public UShort component15() { - return getCategoryId(); + public ULong component15() { + return getUncompressedFileSize(); } @Override public ULong component16() { - return getUncompressedFileSize(); + return getEpochHour(); } @Override public ULong component17() { - return getEpochHour(); + return getEpochExpires(); } @Override public ULong component18() { - return getEpochExpires(); + return getEpochArchived(); } @Override public ULong component19() { - return getEpochArchived(); + return getCiId(); } @Override @@ -604,7 +604,7 @@ public ULong component20() { @Override public ULong component21() { - return getCiId(); + return getObjectFormatId(); } @Override @@ -668,38 +668,38 @@ public String value12() { } @Override - public String value13() { - return getLogtag(); + public UShort value13() { + return getSourceSystemId(); } @Override public UShort value14() { - return getSourceSystemId(); + return getCategoryId(); } @Override - public UShort value15() { - return getCategoryId(); + public ULong value15() { + return getUncompressedFileSize(); } @Override public ULong value16() { - return getUncompressedFileSize(); + return getEpochHour(); } @Override public ULong value17() { - return getEpochHour(); + return getEpochExpires(); } @Override public ULong value18() { - return getEpochExpires(); + return getEpochArchived(); } @Override public ULong value19() { - return getEpochArchived(); + return getCiId(); } @Override @@ -709,7 +709,7 @@ public ULong value20() { @Override public ULong value21() { - return getCiId(); + return getObjectFormatId(); } @Override @@ -785,44 +785,44 @@ public LogfileRecord value12(String value) { } @Override - public LogfileRecord value13(String value) { - setLogtag(value); + public LogfileRecord value13(UShort value) { + setSourceSystemId(value); return this; } @Override public LogfileRecord value14(UShort value) { - setSourceSystemId(value); + setCategoryId(value); return this; } @Override - public LogfileRecord value15(UShort value) { - setCategoryId(value); + public LogfileRecord value15(ULong value) { + setUncompressedFileSize(value); return this; } @Override public LogfileRecord value16(ULong value) { - setUncompressedFileSize(value); + setEpochHour(value); return this; } @Override public LogfileRecord value17(ULong value) { - setEpochHour(value); + setEpochExpires(value); return this; } @Override public LogfileRecord value18(ULong value) { - setEpochExpires(value); + setEpochArchived(value); return this; } @Override public LogfileRecord value19(ULong value) { - setEpochArchived(value); + setCiId(value); return this; } @@ -834,12 +834,12 @@ public LogfileRecord value20(ULong value) { @Override public LogfileRecord value21(ULong value) { - setCiId(value); + setObjectFormatId(value); return this; } @Override - public LogfileRecord values(ULong value1, Date value2, Date value3, UShort value4, String value5, String value6, UShort value7, String value8, Timestamp value9, ULong value10, String value11, String value12, String value13, UShort value14, UShort value15, ULong value16, ULong value17, ULong value18, ULong value19, ULong value20, ULong value21) { + public LogfileRecord values(ULong value1, Date value2, Date value3, UShort value4, String value5, String value6, UShort value7, String value8, Timestamp value9, ULong value10, String value11, String value12, UShort value13, UShort value14, ULong value15, ULong value16, ULong value17, ULong value18, ULong value19, ULong value20, ULong value21) { value1(value1); value2(value2); value3(value3); @@ -878,7 +878,7 @@ public LogfileRecord() { /** * Create a detached, initialised LogfileRecord */ - public LogfileRecord(ULong id, Date logdate, Date expiration, UShort bucketId, String path, String objectKeyHash, UShort hostId, String originalFilename, Timestamp archived, ULong fileSize, String sha256Checksum, String archiveEtag, String logtag, UShort sourceSystemId, UShort categoryId, ULong uncompressedFileSize, ULong epochHour, ULong epochExpires, ULong epochArchived, ULong logtagId, ULong ciId) { + public LogfileRecord(ULong id, Date logdate, Date expiration, UShort bucketId, String path, String objectKeyHash, UShort hostId, String originalFilename, Timestamp archived, ULong fileSize, String sha256Checksum, String archiveEtag, UShort sourceSystemId, UShort categoryId, ULong uncompressedFileSize, ULong epochHour, ULong epochExpires, ULong epochArchived, ULong ciId, ULong logtagId, ULong objectFormatId) { super(Logfile.LOGFILE); set(0, id); @@ -893,14 +893,14 @@ public LogfileRecord(ULong id, Date logdate, Date expiration, UShort bucketId, S set(9, fileSize); set(10, sha256Checksum); set(11, archiveEtag); - set(12, logtag); - set(13, sourceSystemId); - set(14, categoryId); - set(15, uncompressedFileSize); - set(16, epochHour); - set(17, epochExpires); - set(18, epochArchived); + set(12, sourceSystemId); + set(13, categoryId); + set(14, uncompressedFileSize); + set(15, epochHour); + set(16, epochExpires); + set(17, epochArchived); + set(18, ciId); set(19, logtagId); - set(20, ciId); + set(20, objectFormatId); } } diff --git a/src/test/java/com/teragrep/pth_06/planner/StreamDBClientTest.java b/src/test/java/com/teragrep/pth_06/planner/StreamDBClientTest.java index 780bc367c0..a854ce170b 100644 --- a/src/test/java/com/teragrep/pth_06/planner/StreamDBClientTest.java +++ b/src/test/java/com/teragrep/pth_06/planner/StreamDBClientTest.java @@ -136,13 +136,13 @@ private LogfileRecord logfileRecordForEpoch(long epoch, boolean hasNullEpochColu ULong.valueOf(120L), "sha256 checksum 1", "archive tag 1", - "oldExample", UShort.valueOf(2), UShort.valueOf(1), ULong.valueOf(390L), ULong.valueOf(epoch), ULong.valueOf(epoch + (365 * 24 * 3600)), ULong.valueOf(epoch), + null, ULong.valueOf(1), null ); @@ -160,13 +160,13 @@ private LogfileRecord logfileRecordForEpoch(long epoch, boolean hasNullEpochColu ULong.valueOf(120L), "sha256 checksum 1", "archive tag 1", - "oldExample", UShort.valueOf(2), UShort.valueOf(1), ULong.valueOf(390L), null, null, null, + null, ULong.valueOf(1), null ); @@ -431,13 +431,13 @@ public void deleteRangeRemovesNullLogtimeRowsOutsideOfRange() { ULong.valueOf(120L), "sha256 checksum 1", "archive tag 1", - "oldExample", UShort.valueOf(2), UShort.valueOf(1), ULong.valueOf(390L), null, null, null, + null, ULong.valueOf(1), null ); diff --git a/src/test/resources/CREATE_STREAMDB_DB.sql b/src/test/resources/CREATE_STREAMDB_DB.sql index 16d5b8cf89..010f67786b 100644 --- a/src/test/resources/CREATE_STREAMDB_DB.sql +++ b/src/test/resources/CREATE_STREAMDB_DB.sql @@ -113,6 +113,12 @@ CREATE TABLE `ci` ( PRIMARY KEY (`id`), UNIQUE KEY `uix_ci` (`name`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='Contains ci values that are identified using the ID'; +CREATE TABLE `object_format` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID for object_format', + `name` varchar(255) NOT NULL COMMENT 'object_format of the logfile records', + PRIMARY KEY (`id`), + UNIQUE KEY `uix_object_format` (`name`) +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC COMMENT='Contains object_format values that are identified using the ID'; CREATE TABLE `logfile` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `logdate` date NOT NULL COMMENT 'Log file''s date', @@ -126,31 +132,31 @@ CREATE TABLE `logfile` ( `file_size` bigint(20) unsigned NOT NULL DEFAULT 0 COMMENT 'Log file''s size in bytes', `sha256_checksum` char(44) NOT NULL COMMENT 'An SHA256 hash of the log file (Note: known to be 44 characters long)', `archive_etag` varchar(64) NOT NULL COMMENT 'Object storage''s MD5 hash of the log file (Note: room left for possible implementation changes)', - `logtag` varchar(48) NOT NULL COMMENT 'A link back to CFEngine', `source_system_id` smallint(5) unsigned NOT NULL COMMENT 'Log file''s source system (references source_system.id)', `category_id` smallint(5) unsigned NOT NULL DEFAULT 0 COMMENT 'Log file''s category (references category.id)', `uncompressed_file_size` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s uncompressed file size', `epoch_hour` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s epoch logdate', `epoch_expires` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s epoch expiration', `epoch_archived` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s epoch archived', - `logtag_id` bigint(20) unsigned NOT NULL COMMENT 'Log file''s foreign key to logtag', `ci_id` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s foreign key to ci table', + `logtag_id` bigint(20) unsigned NOT NULL COMMENT 'Log file''s foreign key to logtag', + `object_format_id` bigint(20) unsigned DEFAULT NULL COMMENT 'Log file''s foreign key to object_format table', PRIMARY KEY (`id`), UNIQUE KEY `uix_logfile_object_hash` (`object_key_hash`), KEY `bucket_id` (`bucket_id`), KEY `category_id` (`category_id`), KEY `ix_logfile_expiration` (`expiration`), KEY `ix_logfile__source_system_id` (`source_system_id`), - KEY `cix_logfile_logdate_host_id_logtag` (`logdate`,`host_id`,`logtag`), - KEY `cix_logfile_host_id_logtag_logdate` (`host_id`,`logtag`,`logdate`), - KEY `cix_logfile_epoch_hour_host_id_logtag` (`epoch_hour`,`host_id`,`logtag`), KEY `ix_logfile_epoch_expires` (`epoch_expires`), + KEY `fk_logfile__ci_id` (`ci_id`), KEY `fk_logfile__logtag_id` (`logtag_id`), KEY `cix_logfile_epoch_hour_host_id_logtag_id` (`epoch_hour`,`host_id`,`logtag_id`), KEY `cix_logfile_logdate_host_id_logtag_id` (`logdate`,`host_id`,`logtag_id`), - KEY `fk_logfile__ci_id` (`ci_id`), + KEY `fk_logfile__object_format_id` (`object_format_id`), + KEY `fk_logfile__host_id` (`host_id`), CONSTRAINT `fk_logfile__ci_id` FOREIGN KEY (`ci_id`) REFERENCES `ci` (`id`), CONSTRAINT `fk_logfile__logtag_id` FOREIGN KEY (`logtag_id`) REFERENCES `logtag` (`id`), + CONSTRAINT `fk_logfile__object_format_id` FOREIGN KEY (`object_format_id`) REFERENCES `object_format` (`id`), CONSTRAINT `fk_logfile__source_system_id` FOREIGN KEY (`source_system_id`) REFERENCES `source_system` (`id`), CONSTRAINT `logfile_ibfk_1` FOREIGN KEY (`bucket_id`) REFERENCES `bucket` (`id`), CONSTRAINT `logfile_ibfk_2` FOREIGN KEY (`host_id`) REFERENCES `host` (`id`),