Changeset 33753

Timestamp:

Apr 10, 2012, 3:49:19 PM (14 years ago)

Author:

rhenders

Message:

added table for object batches; new default for base_path; new fields for queueing OB batches in batch table and 'active' in config table.

File:

• trunk/ippToPsps/config/ippToPspsDbSchema.sql (modified) (8 diffs)

trunk/ippToPsps/config/ippToPspsDbSchema.sql

@@ -45 +45 @@
   `purged` tinyint(4) NOT NULL default '0',
   PRIMARY KEY  (`batch_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=326479 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=328286 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -65 +65 @@
   KEY `fk_config` (`config`),
   CONSTRAINT `fk_config` FOREIGN KEY (`config`) REFERENCES `config` (`name`) ON DELETE CASCADE
-) ENGINE=InnoDB AUTO_INCREMENT=25457 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=44588 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -87 +87 @@
   PRIMARY KEY  (`id`),
   UNIQUE KEY `unique_key` (`host`,`pid`)
-) ENGINE=InnoDB AUTO_INCREMENT=961 DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB AUTO_INCREMENT=1227 DEFAULT CHARSET=latin1;
 SET character_set_client = @saved_cs_client;
 
@@ -110 +110 @@
   `max_dec` double default '90',
   `box_size` double default '4',
-  `base_path` varchar(1000) default NULL,
+  `base_path` varchar(1000) default '/data/ipp005.0/ipptopsps/',
   `data_release` smallint(6) default '0',
   `delete_local` tinyint(1) default '0',
@@ -120 +120 @@
   `queue_P2` tinyint(1) default '1',
   `queue_ST` tinyint(1) default '0',
+  `queue_OB` tinyint(1) default '0',
+  `active` tinyint(1) default '1',
   UNIQUE KEY `name` (`name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -141 +143 @@
 
 --
+-- Table structure for table `object`
+--
+
+DROP TABLE IF EXISTS `object`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `object` (
+  `batch_id` bigint(20) unsigned NOT NULL,
+  `region` varchar(50) default NULL,
+  KEY `batch_id` (`batch_id`),
+  CONSTRAINT `object_fk_1` FOREIGN KEY (`batch_id`) REFERENCES `batch` (`batch_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+SET character_set_client = @saved_cs_client;
+
+--
 -- Table structure for table `pending`
 --
@@ -151 +168 @@
   `batch_type` varchar(10) default NULL,
   `stage_id` bigint(20) default NULL,
-  `ra_bore` float default NULL,
-  `dec_bore` float default NULL,
   UNIQUE KEY `a_key` (`box_id`,`stage_id`,`batch_type`),
+  UNIQUE KEY `stage_id_key` (`stage_id`),
   CONSTRAINT `box_key` FOREIGN KEY (`box_id`) REFERENCES `box` (`id`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
@@ -199 +215 @@
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2012-03-22  7:59:34
+-- Dump completed on 2012-04-10  6:00:59