adjust schema
This commit is contained in:
@ -1,9 +1,9 @@
|
|||||||
-- Configuration and Provisioning Schema
|
-- Configuration and Provisioning Schema
|
||||||
|
|
||||||
|
|
||||||
DROP TABLE tDatapoint;
|
DROP TABLE tReadDatapoint;
|
||||||
|
|
||||||
CREATE TABLE tDatapoint (
|
CREATE TABLE tReadDatapoint (
|
||||||
id INTEGER PRIMARY KEY AUTO_INCREMENT,
|
id INTEGER PRIMARY KEY AUTO_INCREMENT,
|
||||||
unit INTEGER NOT NULL,
|
unit INTEGER NOT NULL,
|
||||||
address INTEGER NOT NULL,
|
address INTEGER NOT NULL,
|
||||||
@ -19,98 +19,194 @@ CREATE TABLE tDatapoint (
|
|||||||
available BOOLEAN DEFAULT TRUE,
|
available BOOLEAN DEFAULT TRUE,
|
||||||
retries INTEGER NOT NULL DEFAULT 0,
|
retries INTEGER NOT NULL DEFAULT 0,
|
||||||
giveUpCount INTEGER NOT NULL DEFAULT 0,
|
giveUpCount INTEGER NOT NULL DEFAULT 0,
|
||||||
CONSTRAINT uniqueDatapoint UNIQUE (unit, address, count, label)
|
active BOOLEAN NOT NULL DEFAULT TRUE,
|
||||||
|
CONSTRAINT uniqueReadDatapoint UNIQUE (unit, address, count, label)
|
||||||
);
|
);
|
||||||
|
|
||||||
-- ALTER TABLE tDatapoint MODIFY available BOOLEAN DEFAULT TRUE;
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
-- ALTER TABLE tDatapoint MODIFY lastContact TIMESTAMP(3);
|
|
||||||
-- ALTER TABLE tDatapoint MODIFY scanRate TIME(3) DEFAULT '00:00:01.000';
|
|
||||||
-- ALTER TABLE tDatapoint ADD giveUpCount INTEGER NOT NULL DEFAULT 0;
|
|
||||||
-- ALTER TABLE tDatapoint MODIFY lastContact TIMESTAMP(3) NOT NULL DEFAULT '1970-01-01 00:00:01.000';
|
|
||||||
|
|
||||||
-- ModbusRequestDefinition(4, 0x2000, 2, 'F', '(ERR) Unavailable device'),
|
|
||||||
-- ModbusRequestDefinition(1, 0x2000, 4, 'F', '(ERR) Wrong register size'),
|
|
||||||
-- ModbusRequestDefinition(1, 0x2000, 2, 'F', 'Voltage'),
|
|
||||||
-- ModbusRequestDefinition(1, 0x2020, 2, 'F', 'Frequency'),
|
|
||||||
-- ModbusRequestDefinition(1, 0x2060, 2, 'F', 'Current'),
|
|
||||||
-- ModbusRequestDefinition(3, 0x0004, 2, 'RF', 'Resistance Channel 1'),
|
|
||||||
-- ModbusRequestDefinition(3, 0x000C, 2, 'RF', 'Temperature Channel 1'),
|
|
||||||
-- ModbusRequestDefinition(3, 0x0014, 2, 'RF', 'Resistance Channel 2'),
|
|
||||||
-- ModbusRequestDefinition(3, 0x001C, 2, 'RF', 'Temperature Channel 2'),
|
|
||||||
|
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
|
||||||
VALUES(4, 0x2000, 2, 'F', '(ERR) Unavailable device', 'IoT/ModbusMaster1/UnavailableDevice', '00:00:01.000');
|
VALUES(4, 0x2000, 2, 'F', '(ERR) Unavailable device', 'IoT/ModbusMaster1/UnavailableDevice', '00:00:01.000');
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
VALUES(1, 0x2000, 4, 'F', '(ERR) Wrong register size', 'IoT/ModbusMaster1/WrongRegisterSize', '00:05:00.000');
|
VALUES(1, 0x2000, 4, 'F', '(ERR) Wrong register size', 'IoT/ModbusMaster1/WrongRegisterSize', '00:05:00.000');
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
VALUES(1, 0x2000, 2, 'F', 'Voltage', 'IoT/ModbusMaster1/Voltage', '00:05:00.000');
|
VALUES(1, 0x2000, 2, 'F', 'Voltage', 'IoT/ModbusMaster1/Voltage', '00:05:00.000');
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
VALUES(1, 0x2020, 2, 'F', 'Frequency', 'IoT/ModbusMaster1/Frequency', '00:05:00.000');
|
VALUES(1, 0x2020, 2, 'F', 'Frequency', 'IoT/ModbusMaster1/Frequency', '00:05:00.000');
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
VALUES(1, 0x2060, 2, 'F', 'Current', 'IoT/ModbusMaster1/Current', '00:05:00.000');
|
VALUES(1, 0x2060, 2, 'F', 'Current', 'IoT/ModbusMaster1/Current', '00:05:00.000');
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
VALUES(3, 0x0004, 2, 'RF', 'Resistance Channel 1', 'IoT/ModbusMaster1/Channel1/Resistance', '00:00:01.000');
|
VALUES(3, 0x0004, 2, 'RF', 'Resistance Channel 1', 'IoT/ModbusMaster1/Channel1/Resistance', '00:00:01.000');
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
VALUES(3, 0x000C, 2, 'RF', 'Temperature Channel 1', 'IoT/ModbusMaster1/Channel1/Temperature', '00:00:01.000');
|
VALUES(3, 0x000C, 2, 'RF', 'Temperature Channel 1', 'IoT/ModbusMaster1/Channel1/Temperature', '00:00:01.000');
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
VALUES(3, 0x0014, 2, 'RF', 'Resistance Channel 2', 'IoT/ModbusMaster1/Channel2/Resistance', '00:00:01.000');
|
VALUES(3, 0x0014, 2, 'RF', 'Resistance Channel 2', 'IoT/ModbusMaster1/Channel2/Resistance', '00:00:01.000');
|
||||||
INSERT INTO tDatapoint (unit, address, count, converter, label, topic, scanRate)
|
INSERT INTO tReadDatapoint (unit, address, count, converter, label, topic, scanRate)
|
||||||
VALUES(3, 0x001C, 2, 'RF', 'Temperature Channel 2', 'IoT/ModbusMaster1/Channel2/Temperature', '00:00:01.000');
|
VALUES(3, 0x001C, 2, 'RF', 'Temperature Channel 2', 'IoT/ModbusMaster1/Channel2/Temperature', '00:00:01.000');
|
||||||
|
|
||||||
|
|
||||||
CREATE OR REPLACE VIEW vDatapointsToBeQueried AS
|
DROP TABLE tWriteDatapoint;
|
||||||
SELECT id, unit, address, count, converter
|
|
||||||
FROM tDatapoint
|
|
||||||
WHERE ADDTIME(lastContact, ADDTIME(scanRate, backoff)) < NOW(3) AND
|
|
||||||
available;
|
|
||||||
|
|
||||||
|
CREATE TABLE tWriteDatapoint (
|
||||||
DROP TABLE tNotification;
|
|
||||||
|
|
||||||
CREATE TABLE tNotification (
|
|
||||||
id INTEGER PRIMARY KEY AUTO_INCREMENT,
|
id INTEGER PRIMARY KEY AUTO_INCREMENT,
|
||||||
datapointId INTEGER NOT NULL REFERENCES tDatapoint(id),
|
unit INTEGER NOT NULL,
|
||||||
notificationType VARCHAR(1),
|
address INTEGER NOT NULL,
|
||||||
CONSTRAINT checkNotificationType CHECK (notificationtype IN ('V', 'F', 'R'))
|
count INTEGER NOT NULL,
|
||||||
|
converter VARCHAR(10) NOT NULL,
|
||||||
|
label VARCHAR(128) NOT NULL,
|
||||||
|
topic VARCHAR(256) NOT NULL,
|
||||||
|
lastContact TIMESTAMP(3) NOT NULL DEFAULT '2000-01-01 00:00:01.000',
|
||||||
|
lastError VARCHAR(512),
|
||||||
|
value VARCHAR(512),
|
||||||
|
retries INTEGER NOT NULL DEFAULT 0,
|
||||||
|
active BOOLEAN NOT NULL DEFAULT TRUE,
|
||||||
|
CONSTRAINT uniqueWriteDatapoint UNIQUE (unit, address, count, label)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
INSERT INTO tWriteDatapoint (unit, address, count, converter, label, topic, active)
|
||||||
|
VALUES(5, 0x0000, 1, 'B', 'Relay 1', 'IoT/ModbusMaster1/Relay1', FALSE);
|
||||||
|
|
||||||
|
|
||||||
|
CREATE OR REPLACE VIEW vReadDatapointsToBeHandled AS
|
||||||
|
SELECT id, unit, address, count, converter
|
||||||
|
FROM tReadDatapoint
|
||||||
|
WHERE available AND
|
||||||
|
active AND
|
||||||
|
ADDTIME(lastContact, ADDTIME(scanRate, backoff)) < NOW(3)
|
||||||
|
ORDER BY scanRate;
|
||||||
|
|
||||||
|
CREATE OR REPLACE VIEW vWriteDatapintsToBeHandled AS
|
||||||
|
SELECT id, unit, address, count, converter, value
|
||||||
|
FROM tWriteDatapoint
|
||||||
|
WHERE active;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
DROP TABLE tReadNotification;
|
||||||
|
|
||||||
|
CREATE TABLE tReadNotification (
|
||||||
|
id INTEGER PRIMARY KEY AUTO_INCREMENT,
|
||||||
|
readDatapointId INTEGER NOT NULL REFERENCES tReadDatapoint(id),
|
||||||
|
notificationType VARCHAR(1),
|
||||||
|
CONSTRAINT checkNotificationType CHECK (notificationtype IN ('V', 'F', 'R')) -- value, failure, return
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
DROP TABLE tWrittenNotification;
|
||||||
|
|
||||||
|
CREATE TABLE tWrittenNotification (
|
||||||
|
id INTEGER PRIMARY KEY AUTO_INCREMENT,
|
||||||
|
writeDatapointId INTEGER NOT NULL REFERENCES tWriteDatapoint(id),
|
||||||
|
notificationType VARCHAR(1),
|
||||||
|
CONSTRAINT checkNotificationType CHECK (notificationtype IN ('S', 'F')) -- success, failure
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE TRIGGER trCheckAvailability
|
CREATE OR REPLACE PROCEDURE prWriteFeedback (IN p_id INTEGER, IN p_lastError VARCHAR(512))
|
||||||
BEFORE UPDATE ON tDatapoint FOR EACH ROW
|
MODIFIES SQL DATA
|
||||||
BEGIN
|
BEGIN
|
||||||
IF NEW.retries >= 5 THEN
|
DECLARE v_retries INTEGER;
|
||||||
IF NEW.backoff = '00:00:00.000' THEN
|
DECLARE v_active BOOLEAN;
|
||||||
SET NEW.backoff = OLD.scanRate;
|
|
||||||
|
IF p_lastError = '' OR p_lastError IS NULL THEN
|
||||||
|
UPDATE tWriteDatapoint
|
||||||
|
SET lastError = NULL,
|
||||||
|
lastContact = NOW(3),
|
||||||
|
retries = 0,
|
||||||
|
active = FALSE
|
||||||
|
WHERE id = p_id;
|
||||||
|
INSERT INTO tWrittenNotification (writeDatapointId, notificationType) VALUES (p_id, 'S');
|
||||||
|
ELSE
|
||||||
|
SELECT retries
|
||||||
|
INTO v_retries
|
||||||
|
FROM tWriteDatapoint
|
||||||
|
WHERE id = p_id;
|
||||||
|
|
||||||
|
SET v_retries := v_retries + 1;
|
||||||
|
|
||||||
|
IF v_retries >= 5 THEN
|
||||||
|
SET v_retries := 0;
|
||||||
|
SET v_active := FALSE;
|
||||||
ELSE
|
ELSE
|
||||||
SET NEW.backoff = ADDTIME(OLD.backoff, OLD.backoff);
|
SET v_active := TRUE;
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
UPDATE tWriteDatapoint
|
||||||
|
SET lastError = p_lastError,
|
||||||
|
retries = v_retries,
|
||||||
|
active = v_active
|
||||||
|
WHERE id = p_id;
|
||||||
|
|
||||||
|
IF NOT v_active THEN
|
||||||
|
INSERT INTO tWrittenNotification (writeDatapointId, notificationType) VALUES(p_id, 'F');
|
||||||
END IF;
|
END IF;
|
||||||
SET NEW.retries := 0;
|
|
||||||
SET NEW.giveUpCount := OLD.giveUpCount + 1;
|
|
||||||
END IF;
|
|
||||||
IF NEW.giveUpCount = 10 THEN
|
|
||||||
SET NEW.available := FALSE;
|
|
||||||
SET NEW.giveUpCount := 0;
|
|
||||||
SET NEW.backoff := '00:00:00.000';
|
|
||||||
END IF;
|
END IF;
|
||||||
END; $$
|
END; $$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
DELIMITER $$
|
DELIMITER $$
|
||||||
CREATE OR REPLACE TRIGGER trNotification
|
CREATE OR REPLACE PROCEDURE prReadFeedback (IN p_id INTEGER, IN p_lastValue VARCHAR(512), IN p_lastError VARCHAR(512))
|
||||||
AFTER UPDATE ON tDatapoint FOR EACH ROW
|
MODIFIES SQL DATA
|
||||||
BEGIN
|
BEGIN
|
||||||
DECLARE v_notificationType VARCHAR(1);
|
DECLARE v_retries INTEGER;
|
||||||
IF (NEW.lastError IS NULL OR NEW.lastError = '') AND (NEW.lastValue IS NOT NULL) THEN
|
DECLARE v_backoff TIME(3);
|
||||||
SET v_notificationType := 'V';
|
DECLARE v_scanRate TIME(3);
|
||||||
ELSEIF NEW.available AND NOT OLD.available THEN
|
DECLARE v_giveUpCount INTEGER;
|
||||||
SET v_notificationType := 'R';
|
DECLARE v_available BOOLEAN;
|
||||||
ELSEIF NOT NEW.available AND OLD.available THEN
|
|
||||||
SET v_notificationType := 'F';
|
IF p_lastError = '' OR p_lastError IS NULL THEN
|
||||||
END IF;
|
UPDATE tReadDatapoint
|
||||||
IF v_notificationType IS NOT NULL THEN
|
SET lastError = NULL,
|
||||||
INSERT INTO tNotification (datapointId, notificationType) VALUES(NEW.id, v_notificationType);
|
lastContact = NOW(3),
|
||||||
|
lastValue = p_lastValue,
|
||||||
|
retries = 0,
|
||||||
|
backoff = '00:00:00.000',
|
||||||
|
giveUpCount = 0
|
||||||
|
WHERE id = p_id;
|
||||||
|
INSERT INTO tReadNotification (readDatapointId, notificationType) VALUES(p_id, 'V');
|
||||||
|
ELSE
|
||||||
|
SELECT retries, backoff, scanRate, giveUpCount
|
||||||
|
INTO v_retries, v_backoff, v_scanRate, v_giveUpCount
|
||||||
|
FROM tReadDatapoint
|
||||||
|
WHERE id = p_id;
|
||||||
|
|
||||||
|
SET v_retries := v_retries + 1;
|
||||||
|
|
||||||
|
IF v_retries >= 5 THEN
|
||||||
|
IF v_backoff = '00:00:00.000' THEN
|
||||||
|
SET v_backoff = v_scanRate;
|
||||||
|
ELSE
|
||||||
|
SET v_backoff = ADDTIME(v_backoff, v_backoff);
|
||||||
|
END IF;
|
||||||
|
SET v_retries := 0;
|
||||||
|
SET v_giveUpCount := v_giveUpCount + 1;
|
||||||
|
SET v_available := TRUE;
|
||||||
|
END IF;
|
||||||
|
IF v_giveUpCount = 10 THEN
|
||||||
|
SET v_available := FALSE;
|
||||||
|
SET v_giveUpCount := 0;
|
||||||
|
SET v_backoff := '00:00:00.000';
|
||||||
|
END IF;
|
||||||
|
|
||||||
|
UPDATE tReadDatapoint
|
||||||
|
SET lastError = p_lastError,
|
||||||
|
retries = v_retries,
|
||||||
|
backoff = v_backoff,
|
||||||
|
giveUpCount = v_giveUpCount,
|
||||||
|
available = v_available
|
||||||
|
WHERE id = p_id;
|
||||||
|
|
||||||
|
IF NOT v_available THEN
|
||||||
|
INSERT INTO tReadNotification (readDatapointId, notificationType) VALUES(p_id, 'F');
|
||||||
|
END IF;
|
||||||
END IF;
|
END IF;
|
||||||
END; $$
|
END; $$
|
||||||
DELIMITER ;
|
DELIMITER ;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user