diff --git a/admin/local/docker/compose/docker-compose.yml b/admin/local/docker/compose/docker-compose.yml index 6fd2dfebad..6c02ba9430 100644 --- a/admin/local/docker/compose/docker-compose.yml +++ b/admin/local/docker/compose/docker-compose.yml @@ -103,7 +103,7 @@ services: << : *worker-xrootd command: > entrypoint worker-xrootd - --db-uri mysql://qsmaster@127.0.0.1:3306 + --db-uri mysql://qsmaster:CHANGEME2@127.0.0.1:3306 --db-admin-uri mysql://root:CHANGEME@127.0.0.1:3306 --vnid-config "@/usr/local/lib64/libreplica.so {{db_uri}}/qservw_worker 0 0" --repl-instance-id qserv_proj @@ -138,8 +138,8 @@ services: << : *worker-cmsd command: > entrypoint worker-cmsd - --db-uri mysql://qsmaster@worker_mariadb_0:3306 - --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster@127.0.0.1:3306/qservw_worker 0 0" + --db-uri mysql://qsmaster:CHANGEME2@worker_mariadb_0:3306 + --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster:CHANGEME2@127.0.0.1:3306/qservw_worker 0 0" --results-dirname /qserv/data/results --repl-instance-id qserv_proj --repl-auth-key replauthkey @@ -208,9 +208,9 @@ services: << : *worker-xrootd command: > entrypoint --log-level DEBUG worker-xrootd - --db-uri mysql://qsmaster@127.0.0.1:3306?socket={{db_socket}} + --db-uri mysql://qsmaster:CHANGEME2@127.0.0.1:3306?socket={{db_socket}} --db-admin-uri mysql://root:CHANGEME@127.0.0.1:3306?socket={{db_socket}} - --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster@127.0.0.1:3306/qservw_worker 0 0" + --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster:CHANGEME2@127.0.0.1:3306/qservw_worker 0 0" --repl-instance-id qserv_proj --repl-auth-key replauthkey --repl-admin-auth-key=repladminauthkey @@ -244,8 +244,8 @@ services: << : *worker-cmsd command: > entrypoint --log-level DEBUG worker-cmsd - --db-uri mysql://qsmaster@worker_mariadb_1:3306?socket=/qserv/mariadb/run/mysqld.sock - --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster@127.0.0.1:3306/qservw_worker 0 0" + --db-uri mysql://qsmaster:CHANGEME2@worker_mariadb_1:3306?socket=/qserv/mariadb/run/mysqld.sock + --vnid-config "@/usr/local/lib64/libreplica.so mysql://qsmaster:CHANGEME2@127.0.0.1:3306/qservw_worker 0 0" --results-dirname /qserv/data/results --repl-instance-id qserv_proj --repl-auth-key replauthkey @@ -357,7 +357,7 @@ services: init: true command: > entrypoint --log-level DEBUG proxy - --db-uri mysql://qsmaster@127.0.0.1:3306?socket={{db_socket}} + --db-uri mysql://qsmaster:CHANGEME2@127.0.0.1:3306?socket={{db_socket}} --db-admin-uri mysql://root:CHANGEME@127.0.0.1:3306?socket={{db_socket}} --targs db_socket=/qserv/mariadb/run/mysqld.sock --xrootd-manager czar_xrootd @@ -395,7 +395,7 @@ services: init: true command: > entrypoint --log-level DEBUG czar-http - --db-uri mysql://qsmaster@czar_mariadb:3306/ + --db-uri mysql://qsmaster:CHANGEME2@czar_mariadb:3306/ --xrootd-manager czar_xrootd --czar-name http --http-port 4048 diff --git a/admin/tools/docker/base/Dockerfile b/admin/tools/docker/base/Dockerfile index 6e1fc1ec08..50150e7900 100644 --- a/admin/tools/docker/base/Dockerfile +++ b/admin/tools/docker/base/Dockerfile @@ -112,6 +112,7 @@ RUN cd /usr/share/java \ RUN cd /tmp \ && git clone https://github.com/lsst/mysqlproxy \ && cd mysqlproxy \ + && git checkout 0.8.5.lsst8 \ && cp /usr/lib64/pkgconfig/lua-5.1.pc /usr/lib64/pkgconfig/lua5.1.pc \ && ./configure \ && make \ diff --git a/admin/tools/docker/mariadb/Dockerfile b/admin/tools/docker/mariadb/Dockerfile index d70a60dbae..5749546b8e 100644 --- a/admin/tools/docker/mariadb/Dockerfile +++ b/admin/tools/docker/mariadb/Dockerfile @@ -15,7 +15,7 @@ FROM ubuntu:focal AS mariadb-scisql-builder RUN apt-get update \ && apt-get install -y curl \ - && curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | bash -s -- --mariadb-server-version="mariadb-10.6.8" \ + && curl -LsS https://r.mariadb.com/downloads/mariadb_repo_setup | bash -s -- --mariadb-server-version="mariadb-11.4.4" \ && apt-get install -y g++ make git python3 libmariadb-dev \ && update-alternatives --install /usr/bin/python python /usr/bin/python3 0 @@ -40,7 +40,7 @@ RUN chmod a+r /tmp/scisql/build/deploy.mysql # off-the-shelf mariadb image. This produces a generic "mariadb with scisql installed" container image. #------------------------------------------------------------------------------------------------------------- -FROM mariadb:10.6.8 AS mariadb-scisql +FROM mariadb:11.4.4 AS mariadb-scisql COPY --from=mariadb-scisql-builder /tmp/scisql/build/libscisql-scisql_0.3.so /usr/lib/mysql/plugin COPY --from=mariadb-scisql-builder /tmp/scisql/build/deploy.mysql /docker-entrypoint-initdb.d/scisql.sql diff --git a/doc/admin/admin-upgrade.rst b/doc/admin/admin-upgrade.rst new file mode 100644 index 0000000000..74cc821802 --- /dev/null +++ b/doc/admin/admin-upgrade.rst @@ -0,0 +1,30 @@ +.. _admin-upgrade: + +Instructins for upgrading Qserv to newer releases +================================================= + +.. _admin-upgrade-mariadb-11-4-4: + +Upgrading Qserv to MariaDB 11.4.4 +--------------------------------- + +MariaDB 11.4.4 is a major release that introduces a number of new features and +improvements. If your instance of Qserv is still based on MariaDB 10.6.8, you +need to upgrade your data to the new version. + +To upgrade your Qserv installation to MariaDB 11.4.4, follow these steps: + +- Read the `MariaDB 11.4.4 release notes `_ to learn about the new features and improvements. +- Read the guide `Upgrading from MariaDB 10.6 to MariaDB 10.11 `_ to learn how to upgrade your databases. +- Turn Qserv into the database-only mode by ensuring that all but the MariaDB services are being run. +- Log into the MariaDB containers and run the database upgrade command as shown below: + + .. code-block:: bash + + mariadb-upgrade -P3306 -h127.0.0.1 --protocol=tcp -uroot -p****** + + Where ``-P`` specifies the port number, ``-h`` specifies the host, ``-u`` specifies the user, and ``-p`` specifies the password. + Note that the port number may be different in your installation. + +Experiments with the production databases at USDF (SLAC) have shown that the upgrade process is safe and reliable. +However, it is still recommended to make a backup of your data before proceeding with the upgrade. diff --git a/doc/admin/index.rst b/doc/admin/index.rst index 24bb3322b6..fb13e2702a 100644 --- a/doc/admin/index.rst +++ b/doc/admin/index.rst @@ -5,6 +5,13 @@ Administrator's Guide ##################### +.. warning:: + + This version of Qserv uses MariaDB version 11.4.4. If you still have an older release based on + MariaDB 10.6.8 then you should upgrade your databases as described in the following section: + + - :ref:`admin-upgrade-mariadb-11-4-4` + .. toctree:: :maxdepth: 4 @@ -12,3 +19,4 @@ Administrator's Guide row-counters data-table-indexes director-index + admin-upgrade diff --git a/itest_src/datasets/case01/data/schema/Filter.schema b/itest_src/datasets/case01/data/schema/Filter.schema index 0ba1cd8719..4aed19bc36 100644 --- a/itest_src/datasets/case01/data/schema/Filter.schema +++ b/itest_src/datasets/case01/data/schema/Filter.schema @@ -1,39 +1,6 @@ --- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) --- --- Host: localhost Database: case01_m --- ------------------------------------------------------ --- Server version 5.1.61-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Filter` --- - -DROP TABLE IF EXISTS `Filter`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Filter` ( `filterId` tinyint(4) NOT NULL, `filterName` char(3) NOT NULL, `photClam` float NOT NULL, `photBW` float NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-03-28 10:31:56 diff --git a/itest_src/datasets/case01/data/schema/LeapSeconds.schema b/itest_src/datasets/case01/data/schema/LeapSeconds.schema index baf66c5ac0..f40a6caa37 100644 --- a/itest_src/datasets/case01/data/schema/LeapSeconds.schema +++ b/itest_src/datasets/case01/data/schema/LeapSeconds.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) --- --- Host: localhost Database: rplante_PT1_2_u_pt12prod_im3000 --- ------------------------------------------------------ --- Server version 5.1.61-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `LeapSeconds` --- - -DROP TABLE IF EXISTS `LeapSeconds`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `LeapSeconds` ( `whenJd` float NOT NULL, `offset` float NOT NULL, @@ -29,14 +7,3 @@ CREATE TABLE `LeapSeconds` ( `whenUtc` bigint(20) DEFAULT NULL, `whenTai` bigint(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-04-16 10:56:43 diff --git a/itest_src/datasets/case01/data/schema/Logs.schema b/itest_src/datasets/case01/data/schema/Logs.schema index 52528a9943..76a2dd69c5 100644 --- a/itest_src/datasets/case01/data/schema/Logs.schema +++ b/itest_src/datasets/case01/data/schema/Logs.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.5.20, for Linux (x86_64) --- --- Host: localhost Database: test --- ------------------------------------------------------ --- Server version 5.5.20-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Logs` --- - -DROP TABLE IF EXISTS `Logs`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Logs` ( `id` int(11) NOT NULL AUTO_INCREMENT, `HOSTID` varchar(80) DEFAULT NULL, @@ -48,14 +26,3 @@ CREATE TABLE `Logs` ( PRIMARY KEY (`id`), KEY `a` (`RUNID`) ) ENGINE=MyISAM AUTO_INCREMENT=1001 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-04-16 16:31:24 diff --git a/itest_src/datasets/case01/data/schema/Object.schema b/itest_src/datasets/case01/data/schema/Object.schema index edbcd9f1b0..624f2fe308 100644 --- a/itest_src/datasets/case01/data/schema/Object.schema +++ b/itest_src/datasets/case01/data/schema/Object.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) --- --- Host: localhost Database: case01_m --- ------------------------------------------------------ --- Server version 5.1.61-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Object` --- - -DROP TABLE IF EXISTS `Object`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Object` ( `objectId` bigint(20) NOT NULL, `iauId` char(34) DEFAULT NULL, @@ -250,14 +228,3 @@ CREATE TABLE `Object` ( `yFlags` int(11) DEFAULT NULL, `varBinaryField` varbinary(100) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-03-28 10:31:56 diff --git a/itest_src/datasets/case01/data/schema/RefSrcMatch.schema b/itest_src/datasets/case01/data/schema/RefSrcMatch.schema index 2a7e1165e3..14ee672f7c 100644 --- a/itest_src/datasets/case01/data/schema/RefSrcMatch.schema +++ b/itest_src/datasets/case01/data/schema/RefSrcMatch.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) --- --- Host: localhost Database: tmp1 --- ------------------------------------------------------ --- Server version 5.1.61-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `RefSrcMatch` --- - -DROP TABLE IF EXISTS `RefSrcMatch`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `RefSrcMatch` ( `refObjectId` bigint(20) DEFAULT NULL, `sourceId` bigint(20) DEFAULT NULL, @@ -34,14 +12,3 @@ CREATE TABLE `RefSrcMatch` ( KEY `sourceId` (`sourceId`), KEY `refObjectId` (`refObjectId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-04-16 15:20:06 diff --git a/itest_src/datasets/case01/data/schema/Science_Ccd_Exposure.schema b/itest_src/datasets/case01/data/schema/Science_Ccd_Exposure.schema index 58a2658578..99b48d756d 100644 --- a/itest_src/datasets/case01/data/schema/Science_Ccd_Exposure.schema +++ b/itest_src/datasets/case01/data/schema/Science_Ccd_Exposure.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) --- --- Host: localhost Database: case01_m --- ------------------------------------------------------ --- Server version 5.1.61-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Science_Ccd_Exposure` --- - -DROP TABLE IF EXISTS `Science_Ccd_Exposure`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Science_Ccd_Exposure` ( `scienceCcdExposureId` bigint(20) NOT NULL, `visit` int(11) NOT NULL, @@ -67,14 +45,3 @@ CREATE TABLE `Science_Ccd_Exposure` ( `poly` binary(120) NOT NULL, `flags` int(11) NOT NULL DEFAULT '0' ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-03-28 10:31:57 diff --git a/itest_src/datasets/case01/data/schema/SimRefObject.schema b/itest_src/datasets/case01/data/schema/SimRefObject.schema index 7ff04de060..d731614673 100644 --- a/itest_src/datasets/case01/data/schema/SimRefObject.schema +++ b/itest_src/datasets/case01/data/schema/SimRefObject.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) --- --- Host: localhost Database: tmp1 --- ------------------------------------------------------ --- Server version 5.1.61-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `SimRefObject` --- - -DROP TABLE IF EXISTS `SimRefObject`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `SimRefObject` ( `refObjectId` bigint(20) NOT NULL, `isStar` tinyint(4) NOT NULL, @@ -52,14 +30,3 @@ CREATE TABLE `SimRefObject` ( `zCov` smallint(6) NOT NULL, `yCov` smallint(6) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-04-16 15:20:21 diff --git a/itest_src/datasets/case01/data/schema/Source.schema b/itest_src/datasets/case01/data/schema/Source.schema index a2fe7ad32a..42e609b29f 100644 --- a/itest_src/datasets/case01/data/schema/Source.schema +++ b/itest_src/datasets/case01/data/schema/Source.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) --- --- Host: localhost Database: case01_m --- ------------------------------------------------------ --- Server version 5.1.61-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Source` --- - -DROP TABLE IF EXISTS `Source`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Source` ( `sourceId` bigint(20) NOT NULL, `scienceCcdExposureId` bigint(20) DEFAULT NULL, @@ -130,14 +108,3 @@ CREATE TABLE `Source` ( `flagForWcs` smallint(6) DEFAULT NULL, `blobField` blob DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-03-28 10:31:56 diff --git a/itest_src/datasets/case01/data/schema/sdqa_Metric.schema b/itest_src/datasets/case01/data/schema/sdqa_Metric.schema index 2a8fb71647..778f6748db 100644 --- a/itest_src/datasets/case01/data/schema/sdqa_Metric.schema +++ b/itest_src/datasets/case01/data/schema/sdqa_Metric.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for redhat-linux-gnu (x86_64) --- --- Host: localhost Database: rplante_PT1_2_u_pt12prod_im3000 --- ------------------------------------------------------ --- Server version 5.1.61-log - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `sdqa_Metric` --- - -DROP TABLE IF EXISTS `sdqa_Metric`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `sdqa_Metric` ( `sdqa_metricId` smallint(6) NOT NULL AUTO_INCREMENT, `metricName` varchar(30) NOT NULL, @@ -29,14 +7,3 @@ CREATE TABLE `sdqa_Metric` ( PRIMARY KEY (`sdqa_metricId`), UNIQUE KEY `UQ_sdqaMetric_metricName` (`metricName`) ) ENGINE=MyISAM AUTO_INCREMENT=54 DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2012-04-16 14:41:27 diff --git a/itest_src/datasets/case02/data/schema/Object.schema b/itest_src/datasets/case02/data/schema/Object.schema index 32ce7220b2..b3a3788807 100644 --- a/itest_src/datasets/case02/data/schema/Object.schema +++ b/itest_src/datasets/case02/data/schema/Object.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.11 --- --- Host: localhost Database: rplante_pt11 --- ------------------------------------------------------ --- Server version 5.0.77 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- 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` ( `objectId` bigint(20) NOT NULL, `iauId` char(34) default NULL, @@ -249,14 +227,3 @@ CREATE TABLE `Object` ( PRIMARY KEY (`objectId`), KEY `IDX_Object_decl` (`decl_PS`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -SET character_set_client = @saved_cs_client; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2011-02-24 2:47:15 diff --git a/itest_src/datasets/case02/data/schema/Source.schema b/itest_src/datasets/case02/data/schema/Source.schema index 86f4f03836..d9d71d8646 100644 --- a/itest_src/datasets/case02/data/schema/Source.schema +++ b/itest_src/datasets/case02/data/schema/Source.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.51, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: rplante_DC3b_u_pt11final --- ------------------------------------------------------ --- Server version 5.1.51 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Source` --- - -DROP TABLE IF EXISTS `Source`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Source` ( `sourceId` bigint(20) NOT NULL, `scienceCcdExposureId` bigint(20) DEFAULT NULL, @@ -121,14 +99,3 @@ CREATE TABLE `Source` ( KEY `IDX_procHistoryId` (`procHistoryId`), KEY `IDX_Source_decl` (`decl`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2011-03-07 16:04:11 diff --git a/itest_src/datasets/case03/data/schema/AvgForcedPhot.schema b/itest_src/datasets/case03/data/schema/AvgForcedPhot.schema index 6c9b2b6077..c76332005d 100644 --- a/itest_src/datasets/case03/data/schema/AvgForcedPhot.schema +++ b/itest_src/datasets/case03/data/schema/AvgForcedPhot.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `AvgForcedPhot` --- - -DROP TABLE IF EXISTS `AvgForcedPhot`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `AvgForcedPhot` ( `deepSourceId` bigint(20) NOT NULL, `ra` double NOT NULL, @@ -52,14 +30,3 @@ CREATE TABLE `AvgForcedPhot` ( PRIMARY KEY (`deepSourceId`), KEY `IDX_htmId20` (`htmId20`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:02 diff --git a/itest_src/datasets/case03/data/schema/AvgForcedPhotYearly.schema b/itest_src/datasets/case03/data/schema/AvgForcedPhotYearly.schema index c98f7bc9f5..0443894aa4 100644 --- a/itest_src/datasets/case03/data/schema/AvgForcedPhotYearly.schema +++ b/itest_src/datasets/case03/data/schema/AvgForcedPhotYearly.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `AvgForcedPhotYearly` --- - -DROP TABLE IF EXISTS `AvgForcedPhotYearly`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `AvgForcedPhotYearly` ( `deepSourceId` bigint(20) NOT NULL, `year` tinyint(4) NOT NULL, @@ -47,14 +25,3 @@ CREATE TABLE `AvgForcedPhotYearly` ( PRIMARY KEY (`deepSourceId`,`year`), KEY `IDX_htmId20` (`htmId20`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:02 diff --git a/itest_src/datasets/case03/data/schema/DeepCoadd.schema b/itest_src/datasets/case03/data/schema/DeepCoadd.schema index 0a7de27983..1fba3c1cb0 100644 --- a/itest_src/datasets/case03/data/schema/DeepCoadd.schema +++ b/itest_src/datasets/case03/data/schema/DeepCoadd.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `DeepCoadd` --- - -DROP TABLE IF EXISTS `DeepCoadd`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `DeepCoadd` ( `deepCoaddId` bigint(20) NOT NULL, `tract` int(11) NOT NULL, @@ -60,14 +38,3 @@ CREATE TABLE `DeepCoadd` ( KEY `IDX_tract_patch_filterName` (`tract`,`patch`,`filterName`), KEY `FK_DeepCoadd_filterId` (`filterId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:03 diff --git a/itest_src/datasets/case03/data/schema/DeepCoadd_Metadata.schema b/itest_src/datasets/case03/data/schema/DeepCoadd_Metadata.schema index 2f68b4328e..10c7eb50f7 100644 --- a/itest_src/datasets/case03/data/schema/DeepCoadd_Metadata.schema +++ b/itest_src/datasets/case03/data/schema/DeepCoadd_Metadata.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `DeepCoadd_Metadata` --- - -DROP TABLE IF EXISTS `DeepCoadd_Metadata`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `DeepCoadd_Metadata` ( `deepCoaddId` bigint(20) NOT NULL, `metadataKey` varchar(255) NOT NULL, @@ -30,14 +8,3 @@ CREATE TABLE `DeepCoadd_Metadata` ( PRIMARY KEY (`deepCoaddId`,`metadataKey`), KEY `IDX_metadataKey` (`metadataKey`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:03 diff --git a/itest_src/datasets/case03/data/schema/DeepCoadd_To_Htm10.schema b/itest_src/datasets/case03/data/schema/DeepCoadd_To_Htm10.schema index 1f154c47c3..eabc469b63 100644 --- a/itest_src/datasets/case03/data/schema/DeepCoadd_To_Htm10.schema +++ b/itest_src/datasets/case03/data/schema/DeepCoadd_To_Htm10.schema @@ -1,39 +1,6 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `DeepCoadd_To_Htm10` --- - -DROP TABLE IF EXISTS `DeepCoadd_To_Htm10`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `DeepCoadd_To_Htm10` ( `deepCoaddId` bigint(20) NOT NULL, `htmId10` int(11) NOT NULL, KEY `IDX_htmId10` (`htmId10`), KEY `IDX_deepCoaddId` (`deepCoaddId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:03 diff --git a/itest_src/datasets/case03/data/schema/Filter.schema b/itest_src/datasets/case03/data/schema/Filter.schema index 33b24234d6..9a0015722c 100644 --- a/itest_src/datasets/case03/data/schema/Filter.schema +++ b/itest_src/datasets/case03/data/schema/Filter.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Filter` --- - -DROP TABLE IF EXISTS `Filter`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Filter` ( `filterId` tinyint(4) NOT NULL, `filterName` char(3) NOT NULL, @@ -27,14 +5,3 @@ CREATE TABLE `Filter` ( `photBW` float NOT NULL, PRIMARY KEY (`filterId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:03 diff --git a/itest_src/datasets/case03/data/schema/LeapSeconds.schema b/itest_src/datasets/case03/data/schema/LeapSeconds.schema index 47b05e9c30..f40a6caa37 100644 --- a/itest_src/datasets/case03/data/schema/LeapSeconds.schema +++ b/itest_src/datasets/case03/data/schema/LeapSeconds.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `LeapSeconds` --- - -DROP TABLE IF EXISTS `LeapSeconds`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `LeapSeconds` ( `whenJd` float NOT NULL, `offset` float NOT NULL, @@ -29,14 +7,3 @@ CREATE TABLE `LeapSeconds` ( `whenUtc` bigint(20) DEFAULT NULL, `whenTai` bigint(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:03 diff --git a/itest_src/datasets/case03/data/schema/RefDeepSrcMatch.schema b/itest_src/datasets/case03/data/schema/RefDeepSrcMatch.schema index eef867e9ab..ffb51b7f39 100644 --- a/itest_src/datasets/case03/data/schema/RefDeepSrcMatch.schema +++ b/itest_src/datasets/case03/data/schema/RefDeepSrcMatch.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `RefDeepSrcMatch` --- - -DROP TABLE IF EXISTS `RefDeepSrcMatch`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `RefDeepSrcMatch` ( `ra` double DEFAULT NULL, `decl` double DEFAULT NULL, @@ -37,14 +15,3 @@ CREATE TABLE `RefDeepSrcMatch` ( KEY `refObjectId_2` (`refObjectId`,`deepSourceId`), KEY `deepSourceId_2` (`deepSourceId`,`refObjectId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:03 diff --git a/itest_src/datasets/case03/data/schema/RefObject.schema b/itest_src/datasets/case03/data/schema/RefObject.schema index bfb1ff8215..01ccc474ff 100644 --- a/itest_src/datasets/case03/data/schema/RefObject.schema +++ b/itest_src/datasets/case03/data/schema/RefObject.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `RefObject` --- - -DROP TABLE IF EXISTS `RefObject`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `RefObject` ( `refObjectId` bigint(20) NOT NULL, `run` smallint(6) DEFAULT NULL, @@ -55,14 +33,3 @@ CREATE TABLE `RefObject` ( KEY `IDX_decl` (`decl`), KEY `IDX_htmId20` (`htmId20`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:03 diff --git a/itest_src/datasets/case03/data/schema/RunDeepForcedSource.schema b/itest_src/datasets/case03/data/schema/RunDeepForcedSource.schema index 1efe70607f..e490b45362 100644 --- a/itest_src/datasets/case03/data/schema/RunDeepForcedSource.schema +++ b/itest_src/datasets/case03/data/schema/RunDeepForcedSource.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `RunDeepForcedSource` --- - -DROP TABLE IF EXISTS `RunDeepForcedSource`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `RunDeepForcedSource` ( `id` bigint(20) NOT NULL, `coord_ra` double DEFAULT NULL, @@ -117,14 +95,3 @@ CREATE TABLE `RunDeepForcedSource` ( KEY `objectId` (`objectId`), KEY `coord_ra` (`coord_ra`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:03 diff --git a/itest_src/datasets/case03/data/schema/RunDeepSource.schema b/itest_src/datasets/case03/data/schema/RunDeepSource.schema index 9a99a4c7a2..e89a2d44b7 100644 --- a/itest_src/datasets/case03/data/schema/RunDeepSource.schema +++ b/itest_src/datasets/case03/data/schema/RunDeepSource.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `RunDeepSource` --- - -DROP TABLE IF EXISTS `RunDeepSource`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `RunDeepSource` ( `id` bigint(20) NOT NULL, `coord_ra` double DEFAULT NULL, @@ -166,14 +144,3 @@ CREATE TABLE `RunDeepSource` ( KEY `IDX_coadd_id` (`coadd_id`), KEY `IDX_coadd_filter_id` (`coadd_filter_id`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:22 diff --git a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure.schema b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure.schema index 3bafa32e4b..9153f1c651 100644 --- a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure.schema +++ b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Science_Ccd_Exposure` --- - -DROP TABLE IF EXISTS `Science_Ccd_Exposure`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Science_Ccd_Exposure` ( `scienceCcdExposureId` bigint(20) NOT NULL, `run` int(11) NOT NULL, @@ -66,14 +44,3 @@ CREATE TABLE `Science_Ccd_Exposure` ( KEY `IDX_htmId20` (`htmId20`), KEY `FK_Science_Ccd_Exposure_filterId` (`filterId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:22 diff --git a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_Metadata.schema b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_Metadata.schema index c9f952d4b8..52b1f30a8d 100644 --- a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_Metadata.schema +++ b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_Metadata.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Science_Ccd_Exposure_Metadata` --- - -DROP TABLE IF EXISTS `Science_Ccd_Exposure_Metadata`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Science_Ccd_Exposure_Metadata` ( `scienceCcdExposureId` bigint(20) NOT NULL, `metadataKey` varchar(255) NOT NULL, @@ -30,14 +8,3 @@ CREATE TABLE `Science_Ccd_Exposure_Metadata` ( PRIMARY KEY (`scienceCcdExposureId`,`metadataKey`), KEY `IDX_metadataKey` (`metadataKey`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:22 diff --git a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_Metadata_coadd_r.schema b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_Metadata_coadd_r.schema index fcae47bc41..11395a15fd 100644 --- a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_Metadata_coadd_r.schema +++ b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_Metadata_coadd_r.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Science_Ccd_Exposure_Metadata_coadd_r` --- - -DROP TABLE IF EXISTS `Science_Ccd_Exposure_Metadata_coadd_r`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Science_Ccd_Exposure_Metadata_coadd_r` ( `scienceCcdExposureId` bigint(20) NOT NULL, `metadataKey` varchar(255) NOT NULL, @@ -30,14 +8,3 @@ CREATE TABLE `Science_Ccd_Exposure_Metadata_coadd_r` ( PRIMARY KEY (`scienceCcdExposureId`,`metadataKey`), KEY `IDX_metadataKey` (`metadataKey`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:23 diff --git a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_To_Htm10_coadd_r.schema b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_To_Htm10_coadd_r.schema index 455392cb6b..fb24b6d5ad 100644 --- a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_To_Htm10_coadd_r.schema +++ b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_To_Htm10_coadd_r.schema @@ -1,39 +1,6 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Science_Ccd_Exposure_To_Htm10_coadd_r` --- - -DROP TABLE IF EXISTS `Science_Ccd_Exposure_To_Htm10_coadd_r`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Science_Ccd_Exposure_To_Htm10_coadd_r` ( `scienceCcdExposureId` bigint(20) NOT NULL, `htmId10` int(11) NOT NULL, KEY `IDX_htmId10` (`htmId10`), KEY `IDX_scienceCcdExposureId` (`scienceCcdExposureId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:23 diff --git a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_coadd_r.schema b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_coadd_r.schema index ca9b214a46..1313abaefb 100644 --- a/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_coadd_r.schema +++ b/itest_src/datasets/case03/data/schema/Science_Ccd_Exposure_coadd_r.schema @@ -1,25 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Science_Ccd_Exposure_coadd_r` --- - -DROP TABLE IF EXISTS `Science_Ccd_Exposure_coadd_r`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Science_Ccd_Exposure_coadd_r` ( `scienceCcdExposureId` bigint(20) NOT NULL, `run` int(11) NOT NULL, @@ -66,14 +44,3 @@ CREATE TABLE `Science_Ccd_Exposure_coadd_r` ( KEY `IDX_htmId20` (`htmId20`), KEY `FK_Science_Ccd_Exposure_filterId` (`filterId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:23 diff --git a/itest_src/datasets/case03/data/schema/ZZZ_Db_Description.schema b/itest_src/datasets/case03/data/schema/ZZZ_Db_Description.schema index ab661d0a1e..bead9324d0 100644 --- a/itest_src/datasets/case03/data/schema/ZZZ_Db_Description.schema +++ b/itest_src/datasets/case03/data/schema/ZZZ_Db_Description.schema @@ -1,37 +1,4 @@ --- MySQL dump 10.13 Distrib 5.1.61, for unknown-linux-gnu (x86_64) --- --- Host: localhost Database: w2013 --- ------------------------------------------------------ --- Server version 5.1.61 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `ZZZ_Db_Description` --- - -DROP TABLE IF EXISTS `ZZZ_Db_Description`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `ZZZ_Db_Description` ( `f` varchar(255) DEFAULT NULL, `r` varchar(255) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; - -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2013-02-08 15:04:23 diff --git a/itest_src/datasets/case04/data/schema/DeepCoadd.schema b/itest_src/datasets/case04/data/schema/DeepCoadd.schema index 098fb04885..1fba3c1cb0 100644 --- a/itest_src/datasets/case04/data/schema/DeepCoadd.schema +++ b/itest_src/datasets/case04/data/schema/DeepCoadd.schema @@ -1,27 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.65, for unknown-linux-gnu (x86_64) --- --- Host: 127.0.0.1 Database: LSST --- ------------------------------------------------------ --- Server version 5.1.65 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `DeepCoadd` --- - -DROP TABLE IF EXISTS `DeepCoadd`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `DeepCoadd` ( `deepCoaddId` bigint(20) NOT NULL, `tract` int(11) NOT NULL, @@ -62,15 +38,3 @@ CREATE TABLE `DeepCoadd` ( KEY `IDX_tract_patch_filterName` (`tract`,`patch`,`filterName`), KEY `FK_DeepCoadd_filterId` (`filterId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2015-01-09 16:27:09 diff --git a/itest_src/datasets/case04/data/schema/DeepForcedSource.schema b/itest_src/datasets/case04/data/schema/DeepForcedSource.schema index c21d12d204..6cc0986878 100644 --- a/itest_src/datasets/case04/data/schema/DeepForcedSource.schema +++ b/itest_src/datasets/case04/data/schema/DeepForcedSource.schema @@ -1,27 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.65, for unknown-linux-gnu (x86_64) --- --- Host: 127.0.0.1 Database: LSST --- ------------------------------------------------------ --- Server version 5.1.65 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `DeepForcedSource_6970` --- - -DROP TABLE IF EXISTS `DeepForcedSource`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `DeepForcedSource` ( `deepForcedSourceId` bigint(20) NOT NULL, `scienceCcdExposureId` bigint(20) NOT NULL, @@ -83,15 +59,3 @@ CREATE TABLE `DeepForcedSource` ( PRIMARY KEY (`deepForcedSourceId`), KEY `deepSourceId` (`deepSourceId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2015-01-09 16:28:38 diff --git a/itest_src/datasets/case04/data/schema/DeepSource.schema b/itest_src/datasets/case04/data/schema/DeepSource.schema index 1c4448b8ee..a330e19036 100644 --- a/itest_src/datasets/case04/data/schema/DeepSource.schema +++ b/itest_src/datasets/case04/data/schema/DeepSource.schema @@ -1,27 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.65, for unknown-linux-gnu (x86_64) --- --- Host: 127.0.0.1 Database: LSST --- ------------------------------------------------------ --- Server version 5.1.65 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `DeepSource_6970` --- - -DROP TABLE IF EXISTS `DeepSource`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `DeepSource` ( `deepSourceId` bigint(20) NOT NULL, `parentDeepSourceId` bigint(20) DEFAULT NULL, @@ -81,15 +57,3 @@ CREATE TABLE `DeepSource` ( KEY `deepCoaddId` (`deepCoaddId`), KEY `parentDeepSourceId` (`parentDeepSourceId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2015-01-09 16:50:04 diff --git a/itest_src/datasets/case04/data/schema/DeepSourceDupKeys.schema b/itest_src/datasets/case04/data/schema/DeepSourceDupKeys.schema index 799bbc9ea4..9bc74d060e 100644 --- a/itest_src/datasets/case04/data/schema/DeepSourceDupKeys.schema +++ b/itest_src/datasets/case04/data/schema/DeepSourceDupKeys.schema @@ -1,27 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.65, for unknown-linux-gnu (x86_64) --- --- Host: 127.0.0.1 Database: LSST --- ------------------------------------------------------ --- Server version 5.1.65 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `DeepSource_6970` --- - -DROP TABLE IF EXISTS `DeepSourceDupKeys`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `DeepSourceDupKeys` ( `deepSourceId` bigint(20) NOT NULL, `parentDeepSourceId` bigint(20) DEFAULT NULL, @@ -81,15 +57,3 @@ CREATE TABLE `DeepSourceDupKeys` ( KEY `deepCoaddId` (`deepCoaddId`), KEY `parentDeepSourceId` (`parentDeepSourceId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2015-01-09 16:50:04 diff --git a/itest_src/datasets/case04/data/schema/Science_Ccd_Exposure.schema b/itest_src/datasets/case04/data/schema/Science_Ccd_Exposure.schema index 97a13b65c6..d90a65fd63 100644 --- a/itest_src/datasets/case04/data/schema/Science_Ccd_Exposure.schema +++ b/itest_src/datasets/case04/data/schema/Science_Ccd_Exposure.schema @@ -1,27 +1,3 @@ --- MySQL dump 10.13 Distrib 5.1.65, for unknown-linux-gnu (x86_64) --- --- Host: 127.0.0.1 Database: LSST --- ------------------------------------------------------ --- Server version 5.1.65 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!40101 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `Science_Ccd_Exposure` --- - -DROP TABLE IF EXISTS `Science_Ccd_Exposure`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!40101 SET character_set_client = utf8 */; CREATE TABLE `Science_Ccd_Exposure` ( `scienceCcdExposureId` bigint(20) NOT NULL, `run` int(11) NOT NULL, @@ -69,15 +45,3 @@ CREATE TABLE `Science_Ccd_Exposure` ( KEY `IDX_htmId20` (`htmId20`), KEY `FK_Science_Ccd_Exposure_filterId` (`filterId`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2015-01-09 16:27:10 diff --git a/src/admin/etc/integration_tests.yaml b/src/admin/etc/integration_tests.yaml index 64a4783c37..d1ee2a9056 100644 --- a/src/admin/etc/integration_tests.yaml +++ b/src/admin/etc/integration_tests.yaml @@ -1,8 +1,8 @@ --- -reference-db-uri: mysql://qsmaster@integration-test-reference:3306 +reference-db-uri: mysql://qsmaster:CHANGEME2@integration-test-reference:3306 reference-db-admin-uri: mysql://root:CHANGEME@integration-test-reference:3306 replication-controller-uri: repl://@repl_controller:25081 -qserv-uri: qserv://qsmaster@czar_proxy:4040 +qserv-uri: qserv://qsmaster:CHANGEME2@czar_proxy:4040 qserv-http-uri: https://czar_http:4048 czar-db-admin-uri: mysql://root:CHANGEME@czar_mariadb:3306 # The folder where the itest sources will be mounted in the container: diff --git a/src/admin/python/lsst/qserv/admin/cli/_integration_test.py b/src/admin/python/lsst/qserv/admin/cli/_integration_test.py index 0f67d9a67c..331625096c 100644 --- a/src/admin/python/lsst/qserv/admin/cli/_integration_test.py +++ b/src/admin/python/lsst/qserv/admin/cli/_integration_test.py @@ -62,35 +62,36 @@ def wait_for_replication_system(repl_ctrl_uri: str) -> None: ReplicationInterface(repl_ctrl_uri).version() -class CzarNotReady(RuntimeError): +class DbServiceNotReady(RuntimeError): pass - @backoff.on_exception( - exception=(CzarNotReady, mysql.connector.errors.DatabaseError, MySQLInterfaceError), + exception=(DbServiceNotReady, mysql.connector.errors.DatabaseError, MySQLInterfaceError), wait_gen=backoff.expo, on_backoff=on_backoff(log=_log), max_time=max_backoff_sec, ) -def wait_for_czar(czar_db_uri: str) -> None: - """Wait for the czar to be ready. +def wait_for_db_service(db_uri: str, checkdb: str) -> None: + """Wait for the database service to be ready. Parameters ---------- - czar_db_uri : str - The uri to the czar database. + db_uri : str + The uri to the database service. + checkdb : str + The name of the database to check for. Raises ------ - CzarNotReady - If the czar is not ready. This is handled by the backoff decorator until - a max wait time is exceeded, and then the excetpion will not be caught, + DbServiceNotReady + If the service is not ready. This is handled by the backoff decorator until + a max wait time is exceeded, and then the exception will not be caught, and can be handled above or test execution can be aborted. """ - parsed = urlparse(czar_db_uri) + parsed = urlparse(db_uri) def get_databases() -> List[str]: - """Get the names of the databases in the czar db.""" + """Get the names of the databases in the database service.""" with closing( mysql.connector.connect( user=parsed.username, @@ -104,10 +105,9 @@ def get_databases() -> List[str]: return [str(row[0]) for row in cursor.fetchall()] databases = get_databases() - checkdb = "qservMeta" if checkdb in databases: return - raise CzarNotReady(f"{checkdb} not in existing databases: {databases}") + raise DbServiceNotReady(f"{checkdb} not in existing databases: {databases}") def run_integration_tests( @@ -120,6 +120,7 @@ def run_integration_tests( tests_yaml: str, compare_results: bool, mysqld_user: str, + mysqld_password: str, ) -> itest.ITestResults: """Top level script to run the integration tests. @@ -148,6 +149,8 @@ def run_integration_tests( If True run query output comparison, if False do not. mysqld_user : `str` The name of the qserv user. + mysqld_password : `str` + The password for the qserv user. Returns ------- @@ -157,6 +160,7 @@ def run_integration_tests( save_template_cfg( dict( mysqld_user_qserv=mysqld_user, + mysqld_user_qserv_password=mysqld_password, ) ) @@ -171,7 +175,8 @@ def run_integration_tests( raise RuntimeError("qserv_testdata sources are not present.") if unload or load != False or reload or run_tests: - wait_for_czar(tests_data["czar-db-admin-uri"]) + wait_for_db_service(tests_data["reference-db-admin-uri"], "mysql") + wait_for_db_service(tests_data["czar-db-admin-uri"], "qservMeta") wait_for_replication_system(tests_data["replication-controller-uri"]) # If unload is True, and load is not specified (default is `None`, means @@ -235,6 +240,7 @@ def run_integration_tests_http( tests_yaml: str, compare_results: bool, mysqld_user: str, + mysqld_password: str, ) -> itest.ITestResults: """Top level script to run the integration tests of the HTTP frontend. @@ -263,6 +269,8 @@ def run_integration_tests_http( If True run query output comparison, if False do not. mysqld_user : `str` The name of the qserv user. + mysqld_password : `str` + The password for the qserv user. Returns ------- @@ -272,6 +280,7 @@ def run_integration_tests_http( save_template_cfg( dict( mysqld_user_qserv=mysqld_user, + mysqld_user_qserv_password=mysqld_password, ) ) @@ -286,7 +295,8 @@ def run_integration_tests_http( raise RuntimeError("qserv_testdata sources are not present.") if unload or load != False or reload or run_tests: - wait_for_czar(tests_data["czar-db-admin-uri"]) + wait_for_db_service(tests_data["reference-db-admin-uri"], "mysql") + wait_for_db_service(tests_data["czar-db-admin-uri"], "qservMeta") wait_for_replication_system(tests_data["replication-controller-uri"]) # If unload is True, and load is not specified (default is `None`, means @@ -368,7 +378,7 @@ def run_integration_tests_http_ingest( tests_data = yaml.safe_load(f.read()) if run_tests: - wait_for_czar(tests_data["czar-db-admin-uri"]) + wait_for_db_service(tests_data["czar-db-admin-uri"], "qservMeta") wait_for_replication_system(tests_data["replication-controller-uri"]) return itest.run_http_ingest( http_frontend_uri=tests_data["qserv-http-uri"], diff --git a/src/admin/python/lsst/qserv/admin/cli/script.py b/src/admin/python/lsst/qserv/admin/cli/script.py index 4f72673cff..646de3a55c 100644 --- a/src/admin/python/lsst/qserv/admin/cli/script.py +++ b/src/admin/python/lsst/qserv/admin/cli/script.py @@ -63,6 +63,7 @@ def smig_dir() -> str: replication_controller_smig_dir = "replica/schema" mysqld_user_qserv = "qsmaster" +mysqld_user_qserv_password = "CHANGEME2" ld_preload = "libjemalloc.so.2" @@ -468,6 +469,8 @@ def enter_worker_xrootd( save_template_cfg(targs) save_template_cfg({"mysqld_user_qserv": mysqld_user_qserv}) + save_template_cfg({"mysqld_user_qserv_password": mysqld_user_qserv_password}) + smig_worker(db_admin_uri, update=False) @@ -623,6 +626,7 @@ def enter_proxy( { "proxy_backend_address": proxy_backend_address, "mysqld_user_qserv": url.username, + "mysqld_user_qserv_password": url.password, "czar_db_host": url.host or "", "czar_db_port": url.port or "", "czar_db_socket": url.query.get("socket", ""), @@ -696,6 +700,7 @@ def enter_czar_http( save_template_cfg( { "mysqld_user_qserv": url.username, + "mysqld_user_qserv_password": url.password, "czar_db_host": url.host or "", "czar_db_port": url.port or "", "czar_db_socket": url.query.get("socket", ""), @@ -1065,6 +1070,7 @@ def integration_test( tests_yaml=tests_yaml, compare_results=compare_results, mysqld_user=mysqld_user_qserv, + mysqld_password=mysqld_user_qserv_password, ) @@ -1092,6 +1098,7 @@ def integration_test_http( tests_yaml=tests_yaml, compare_results=compare_results, mysqld_user=mysqld_user_qserv, + mysqld_password=mysqld_user_qserv_password, ) diff --git a/src/admin/python/lsst/qserv/admin/itest.py b/src/admin/python/lsst/qserv/admin/itest.py index 75effc420e..eabe61b9e4 100644 --- a/src/admin/python/lsst/qserv/admin/itest.py +++ b/src/admin/python/lsst/qserv/admin/itest.py @@ -180,6 +180,7 @@ def run_detached(self, connection: str, qserv: bool, database: str) -> None: f"{parsed.hostname}", f"--port={parsed.port}", f"--user={parsed.username}", + f"--password={parsed.password}", "--batch", "--binary-as-hex", "--skip-column-names", @@ -201,6 +202,7 @@ def run_detached(self, connection: str, qserv: bool, database: str) -> None: f"{parsed.hostname}", f"--port={parsed.port}", f"--user={parsed.username}", + f"--password={parsed.password}", "--batch", "--binary-as-hex", "--skip-column-names", @@ -223,6 +225,7 @@ def run_detached(self, connection: str, qserv: bool, database: str) -> None: f"{parsed.hostname}", f"--port={parsed.port}", f"--user={parsed.username}", + f"--password={parsed.password}", "--batch", "--binary-as-hex", "-e", @@ -247,6 +250,7 @@ def run_attached(self, connection: str, qserv: bool, database: str) -> None: """ query = self._render_query(self.query_t, qserv, database) parsed = urlparse(connection) + _log.debug("connection:%s parsed:%s", connection, str(parsed)) _log.debug("run_attached qserv:%s", qserv) args = [ "mysql", @@ -254,6 +258,7 @@ def run_attached(self, connection: str, qserv: bool, database: str) -> None: f"{parsed.hostname}", f"--port={parsed.port}", f"--user={parsed.username}", + f"--password={parsed.password}", "--batch", "--binary-as-hex", "--database", @@ -483,6 +488,7 @@ def run_attached(self, connection: str, database: str) -> None: f"{parsed.hostname}", f"--port={parsed.port}", f"--user={parsed.username}", + f"--password={parsed.password}", "--batch", "--binary-as-hex", "--database", diff --git a/src/admin/python/lsst/qserv/admin/itest_load.py b/src/admin/python/lsst/qserv/admin/itest_load.py index 676e7aa6ab..d3d8d5a99f 100644 --- a/src/admin/python/lsst/qserv/admin/itest_load.py +++ b/src/admin/python/lsst/qserv/admin/itest_load.py @@ -107,8 +107,8 @@ def _create_ref_db(ref_db_admin: str, name: str) -> None: The name of the database to create. """ statements = [ - "CREATE USER IF NOT EXISTS '{{ mysqld_user_qserv }}'@'localhost';", - "CREATE USER IF NOT EXISTS '{{ mysqld_user_qserv }}'@'%';", + "CREATE USER IF NOT EXISTS '{{ mysqld_user_qserv }}'@'localhost' IDENTIFIED BY '{{ mysqld_user_qserv_password }}';", + "CREATE USER IF NOT EXISTS '{{ mysqld_user_qserv }}'@'%' IDENTIFIED BY '{{ mysqld_user_qserv_password }}';", "CREATE DATABASE IF NOT EXISTS {name};", "GRANT ALL ON {name}.* TO '{{ mysqld_user_qserv }}'@'localhost';", "GRANT ALL ON {name}.* TO '{{ mysqld_user_qserv }}'@'%';", diff --git a/src/admin/schema/migrate-None-to-0.sql.jinja b/src/admin/schema/migrate-None-to-0.sql.jinja index a49750df0d..8f4c42c7c4 100644 --- a/src/admin/schema/migrate-None-to-0.sql.jinja +++ b/src/admin/schema/migrate-None-to-0.sql.jinja @@ -1,5 +1,5 @@ -CREATE USER '{{ mysqld_user_qserv }}'@'localhost'; -CREATE USER '{{ mysqld_user_qserv }}'@'%'; +CREATE USER '{{ mysqld_user_qserv }}'@'localhost' IDENTIFIED BY "{{ mysqld_user_qserv_password }}"; +CREATE USER '{{ mysqld_user_qserv }}'@'%' IDENTIFIED BY "{{ mysqld_user_qserv_password }}"; GRANT ALL ON qservResult.* TO '{{ mysqld_user_qserv }}'@'localhost'; GRANT ALL ON qservResult.* TO '{{ mysqld_user_qserv }}'@'%'; diff --git a/src/admin/templates/http/etc/qserv-czar.cnf.jinja b/src/admin/templates/http/etc/qserv-czar.cnf.jinja index 7fc2ff4bf4..4f70f5b9cf 100644 --- a/src/admin/templates/http/etc/qserv-czar.cnf.jinja +++ b/src/admin/templates/http/etc/qserv-czar.cnf.jinja @@ -11,16 +11,16 @@ technology = mysql hostname = {{ czar_db_host }} port = {{ czar_db_port }} username = qsmaster -password = +password = CHANGEME2 database = qservCssData socket = {{ czar_db_socket }} [resultdb] -passwd = db = qservResult unix_socket = {{ czar_db_socket }} host = {{ czar_db_host }} user = qsmaster +passwd = CHANGEME2 port = {{ czar_db_port }} # Any table in resultdb that hasn't been updated in this many days is deleted. @@ -35,11 +35,11 @@ maxtablesize_mb = 5100 # database connection for QMeta database [qmeta] -passwd = db = qservMeta unix_socket = {{ czar_db_socket }} host = {{ czar_db_host }} user = qsmaster +passwd = CHANGEME2 port = {{ czar_db_port }} maxMsgSourceStore = 5 @@ -47,9 +47,9 @@ maxMsgSourceStore = 5 # Using qmeta for now. May move this qservResult or make its own instance # databse based on what happens with multiple czars. [qstatus] -passwd = db = qservMeta user = qsmaster +passwd = CHANGEME2 host = {{ czar_db_host }} port = {{ czar_db_port }} diff --git a/src/admin/templates/proxy/etc/qserv-czar.cnf.jinja b/src/admin/templates/proxy/etc/qserv-czar.cnf.jinja index aba9731c97..5ed3b42309 100644 --- a/src/admin/templates/proxy/etc/qserv-czar.cnf.jinja +++ b/src/admin/templates/proxy/etc/qserv-czar.cnf.jinja @@ -11,16 +11,16 @@ technology = mysql hostname = {{ czar_db_host }} port = {{ czar_db_port }} username = qsmaster -password = +password = CHANGEME2 database = qservCssData socket = {{ czar_db_socket }} [resultdb] -passwd = db = qservResult unix_socket = {{ czar_db_socket }} host = {{ czar_db_host }} user = qsmaster +passwd = CHANGEME2 port = {{ czar_db_port }} # Any table in resultdb that hasn't been updated in this many days is deleted. @@ -35,11 +35,11 @@ maxtablesize_mb = 5100 # database connection for QMeta database [qmeta] -passwd = db = qservMeta unix_socket = {{ czar_db_socket }} host = {{ czar_db_host }} user = qsmaster +passwd = CHANGEME2 port = {{ czar_db_port }} maxMsgSourceStore = 5 @@ -47,10 +47,10 @@ maxMsgSourceStore = 5 # Using qmeta for now. May move this qservResult or make its own instance # databse based on what happens with multiple czars. [qstatus] -passwd = #db = qservStatusData db = qservMeta user = qsmaster +passwd = CHANGEME2 host = {{ czar_db_host }} port = {{ czar_db_port }} diff --git a/src/admin/templates/xrootd/etc/xrdssi.cf.jinja b/src/admin/templates/xrootd/etc/xrdssi.cf.jinja index 1bcc9c5f18..af43a4cc01 100644 --- a/src/admin/templates/xrootd/etc/xrdssi.cf.jinja +++ b/src/admin/templates/xrootd/etc/xrdssi.cf.jinja @@ -9,8 +9,7 @@ socket = {{ db_socket }} # Username for mysql connections username = qsmaster -# qsmaster does not have a password -password = +password = CHANGEME2 [memman] diff --git a/src/ccontrol/UserQuerySet.h b/src/ccontrol/UserQuerySet.h index 182653a296..1d7748c1a6 100644 --- a/src/ccontrol/UserQuerySet.h +++ b/src/ccontrol/UserQuerySet.h @@ -55,7 +55,7 @@ class UserQuerySet : public UserQuery { std::string getError() const override { return std::string(); } /// Begin execution of the query over all ChunkSpecs added so far. - void submit() override{}; + void submit() override {}; /// Wait until the query has completed execution. /// @return the final execution state. diff --git a/src/css/KvInterface.h b/src/css/KvInterface.h index 066fcc801c..1812895a76 100644 --- a/src/css/KvInterface.h +++ b/src/css/KvInterface.h @@ -48,7 +48,7 @@ class KvInterface { */ static const unsigned int MAX_KEY_LENGTH = 255; - virtual ~KvInterface(){}; + virtual ~KvInterface() {}; /** * Create a slash-delimited key-value pair. diff --git a/src/css/KvInterfaceImplMySql.h b/src/css/KvInterfaceImplMySql.h index d2e8115724..57fa998809 100644 --- a/src/css/KvInterfaceImplMySql.h +++ b/src/css/KvInterfaceImplMySql.h @@ -56,7 +56,7 @@ class KvInterfaceImplMySql : public KvInterface { * @param mysqlConf: Configuration object for mysql connection */ explicit KvInterfaceImplMySql(mysql::MySqlConfig const& mysqlConf, bool readOnly = false); - virtual ~KvInterfaceImplMySql(){}; + virtual ~KvInterfaceImplMySql() {}; virtual std::string create(std::string const& key, std::string const& value, bool unique = false) override; diff --git a/src/css/testKvInterfaceImpl.cc b/src/css/testKvInterfaceImpl.cc index 73b5dc13e1..eac19c96c3 100644 --- a/src/css/testKvInterfaceImpl.cc +++ b/src/css/testKvInterfaceImpl.cc @@ -61,7 +61,7 @@ struct KvInterfaceFixture { v2 = "secondOne"; }; - ~KvInterfaceFixture(void){}; + ~KvInterfaceFixture(void) {}; void doIt(lsst::qserv::css::KvInterface* kvI) { kvI->create(prefix, v1); diff --git a/src/global/testResourceUnit.cc b/src/global/testResourceUnit.cc index 85ca378f75..dfde0e3c23 100644 --- a/src/global/testResourceUnit.cc +++ b/src/global/testResourceUnit.cc @@ -38,7 +38,7 @@ struct Fixture { Fixture() : dummy(0) {} int dummy; - ~Fixture(void){}; + ~Fixture(void) {}; }; int const MAGIC_SIZE = 80; diff --git a/src/http/testAsyncReq.cc b/src/http/testAsyncReq.cc index ba760e784d..4e4668196b 100644 --- a/src/http/testAsyncReq.cc +++ b/src/http/testAsyncReq.cc @@ -158,8 +158,7 @@ BOOST_FIXTURE_TEST_CASE(create, AsyncReqFixture) { BOOST_CHECK_THROW( { auto const url = "https://127.0.0.1:80/"; - req = http::AsyncReq::create( - io_service, [](auto const& req) {}, http::Method::GET, url); + req = http::AsyncReq::create(io_service, [](auto const& req) {}, http::Method::GET, url); }, std::invalid_argument); diff --git a/src/http/testRequestQuery.cc b/src/http/testRequestQuery.cc index 72c727d8b9..231e66f719 100644 --- a/src/http/testRequestQuery.cc +++ b/src/http/testRequestQuery.cc @@ -122,8 +122,8 @@ BOOST_AUTO_TEST_CASE(RequestQueryTest) { BOOST_CHECK_EQUAL(query.optionalUInt16("some_unknown_param", defaultUInt16Value), defaultUInt16Value); }); BOOST_CHECK_THROW({ query.optionalUInt16("out_of_range_uint16"); }, std::out_of_range); - BOOST_CHECK_THROW({ query.optionalUInt16("out_of_range_uint16", defaultUInt16Value); }, - std::out_of_range); + BOOST_CHECK_THROW( + { query.optionalUInt16("out_of_range_uint16", defaultUInt16Value); }, std::out_of_range); // Test parsing 'unsigned int' diff --git a/src/partition/tests/objectIndex.cc b/src/partition/tests/objectIndex.cc index c7590fc817..bcc93fdee8 100644 --- a/src/partition/tests/objectIndex.cc +++ b/src/partition/tests/objectIndex.cc @@ -77,15 +77,18 @@ BOOST_AUTO_TEST_CASE(ObjectIndexTest) { csv::Editor editor(dialect, dialect, fields, fields); // Make sure input parameters are properly validated - BOOST_CHECK_THROW({ ObjectIndex::instance()->create("", editor, "id", "chunkId", "subChunkId"); }, - std::invalid_argument); + BOOST_CHECK_THROW( + { ObjectIndex::instance()->create("", editor, "id", "chunkId", "subChunkId"); }, + std::invalid_argument); BOOST_CHECK_THROW( { ObjectIndex::instance()->create(indexFileName, editor, "", "chunkId", "subChunkId"); }, std::invalid_argument); - BOOST_CHECK_THROW({ ObjectIndex::instance()->create(indexFileName, editor, "id", "", "subChunkId"); }, - std::invalid_argument); - BOOST_CHECK_THROW({ ObjectIndex::instance()->create(indexFileName, editor, "id", "chunkId", ""); }, - std::invalid_argument); + BOOST_CHECK_THROW( + { ObjectIndex::instance()->create(indexFileName, editor, "id", "", "subChunkId"); }, + std::invalid_argument); + BOOST_CHECK_THROW( + { ObjectIndex::instance()->create(indexFileName, editor, "id", "chunkId", ""); }, + std::invalid_argument); BOOST_CHECK_THROW({ ObjectIndex::instance()->open("", dialect); }, std::invalid_argument); BOOST_CHECK_THROW({ ObjectIndex::instance()->open("file:///", dialect); }, std::invalid_argument); diff --git a/src/qdisp/Executive.cc b/src/qdisp/Executive.cc index defcf56541..e2de8c05df 100644 --- a/src/qdisp/Executive.cc +++ b/src/qdisp/Executive.cc @@ -367,8 +367,8 @@ void Executive::markCompleted(int jobId, bool success) { _unTrack(jobId); if (!success && !isLimitRowComplete()) { LOGS(_log, LOG_LVL_ERROR, - "Executive: requesting squash, cause: " - << " failed (code=" << err.getCode() << " " << err.getMsg() << ")"); + "Executive: requesting squash, cause: " << " failed (code=" << err.getCode() << " " + << err.getMsg() << ")"); squash(); // ask to squash } } @@ -481,9 +481,8 @@ bool Executive::_track(int jobId, shared_ptr const& r) { lock_guard lock(_incompleteJobsMutex); if (_incompleteJobs.find(jobId) != _incompleteJobs.end()) { LOGS(_log, LOG_LVL_WARN, - "Attempt for TRACKING " - << " failed as jobId already found in incomplete jobs. " - << _getIncompleteJobsString(-1)); + "Attempt for TRACKING " << " failed as jobId already found in incomplete jobs. " + << _getIncompleteJobsString(-1)); return false; } _incompleteJobs[jobId] = r; diff --git a/src/qdisp/QueryRequest.cc b/src/qdisp/QueryRequest.cc index a8d4e8f2ee..3d712757e7 100644 --- a/src/qdisp/QueryRequest.cc +++ b/src/qdisp/QueryRequest.cc @@ -180,8 +180,8 @@ bool QueryRequest::_importResultFile(JobQuery::Ptr const& jq) { int dataIgnored = (executive->incrDataIgnoredCount()); if ((dataIgnored - 1) % 1000 == 0) { LOGS(_log, LOG_LVL_INFO, - "QueryRequest::_processData ignoring, enough rows already " - << "dataIgnored=" << dataIgnored); + "QueryRequest::_processData ignoring, enough rows already " << "dataIgnored=" + << dataIgnored); } } _errorFinish(true); diff --git a/src/qdisp/ResponseHandler.h b/src/qdisp/ResponseHandler.h index 95a82f8357..34064a3705 100644 --- a/src/qdisp/ResponseHandler.h +++ b/src/qdisp/ResponseHandler.h @@ -80,7 +80,7 @@ class ResponseHandler { virtual Error getError() const = 0; /// Do anything that needs to be done if this job gets cancelled. - virtual void processCancel(){}; + virtual void processCancel() {}; /// Scrub the results from jobId-attempt from the result table. virtual void prepScrubResults(int jobId, int attempt) = 0; diff --git a/src/qdisp/XrdSsiMocks.h b/src/qdisp/XrdSsiMocks.h index d4b358b322..61cad5b731 100644 --- a/src/qdisp/XrdSsiMocks.h +++ b/src/qdisp/XrdSsiMocks.h @@ -43,7 +43,7 @@ class XrdSsiServiceMock : public XrdSsiService { public: void ProcessRequest(XrdSsiRequest &reqRef, XrdSsiResource &resRef) override; - XrdSsiServiceMock(Executive *executive){}; + XrdSsiServiceMock(Executive *executive) {}; virtual ~XrdSsiServiceMock() {} diff --git a/src/qhttp/LogHelpers.h b/src/qhttp/LogHelpers.h index 1bbe4f6b37..980b6b9810 100644 --- a/src/qhttp/LogHelpers.h +++ b/src/qhttp/LogHelpers.h @@ -44,7 +44,7 @@ namespace lsst::qserv::qhttp { struct ServerLogger { Server const* server; - ServerLogger(Server const* server) : server(server){}; + ServerLogger(Server const* server) : server(server) {}; }; inline std::ostream& operator<<(std::ostream& str, ServerLogger const& logger) { @@ -56,7 +56,7 @@ inline ServerLogger logger(Server::Ptr const& server) { return ServerLogger(serv struct SocketLogger { boost::asio::detail::socket_type sockno; - SocketLogger(boost::asio::ip::tcp::socket* socket) : sockno(socket->native_handle()){}; + SocketLogger(boost::asio::ip::tcp::socket* socket) : sockno(socket->native_handle()) {}; }; inline std::ostream& operator<<(std::ostream& str, SocketLogger const& logger) { @@ -69,7 +69,7 @@ inline SocketLogger logger(std::shared_ptr socket) struct AjaxLogger { AjaxEndpoint const* aep; - AjaxLogger(AjaxEndpoint const* aep) : aep(aep){}; + AjaxLogger(AjaxEndpoint const* aep) : aep(aep) {}; }; inline std::ostream& operator<<(std::ostream& str, AjaxLogger const& logger) { diff --git a/src/qmeta/QMetaTransaction.h b/src/qmeta/QMetaTransaction.h index 4faf938ea6..252603e229 100644 --- a/src/qmeta/QMetaTransaction.h +++ b/src/qmeta/QMetaTransaction.h @@ -50,7 +50,7 @@ class QMetaTransaction : public sql::SqlTransactionScope { return sql::SqlTransactionScope::create(conn); } - ~QMetaTransaction() override{}; + ~QMetaTransaction() override {}; void throwException(util::Issue::Context const& ctx, std::string const& msg) override; diff --git a/src/qmeta/schema/migrate-None-to-9.sql.jinja b/src/qmeta/schema/migrate-None-to-9.sql.jinja index 3fd0e7e38b..46bf1ba392 100644 --- a/src/qmeta/schema/migrate-None-to-9.sql.jinja +++ b/src/qmeta/schema/migrate-None-to-9.sql.jinja @@ -2,8 +2,8 @@ -- Script to initialize the QMeta database -- -CREATE USER IF NOT EXISTS '{{ mysqld_user_qserv }}'@'localhost'; -CREATE USER IF NOT EXISTS '{{ mysqld_user_qserv }}'@'%'; +CREATE USER IF NOT EXISTS '{{ mysqld_user_qserv }}'@'localhost' IDENTIFIED BY "{{ mysqld_user_qserv_password }}"; +CREATE USER IF NOT EXISTS '{{ mysqld_user_qserv }}'@'%' IDENTIFIED BY "{{ mysqld_user_qserv_password }}"; -- Director index database (i.e. objectId/chunkId relation) -- created by integration test script/loader for now diff --git a/src/qproc/testChunkSpec.cc b/src/qproc/testChunkSpec.cc index d4f935cfda..6f12422be0 100644 --- a/src/qproc/testChunkSpec.cc +++ b/src/qproc/testChunkSpec.cc @@ -71,7 +71,7 @@ struct Fixture { c4(ChunkSpec::makeFake(104)), c5(ChunkSpec::makeFake(105)) {} - ~Fixture(void){}; + ~Fixture(void) {}; ChunkSpec c1; ChunkSpec c2; diff --git a/src/qproc/testIndexMap.cc b/src/qproc/testIndexMap.cc index 8352cec720..5007786b02 100644 --- a/src/qproc/testIndexMap.cc +++ b/src/qproc/testIndexMap.cc @@ -67,7 +67,7 @@ using lsst::qserv::qproc::SecondaryIndex; struct Fixture { Fixture(void) : si() {} - ~Fixture(void){}; + ~Fixture(void) {}; SecondaryIndex si; // TODO: IndexMap with fake secondary index: see DM-4047 diff --git a/src/query/PassTerm.h b/src/query/PassTerm.h index 142ebdbd35..4cee4be8e3 100644 --- a/src/query/PassTerm.h +++ b/src/query/PassTerm.h @@ -42,7 +42,7 @@ class PassTerm : public BoolFactorTerm { void findValueExprs(ValueExprPtrVector& vector) const override {} /// Get a vector of references to pointers to the ValueExprs this contains. - void findValueExprRefs(ValueExprPtrRefVector& vector) override{}; + void findValueExprRefs(ValueExprPtrRefVector& vector) override {}; /// Get a vector of the ColumnRefs this contains. void findColumnRefs(ColumnRef::Vector& vector) const override {} diff --git a/src/replica/apps/WorkerApp.cc b/src/replica/apps/WorkerApp.cc index ca5d6c1659..9f9cd76ba2 100644 --- a/src/replica/apps/WorkerApp.cc +++ b/src/replica/apps/WorkerApp.cc @@ -141,12 +141,11 @@ int WorkerApp::runImpl() { LOGS(_log, LOG_LVL_WARN, context << "adding worker to the registry failed, ex: " << ex.what()); } LOGS(_log, LOG_LVL_DEBUG, - "HEARTBEAT" - << " worker: " << reqProcSvr->worker() - << " processor.state: " << reqProcSvr->processor()->state2string() - << " new, in-progress, finished: " << reqProcSvr->processor()->numNewRequests() << ", " - << reqProcSvr->processor()->numInProgressRequests() << ", " - << reqProcSvr->processor()->numFinishedRequests()); + "HEARTBEAT" << " worker: " << reqProcSvr->worker() + << " processor.state: " << reqProcSvr->processor()->state2string() + << " new, in-progress, finished: " << reqProcSvr->processor()->numNewRequests() + << ", " << reqProcSvr->processor()->numInProgressRequests() << ", " + << reqProcSvr->processor()->numFinishedRequests()); this_thread::sleep_for( chrono::seconds(max(1U, config->get("registry", "heartbeat-ival-sec")))); } diff --git a/src/replica/tests/testFileIngestApp.cc b/src/replica/tests/testFileIngestApp.cc index e520eb4c9a..6c285aec96 100644 --- a/src/replica/tests/testFileIngestApp.cc +++ b/src/replica/tests/testFileIngestApp.cc @@ -227,11 +227,12 @@ BOOST_AUTO_TEST_CASE(FileIngestAppTest_parseChunkContribution) { BOOST_CHECK(contrib.chunk == 2); BOOST_CHECK(contrib.isOverlap); - BOOST_CHECK_THROW({ contrib = FileIngestApp::parseChunkContribution("path/chunk_2_overlap.txt"); }, - invalid_argument); + BOOST_CHECK_THROW( + { contrib = FileIngestApp::parseChunkContribution("path/chunk_2_overlap.txt"); }, + invalid_argument); - BOOST_CHECK_THROW({ contrib = FileIngestApp::parseChunkContribution("chunk_2_overlap"); }, - invalid_argument); + BOOST_CHECK_THROW( + { contrib = FileIngestApp::parseChunkContribution("chunk_2_overlap"); }, invalid_argument); BOOST_CHECK_THROW({ contrib = FileIngestApp::parseChunkContribution("chunk_"); }, invalid_argument); diff --git a/src/replica/tests/testFileUtils.cc b/src/replica/tests/testFileUtils.cc index 16d37927d8..2d897a8b47 100644 --- a/src/replica/tests/testFileUtils.cc +++ b/src/replica/tests/testFileUtils.cc @@ -95,8 +95,8 @@ BOOST_AUTO_TEST_CASE(FileUtils_createTemporaryFile) { // Test if throws when the model is empty prefix = string(); model = string(); - BOOST_CHECK_THROW({ filePath = FileUtils::createTemporaryFile(baseDir, prefix, model); }, - invalid_argument); + BOOST_CHECK_THROW( + { filePath = FileUtils::createTemporaryFile(baseDir, prefix, model); }, invalid_argument); // Test if throws when the maximum number of retries is less than 1 prefix = string(); @@ -137,8 +137,9 @@ BOOST_AUTO_TEST_CASE(FileUtils_createTemporaryFile) { for (auto&& d : digits) { string const filePath = baseFilePath + "-" + d; LOGS_INFO("FileUtils::createTemporaryFile creating a temporary file: " + filePath); - BOOST_CHECK_THROW({ FileUtils::createTemporaryFile(baseFilePath, "-", "%", suffix, maxRetries); }, - runtime_error); + BOOST_CHECK_THROW( + { FileUtils::createTemporaryFile(baseFilePath, "-", "%", suffix, maxRetries); }, + runtime_error); } fs::remove(baseFilePath, errCode); diff --git a/src/sql/SqlConnection.h b/src/sql/SqlConnection.h index 575275b80a..0800ada1e1 100644 --- a/src/sql/SqlConnection.h +++ b/src/sql/SqlConnection.h @@ -69,7 +69,7 @@ class SqlResultIter { /// class SqlConnection : Class for interacting with a MySQL database. class SqlConnection { public: - virtual ~SqlConnection(){}; + virtual ~SqlConnection() {}; virtual void reset(mysql::MySqlConfig const& sc) = 0; diff --git a/src/tests/QueryAnaFixture.h b/src/tests/QueryAnaFixture.h index cf2cc6286a..58f76416a1 100644 --- a/src/tests/QueryAnaFixture.h +++ b/src/tests/QueryAnaFixture.h @@ -56,7 +56,7 @@ struct QueryAnaFixture { QueryAnaFixture() : qsTest(cfgNum, css::CssAccess::createFromData(mapBuffer, "."), defaultDb, - sql::SqlConfig(sql::SqlConfig::MOCK)){}; + sql::SqlConfig(sql::SqlConfig::MOCK)) {}; qproc::QuerySession::Test qsTest; QueryAnaHelper queryAnaHelper; diff --git a/src/util/Command.h b/src/util/Command.h index 3c95235ea4..b1620f5b65 100644 --- a/src/util/Command.h +++ b/src/util/Command.h @@ -55,7 +55,7 @@ class Tracker { /// Base class to allow arbitrary data to be passed to or returned from /// Command::action. struct CmdData { - virtual ~CmdData(){}; + virtual ~CmdData() {}; }; /// Base class for commands. Can be used with functions as is or diff --git a/src/util/EventThread.h b/src/util/EventThread.h index c4fd4afb15..ea9ec3dd7a 100644 --- a/src/util/EventThread.h +++ b/src/util/EventThread.h @@ -76,7 +76,7 @@ namespace lsst::qserv::util { class CommandQueue { public: using Ptr = std::shared_ptr; - virtual ~CommandQueue(){}; + virtual ~CommandQueue() {}; /// Queue a command object in a thread safe way and signal any threads /// waiting on the queue that a command is available. virtual void queCmd(Command::Ptr const& cmd) { @@ -119,8 +119,8 @@ class CommandQueue { } } - virtual void commandStart(Command::Ptr const&){}; //< Derived methods must be thread safe. - virtual void commandFinish(Command::Ptr const&){}; //< Derived methods must be thread safe. + virtual void commandStart(Command::Ptr const&) {}; //< Derived methods must be thread safe. + virtual void commandFinish(Command::Ptr const&) {}; //< Derived methods must be thread safe. protected: std::deque _qu{}; diff --git a/src/util/ThreadPriority.cc b/src/util/ThreadPriority.cc index f41fb6ca45..6a6a02ff3e 100644 --- a/src/util/ThreadPriority.cc +++ b/src/util/ThreadPriority.cc @@ -39,10 +39,8 @@ namespace lsst::qserv::util { void ThreadPriority::storeOriginalValues() { getCurrentValues(_originalPriority, _originalPolicy); - LOGS( - _log, LOG_LVL_DEBUG, - "thread priority original " - << " priority=" << _originalPriority << " policy=" << _originalPolicy); + LOGS(_log, LOG_LVL_DEBUG, + "thread priority original " << " priority=" << _originalPriority << " policy=" << _originalPolicy); } void ThreadPriority::getCurrentValues(int &priority, int &policy) { diff --git a/src/util/testFileNameParser.cc b/src/util/testFileNameParser.cc index 99c7a32e52..3a21ddaa82 100644 --- a/src/util/testFileNameParser.cc +++ b/src/util/testFileNameParser.cc @@ -104,11 +104,11 @@ BOOST_AUTO_TEST_CASE(ResultFileNameParserTest) { BOOST_CHECK_EQUAL(file, fileExpected); }); - BOOST_CHECK_THROW({ util::ResultFileNameParser const file("1-2-3-4" + fileName); }, - std::invalid_argument); + BOOST_CHECK_THROW( + { util::ResultFileNameParser const file("1-2-3-4" + fileName); }, std::invalid_argument); - BOOST_CHECK_THROW({ util::ResultFileNameParser const file("a-2-3-4-5" + fileName); }, - std::invalid_argument); + BOOST_CHECK_THROW( + { util::ResultFileNameParser const file("a-2-3-4-5" + fileName); }, std::invalid_argument); } BOOST_AUTO_TEST_SUITE_END() diff --git a/src/util/threadSafe.h b/src/util/threadSafe.h index 25e3080c2e..327a9c9973 100644 --- a/src/util/threadSafe.h +++ b/src/util/threadSafe.h @@ -41,7 +41,7 @@ namespace lsst::qserv::util { template class Sequential { public: - explicit Sequential(T seq) : _seq(seq){}; + explicit Sequential(T seq) : _seq(seq) {}; // Returns the value before incrementing. T incr() { std::lock_guard lock(_mutex); @@ -63,12 +63,12 @@ class Sequential { template class Flag { public: - explicit Flag(T flag) : _flag(flag){}; + explicit Flag(T flag) : _flag(flag) {}; Flag& operator=(Flag&& other) = delete; Flag(const Flag&&) = delete; Flag& operator=(const Flag&) = delete; Flag(const Flag&) = delete; - virtual ~Flag(){}; + virtual ~Flag() {}; /// Sets flag value to 'val' and returns the old value of flag. virtual T exchange(T val) { @@ -98,8 +98,8 @@ class Flag { template class FlagNotify { public: - explicit FlagNotify(T flag) : _flag(flag){}; - virtual ~FlagNotify(){}; + explicit FlagNotify(T flag) : _flag(flag) {}; + virtual ~FlagNotify() {}; /** Sets flag value to 'val' while notifying others of the change, * and returns the old value of flag. */ diff --git a/src/wbase/Task.cc b/src/wbase/Task.cc index 5687e2ddfb..05215eeca5 100644 --- a/src/wbase/Task.cc +++ b/src/wbase/Task.cc @@ -159,9 +159,7 @@ Task::Task(TaskMsgPtr const& t, int fragmentNumber, shared_ptr co } allIds.add(to_string(_qId) + "_" + to_string(_jId)); - LOGS(_log, LOG_LVL_DEBUG, - "Task(...) " - << "this=" << this << " : " << allIds); + LOGS(_log, LOG_LVL_DEBUG, "Task(...) " << "this=" << this << " : " << allIds); // Determine which major tables this task will use. int const size = t->scantable_size(); diff --git a/src/wbase/Task.h b/src/wbase/Task.h index 71589c3c48..c9dda2671a 100644 --- a/src/wbase/Task.h +++ b/src/wbase/Task.h @@ -77,7 +77,7 @@ class UserQueryInfo; class TaskQueryRunner { public: using Ptr = std::shared_ptr; - virtual ~TaskQueryRunner(){}; + virtual ~TaskQueryRunner() {}; virtual bool runQuery() = 0; virtual void cancel() = 0; ///< Repeated calls to cancel() must be harmless. }; diff --git a/src/wconfig/testSanityCheck.cc b/src/wconfig/testSanityCheck.cc index 5884051f0d..e7702f02c1 100644 --- a/src/wconfig/testSanityCheck.cc +++ b/src/wconfig/testSanityCheck.cc @@ -35,8 +35,8 @@ namespace test = boost::test_tools; using lsst::qserv::wconfig::WorkerConfig; struct SanityFixture { - SanityFixture(void){}; - ~SanityFixture(void){}; + SanityFixture(void) {}; + ~SanityFixture(void) {}; }; BOOST_FIXTURE_TEST_SUITE(SanityCheckTest, SanityFixture) diff --git a/src/wdb/ChunkResource.cc b/src/wdb/ChunkResource.cc index a11e1b6616..b131552e29 100644 --- a/src/wdb/ChunkResource.cc +++ b/src/wdb/ChunkResource.cc @@ -194,8 +194,8 @@ class ChunkEntry { last = it->second; } scm[*i] = last + 1; // write new value - } // All subchunks - } // All tables + } // All subchunks + } // All tables // For now, every other user of this chunk must wait while // we fetch the resource. if (needed.size() > 0) { @@ -230,8 +230,8 @@ class ChunkEntry { "ChunkResource ChunkEntry::release: Error releasing un-acquired resource"); } scm[*i] = it->second - 1; // write new value - } // All subchunks - } // All tables + } // All subchunks + } // All tables --_refCount; _flush(db, backend); // Discard resources no longer needed by anyone. // flush could be detached from the release function, to be called at a diff --git a/src/wdb/SQLBackend.h b/src/wdb/SQLBackend.h index 5d3f5ed709..a8cd993e2d 100644 --- a/src/wdb/SQLBackend.h +++ b/src/wdb/SQLBackend.h @@ -128,7 +128,7 @@ class FakeBackend : public SQLBackend { void discard(ScTableVector const& v) override; - void memLockRequireOwnership() override{}; ///< Do nothing for fake version. + void memLockRequireOwnership() override {}; ///< Do nothing for fake version. /// For unit tests only. static std::string makeFakeKey(ScTable const& sctbl) { diff --git a/src/wpublish/testChunkInventory.cc b/src/wpublish/testChunkInventory.cc index a27fc7ec4c..94e3870a85 100644 --- a/src/wpublish/testChunkInventory.cc +++ b/src/wpublish/testChunkInventory.cc @@ -45,8 +45,8 @@ bool startswith(std::string const& a, std::string const& start) { } // namespace struct ChunkInvFixture { - ChunkInvFixture(void){}; - ~ChunkInvFixture(void){}; + ChunkInvFixture(void) {}; + ~ChunkInvFixture(void) {}; }; struct ChunkSql : public MockSql { diff --git a/src/wsched/BlendScheduler.h b/src/wsched/BlendScheduler.h index 7a284dbcd2..1ee2b65956 100644 --- a/src/wsched/BlendScheduler.h +++ b/src/wsched/BlendScheduler.h @@ -130,7 +130,7 @@ class BlendScheduler : public wsched::SchedulerBase { nlohmann::json statusToJsonBlend(); /// Do nothing, the schedulers this class manages keep their own statistics. - void recordPerformanceData() override{}; + void recordPerformanceData() override {}; private: int _getAdjustedMaxThreads(int oldAdjMax, int inFlight); diff --git a/src/wsched/ChunkTasksQueue.cc b/src/wsched/ChunkTasksQueue.cc index 5b1889ab8d..11371d08da 100644 --- a/src/wsched/ChunkTasksQueue.cc +++ b/src/wsched/ChunkTasksQueue.cc @@ -45,8 +45,8 @@ void ChunkTasksQueue::queueTask(std::vector const& tasks) { int chunkId = task->getChunkId(); if (iter != _chunkMap.end() && iter->first != chunkId) { LOGS(_log, LOG_LVL_ERROR, - "All tasks grouped together must be on the same chunk." - << " chunkA=" << iter->first << " chunkB=" << chunkId); + "All tasks grouped together must be on the same chunk." << " chunkA=" << iter->first + << " chunkB=" << chunkId); throw util::Bug(ERR_LOC, "ChunkTasksQueue::queueTask mismatched chunkIds"); } /// If it's the first time through, or the chunkId is different than the previous one, then diff --git a/src/wsched/FifoScheduler.h b/src/wsched/FifoScheduler.h index 56a27c4193..f9a369249e 100644 --- a/src/wsched/FifoScheduler.h +++ b/src/wsched/FifoScheduler.h @@ -36,7 +36,7 @@ class FifoScheduler : public wcontrol::Scheduler { public: typedef std::shared_ptr Ptr; - FifoScheduler(){}; + FifoScheduler() {}; virtual ~FifoScheduler() {} std::string getName() const override { return std::string("FifoSched"); }