Author: [log in to unmask]
Date: Tue Sep 1 19:06:14 2015
New Revision: 3490
Log:
Remove EVIO files DAO as it will be replaced by datacat.
Removed:
java/trunk/run-database/src/main/java/org/hps/run/database/EvioFilesDao.java
java/trunk/run-database/src/main/java/org/hps/run/database/EvioFilesDaoImpl.java
Modified:
java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDaoImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseDaoFactory.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDaoImpl.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryImpl.java
Modified: java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDaoImpl.java
=============================================================================
--- java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDaoImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/EpicsDataDaoImpl.java Tue Sep 1 19:06:14 2015
@@ -9,9 +9,14 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.hps.record.epics.EpicsData;
import org.hps.record.epics.EpicsHeader;
+import org.hps.record.epics.EpicsRunProcessor;
+import org.lcsim.util.log.DefaultLogFormatter;
+import org.lcsim.util.log.LogUtil;
/**
* Implementation of database operations for EPICS data.
@@ -20,6 +25,12 @@
*/
final class EpicsDataDaoImpl implements EpicsDataDao {
+ /**
+ * Setup class logger.
+ */
+ private static final Logger LOGGER = LogUtil
+ .create(EpicsDataDaoImpl.class, new DefaultLogFormatter(), Level.INFO);
+
/**
* The database connection.
*/
@@ -232,10 +243,12 @@
insertStatement.setDouble(parameterIndex, value);
++parameterIndex;
}
- final int dataRowsCreated = insertStatement.executeUpdate();
+ final int dataRowsCreated = insertStatement.executeUpdate();
if (dataRowsCreated == 0) {
throw new SQLException("Creation of EPICS data failed; no rows affected.");
}
+ LOGGER.info("inserted EPICS data with run " + epicsHeader.getRun() + ", seq " + epicsHeader.getSequence() + "timestamp "
+ + epicsHeader.getTimestamp());
insertStatement.close();
}
} catch (final SQLException e) {
Modified: java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseDaoFactory.java
=============================================================================
--- java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseDaoFactory.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseDaoFactory.java Tue Sep 1 19:06:14 2015
@@ -57,15 +57,6 @@
}
/**
- * Get the EVIO files DAO.
- *
- * @return the EVIO files DAO
- */
- public EvioFilesDao createEvioFilesDao() {
- return new EvioFilesDaoImpl(connection);
- }
-
- /**
* Get the run summary DAO.
*
* @return the run summary DAO
Modified: java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDaoImpl.java
=============================================================================
--- java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDaoImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryDaoImpl.java Tue Sep 1 19:06:14 2015
@@ -71,11 +71,6 @@
private EpicsDataDao epicsDataDao = null;
/**
- * The database API for EVIO file information.
- */
- private EvioFilesDao evioFilesDao = null;
-
- /**
* The database API for scaler data.
*/
private ScalerDataDao scalerDataDao = null;
@@ -100,7 +95,6 @@
// Setup DAO API objects for managing complex object state.
epicsDataDao = new EpicsDataDaoImpl(this.connection);
scalerDataDao = new ScalerDataDaoImpl(this.connection);
- evioFilesDao = new EvioFilesDaoImpl(this.connection);
triggerConfigIntDao = new TriggerConfigDaoImpl(this.connection);
}
@@ -120,9 +114,6 @@
// Delete scaler data.
this.scalerDataDao.deleteScalerData(run);
-
- // Delete file list.
- this.evioFilesDao.deleteEvioFiles(run);
// Delete trigger config.
this.triggerConfigIntDao.deleteTriggerConfigInt(run);
@@ -383,10 +374,6 @@
// Insert basic run log info.
this.insertRunSummary(runSummary);
- // Insert list of files.
- LOGGER.info("inserting EVIO " + runSummary.getEvioFiles().size() + " files");
- evioFilesDao.insertEvioFiles(runSummary.getEvioFiles(), runSummary.getRun());
-
// Insert EPICS data.
LOGGER.info("inserting " + runSummary.getEpicsData().size() + " EPICS records");
epicsDataDao.insertEpicsData(runSummary.getEpicsData());
@@ -451,9 +438,6 @@
// Read scaler data and set on RunSummary.
runSummary.setScalerData(scalerDataDao.getScalerData(run));
-
- // Read EVIO file list and set on RunSummary.
- runSummary.setEvioFiles(evioFilesDao.getEvioFiles(run));
// Read trigger config.
runSummary.setTriggerConfigInt(triggerConfigIntDao.getTriggerConfig(run));
Modified: java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryImpl.java
=============================================================================
--- java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryImpl.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunSummaryImpl.java Tue Sep 1 19:06:14 2015
@@ -373,9 +373,17 @@
*/
@Override
public String toString() {
- return "RunSummary { run: " + this.getRun() + ", startDate: " + DATE_DISPLAY.format(this.getStartDate())
- + ", endDate: " + DATE_DISPLAY.format(this.getEndDate()) + ", totalEvents: " + this.getTotalEvents()
- + ", totalFiles: " + this.getTotalFiles() + ", endOkay: " + this.getEndOkay() + ", runOkay: "
- + this.getRunOkay() + ", updated: " + this.getUpdated() + ", created: " + this.getCreated() + " }";
- }
+ return "RunSummary { "
+ + "run: " + this.getRun()
+ + ", startDate: " + (this.getStartDate() != null ? DATE_DISPLAY.format(this.getStartDate()) : null)
+ + ", endDate: " + (this.getEndDate() != null ? DATE_DISPLAY.format(this.getEndDate()) : null)
+ + ", totalEvents: " + this.getTotalEvents()
+ + ", totalFiles: " + this.getTotalFiles()
+ + ", endOkay: " + this.getEndOkay()
+ + ", runOkay: "
+ + this.getRunOkay()
+ + ", updated: " + this.getUpdated()
+ + ", created: " + this.getCreated()
+ + " }";
+ }
}
