简柏林 / thingskit · Commits

Commit 77de5522af9eaab7a6e3a60e0d504f3a8b04aac5

Authored by viktorbasanets
1 parent 9237a5dd

Were fixed materialized views

Inline Side-by-side
Showing 2 changed files with 61 additions and 75 deletions
@@ -22,72 +22,51 @@ DROP MATERIALIZED VIEW IF EXISTS thingsboard.entity_views_by_tenant_and_customer @@ -22,72 +22,51 @@ DROP MATERIALIZED VIEW IF EXISTS thingsboard.entity_views_by_tenant_and_customer
22 DROP TABLE IF EXISTS thingsboard.entity_views; 22 DROP TABLE IF EXISTS thingsboard.entity_views;
23 23
24 CREATE TABLE IF NOT EXISTS thingsboard.entity_views ( 24 CREATE TABLE IF NOT EXISTS thingsboard.entity_views (
25 - id timeuuid,  
26 - entity_id timeuuid,  
27 - entity_type text,  
28 - tenant_id timeuuid,  
29 - customer_id timeuuid,  
30 - name text,  
31 - keys text,  
32 - start_ts bigint,  
33 - end_ts bigint,  
34 - search_text text,  
35 - additional_info text,  
36 - PRIMARY KEY (id, entity_id, tenant_id, customer_id) 25 +id timeuuid,
  26 +entity_id timeuuid,
  27 +entity_type text,
  28 +tenant_id timeuuid,
  29 +customer_id timeuuid,
  30 +name text,
  31 +keys text,
  32 +start_ts bigint,
  33 +end_ts bigint,
  34 +search_text text,
  35 +additional_info text,
  36 +PRIMARY KEY (id, tenant_id, customer_id)
37 ); 37 );
38 38
39 CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_name AS 39 CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_name AS
40 - SELECT *  
41 - from thingsboard.entity_views  
42 - WHERE entity_id IS NOT NULL  
43 - AND tenant_id IS NOT NULL  
44 - AND customer_id IS NOT NULL  
45 - AND keys IS NOT NULL  
46 - AND start_ts IS NOT NULL  
47 - AND end_ts IS NOT NULL  
48 - AND name IS NOT NULL  
49 - AND id IS NOT NULL  
50 - PRIMARY KEY (tenant_id, name, id, entity_id, customer_id)  
51 - WITH CLUSTERING ORDER BY (name ASC, id DESC, entity_id DESC, customer_id DESC); 40 +SELECT *
  41 +from thingsboard.entity_views
  42 +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
  43 +PRIMARY KEY (tenant_id, name, id, entity_id, customer_id)
  44 +WITH CLUSTERING ORDER BY (name ASC, id DESC, entity_id DESC, customer_id DESC);
52 45
53 -CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_entity AS  
54 - SELECT *  
55 - from thingsboard.entity_views  
56 - WHERE entity_id IS NOT NULL  
57 - AND tenant_id IS NOT NULL  
58 - AND customer_id IS NOT NULL  
59 - AND keys IS NOT NULL  
60 - AND start_ts IS NOT NULL  
61 - AND end_ts IS NOT NULL  
62 - AND name IS NOT NULL  
63 - AND id IS NOT NULL  
64 - PRIMARY KEY (tenant_id, entity_id, id, customer_id, name)  
65 - WITH CLUSTERING ORDER BY (entity_id ASC, customer_id ASC, id DESC, name DESC); 46 +CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_view_by_tenant_and_search_text AS
  47 +SELECT *
  48 +from thingsboard.entity_views
  49 +WHERE entity_id IS NOT NULL AND search_text 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
  50 +PRIMARY KEY (tenant_id, search_text, id, customer_id, name)
  51 +WITH CLUSTERING ORDER BY (search_text ASC, customer_id ASC, id DESC, name DESC);
66 52
67 -CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer AS  
68 - SELECT *  
69 - from thingsboard.entity_views  
70 - WHERE entity_id IS NOT NULL  
71 - AND tenant_id IS NOT NULL  
72 - AND customer_id IS NOT NULL  
73 - AND keys IS NOT NULL  
74 - AND start_ts IS NOT NULL  
75 - AND end_ts IS NOT NULL  
76 - AND name IS NOT NULL  
77 - AND id IS NOT NULL  
78 - PRIMARY KEY (tenant_id, customer_id, id, entity_id, name)  
79 - WITH CLUSTERING ORDER BY (customer_id ASC, id DESC, entity_id DESC, name DESC); 53 +CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_view_by_tenant_and_entity_and_search_text AS
  54 +SELECT *
  55 +from thingsboard.entity_views
  56 +WHERE entity_id IS NOT NULL AND search_text 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
  57 +PRIMARY KEY (tenant_id, entity_id, search_text, id, customer_id, name)
  58 +WITH CLUSTERING ORDER BY (entity_id ASC, search_text ASC, id DESC, name DESC);
