dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Was fixed the type of startTs & endTs fields of EntityViewEntity class and queries of schemas db tables

Browse Source
This commit is contained in:
viktorbasanets 2018-09-11 15:59:00 +03:00
parent 1e1beaaeac
commit 770253a32c
7 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/src/main/data/upgrade/2.1.1/schema_update.cql
View File

@ -29,8 +29,8 @@ CREATE TABLE IF NOT EXISTS thingsboard.entity_views (
customer_id timeuuid, customer_id timeuuid,
name text, name text,
keys text, keys text,
ts_begin bigint, start_ts bigint,
ts_end bigint, end_ts bigint,
search_text text, search_text text,
additional_info text, additional_info text,
PRIMARY KEY (id, entity_id, tenant_id, customer_id) 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 tenant_id IS NOT NULL
AND customer_id IS NOT NULL AND customer_id IS NOT NULL
AND keys IS NOT NULL AND keys IS NOT NULL
AND ts_begin IS NOT NULL AND start_ts IS NOT NULL
AND ts_end IS NOT NULL AND end_ts IS NOT NULL
AND name IS NOT NULL AND name IS NOT NULL
AND id IS NOT NULL AND id IS NOT NULL
PRIMARY KEY (tenant_id, name, id, entity_id, customer_id) 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 tenant_id IS NOT NULL
AND customer_id IS NOT NULL AND customer_id IS NOT NULL
AND keys IS NOT NULL AND keys IS NOT NULL
AND ts_begin IS NOT NULL AND start_ts IS NOT NULL
AND ts_end IS NOT NULL AND end_ts IS NOT NULL
AND name IS NOT NULL AND name IS NOT NULL
AND id IS NOT NULL AND id IS NOT NULL
PRIMARY KEY (tenant_id, entity_id, id, customer_id, name) 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 tenant_id IS NOT NULL
AND customer_id IS NOT NULL AND customer_id IS NOT NULL
AND keys IS NOT NULL AND keys IS NOT NULL
AND ts_begin IS NOT NULL AND start_ts IS NOT NULL
AND ts_end IS NOT NULL AND end_ts IS NOT NULL
AND name IS NOT NULL AND name IS NOT NULL
AND id IS NOT NULL AND id IS NOT NULL
PRIMARY KEY (tenant_id, customer_id, id, entity_id, name) 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 tenant_id IS NOT NULL
AND customer_id IS NOT NULL AND customer_id IS NOT NULL
AND keys IS NOT NULL AND keys IS NOT NULL
AND ts_begin IS NOT NULL AND start_ts IS NOT NULL
AND ts_end IS NOT NULL AND end_ts IS NOT NULL
AND name IS NOT NULL AND name IS NOT NULL
AND id IS NOT NULL AND id IS NOT NULL
PRIMARY KEY (tenant_id, customer_id, entity_id, id, name) PRIMARY KEY (tenant_id, customer_id, entity_id, id, name)

4
application/src/main/data/upgrade/2.1.1/schema_update.sql
View File

@ -24,8 +24,8 @@ CREATE TABLE IF NOT EXISTS entity_views (
customer_id varchar(31), customer_id varchar(31),
name varchar(255), name varchar(255),
keys varchar(255), keys varchar(255),
ts_begin varchar(255), start_ts bigint,
ts_end varchar(255), end_ts bigint,
search_text varchar(255), search_text varchar(255),
additional_info varchar additional_info varchar
); );

4
dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
View File

@ -156,8 +156,8 @@ public class ModelConstants {
public static final String ENTITY_VIEW_TYPE_PROPERTY = DEVICE_TYPE_PROPERTY; 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_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_KEYS_PROPERTY = "keys";
public static final String ENTITY_VIEW_TS_BEGIN_PROPERTY = "ts_begin"; public static final String ENTITY_VIEW_START_TS_PROPERTY = "start_ts";
public static final String ENTITY_VIEW_TS_END_PROPERTY = "ts_end"; 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_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"; public static final String ENTITY_VIEW_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "entity_view_by_tenant_and_search_text";

16
dao/src/main/java/org/thingsboard/server/dao/model/nosql/EntityViewEntity.java
View File

@ -75,11 +75,11 @@ public class EntityViewEntity implements SearchTextEntity<EntityView> {
@Column(name = ModelConstants.ENTITY_VIEW_KEYS_PROPERTY) @Column(name = ModelConstants.ENTITY_VIEW_KEYS_PROPERTY)
private String keys; private String keys;
@Column(name = ModelConstants.ENTITY_VIEW_TS_BEGIN_PROPERTY) @Column(name = ModelConstants.ENTITY_VIEW_START_TS_PROPERTY)
private String tsBegin; private long startTs;
@Column(name = ModelConstants.ENTITY_VIEW_TS_END_PROPERTY) @Column(name = ModelConstants.ENTITY_VIEW_END_TS_PROPERTY)
private String tsEnd; private long endTs;
@Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY)
private String searchText; private String searchText;
@ -114,8 +114,8 @@ public class EntityViewEntity implements SearchTextEntity<EntityView> {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
this.tsBegin = entityView.getStartTs() != 0L ? String.valueOf(entityView.getStartTs()) : "0"; this.startTs = entityView.getStartTs() != 0L ? entityView.getStartTs() : 0L;
this.tsEnd = entityView.getEndTs() != 0L ? String.valueOf(entityView.getEndTs()) : "0"; this.endTs = entityView.getEndTs() != 0L ? entityView.getEndTs() : 0L;
this.searchText = entityView.getSearchText(); this.searchText = entityView.getSearchText();
this.additionalInfo = entityView.getAdditionalInfo(); this.additionalInfo = entityView.getAdditionalInfo();
} }
@ -144,8 +144,8 @@ public class EntityViewEntity implements SearchTextEntity<EntityView> {
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
entityView.setStartTs(Long.parseLong(tsBegin)); entityView.setStartTs(startTs);
entityView.setEndTs(Long.parseLong(tsEnd)); entityView.setEndTs(endTs);
entityView.setAdditionalInfo(additionalInfo); entityView.setAdditionalInfo(additionalInfo);
return entityView; return entityView;
} }

