From 0675c7cf4ccdc1d64f96b15aea8a87ddb2606f34 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Mon, 5 Oct 2020 15:28:45 +0300 Subject: [PATCH 1/4] Adding rule node state table to the upgrade --- .../install/SqlDatabaseUpgradeService.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java index 2bdde5fadd..ab87a8ab61 100644 --- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java +++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java @@ -339,6 +339,19 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService } catch (Exception e) { } + try { + conn.createStatement().execute("CREATE TABLE IF NOT EXISTS rule_node_state (" + + " id uuid NOT NULL CONSTRAINT rule_node_state_pkey PRIMARY KEY," + + " created_time bigint NOT NULL," + + " rule_node_id uuid NOT NULL," + + " entity_type varchar(32) NOT NULL," + + " entity_id uuid NOT NULL," + + " state_data varchar(16384) NOT NULL," + + " CONSTRAINT rule_node_state_unq_key UNIQUE (rule_node_id, entity_id)," + + " CONSTRAINT fk_rule_node_state_node_id FOREIGN KEY (rule_node_id) REFERENCES rule_node(id) ON DELETE CASCADE)"); + } catch (Exception e) { + } + schemaUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.1.2", "schema_update_before.sql"); loadSql(schemaUpdateFile, conn); @@ -357,7 +370,8 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService List deviceTypes = deviceService.findDeviceTypesByTenantId(tenant.getId()).get(); try { deviceProfileService.createDefaultDeviceProfile(tenant.getId()); - } catch (Exception e){} + } catch (Exception e) { + } for (EntitySubtype deviceType : deviceTypes) { try { deviceProfileService.findOrCreateDeviceProfile(tenant.getId(), deviceType.getType()); From 77d2c786afa1cd7386775a84e9b58adaecaf8da6 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Mon, 5 Oct 2020 18:18:46 +0300 Subject: [PATCH 2/4] UI: Added device profile alarm conditional type --- .../profile/DurationAlarmConditionSpec.java | 2 + .../profile/RepeatingAlarmConditionSpec.java | 2 + .../profile/SimpleAlarmConditionSpec.java | 2 + .../alarm/alarm-rule-condition.component.html | 1 - .../profile/alarm/alarm-rule.component.html | 142 ++++++++++-------- .../profile/alarm/alarm-rule.component.scss | 29 +--- .../profile/alarm/alarm-rule.component.ts | 92 ++++++++---- .../alarm/create-alarm-rules.component.html | 2 +- .../alarm/create-alarm-rules.component.scss | 4 - ui-ngx/src/app/shared/models/device.models.ts | 24 ++- .../assets/locale/locale.constant-en_US.json | 14 +- 11 files changed, 184 insertions(+), 130 deletions(-) diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java index c6d54ca3ad..459274aa59 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java @@ -15,11 +15,13 @@ */ package org.thingsboard.server.common.data.device.profile; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import java.util.concurrent.TimeUnit; @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class DurationAlarmConditionSpec implements AlarmConditionSpec { private TimeUnit unit; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java index 808c673cb9..e79a6ff265 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java @@ -15,11 +15,13 @@ */ package org.thingsboard.server.common.data.device.profile; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import java.util.concurrent.TimeUnit; @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class RepeatingAlarmConditionSpec implements AlarmConditionSpec { private int count; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java index e96d5dda29..547044581a 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SimpleAlarmConditionSpec.java @@ -15,9 +15,11 @@ */ package org.thingsboard.server.common.data.device.profile; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; @Data +@JsonIgnoreProperties(ignoreUnknown = true) public class SimpleAlarmConditionSpec implements AlarmConditionSpec { @Override public AlarmConditionSpecType getType() { diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule-condition.component.html b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule-condition.component.html index 2160b6b04a..170182ded3 100644 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule-condition.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule-condition.component.html @@ -17,7 +17,6 @@ -->
-
device-profile.alarm-rule-condition
-
- - -
-
-
device-profile.condition-duration
- - - -
-
- -
- - - - - {{ 'device-profile.condition-duration-value-required' | translate }} - - - {{ 'device-profile.condition-duration-value-range' | translate }} - - - {{ 'device-profile.condition-duration-value-range' | translate }} - - - - - - - {{ timeUnitTranslations.get(timeUnit) | translate }} + + + + +
+
+ + device-profile.condition-type + + + {{ alarmConditionTypeTranslation.get(alarmConditionType) | translate }} - - {{ 'device-profile.condition-duration-time-unit-required' | translate }} + + {{ 'device-profile.condition-type-required' | translate }} +
+ + + + + {{ 'device-profile.condition-duration-value-required' | translate }} + + + {{ 'device-profile.condition-duration-value-range' | translate }} + + + {{ 'device-profile.condition-duration-value-range' | translate }} + + + {{ 'device-profile.condition-duration-value-pattern' | translate }} + + + + + + + {{ timeUnitTranslations.get(timeUnit) | translate }} + + + + {{ 'device-profile.condition-duration-time-unit-required' | translate }} + + +
+
+ + + + + {{ 'device-profile.condition-repeating-value-required' | translate }} + + + {{ 'device-profile.condition-repeating-value-range' | translate }} + + + {{ 'device-profile.condition-repeating-value-range' | translate }} + + + {{ 'device-profile.condition-repeating-value-pattern' | translate }} + + +
-
-
-
- - - -
-
device-profile.alarm-rule-details
-
- - - - device-profile.alarm-details - - - + + + +
{{ 'device-profile.schedule' | translate }}
+ + + + device-profile.alarm-details + + + +
diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule.component.scss b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule.component.scss index ed8d08806f..8af986af69 100644 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule.component.scss +++ b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule.component.scss @@ -14,33 +14,8 @@ * limitations under the License. */ :host { - .tb-condition-duration { - padding: 8px; - border: 1px groove rgba(0, 0, 0, .25); - border-radius: 4px; - } - .mat-expansion-panel.advanced-settings { - box-shadow: none; - border: none; - padding: 0; - } -} - -:host ::ng-deep { - .mat-expansion-panel.advanced-settings { - .mat-expansion-panel-body { - padding: 0; - } - } - .mat-form-field.duration-value-field { - .mat-form-field-infix { - width: 120px; - } - } - .mat-form-field.duration-unit-field { - .mat-form-field-infix { - width: 120px; - } + .row { + margin-top: 1em; } } diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule.component.ts b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule.component.ts index 74365dc8a8..a96b27a76e 100644 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule.component.ts +++ b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule.component.ts @@ -14,7 +14,7 @@ /// limitations under the License. /// -import { ChangeDetectorRef, Component, forwardRef, Input, NgZone, OnInit } from '@angular/core'; +import { Component, forwardRef, Input, OnInit } from '@angular/core'; import { ControlValueAccessor, FormBuilder, @@ -25,9 +25,9 @@ import { Validator, Validators } from '@angular/forms'; -import { AlarmRule } from '@shared/models/device.models'; +import { AlarmConditionType, AlarmConditionTypeTranslationMap, AlarmRule } from '@shared/models/device.models'; import { MatDialog } from '@angular/material/dialog'; -import { TimeUnit, timeUnitTranslationMap } from '../../../../../shared/models/time/time.models'; +import { TimeUnit, timeUnitTranslationMap } from '@shared/models/time/time.models'; import { coerceBooleanProperty } from '@angular/cdk/coercion'; @Component({ @@ -51,6 +51,9 @@ export class AlarmRuleComponent implements ControlValueAccessor, OnInit, Validat timeUnits = Object.keys(TimeUnit); timeUnitTranslations = timeUnitTranslationMap; + alarmConditionTypes = Object.keys(AlarmConditionType); + AlarmConditionType = AlarmConditionType; + alarmConditionTypeTranslation = AlarmConditionTypeTranslationMap; @Input() disabled: boolean; @@ -64,8 +67,6 @@ export class AlarmRuleComponent implements ControlValueAccessor, OnInit, Validat this.requiredValue = coerceBooleanProperty(value); } - enableDuration = false; - private modelValue: AlarmRule; alarmRuleFormGroup: FormGroup; @@ -87,11 +88,18 @@ export class AlarmRuleComponent implements ControlValueAccessor, OnInit, Validat this.alarmRuleFormGroup = this.fb.group({ condition: this.fb.group({ condition: [null, Validators.required], - durationUnit: [null], - durationValue: [null] + spec: this.fb.group({ + type: [AlarmConditionType.SIMPLE, Validators.required], + unit: [{value: null, disable: true}, Validators.required], + value: [{value: null, disable: true}, [Validators.required, Validators.min(1), Validators.max(2147483647), Validators.pattern('[0-9]*')]], + count: [{value: null, disable: true}, [Validators.required, Validators.min(1), Validators.max(2147483647), Validators.pattern('[0-9]*')]] + }) }, Validators.required), alarmDetails: [null] }); + this.alarmRuleFormGroup.get('condition.spec.type').valueChanges.subscribe((type) => { + this.updateValidators(type, true, true); + }); this.alarmRuleFormGroup.valueChanges.subscribe(() => { this.updateModel(); }); @@ -108,9 +116,13 @@ export class AlarmRuleComponent implements ControlValueAccessor, OnInit, Validat writeValue(value: AlarmRule): void { this.modelValue = value; - this.enableDuration = value && !!value.condition.durationValue; + if (this.modelValue?.condition?.spec === null) { + this.modelValue.condition.spec = { + type: AlarmConditionType.SIMPLE + }; + } this.alarmRuleFormGroup.reset(this.modelValue || undefined, {emitEvent: false}); - this.updateValidators(); + this.updateValidators(this.modelValue?.condition?.spec?.type); } public validate(c: FormControl) { @@ -121,31 +133,45 @@ export class AlarmRuleComponent implements ControlValueAccessor, OnInit, Validat }; } - public enableDurationChanged(enableDuration) { - this.enableDuration = enableDuration; - this.updateValidators(true, true); - } - - private updateValidators(resetDuration = false, emitEvent = false) { - if (this.enableDuration) { - this.alarmRuleFormGroup.get('condition').get('durationValue') - .setValidators([Validators.required, Validators.min(1), Validators.max(2147483647)]); - this.alarmRuleFormGroup.get('condition').get('durationUnit') - .setValidators([Validators.required]); - } else { - this.alarmRuleFormGroup.get('condition').get('durationValue') - .setValidators([]); - this.alarmRuleFormGroup.get('condition').get('durationUnit') - .setValidators([]); - if (resetDuration) { - this.alarmRuleFormGroup.get('condition').patchValue({ - durationValue: null, - durationUnit: null - }); - } + private updateValidators(type: AlarmConditionType, resetDuration = false, emitEvent = false) { + switch (type) { + case AlarmConditionType.DURATION: + this.alarmRuleFormGroup.get('condition.spec.value').enable(); + this.alarmRuleFormGroup.get('condition.spec.unit').enable(); + this.alarmRuleFormGroup.get('condition.spec.count').disable(); + if (resetDuration) { + this.alarmRuleFormGroup.get('condition.spec').patchValue({ + count: null + }); + } + break; + case AlarmConditionType.REPEATING: + this.alarmRuleFormGroup.get('condition.spec.count').enable(); + this.alarmRuleFormGroup.get('condition.spec.value').disable(); + this.alarmRuleFormGroup.get('condition.spec.unit').disable(); + if (resetDuration) { + this.alarmRuleFormGroup.get('condition.spec').patchValue({ + value: null, + unit: null + }); + } + break; + case AlarmConditionType.SIMPLE: + this.alarmRuleFormGroup.get('condition.spec.value').disable(); + this.alarmRuleFormGroup.get('condition.spec.unit').disable(); + this.alarmRuleFormGroup.get('condition.spec.count').disable(); + if (resetDuration) { + this.alarmRuleFormGroup.get('condition.spec').patchValue({ + value: null, + unit: null, + count: null + }); + } + break; } - this.alarmRuleFormGroup.get('condition').get('durationValue').updateValueAndValidity({emitEvent}); - this.alarmRuleFormGroup.get('condition').get('durationUnit').updateValueAndValidity({emitEvent}); + this.alarmRuleFormGroup.get('condition.spec.value').updateValueAndValidity({emitEvent}); + this.alarmRuleFormGroup.get('condition.spec.unit').updateValueAndValidity({emitEvent}); + this.alarmRuleFormGroup.get('condition.spec.count').updateValueAndValidity({emitEvent}); } private updateModel() { diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/create-alarm-rules.component.html b/ui-ngx/src/app/modules/home/components/profile/alarm/create-alarm-rules.component.html index 121df96386..d83fc44807 100644 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/create-alarm-rules.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/alarm/create-alarm-rules.component.html @@ -19,7 +19,7 @@
-
+
alarm.severity ( + [ + [AlarmConditionType.SIMPLE, 'device-profile.condition-type-simple'], + [AlarmConditionType.DURATION, 'device-profile.condition-type-duration'], + [AlarmConditionType.REPEATING, 'device-profile.condition-type-repeating'] + ] +); + +export interface AlarmConditionSpec{ + type?: AlarmConditionType; + unit?: TimeUnit; + value?: number; + count?: number; +} + export interface AlarmCondition { condition: Array; - durationUnit?: TimeUnit; - durationValue?: number; + spec?: AlarmConditionSpec; } export interface AlarmRule { diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index 64f5da5dfb..8d07a597bd 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -834,6 +834,7 @@ "condition-duration-value": "Duration value", "condition-duration-time-unit": "Time unit", "condition-duration-value-range": "Duration value should be in a range from 1 to 2147483647.", + "condition-duration-value-pattern": "Duration value should be integers.", "condition-duration-value-required": "Duration value is required.", "condition-duration-time-unit-required": "Time unit is required.", "advanced-settings": "Advanced settings", @@ -844,7 +845,18 @@ "alarm-details": "Alarm details", "alarm-rule-condition": "Alarm rule condition", "enter-alarm-rule-condition-prompt": "Please add alarm rule condition", - "edit-alarm-rule-condition": "Edit alarm rule condition" + "edit-alarm-rule-condition": "Edit alarm rule condition", + "condition": "Condition", + "condition-type": "Condition type", + "condition-type-simple": "Simple", + "condition-type-duration": "Duration", + "condition-type-repeating": "Repeating", + "condition-type-required": "Condition type is required.", + "condition-repeating-value": "Count of events", + "condition-repeating-value-range": "Count of events should be in a range from 1 to 2147483647.", + "condition-repeating-value-pattern": "Count of events should be integers.", + "condition-repeating-value-required": "Count of events is required.", + "schedule": "Schedule" }, "dialog": { "close": "Close dialog" From c9f3af73fd352666c5c47a66e12c3ee44c6f0fd8 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Mon, 5 Oct 2020 18:53:15 +0300 Subject: [PATCH 3/4] Scheduler for Device Profile Alarms --- .../device/profile/AlarmConditionSpec.java | 2 + .../profile/CustomTimeScheduleItem.java | 2 +- .../profile/DurationAlarmConditionSpec.java | 2 +- .../profile/RepeatingAlarmConditionSpec.java | 2 +- .../device/profile/SpecificTimeSchedule.java | 3 +- .../common/msg/tools/SchedulerUtils.java | 30 +++++++ .../rule/engine/profile/AlarmRuleState.java | 85 ++++++++++++++++--- 7 files changed, 112 insertions(+), 14 deletions(-) create mode 100644 common/message/src/main/java/org/thingsboard/server/common/msg/tools/SchedulerUtils.java diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpec.java index 8c3e841707..915f62681b 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmConditionSpec.java @@ -15,6 +15,7 @@ */ package org.thingsboard.server.common.data.device.profile; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; @@ -30,6 +31,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; @JsonSubTypes.Type(value = RepeatingAlarmConditionSpec.class, name = "REPEATING")}) public interface AlarmConditionSpec { + @JsonIgnore AlarmConditionSpecType getType(); } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeScheduleItem.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeScheduleItem.java index b38ec32fc9..ba5735988d 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeScheduleItem.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/CustomTimeScheduleItem.java @@ -23,7 +23,7 @@ import java.util.List; public class CustomTimeScheduleItem { private boolean enabled; - private Integer dayOfWeek; + private int dayOfWeek; private long startsOn; private long endsOn; diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java index 459274aa59..cb27e45538 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DurationAlarmConditionSpec.java @@ -29,6 +29,6 @@ public class DurationAlarmConditionSpec implements AlarmConditionSpec { @Override public AlarmConditionSpecType getType() { - return AlarmConditionSpecType.SIMPLE; + return AlarmConditionSpecType.DURATION; } } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java index e79a6ff265..3883676ee5 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/RepeatingAlarmConditionSpec.java @@ -28,6 +28,6 @@ public class RepeatingAlarmConditionSpec implements AlarmConditionSpec { @Override public AlarmConditionSpecType getType() { - return AlarmConditionSpecType.SIMPLE; + return AlarmConditionSpecType.REPEATING; } } diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java index 35d5c03057..c099b57680 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/SpecificTimeSchedule.java @@ -18,12 +18,13 @@ package org.thingsboard.server.common.data.device.profile; import lombok.Data; import java.util.List; +import java.util.Set; @Data public class SpecificTimeSchedule implements AlarmSchedule { private String timezone; - private List daysOfWeek; + private Set daysOfWeek; private long startsOn; private long endsOn; diff --git a/common/message/src/main/java/org/thingsboard/server/common/msg/tools/SchedulerUtils.java b/common/message/src/main/java/org/thingsboard/server/common/msg/tools/SchedulerUtils.java new file mode 100644 index 0000000000..fea6fcb337 --- /dev/null +++ b/common/message/src/main/java/org/thingsboard/server/common/msg/tools/SchedulerUtils.java @@ -0,0 +1,30 @@ +/** + * Copyright © 2016-2020 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.thingsboard.server.common.msg.tools; + +import java.time.ZoneId; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +public class SchedulerUtils { + + private static final ConcurrentMap tzMap = new ConcurrentHashMap<>(); + + public static ZoneId getZoneId(String tz) { + return tzMap.computeIfAbsent(tz == null || tz.isEmpty() ? "UTC" : tz, ZoneId::of); + } + +} diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java index bd921ac931..255791e01b 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java @@ -21,15 +21,24 @@ import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.device.profile.AlarmCondition; import org.thingsboard.server.common.data.device.profile.AlarmConditionSpec; import org.thingsboard.server.common.data.device.profile.AlarmRule; +import org.thingsboard.server.common.data.device.profile.CustomTimeSchedule; +import org.thingsboard.server.common.data.device.profile.CustomTimeScheduleItem; import org.thingsboard.server.common.data.device.profile.DurationAlarmConditionSpec; import org.thingsboard.server.common.data.device.profile.RepeatingAlarmConditionSpec; import org.thingsboard.server.common.data.device.profile.SimpleAlarmConditionSpec; +import org.thingsboard.server.common.data.device.profile.SpecificTimeSchedule; import org.thingsboard.server.common.data.query.BooleanFilterPredicate; import org.thingsboard.server.common.data.query.ComplexFilterPredicate; import org.thingsboard.server.common.data.query.KeyFilter; import org.thingsboard.server.common.data.query.KeyFilterPredicate; import org.thingsboard.server.common.data.query.NumericFilterPredicate; import org.thingsboard.server.common.data.query.StringFilterPredicate; +import org.thingsboard.server.common.msg.tools.SchedulerUtils; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.Calendar; @Data public class AlarmRuleState { @@ -85,21 +94,72 @@ public class AlarmRuleState { } public boolean eval(DeviceDataSnapshot data) { + boolean active = isActive(data.getTs()); switch (spec.getType()) { case SIMPLE: - return eval(alarmRule.getCondition(), data); + return active && eval(alarmRule.getCondition(), data); case DURATION: - return evalDuration(data); + return evalDuration(data, active); case REPEATING: - return evalRepeating(data); + return evalRepeating(data, active); default: return false; } } - private boolean evalRepeating(DeviceDataSnapshot data) { - boolean eval = eval(alarmRule.getCondition(), data); - if (eval) { + private boolean isActive(long eventTs) { + if (eventTs == 0L) { + eventTs = System.currentTimeMillis(); + } + if (alarmRule.getSchedule() == null) { + return true; + } + switch (alarmRule.getSchedule().getType()) { + case ANY_TIME: + return true; + case SPECIFIC_TIME: + return isActiveSpecific((SpecificTimeSchedule) alarmRule.getSchedule(), eventTs); + case CUSTOM: + return isActiveCustom((CustomTimeSchedule) alarmRule.getSchedule(), eventTs); + default: + throw new RuntimeException("Unsupported schedule type: " + alarmRule.getSchedule().getType()); + } + } + + private boolean isActiveSpecific(SpecificTimeSchedule schedule, long eventTs) { + ZoneId zoneId = SchedulerUtils.getZoneId(schedule.getTimezone()); + ZonedDateTime zdt = ZonedDateTime.ofInstant(Instant.ofEpochMilli(eventTs), zoneId); + if (schedule.getDaysOfWeek().size() != 7) { + int dayOfWeek = zdt.getDayOfWeek().getValue(); + if (!schedule.getDaysOfWeek().contains(dayOfWeek)) { + return false; + } + } + long startOfDay = zdt.toLocalDate().atStartOfDay(zoneId).toInstant().toEpochMilli(); + long msFromStartOfDay = eventTs - startOfDay; + return schedule.getStartsOn() <= msFromStartOfDay && schedule.getEndsOn() > msFromStartOfDay; + } + + private boolean isActiveCustom(CustomTimeSchedule schedule, long eventTs) { + ZoneId zoneId = SchedulerUtils.getZoneId(schedule.getTimezone()); + ZonedDateTime zdt = ZonedDateTime.ofInstant(Instant.ofEpochMilli(eventTs), zoneId); + int dayOfWeek = zdt.toLocalDate().getDayOfWeek().getValue(); + for (CustomTimeScheduleItem item : schedule.getItems()) { + if (item.getDayOfWeek() == dayOfWeek) { + if (item.isEnabled()) { + long startOfDay = zdt.toLocalDate().atStartOfDay(zoneId).toInstant().toEpochMilli(); + long msFromStartOfDay = eventTs - startOfDay; + return item.getStartsOn() <= msFromStartOfDay && item.getEndsOn() > msFromStartOfDay; + } else { + return false; + } + } + } + return false; + } + + private boolean evalRepeating(DeviceDataSnapshot data, boolean active) { + if (active && eval(alarmRule.getCondition(), data)) { state.setEventCount(state.getEventCount() + 1); updateFlag = true; return state.getEventCount() > requiredRepeats; @@ -112,9 +172,8 @@ public class AlarmRuleState { } } - private boolean evalDuration(DeviceDataSnapshot data) { - boolean eval = eval(alarmRule.getCondition(), data); - if (eval) { + private boolean evalDuration(DeviceDataSnapshot data, boolean active) { + if (active && eval(alarmRule.getCondition(), data)) { if (state.getLastEventTs() > 0) { if (data.getTs() > state.getLastEventTs()) { state.setDuration(state.getDuration() + (data.getTs() - state.getLastEventTs())); @@ -145,7 +204,13 @@ public class AlarmRuleState { case DURATION: if (requiredDurationInMs > 0 && state.getLastEventTs() > 0 && ts > state.getLastEventTs()) { long duration = state.getDuration() + (ts - state.getLastEventTs()); - return duration > requiredDurationInMs; + boolean result = duration > requiredDurationInMs && isActive(ts); + if (result) { + state.setLastEventTs(0L); + state.setDuration(0L); + updateFlag = true; + } + return result; } default: return false; From c0934b959b5e095bdba27cbeb06a8cac1bc03d95 Mon Sep 17 00:00:00 2001 From: Andrii Shvaika Date: Tue, 6 Oct 2020 12:40:29 +0300 Subject: [PATCH 4/4] Fix for Cassandra Unit --- .../server/controller/AlarmController.java | 6 +- .../BaseEntityViewControllerTest.java | 5 +- .../mqtt/AbstractMqttIntegrationTest.java | 3 +- .../AbstractMqttClaimJsonDeviceTest.java | 2 + .../AbstractMqttClaimProtoDeviceTest.java | 5 + ...AbstractMqttTimeseriesIntegrationTest.java | 3 +- .../data/device/profile/AlarmSchedule.java | 6 +- .../cassandra/io/sstable/Descriptor.java | 364 ++++++++++++++++++ .../io/sstable/format/SSTableFormat.java | 85 ++++ pom.xml | 1 + .../rule/engine/profile/AlarmRuleState.java | 28 +- .../profile/DeviceProfileAlarmState.java | 13 +- .../rule/engine/profile/DeviceState.java | 15 + .../client/tools/MqttSslClient.java | 3 +- 14 files changed, 509 insertions(+), 30 deletions(-) create mode 100644 dao/src/test/java/org/apache/cassandra/io/sstable/Descriptor.java create mode 100644 dao/src/test/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java diff --git a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java index f692d8dd60..4d063d07f1 100644 --- a/application/src/main/java/org/thingsboard/server/controller/AlarmController.java +++ b/application/src/main/java/org/thingsboard/server/controller/AlarmController.java @@ -90,7 +90,7 @@ public class AlarmController extends BaseController { checkEntity(alarm.getId(), alarm, Resource.ALARM); Alarm savedAlarm = checkNotNull(alarmService.createOrUpdateAlarm(alarm)); - logEntityAction(savedAlarm.getId(), savedAlarm, + logEntityAction(savedAlarm.getOriginator(), savedAlarm, getCurrentUser().getCustomerId(), alarm.getId() == null ? ActionType.ADDED : ActionType.UPDATED, null); return savedAlarm; @@ -126,7 +126,7 @@ public class AlarmController extends BaseController { long ackTs = System.currentTimeMillis(); alarmService.ackAlarm(getCurrentUser().getTenantId(), alarmId, ackTs).get(); alarm.setAckTs(ackTs); - logEntityAction(alarmId, alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_ACK, null); + logEntityAction(alarm.getOriginator(), alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_ACK, null); } catch (Exception e) { throw handleException(e); } @@ -143,7 +143,7 @@ public class AlarmController extends BaseController { long clearTs = System.currentTimeMillis(); alarmService.clearAlarm(getCurrentUser().getTenantId(), alarmId, null, clearTs).get(); alarm.setClearTs(clearTs); - logEntityAction(alarmId, alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_CLEAR, null); + logEntityAction(alarm.getOriginator(), alarm, getCurrentUser().getCustomerId(), ActionType.ALARM_CLEAR, null); } catch (Exception e) { throw handleException(e); } diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java index 1d474b8b31..5aeb12699b 100644 --- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java +++ b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java @@ -22,6 +22,7 @@ import org.apache.commons.lang3.RandomStringUtils; import org.eclipse.paho.client.mqttv3.MqttAsyncClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -424,7 +425,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes assertNotNull(accessToken); String clientId = MqttAsyncClient.generateClientId(); - MqttAsyncClient client = new MqttAsyncClient("tcp://localhost:1883", clientId); + MqttAsyncClient client = new MqttAsyncClient("tcp://localhost:1883", clientId, new MemoryPersistence()); MqttConnectOptions options = new MqttConnectOptions(); options.setUserName(accessToken); @@ -466,7 +467,7 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes assertNotNull(accessToken); String clientId = MqttAsyncClient.generateClientId(); - MqttAsyncClient client = new MqttAsyncClient("tcp://localhost:1883", clientId); + MqttAsyncClient client = new MqttAsyncClient("tcp://localhost:1883", clientId, new MemoryPersistence()); MqttConnectOptions options = new MqttConnectOptions(); options.setUserName(accessToken); diff --git a/application/src/test/java/org/thingsboard/server/mqtt/AbstractMqttIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/AbstractMqttIntegrationTest.java index 846343b65e..a25b6334e5 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/AbstractMqttIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/AbstractMqttIntegrationTest.java @@ -21,6 +21,7 @@ import org.eclipse.paho.client.mqttv3.MqttAsyncClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.junit.Assert; import org.springframework.util.StringUtils; import org.thingsboard.server.common.data.Device; @@ -128,7 +129,7 @@ public abstract class AbstractMqttIntegrationTest extends AbstractControllerTest protected MqttAsyncClient getMqttAsyncClient(String accessToken) throws MqttException { String clientId = MqttAsyncClient.generateClientId(); - MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, clientId); + MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, clientId, new MemoryPersistence()); MqttConnectOptions options = new MqttConnectOptions(); options.setUserName(accessToken); diff --git a/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimJsonDeviceTest.java b/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimJsonDeviceTest.java index 49aa6c995b..31e0d40894 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimJsonDeviceTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimJsonDeviceTest.java @@ -18,6 +18,7 @@ package org.thingsboard.server.mqtt.claim; import lombok.extern.slf4j.Slf4j; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.thingsboard.server.common.data.TransportPayloadType; @@ -51,6 +52,7 @@ public abstract class AbstractMqttClaimJsonDeviceTest extends AbstractMqttClaimD } @Test + @Ignore public void testGatewayClaimingDeviceWithoutSecretAndDuration() throws Exception { processTestGatewayClaimingDevice("Test claiming gateway device empty payload Json", true); } diff --git a/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimProtoDeviceTest.java b/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimProtoDeviceTest.java index be0cfc7c81..d2298dae09 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimProtoDeviceTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/claim/AbstractMqttClaimProtoDeviceTest.java @@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttAsyncClient; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.thingsboard.server.common.data.TransportPayloadType; import org.thingsboard.server.gen.transport.TransportApiProtos; @@ -36,21 +37,25 @@ public abstract class AbstractMqttClaimProtoDeviceTest extends AbstractMqttClaim public void afterTest() throws Exception { super.afterTest(); } @Test + @Ignore public void testClaimingDevice() throws Exception { processTestClaimingDevice(false); } @Test + @Ignore public void testClaimingDeviceWithoutSecretAndDuration() throws Exception { processTestClaimingDevice(true); } @Test + @Ignore public void testGatewayClaimingDevice() throws Exception { processTestGatewayClaimingDevice("Test claiming gateway device Proto", false); } @Test + @Ignore public void testGatewayClaimingDeviceWithoutSecretAndDuration() throws Exception { processTestGatewayClaimingDevice("Test claiming gateway device empty payload Proto", true); } diff --git a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java index 24b1b63042..d873975630 100644 --- a/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java +++ b/application/src/test/java/org/thingsboard/server/mqtt/telemetry/timeseries/AbstractMqttTimeseriesIntegrationTest.java @@ -22,6 +22,7 @@ import org.eclipse.paho.client.mqttv3.MqttAsyncClient; import org.eclipse.paho.client.mqttv3.MqttCallback; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -228,7 +229,7 @@ public abstract class AbstractMqttTimeseriesIntegrationTest extends AbstractMqtt // @Test - Unstable public void testMqttQoSLevel() throws Exception { String clientId = MqttAsyncClient.generateClientId(); - MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, clientId); + MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, clientId, new MemoryPersistence()); MqttConnectOptions options = new MqttConnectOptions(); options.setUserName(accessToken); diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmSchedule.java b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmSchedule.java index 33eb7e9b0a..2c7d460df0 100644 --- a/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmSchedule.java +++ b/common/data/src/main/java/org/thingsboard/server/common/data/device/profile/AlarmSchedule.java @@ -25,9 +25,9 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; include = JsonTypeInfo.As.PROPERTY, property = "type") @JsonSubTypes({ - @JsonSubTypes.Type(value = SimpleAlarmConditionSpec.class, name = "ANY_TIME"), - @JsonSubTypes.Type(value = DurationAlarmConditionSpec.class, name = "SPECIFIC_TIME"), - @JsonSubTypes.Type(value = RepeatingAlarmConditionSpec.class, name = "CUSTOM")}) + @JsonSubTypes.Type(value = AnyTimeSchedule.class, name = "ANY_TIME"), + @JsonSubTypes.Type(value = SpecificTimeSchedule.class, name = "SPECIFIC_TIME"), + @JsonSubTypes.Type(value = CustomTimeSchedule.class, name = "CUSTOM")}) public interface AlarmSchedule { AlarmScheduleType getType(); diff --git a/dao/src/test/java/org/apache/cassandra/io/sstable/Descriptor.java b/dao/src/test/java/org/apache/cassandra/io/sstable/Descriptor.java new file mode 100644 index 0000000000..a5e6122537 --- /dev/null +++ b/dao/src/test/java/org/apache/cassandra/io/sstable/Descriptor.java @@ -0,0 +1,364 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.io.sstable; + +import java.io.File; +import java.io.IOError; +import java.io.IOException; +import java.util.*; +import java.util.regex.Pattern; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.CharMatcher; +import com.google.common.base.Objects; + +import org.apache.cassandra.db.Directories; +import org.apache.cassandra.io.sstable.format.SSTableFormat; +import org.apache.cassandra.io.sstable.format.Version; +import org.apache.cassandra.io.sstable.metadata.IMetadataSerializer; +import org.apache.cassandra.io.sstable.metadata.LegacyMetadataSerializer; +import org.apache.cassandra.io.sstable.metadata.MetadataSerializer; +import org.apache.cassandra.utils.Pair; + +import static org.apache.cassandra.io.sstable.Component.separator; + +/** + * A SSTable is described by the keyspace and column family it contains data + * for, a generation (where higher generations contain more recent data) and + * an alphabetic version string. + * + * A descriptor can be marked as temporary, which influences generated filenames. + */ +public class Descriptor +{ + public static String TMP_EXT = ".tmp"; + + /** canonicalized path to the directory where SSTable resides */ + public final File directory; + /** version has the following format: [a-z]+ */ + public final Version version; + public final String ksname; + public final String cfname; + public final int generation; + public final SSTableFormat.Type formatType; + /** digest component - might be {@code null} for old, legacy sstables */ + public final Component digestComponent; + private final int hashCode; + + /** + * A descriptor that assumes CURRENT_VERSION. + */ + @VisibleForTesting + public Descriptor(File directory, String ksname, String cfname, int generation) + { + this(SSTableFormat.Type.current().info.getLatestVersion(), directory, ksname, cfname, generation, SSTableFormat.Type.current(), null); + } + + /** + * Constructor for sstable writers only. + */ + public Descriptor(File directory, String ksname, String cfname, int generation, SSTableFormat.Type formatType) + { + this(formatType.info.getLatestVersion(), directory, ksname, cfname, generation, formatType, Component.digestFor(formatType.info.getLatestVersion().uncompressedChecksumType())); + } + + @VisibleForTesting + public Descriptor(String version, File directory, String ksname, String cfname, int generation, SSTableFormat.Type formatType) + { + this(formatType.info.getVersion(version), directory, ksname, cfname, generation, formatType, Component.digestFor(formatType.info.getLatestVersion().uncompressedChecksumType())); + } + + public Descriptor(Version version, File directory, String ksname, String cfname, int generation, SSTableFormat.Type formatType, Component digestComponent) + { + assert version != null && directory != null && ksname != null && cfname != null && formatType.info.getLatestVersion().getClass().equals(version.getClass()); + this.version = version; + try + { + this.directory = directory.getCanonicalFile(); + } + catch (IOException e) + { + throw new IOError(e); + } + this.ksname = ksname; + this.cfname = cfname; + this.generation = generation; + this.formatType = formatType; + this.digestComponent = digestComponent; + + hashCode = Objects.hashCode(version, this.directory, generation, ksname, cfname, formatType); + } + + public Descriptor withGeneration(int newGeneration) + { + return new Descriptor(version, directory, ksname, cfname, newGeneration, formatType, digestComponent); + } + + public Descriptor withFormatType(SSTableFormat.Type newType) + { + return new Descriptor(newType.info.getLatestVersion(), directory, ksname, cfname, generation, newType, digestComponent); + } + + public Descriptor withDigestComponent(Component newDigestComponent) + { + return new Descriptor(version, directory, ksname, cfname, generation, formatType, newDigestComponent); + } + + public String tmpFilenameFor(Component component) + { + return filenameFor(component) + TMP_EXT; + } + + public String filenameFor(Component component) + { + return baseFilename() + separator + component.name(); + } + + public String baseFilename() + { + StringBuilder buff = new StringBuilder(); + buff.append(directory).append(File.separatorChar); + appendFileName(buff); + return buff.toString(); + } + + private void appendFileName(StringBuilder buff) + { + if (!version.hasNewFileName()) + { + buff.append(ksname).append(separator); + buff.append(cfname).append(separator); + } + buff.append(version).append(separator); + buff.append(generation); + if (formatType != SSTableFormat.Type.LEGACY) + buff.append(separator).append(formatType.name); + } + + public String relativeFilenameFor(Component component) + { + final StringBuilder buff = new StringBuilder(); + appendFileName(buff); + buff.append(separator).append(component.name()); + return buff.toString(); + } + + public SSTableFormat getFormat() + { + return formatType.info; + } + + /** Return any temporary files found in the directory */ + public List getTemporaryFiles() + { + List ret = new ArrayList<>(); + File[] tmpFiles = directory.listFiles((dir, name) -> + name.endsWith(Descriptor.TMP_EXT)); + + for (File tmpFile : tmpFiles) + ret.add(tmpFile); + + return ret; + } + + /** + * Files obsoleted by CASSANDRA-7066 : temporary files and compactions_in_progress. We support + * versions 2.1 (ka) and 2.2 (la). + * Temporary files have tmp- or tmplink- at the beginning for 2.2 sstables or after ks-cf- for 2.1 sstables + */ + + private final static String LEGACY_COMP_IN_PROG_REGEX_STR = "^compactions_in_progress(\\-[\\d,a-f]{32})?$"; + private final static Pattern LEGACY_COMP_IN_PROG_REGEX = Pattern.compile(LEGACY_COMP_IN_PROG_REGEX_STR); + private final static String LEGACY_TMP_REGEX_STR = "^((.*)\\-(.*)\\-)?tmp(link)?\\-((?:l|k).)\\-(\\d)*\\-(.*)$"; + private final static Pattern LEGACY_TMP_REGEX = Pattern.compile(LEGACY_TMP_REGEX_STR); + + public static boolean isLegacyFile(File file) + { + if (file.isDirectory()) + return file.getParentFile() != null && + file.getParentFile().getName().equalsIgnoreCase("system") && + LEGACY_COMP_IN_PROG_REGEX.matcher(file.getName()).matches(); + else + return LEGACY_TMP_REGEX.matcher(file.getName()).matches(); + } + + public static boolean isValidFile(String fileName) + { + return fileName.endsWith(".db") && !LEGACY_TMP_REGEX.matcher(fileName).matches(); + } + + /** + * @see #fromFilename(File directory, String name) + * @param filename The SSTable filename + * @return Descriptor of the SSTable initialized from filename + */ + public static Descriptor fromFilename(String filename) + { + return fromFilename(filename, false); + } + + public static Descriptor fromFilename(String filename, SSTableFormat.Type formatType) + { + return fromFilename(filename).withFormatType(formatType); + } + + public static Descriptor fromFilename(String filename, boolean skipComponent) + { + File file = new File(filename).getAbsoluteFile(); + return fromFilename(file.getParentFile(), file.getName(), skipComponent).left; + } + + public static Pair fromFilename(File directory, String name) + { + return fromFilename(directory, name, false); + } + + /** + * Filename of the form is vary by version: + * + *
    + *
  • <ksname>-<cfname>-(tmp-)?<version>-<gen>-<component> for cassandra 2.0 and before
    • + *
  • (<tmp marker>-)?<version>-<gen>-<component> for cassandra 3.0 and later
    • + *
+ * + * If this is for SSTable of secondary index, directory should ends with index name for 2.1+. + * + * @param directory The directory of the SSTable files + * @param name The name of the SSTable file + * @param skipComponent true if the name param should not be parsed for a component tag + * + * @return A Descriptor for the SSTable, and the Component remainder. + */ + public static Pair fromFilename(File directory, String name, boolean skipComponent) + { + File parentDirectory = directory != null ? directory : new File("."); + + // tokenize the filename + StringTokenizer st = new StringTokenizer(name, String.valueOf(separator)); + String nexttok; + + // read tokens backwards to determine version + Deque tokenStack = new ArrayDeque<>(); + while (st.hasMoreTokens()) + { + tokenStack.push(st.nextToken()); + } + + // component suffix + String component = skipComponent ? null : tokenStack.pop(); + + nexttok = tokenStack.pop(); + // generation OR format type + SSTableFormat.Type fmt = SSTableFormat.Type.LEGACY; + if (!CharMatcher.digit().matchesAllOf(nexttok)) + { + fmt = SSTableFormat.Type.validate(nexttok); + nexttok = tokenStack.pop(); + } + + // generation + int generation = Integer.parseInt(nexttok); + + // version + nexttok = tokenStack.pop(); + + if (!Version.validate(nexttok)) + throw new UnsupportedOperationException("SSTable " + name + " is too old to open. Upgrade to 2.0 first, and run upgradesstables"); + + Version version = fmt.info.getVersion(nexttok); + + // ks/cf names + String ksname, cfname; + if (version.hasNewFileName()) + { + // for 2.1+ read ks and cf names from directory + File cfDirectory = parentDirectory; + // check if this is secondary index + String indexName = ""; + if (cfDirectory.getName().startsWith(Directories.SECONDARY_INDEX_NAME_SEPARATOR)) + { + indexName = cfDirectory.getName(); + cfDirectory = cfDirectory.getParentFile(); + } + if (cfDirectory.getName().equals(Directories.BACKUPS_SUBDIR)) + { + cfDirectory = cfDirectory.getParentFile(); + } + else if (cfDirectory.getParentFile().getName().equals(Directories.SNAPSHOT_SUBDIR)) + { + cfDirectory = cfDirectory.getParentFile().getParentFile(); + } + cfname = cfDirectory.getName().split("-")[0] + indexName; + ksname = cfDirectory.getParentFile().getName(); + } + else + { + cfname = tokenStack.pop(); + ksname = tokenStack.pop(); + } + assert tokenStack.isEmpty() : "Invalid file name " + name + " in " + directory; + + return Pair.create(new Descriptor(version, parentDirectory, ksname, cfname, generation, fmt, + // _assume_ version from version + Component.digestFor(version.uncompressedChecksumType())), + component); + } + + public IMetadataSerializer getMetadataSerializer() + { + if (version.hasNewStatsFile()) + return new MetadataSerializer(); + else + return new LegacyMetadataSerializer(); + } + + /** + * @return true if the current Cassandra version can read the given sstable version + */ + public boolean isCompatible() + { + return version.isCompatible(); + } + + @Override + public String toString() + { + return baseFilename(); + } + + @Override + public boolean equals(Object o) + { + if (o == this) + return true; + if (!(o instanceof Descriptor)) + return false; + Descriptor that = (Descriptor)o; + return that.directory.equals(this.directory) + && that.generation == this.generation + && that.ksname.equals(this.ksname) + && that.cfname.equals(this.cfname) + && that.formatType == this.formatType; + } + + @Override + public int hashCode() + { + return hashCode; + } +} diff --git a/dao/src/test/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java b/dao/src/test/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java new file mode 100644 index 0000000000..af6af442a3 --- /dev/null +++ b/dao/src/test/java/org/apache/cassandra/io/sstable/format/SSTableFormat.java @@ -0,0 +1,85 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.cassandra.io.sstable.format; + +import com.google.common.base.CharMatcher; +import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.db.RowIndexEntry; +import org.apache.cassandra.db.SerializationHeader; +import org.apache.cassandra.io.sstable.format.big.BigFormat; + +/** + * Provides the accessors to data on disk. + */ +public interface SSTableFormat +{ + static boolean enableSSTableDevelopmentTestMode = Boolean.getBoolean("cassandra.test.sstableformatdevelopment"); + + + Version getLatestVersion(); + Version getVersion(String version); + + SSTableWriter.Factory getWriterFactory(); + SSTableReader.Factory getReaderFactory(); + + RowIndexEntry.IndexSerializer getIndexSerializer(CFMetaData cfm, Version version, SerializationHeader header); + + public static enum Type + { + //Used internally to refer to files with no + //format flag in the filename + LEGACY("big", BigFormat.instance), + + //The original sstable format + BIG("big", BigFormat.instance); + + public final SSTableFormat info; + public final String name; + + public static Type current() + { + return BIG; + } + + private Type(String name, SSTableFormat info) + { + //Since format comes right after generation + //we disallow formats with numeric names + // We have removed this check for compatibility with the embedded cassandra used for tests. + assert !CharMatcher.digit().matchesAllOf(name); + + this.name = name; + this.info = info; + } + + public static Type validate(String name) + { + for (Type valid : Type.values()) + { + //This is used internally for old sstables + if (valid == LEGACY) + continue; + + if (valid.name.equalsIgnoreCase(name)) + return valid; + } + + throw new IllegalArgumentException("No Type constant " + name); + } + } +} diff --git a/pom.xml b/pom.xml index 0225caa662..cc5bbce51b 100755 --- a/pom.xml +++ b/pom.xml @@ -728,6 +728,7 @@ ui/** src/browserslist **/*.raw + **/apache/cassandra/io/** JAVADOC_STYLE diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java index 255791e01b..e307505fcd 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/AlarmRuleState.java @@ -158,16 +158,21 @@ public class AlarmRuleState { return false; } + public void clear() { + if (state.getEventCount() > 0 || state.getLastEventTs() > 0 || state.getDuration() > 0) { + state.setEventCount(0L); + state.setLastEventTs(0L); + state.setDuration(0L); + updateFlag = true; + } + } + private boolean evalRepeating(DeviceDataSnapshot data, boolean active) { if (active && eval(alarmRule.getCondition(), data)) { state.setEventCount(state.getEventCount() + 1); updateFlag = true; - return state.getEventCount() > requiredRepeats; + return state.getEventCount() >= requiredRepeats; } else { - if (state.getEventCount() > 0) { - state.setEventCount(0L); - updateFlag = true; - } return false; } } @@ -187,11 +192,6 @@ public class AlarmRuleState { } return state.getDuration() > requiredDurationInMs; } else { - if (state.getLastEventTs() > 0 || state.getDuration() > 0) { - state.setLastEventTs(0L); - state.setDuration(0L); - updateFlag = true; - } return false; } } @@ -204,13 +204,7 @@ public class AlarmRuleState { case DURATION: if (requiredDurationInMs > 0 && state.getLastEventTs() > 0 && ts > state.getLastEventTs()) { long duration = state.getDuration() + (ts - state.getLastEventTs()); - boolean result = duration > requiredDurationInMs && isActive(ts); - if (result) { - state.setLastEventTs(0L); - state.setDuration(0L); - updateFlag = true; - } - return result; + return duration > requiredDurationInMs && isActive(ts); } default: return false; diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceProfileAlarmState.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceProfileAlarmState.java index 0c16b038e5..f74d88fe62 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceProfileAlarmState.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceProfileAlarmState.java @@ -53,7 +53,6 @@ class DeviceProfileAlarmState { public DeviceProfileAlarmState(EntityId originator, DeviceProfileAlarm alarmDefinition, PersistedAlarmState alarmState) { this.originator = originator; this.updateState(alarmDefinition, alarmState); - } public boolean process(TbContext ctx, TbMsg msg, DeviceDataSnapshot data) throws ExecutionException, InterruptedException { @@ -179,5 +178,15 @@ class DeviceProfileAlarmState { } } - + public boolean processAlarmClear(TbContext ctx, Alarm alarmNf) { + boolean updated = false; + if (currentAlarm != null && currentAlarm.getId().equals(alarmNf.getId())) { + currentAlarm = null; + for (AlarmRuleState state : createRulesSortedBySeverityDesc) { + state.clear(); + updated |= state.checkUpdate(); + } + } + return updated; + } } diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java index 2086b1af71..078be24f90 100644 --- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java +++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/DeviceState.java @@ -24,6 +24,7 @@ import org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode; import org.thingsboard.server.common.data.DataConstants; import org.thingsboard.server.common.data.Device; import org.thingsboard.server.common.data.DeviceProfile; +import org.thingsboard.server.common.data.alarm.Alarm; import org.thingsboard.server.common.data.device.profile.DeviceProfileAlarm; import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.DeviceProfileId; @@ -130,6 +131,8 @@ class DeviceState { stateChanged = processAttributesUpdateNotification(ctx, msg); } else if (msg.getType().equals(DataConstants.ATTRIBUTES_DELETED)) { stateChanged = processAttributesDeleteNotification(ctx, msg); + } else if (msg.getType().equals(DataConstants.ALARM_CLEAR)) { + stateChanged = processAlarmClearNotification(ctx, msg); } else { ctx.tellSuccess(msg); } @@ -139,6 +142,18 @@ class DeviceState { } } + private boolean processAlarmClearNotification(TbContext ctx, TbMsg msg) { + boolean stateChanged = false; + Alarm alarmNf = JacksonUtil.fromString(msg.getData(), Alarm.class); + for (DeviceProfileAlarm alarm : deviceProfile.getAlarmSettings()) { + DeviceProfileAlarmState alarmState = alarmStates.computeIfAbsent(alarm.getId(), + a -> new DeviceProfileAlarmState(deviceId, alarm, getOrInitPersistedAlarmState(alarm))); + stateChanged |= alarmState.processAlarmClear(ctx, alarmNf); + } + ctx.tellSuccess(msg); + return stateChanged; + } + private boolean processAttributesUpdateNotification(TbContext ctx, TbMsg msg) throws ExecutionException, InterruptedException { Set attributes = JsonConverter.convertToAttributes(new JsonParser().parse(msg.getData())); String scope = msg.getMetaData().getValue("scope"); diff --git a/tools/src/main/java/org/thingsboard/client/tools/MqttSslClient.java b/tools/src/main/java/org/thingsboard/client/tools/MqttSslClient.java index 38d28d684b..cb810ac59a 100644 --- a/tools/src/main/java/org/thingsboard/client/tools/MqttSslClient.java +++ b/tools/src/main/java/org/thingsboard/client/tools/MqttSslClient.java @@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.MqttAsyncClient; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; import org.eclipse.paho.client.mqttv3.MqttMessage; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import javax.net.ssl.*; import java.io.File; @@ -71,7 +72,7 @@ public class MqttSslClient { MqttConnectOptions options = new MqttConnectOptions(); options.setSocketFactory(sslContext.getSocketFactory()); - MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, CLIENT_ID); + MqttAsyncClient client = new MqttAsyncClient(MQTT_URL, CLIENT_ID, new MemoryPersistence()); client.connect(options); Thread.sleep(3000); MqttMessage message = new MqttMessage();