From 678f22f57dcee8b756023ed88d412ade43539c20 Mon Sep 17 00:00:00 2001
From: Joris van Zwieten <zwieten@astron.nl>
Date: Thu, 5 Apr 2007 12:26:59 +0000
Subject: [PATCH] BugID: 1037 - Renamed is_clean_startup() to is_new_run() to
conform with C++ interface. - Added "Type" field to command table.
---
.../sql/create_blackboard_functions.sql | 2 +-
.../sql/create_blackboard_tables.sql | 20 ++++++++++---------
CEP/BB/BBSControl/src/CommandQueue.cc | 2 +-
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/CEP/BB/BBSControl/sql/create_blackboard_functions.sql b/CEP/BB/BBSControl/sql/create_blackboard_functions.sql
index 7bc506f319c..ce554c3116b 100644
--- a/CEP/BB/BBSControl/sql/create_blackboard_functions.sql
+++ b/CEP/BB/BBSControl/sql/create_blackboard_functions.sql
@@ -68,7 +68,7 @@ LANGUAGE SQL;
-- checking the result table. NOTE: This is also not foolproof, if
-- the first command modifies data/state (because it can be partly
-- executed).
-CREATE OR REPLACE FUNCTION blackboard.is_clean_startup(global BOOL)
+CREATE OR REPLACE FUNCTION blackboard.is_new_run(global BOOL)
RETURNS BOOLEAN AS
$$
DECLARE
diff --git a/CEP/BB/BBSControl/sql/create_blackboard_tables.sql b/CEP/BB/BBSControl/sql/create_blackboard_tables.sql
index 44f9f6facce..37750f94110 100644
--- a/CEP/BB/BBSControl/sql/create_blackboard_tables.sql
+++ b/CEP/BB/BBSControl/sql/create_blackboard_tables.sql
@@ -14,7 +14,7 @@ CREATE TABLE blackboard.strategy
"WorkDomainSize.Time" DOUBLE PRECISION NOT NULL,
"Correlation.Selection" TEXT DEFAULT 'CROSS',
- "Correlation.Type" TEXT DEFAULT '["XX","XY","YX","YY"]'
+ "Correlation.Type" TEXT DEFAULT '[]'
);
@@ -26,7 +26,9 @@ CREATE SEQUENCE blackboard.command_id_seq;
CREATE TABLE blackboard.command
(
id INTEGER PRIMARY KEY,
- timestamp TIMESTAMP WITH TIME ZONE DEFAULT now()
+ timestamp TIMESTAMP WITH TIME ZONE DEFAULT now(),
+
+ "Type" TEXT NOT NULL
);
@@ -43,12 +45,12 @@ CREATE TABLE blackboard.step
"Baselines.Station2" TEXT DEFAULT '[]',
"Correlation.Selection" TEXT DEFAULT 'CROSS',
- "Correlation.Type" TEXT DEFAULT '["XX","XY","YX","YY"]',
+ "Correlation.Type" TEXT DEFAULT '[]',
"Sources" TEXT DEFAULT '[]',
"InstrumentModel" TEXT DEFAULT '[]',
- "OutputData" TEXT DEFAULT 'CORRECTED_DATA'
+ "OutputData" TEXT NOT NULL
);
@@ -56,10 +58,10 @@ CREATE TABLE blackboard.solve_arguments
(
step_id INTEGER UNIQUE NOT NULL REFERENCES blackboard.step (id) ON DELETE CASCADE,
- "MaxIter" INTEGER DEFAULT 1,
- "Epsilon" DOUBLE PRECISION DEFAULT 1e-6,
- "MinConverged" DOUBLE PRECISION DEFAULT 100.0,
- "Parms" TEXT DEFAULT '[]',
+ "MaxIter" INTEGER NOT NULL,
+ "Epsilon" DOUBLE PRECISION NOT NULL,
+ "MinConverged" DOUBLE PRECISION NOT NULL,
+ "Parms" TEXT NOT NULL,
"ExclParms" TEXT DEFAULT '[]',
"DomainSize.Freq" DOUBLE PRECISION NOT NULL,
"DomainSize.Time" DOUBLE PRECISION NOT NULL
@@ -93,7 +95,7 @@ CREATE TABLE blackboard.result
timestamp TIMESTAMP WITH TIME ZONE DEFAULT now(),
node INET DEFAULT inet_client_addr(),
- result_code INTEGER DEFAULT 0,
+ result_code INTEGER NOT NULL,
message TEXT NOT NULL
);
diff --git a/CEP/BB/BBSControl/src/CommandQueue.cc b/CEP/BB/BBSControl/src/CommandQueue.cc
index 86ad0391cd9..e1b71c683a6 100644
--- a/CEP/BB/BBSControl/src/CommandQueue.cc
+++ b/CEP/BB/BBSControl/src/CommandQueue.cc
@@ -241,7 +241,7 @@ namespace LOFAR
// Compose the query.
ostringstream query;
- query << "SELECT * FROM blackboard.is_clean_startup('"
+ query << "SELECT * FROM blackboard.is_new_run('"
<< (isGlobalCtrl ? "TRUE" : "FALSE")
<< "') AS result";
--
GitLab