16
dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java
View File

@ -66,11 +66,11 @@ public class EntityViewEntity extends BaseSqlEntity<EntityView> implements Searc
@Column(name = ModelConstants.ENTITY_VIEW_KEYS_PROPERTY) @Column(name = ModelConstants.ENTITY_VIEW_KEYS_PROPERTY)
private String keys; private String keys;
@Column(name = ModelConstants.ENTITY_VIEW_TS_BEGIN_PROPERTY) @Column(name = ModelConstants.ENTITY_VIEW_START_TS_PROPERTY)
private String tsBegin; private long startTs;
@Column(name = ModelConstants.ENTITY_VIEW_TS_END_PROPERTY) @Column(name = ModelConstants.ENTITY_VIEW_END_TS_PROPERTY)
private String tsEnd; private long endTs;
@Column(name = ModelConstants.SEARCH_TEXT_PROPERTY) @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY)
private String searchText; private String searchText;
@ -105,8 +105,8 @@ public class EntityViewEntity extends BaseSqlEntity<EntityView> implements Searc
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
this.tsBegin = entityView.getStartTs() != 0L ? String.valueOf(entityView.getStartTs()) : "0"; this.startTs = entityView.getStartTs() != 0L ? entityView.getStartTs() : 0L;
this.tsEnd = entityView.getEndTs() != 0L ? String.valueOf(entityView.getEndTs()) : "0"; this.endTs = entityView.getEndTs() != 0L ? entityView.getEndTs() : 0L;
this.searchText = entityView.getSearchText(); this.searchText = entityView.getSearchText();
this.additionalInfo = entityView.getAdditionalInfo(); this.additionalInfo = entityView.getAdditionalInfo();
} }
@ -141,8 +141,8 @@ public class EntityViewEntity extends BaseSqlEntity<EntityView> implements Searc
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
entityView.setStartTs(Long.parseLong(tsBegin)); entityView.setStartTs(startTs);
entityView.setEndTs(Long.parseLong(tsEnd)); entityView.setEndTs(endTs);
entityView.setAdditionalInfo(additionalInfo); entityView.setAdditionalInfo(additionalInfo);
return entityView; return entityView;
} }

12
dao/src/main/resources/cassandra/schema.cql
View File

@ -647,8 +647,8 @@ CREATE TABLE IF NOT EXISTS thingsboard.entity_views (
customer_id timeuuid, customer_id timeuuid,
name text, name text,
keys text, keys text,
ts_begin bigint, start_ts bigint,
ts_end bigint, end_ts bigint,
search_text text, search_text text,
additional_info text, additional_info text,
PRIMARY KEY (id, tenant_id, customer_id) 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 CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_name AS
SELECT * SELECT *
from thingsboard.entity_views 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) PRIMARY KEY (tenant_id, name, id, entity_id, customer_id)
WITH CLUSTERING ORDER BY (name ASC, id DESC, entity_id DESC, customer_id DESC); 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 CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_entity AS
SELECT * SELECT *
from thingsboard.entity_views 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) PRIMARY KEY (tenant_id, entity_id, id, customer_id, name)
WITH CLUSTERING ORDER BY (entity_id ASC, customer_id ASC, id DESC, name DESC); 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 CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer AS
SELECT * SELECT *
from thingsboard.entity_views 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) PRIMARY KEY (tenant_id, customer_id, id, entity_id, name)
WITH CLUSTERING ORDER BY (customer_id ASC, id DESC, entity_id DESC, name DESC); 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 CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer_and_entity AS
SELECT * SELECT *
from thingsboard.entity_views 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) PRIMARY KEY (tenant_id, customer_id, entity_id, id, name)
WITH CLUSTERING ORDER BY (customer_id ASC, entity_id DESC, id DESC, name DESC); WITH CLUSTERING ORDER BY (customer_id ASC, entity_id DESC, id DESC, name DESC);

4
dao/src/main/resources/sql/schema.sql
View File

@ -260,8 +260,8 @@ CREATE TABLE IF NOT EXISTS entity_views (
customer_id varchar(31), customer_id varchar(31),
name varchar(255), name varchar(255),
keys varchar(255), keys varchar(255),
ts_begin varchar(255), start_ts bigint,
ts_end varchar(255), end_ts bigint,
search_text varchar(255), search_text varchar(255),
additional_info varchar additional_info varchar
); );