80 59
81 -CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer_and_entity AS  
82 - SELECT *  
83 - from thingsboard.entity_views  
84 - WHERE entity_id IS NOT NULL  
85 - AND tenant_id IS NOT NULL  
86 - AND customer_id IS NOT NULL  
87 - AND keys IS NOT NULL  
88 - AND start_ts IS NOT NULL  
89 - AND end_ts IS NOT NULL  
90 - AND name IS NOT NULL  
91 - AND id IS NOT NULL  
92 - PRIMARY KEY (tenant_id, customer_id, entity_id, id, name)  
93 - WITH CLUSTERING ORDER BY (customer_id ASC, entity_id DESC, id DESC, name DESC); 60 +CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer_and_search_text AS
  61 +SELECT *
  62 +from thingsboard.entity_views
  63 +WHERE entity_id IS NOT NULL AND search_text 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
  64 +PRIMARY KEY (tenant_id, customer_id, search_text, id, entity_id)
  65 +WITH CLUSTERING ORDER BY (customer_id ASC, search_text ASC, id DESC, entity_id DESC);
  66 +
  67 +CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer_and_entity_and_search_text AS
  68 +SELECT *
  69 +from thingsboard.entity_views
  70 +WHERE entity_id IS NOT NULL AND search_text 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
  71 +PRIMARY KEY (tenant_id, customer_id, search_text,entity_id, id)
  72 +WITH CLUSTERING ORDER BY (customer_id ASC, search_text ASC, entity_id DESC, id DESC);
@@ -661,23 +661,30 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_na @@ -661,23 +661,30 @@ CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_na
661 PRIMARY KEY (tenant_id, name, id, entity_id, customer_id) 661 PRIMARY KEY (tenant_id, name, id, entity_id, customer_id)
662 WITH CLUSTERING ORDER BY (name ASC, id DESC, entity_id DESC, customer_id DESC); 662 WITH CLUSTERING ORDER BY (name ASC, id DESC, entity_id DESC, customer_id DESC);
663 663
664 -CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_entity AS 664 +CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_view_by_tenant_and_search_text AS
665 SELECT * 665 SELECT *
666 from thingsboard.entity_views 666 from thingsboard.entity_views
667 - 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  
668 - PRIMARY KEY (tenant_id, entity_id, id, customer_id, name)  
669 - WITH CLUSTERING ORDER BY (entity_id ASC, customer_id ASC, id DESC, name DESC); 667 + WHERE entity_id IS NOT NULL AND search_text 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
  668 + PRIMARY KEY (tenant_id, search_text, id, customer_id, name)
  669 + WITH CLUSTERING ORDER BY (search_text ASC, customer_id ASC, id DESC, name DESC);
670 670
671 -CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer AS 671 +CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_view_by_tenant_and_entity_and_search_text AS
672 SELECT * 672 SELECT *
673 from thingsboard.entity_views 673 from thingsboard.entity_views
674 - 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  
675 - PRIMARY KEY (tenant_id, customer_id, id, entity_id, name)  
676 - WITH CLUSTERING ORDER BY (customer_id ASC, id DESC, entity_id DESC, name DESC); 674 + WHERE entity_id IS NOT NULL AND search_text 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
  675 + PRIMARY KEY (tenant_id, entity_id, search_text, id, customer_id, name)
  676 + WITH CLUSTERING ORDER BY (entity_id ASC, search_text ASC, id DESC, name DESC);
677 677
678 -CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer_and_entity AS 678 +CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer_and_search_text AS
679 SELECT * 679 SELECT *
680 from thingsboard.entity_views 680 from thingsboard.entity_views
681 - 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  
682 - PRIMARY KEY (tenant_id, customer_id, entity_id, id, name)  
683 - WITH CLUSTERING ORDER BY (customer_id ASC, entity_id DESC, id DESC, name DESC); 681 + WHERE entity_id IS NOT NULL AND search_text 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
  682 + PRIMARY KEY (tenant_id, customer_id, search_text, id, entity_id)
  683 + WITH CLUSTERING ORDER BY (customer_id ASC, search_text ASC, id DESC, entity_id DESC);
  684 +
  685 +CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.entity_views_by_tenant_and_customer_and_entity_and_search_text AS
  686 + SELECT *
  687 + from thingsboard.entity_views
  688 + WHERE entity_id IS NOT NULL AND search_text 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
  689 + PRIMARY KEY (tenant_id, customer_id, search_text,entity_id, id)
  690 + WITH CLUSTERING ORDER BY (customer_id ASC, search_text ASC, entity_id DESC, id DESC);