Update of /cvsroot/monetdb/sql/src/test/Skyserver
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31611/src/test/Skyserver
Modified Files:
Skyserver_dropFunctions_v6.sql Skyserver_functions_v6.sql
Log Message:
propagated changes of Friday Jun 06 2008 - Tuesday Jun 10 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - romulog: src/test/Skyserver/Skyserver_dropFunctions_v6.sql,1.1.2.6
src/test/Skyserver/Skyserver_functions_v6.sql,1.1.2.8
Add missing function:
fGetUrlFitsSpectrum
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - romulog: src/test/Skyserver/Skyserver_dropFunctions_v6.sql,1.1.2.7
src/test/Skyserver/Skyserver_functions_v6.sql,1.1.2.9
Add missing function:
fGetNearestObjAllEq
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - nielsnes:
src/test/bugs/Tests/subselect_ambigious_columns-bug-sf-949071.stable.out.Algebra,1.1.2.2
src/test/bugs/Tests/subselect_ambigious_columns-bug-sf-949071.stable.out.Five.Algebra,1.1.2.1
added algebra specific output
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/08 - romulog: src/test/Skyserver/Skyserver_functions_v6.sql,1.1.2.10
Correct the function to avoid errors...
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/09 - nielsnes: src/test/bugs/Tests/All,1.112.2.3
src/test/bugs/Tests/div_zero_bug.sql,1.1.2.1
src/test/bugs/Tests/div_zero_bug.stable.err,1.1.2.1
src/test/bugs/Tests/div_zero_bug.stable.out,1.1.2.1
added test for bug in avg() NULL handling
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/09 - stmane: MonetDB-SQL.spec.in,1.63.2.3
For convenience of both developers and users as well as to comply even more
with open source standards, we now set/use the following defaults for the
configure options
--enable-strict, --enable-assert, --enable-debug, --enable-optimize
(Unless specified differently, the same defaults are used for both the
"Stable" release branches and the "Current" development trunk.)
When compiling from CVS sources
(as mainly done by developers):
strict=yes assert=yes debug=yes optimize=no (*)
When compiling from packaged/distributed sources (i.e., tarballs)
(as mainly done by users):
strict=no assert=no debug=no optimize=no (*)
For building binary distributions (RPMs, MSIs):
strict=no assert=no debug=no optimize=yes
With nightly testing for the "Stable" release branches:
strict=yes assert=no debug=no optimize=yes
With nightly testing for the "Current" development trunk:
strict=yes assert=yes debug=no optimize=yes
(*)
IMPORTANT NOTE:
Since "--enable-optimize=yes" is no longer the default for any case except
binary packages, it is *strongly recommended* to (re)compile everything from
scratch, *explicitly configured* with
"--enable-debug=no --enable-optimize=yes",
in case you want/need to run any performance experiments with MonetDB!
(Please note:
"--enable-X=yes" is equivalent to "--enable-X", and
"--enable-X=no" is equivalent to "--disable-X".)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: Skyserver_dropFunctions_v6.sql
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_dropFunctions_v6.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Skyserver_dropFunctions_v6.sql 5 Jun 2008 09:24:23 -0000 1.4
+++ Skyserver_dropFunctions_v6.sql 10 Jun 2008 08:34:08 -0000 1.5
@@ -1,3 +1,5 @@
+DROP FUNCTION fGetNearestObjAllEq;
+DROP FUNCTION fGetUrlFitsSpectrum;
DROP FUNCTION fGetUrlFrameImg;
DROP FUNCTION fGetNearbyObjAllEq;
DROP FUNCTION fGetNearbyObjAllXYZ;
Index: Skyserver_functions_v6.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_functions_v6.sql,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Skyserver_functions_v6.sql 5 Jun 2008 09:24:23 -0000 1.4
+++ Skyserver_functions_v6.sql 10 Jun 2008 08:34:10 -0000 1.5
@@ -2263,3 +2263,50 @@
+ cast(coalesce(specObjId,0) as varchar(32));
end;
+CREATE FUNCTION fGetUrlFitsSpectrum(specObjIdd bigint)
+RETURNS varchar(128)
+BEGIN
+ DECLARE link varchar(128), plate varchar(16), mjd varchar(16), fiber
varchar(16), rerun int;
+ SET link = (select value from SiteConstants where
name='DataServerURL');
+ SET rerun=(select p.spRerun from specobjall s, platex p where
s.plateid=p.plateid and s.specobjid=specObjIdd);
+ SET link = link + 'spectro/1d_' + cast(rerun as varchar(4)) + '/';
+ SELECT cast(p.mjd as varchar(8)) into mjd
+ FROM PlateX p, specObjAll s
+ WHERE p.plateId=s.plateId AND s.specObjID=specObjIdd;
+ SELECT cast(p.plate as varchar(8)) into plate
+ FROM PlateX p, specObjAll s
+ WHERE p.plateId=s.plateId AND s.specObjID=specObjIdd;
+ SELECT cast(s.fiberID as varchar(8)) into fiber
+ FROM PlateX p, specObjAll s
+ WHERE p.plateId=s.plateId AND s.specObjID=specObjIdd;
+ SET plate = substring('0000',1,4-length(plate)) + plate;
+ SET fiber = substring( '000',1,3-length(fiber)) + fiber;
+ RETURN link + plate + '/1d/spSpec-'+mjd+'-'+plate+'-'+fiber+'.fit';
+END;
+
+CREATE FUNCTION fGetNearestObjAllEq (ra float, "dec" float, r float)
+RETURNS TABLE (
+ objID bigint,
+ run int ,
+ camcol int ,
+ field int ,
+ rerun int ,
+ type int ,
+ mode int ,
+ cx float ,
+ cy float ,
+ cz float ,
+ htmID bigint,
+ distance float -- distance in arc minutes
+ )
+BEGIN
+ DECLARE d2r float,nx float,ny float,nz float ;
+ set d2r = PI()/180.0;
+ set nx = COS("dec"*d2r)*COS(ra*d2r);
+ set ny = COS("dec"*d2r)*SIN(ra*d2r);
+ set nz = SIN("dec"*d2r);
+ RETURN TABLE (SELECT *
+ FROM fGetNearbyObjAllXYZ(nx,ny,nz,r)
+ ORDER BY distance ASC LIMIT 1); -- order by needed to get the closest
one.
+END;
+
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
