From 770253a32ce950225d8da9836814cc71eb2a3de6 Mon Sep 17 00:00:00 2001 From: viktorbasanets Date: Tue, 11 Sep 2018 15:59:00 +0300 Subject: [PATCH] Was fixed the type of startTs & endTs fields of EntityViewEntity class and queries of schemas db tables --- .../main/data/upgrade/2.1.1/schema_update.cql | 20 +++++++++---------- .../main/data/upgrade/2.1.1/schema_update.sql | 4 ++-- .../server/dao/model/ModelConstants.java | 4 ++-- .../dao/model/nosql/EntityViewEntity.java | 16 +++++++-------- .../dao/model/sql/EntityViewEntity.java | 16 +++++++-------- dao/src/main/resources/cassandra/schema.cql | 12 +++++------ dao/src/main/resources/sql/schema.sql | 4 ++-- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/application/src/main/data/upgrade/2.1.1/schema_update.cql b/application/src/main/data/upgrade/2.1.1/schema_update.cql index 1329a0b546..e0cff4108f 100644 --- a/application/src/main/data/upgrade/2.1.1/schema_update.cql +++ b/application/src/main/data/upgrade/2.1.1/schema_update.cql @@ -29,8 +29,8 @@ CREATE TABLE IF NOT EXISTS thingsboard.entity_views ( customer_id timeuuid, name text, keys text, - ts_begin bigint, - ts_end bigint, + start_ts bigint, + end_ts bigint, search_text text, additional_info text, PRIMARY KEY (id, entity_id, tenant_id, customer_id) @@ -43,8 +43,8 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_na AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL - AND ts_begin IS NOT NULL - AND ts_end IS NOT NULL + AND start_ts IS NOT NULL + AND end_ts IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL PRIMARY KEY (tenant_id, name, id, entity_id, customer_id) @@ -57,8 +57,8 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_en AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL - AND ts_begin IS NOT NULL - AND ts_end IS NOT NULL + AND start_ts IS NOT NULL + AND end_ts IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL PRIMARY KEY (tenant_id, entity_id, id, customer_id, name) @@ -71,8 +71,8 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_cu AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL - AND ts_begin IS NOT NULL - AND ts_end IS NOT NULL + AND start_ts IS NOT NULL + AND end_ts IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL PRIMARY KEY (tenant_id, customer_id, id, entity_id, name) @@ -85,8 +85,8 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_cu AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL - AND ts_begin IS NOT NULL - AND ts_end IS NOT NULL + AND start_ts IS NOT NULL + AND end_ts IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL PRIMARY KEY (tenant_id, customer_id, entity_id, id, name) diff --git a/application/src/main/data/upgrade/2.1.1/schema_update.sql b/application/src/main/data/upgrade/2.1.1/schema_update.sql index 3670aad035..bd2c341e7f 100644 --- a/application/src/main/data/upgrade/2.1.1/schema_update.sql +++ b/application/src/main/data/upgrade/2.1.1/schema_update.sql @@ -24,8 +24,8 @@ CREATE TABLE IF NOT EXISTS entity_views ( customer_id varchar(31), name varchar(255), keys varchar(255), - ts_begin varchar(255), - ts_end varchar(255), + start_ts bigint, + end_ts bigint, search_text varchar(255), additional_info varchar ); diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java index 7e9662ebe2..a6787d0520 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java @@ -156,8 +156,8 @@ public class ModelConstants { public static final String ENTITY_VIEW_TYPE_PROPERTY = DEVICE_TYPE_PROPERTY; public static final String ENTITY_VIEW_TENANT_AND_NAME_VIEW_NAME = "entity_view_by_tenant_and_name"; public static final String ENTITY_VIEW_KEYS_PROPERTY = "keys"; - public static final String ENTITY_VIEW_TS_BEGIN_PROPERTY = "ts_begin"; - public static final String ENTITY_VIEW_TS_END_PROPERTY = "ts_end"; + public static final String ENTITY_VIEW_START_TS_PROPERTY = "start_ts"; + public static final String ENTITY_VIEW_END_TS_PROPERTY = "end_ts"; public static final String ENTITY_VIEW_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY; public static final String ENTITY_VIEW_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "entity_view_by_tenant_and_search_text"; diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EntityViewEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EntityViewEntity.java index 3f7571363a..91cd2ea563 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EntityViewEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/nosql/EntityViewEntity.java @@ -75,11 +75,11 @@ public class EntityViewEntity implements SearchTextEntity { @Column(name = ModelConstants.ENTITY_VIEW_KEYS_PROPERTY) private String keys; - @Column(name = ModelConstants.ENTITY_VIEW_TS_BEGIN_PROPERTY) - private String tsBegin; + @Column(name = ModelConstants.ENTITY_VIEW_START_TS_PROPERTY) + private long startTs; - @Column(name = ModelConstants.ENTITY_VIEW_TS_END_PROPERTY) - private String tsEnd; + @Column(name = ModelConstants.ENTITY_VIEW_END_TS_PROPERTY) + private long endTs; @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; @@ -114,8 +114,8 @@ public class EntityViewEntity implements SearchTextEntity { } catch (IOException e) { e.printStackTrace(); } - this.tsBegin = entityView.getStartTs() != 0L ? String.valueOf(entityView.getStartTs()) : "0"; - this.tsEnd = entityView.getEndTs() != 0L ? String.valueOf(entityView.getEndTs()) : "0"; + this.startTs = entityView.getStartTs() != 0L ? entityView.getStartTs() : 0L; + this.endTs = entityView.getEndTs() != 0L ? entityView.getEndTs() : 0L; this.searchText = entityView.getSearchText(); this.additionalInfo = entityView.getAdditionalInfo(); } @@ -144,8 +144,8 @@ public class EntityViewEntity implements SearchTextEntity { } catch (IOException e) { e.printStackTrace(); } - entityView.setStartTs(Long.parseLong(tsBegin)); - entityView.setEndTs(Long.parseLong(tsEnd)); + entityView.setStartTs(startTs); + entityView.setEndTs(endTs); entityView.setAdditionalInfo(additionalInfo); return entityView; } diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java index a89d3dec84..9492f191db 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java +++ b/dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java @@ -66,11 +66,11 @@ public class EntityViewEntity extends BaseSqlEntity implements Searc @Column(name = ModelConstants.ENTITY_VIEW_KEYS_PROPERTY) private String keys; - @Column(name = ModelConstants.ENTITY_VIEW_TS_BEGIN_PROPERTY) - private String tsBegin; + @Column(name = ModelConstants.ENTITY_VIEW_START_TS_PROPERTY) + private long startTs; - @Column(name = ModelConstants.ENTITY_VIEW_TS_END_PROPERTY) - private String tsEnd; + @Column(name = ModelConstants.ENTITY_VIEW_END_TS_PROPERTY) + private long endTs; @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) private String searchText; @@ -105,8 +105,8 @@ public class EntityViewEntity extends BaseSqlEntity implements Searc } catch (IOException e) { e.printStackTrace(); } - this.tsBegin = entityView.getStartTs() != 0L ? String.valueOf(entityView.getStartTs()) : "0"; - this.tsEnd = entityView.getEndTs() != 0L ? String.valueOf(entityView.getEndTs()) : "0"; + this.startTs = entityView.getStartTs() != 0L ? entityView.getStartTs() : 0L; + this.endTs = entityView.getEndTs() != 0L ? entityView.getEndTs() : 0L; this.searchText = entityView.getSearchText(); this.additionalInfo = entityView.getAdditionalInfo(); } @@ -141,8 +141,8 @@ public class EntityViewEntity extends BaseSqlEntity implements Searc } catch (IOException e) { e.printStackTrace(); } - entityView.setStartTs(Long.parseLong(tsBegin)); - entityView.setEndTs(Long.parseLong(tsEnd)); + entityView.setStartTs(startTs); + entityView.setEndTs(endTs); entityView.setAdditionalInfo(additionalInfo); return entityView; } diff --git a/dao/src/main/resources/cassandra/schema.cql b/dao/src/main/resources/cassandra/schema.cql index 89df266d75..3cefacb970 100644 --- a/dao/src/main/resources/cassandra/schema.cql +++ b/dao/src/main/resources/cassandra/schema.cql @@ -647,8 +647,8 @@ CREATE TABLE IF NOT EXISTS thingsboard.entity_views ( customer_id timeuuid, name text, keys text, - ts_begin bigint, - ts_end bigint, + start_ts bigint, + end_ts bigint, search_text text, additional_info text, PRIMARY KEY (id, tenant_id, customer_id) @@ -657,27 +657,27 @@ CREATE TABLE IF NOT EXISTS thingsboard.entity_views ( CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_name AS SELECT * from thingsboard.entity_views - WHERE entity_id IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL AND ts_begin IS NOT NULL AND ts_end IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL + WHERE entity_id IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL AND start_ts IS NOT NULL AND end_ts IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL PRIMARY KEY (tenant_id, name, id, entity_id, customer_id) WITH CLUSTERING ORDER BY (name ASC, id DESC, entity_id DESC, customer_id DESC); CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_entity AS SELECT * from thingsboard.entity_views - WHERE entity_id IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL AND ts_begin IS NOT NULL AND ts_end IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL + WHERE entity_id IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL AND start_ts IS NOT NULL AND end_ts IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL PRIMARY KEY (tenant_id, entity_id, id, customer_id, name) WITH CLUSTERING ORDER BY (entity_id ASC, customer_id ASC, id DESC, name DESC); CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer AS SELECT * from thingsboard.entity_views - WHERE entity_id IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL AND ts_begin IS NOT NULL AND ts_end IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL + WHERE entity_id IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL AND start_ts IS NOT NULL AND end_ts IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL PRIMARY KEY (tenant_id, customer_id, id, entity_id, name) WITH CLUSTERING ORDER BY (customer_id ASC, id DESC, entity_id DESC, name DESC); CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer_and_entity AS SELECT * from thingsboard.entity_views - WHERE entity_id IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL AND ts_begin IS NOT NULL AND ts_end IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL + WHERE entity_id IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND keys IS NOT NULL AND start_ts IS NOT NULL AND end_ts IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL PRIMARY KEY (tenant_id, customer_id, entity_id, id, name) WITH CLUSTERING ORDER BY (customer_id ASC, entity_id DESC, id DESC, name DESC); diff --git a/dao/src/main/resources/sql/schema.sql b/dao/src/main/resources/sql/schema.sql index ed3583cef3..a3197b7e2f 100644 --- a/dao/src/main/resources/sql/schema.sql +++ b/dao/src/main/resources/sql/schema.sql @@ -260,8 +260,8 @@ CREATE TABLE IF NOT EXISTS entity_views ( customer_id varchar(31), name varchar(255), keys varchar(255), - ts_begin varchar(255), - ts_end varchar(255), + start_ts bigint, + end_ts bigint, search_text varchar(255), additional_info varchar );