Changeset: f04b542925a7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f04b542925a7
Removed Files:
sql/test/Skyserver/Skyserver_dropMath.sql
sql/test/Skyserver/Skyserver_dropMs_functions.sql
Modified Files:
common/stream/stream.c
gdk/gdk_atoms.c
sql/test/Skyserver/Skyserver_functions.sql
sql/test/Skyserver/Skyserver_functions_v6.sql
sql/test/Skyserver/Tests/Skyserver.SQL.py
sql/test/Skyserver/Tests/Skyserver_v6.SQL.py
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 935 to 300 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -781,6 +781,26 @@ stream_gzread(stream *s, void *buf, size
s->errnr = MNSTR_READ_ERROR;
return -1;
}
+#ifdef WIN32
+ /* on Windows when in text mode, convert \r\n line
+ * endings to \n */
+ if (s->type == ST_ASCII) {
+ char *p1, *p2, *pe;
+
+ p1 = buf;
+ pe = p1 + size;
+ while (p1 < pe && *p1 != '\r')
+ p1++;
+ p2 = p1;
+ while (p1 < pe) {
+ if (*p1 == '\r' && p1[1] == '\n')
+ size--;
+ else
+ *p2++ = *p1;
+ p1++;
+ }
+ }
+#endif
return (ssize_t) (size / elmsize);
}
return 0;
@@ -996,6 +1016,26 @@ stream_bzread(stream *s, void *buf, size
s->errnr = MNSTR_READ_ERROR;
return -1;
}
+#ifdef WIN32
+ /* on Windows when in text mode, convert \r\n line endings to
+ * \n */
+ if (s->type == ST_ASCII) {
+ char *p1, *p2, *pe;
+
+ p1 = buf;
+ pe = p1 + size;
+ while (p1 < pe && *p1 != '\r')
+ p1++;
+ p2 = p1;
+ while (p1 < pe) {
+ if (*p1 == '\r' && p1[1] == '\n')
+ size--;
+ else
+ *p2++ = *p1;
+ p1++;
+ }
+ }
+#endif
return size / elmsize;
}
diff --git a/sql/test/Skyserver/Skyserver_dropMath.sql
b/sql/test/Skyserver/Skyserver_dropMath.sql
deleted file mode 100644
--- a/sql/test/Skyserver/Skyserver_dropMath.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-START TRANSACTION;
-
-DROP FUNCTION degrees;
-DROP FUNCTION radians;
-
-COMMIT;
diff --git a/sql/test/Skyserver/Skyserver_dropMs_functions.sql
b/sql/test/Skyserver/Skyserver_dropMs_functions.sql
deleted file mode 100644
--- a/sql/test/Skyserver/Skyserver_dropMs_functions.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-START TRANSACTION;
-
-DROP FUNCTION MS_STUFF;
-DROP FUNCTION MS_ROUND;
-
-COMMIT;
diff --git a/sql/test/Skyserver/Skyserver_functions.sql
b/sql/test/Skyserver/Skyserver_functions.sql
--- a/sql/test/Skyserver/Skyserver_functions.sql
+++ b/sql/test/Skyserver/Skyserver_functions.sql
@@ -651,7 +651,7 @@ CREATE FUNCTION fDistanceArcMinXYZ(nx1 f
RETURNS float
BEGIN
DECLARE d2r float;
- RETURN (
2*DEGREES(ASIN(sqrt(left_shift(nx1-nx2,2)+left_shift(ny1-ny2,2)+left_shift(nz1-nz2,2))/2))*60);
+ RETURN (
2*SYS.DEGREES(ASIN(sqrt(left_shift(nx1-nx2,2)+left_shift(ny1-ny2,2)+left_shift(nz1-nz2,2))/2))*60);
END;
CREATE FUNCTION fDistanceArcMinEq(ra1 float, dec1 float,
@@ -667,7 +667,7 @@ BEGIN
SET ny2 = COS(dec2*d2r)*SIN(ra2*d2r);
SET nz2 = SIN(dec2*d2r);
- RETURN (
2*DEGREES(ASIN(sqrt(left_shift(nx1-nx2,2)+left_shift(ny1-ny2,2)+left_shift(nz1-nz2,2))/2))*60);
+ RETURN (
2*SYS.DEGREES(ASIN(sqrt(left_shift(nx1-nx2,2)+left_shift(ny1-ny2,2)+left_shift(nz1-nz2,2))/2))*60);
END;
CREATE FUNCTION fDMSbase(deg float, truncat int, precision int)
@@ -699,17 +699,17 @@ BEGIN
SET np = np + 1;
END WHILE;
SET d = ABS(deg);
- -- degrees
+ -- sys.degrees
SET nd = FLOOR(d);
SET q = LTRIM(CAST(nd as varchar(2)));
- SET t = MS_STUFF(t,3-LENGTH(q),LENGTH(q), q);
+ SET t = SYS.MS_STUFF(t,3-LENGTH(q),LENGTH(q), q);
-- minutes
SET d = 60.0 * (d-nd);
SET nd = FLOOR(d);
SET q = LTRIM(CAST(nd as varchar(4)));
- SET t = MS_STUFF(t,6-LENGTH(q),LENGTH(q), q);
+ SET t = SYS.MS_STUFF(t,6-LENGTH(q),LENGTH(q), q);
-- seconds
- SET d = MS_ROUND( 60.0 * (d-nd),precision,truncat );
+ SET d = SYS.MS_ROUND( 60.0 * (d-nd),precision,truncat );
-- SET d = 60.0 * (d-nd);
IF (precision = 1)
THEN SET q = LTRIM(cast( round(d, precision) as varchar(7)));
@@ -717,7 +717,7 @@ BEGIN
IF (precision = 10)
THEN SET q = LTRIM(cast( round(d, precision) as varchar(16)));
END IF;
- SET t = MS_STUFF(t,10+precision-LENGTH(q),LENGTH(q), q);
+ SET t = SYS.MS_STUFF(t,10+precision-LENGTH(q),LENGTH(q), q);
--
RETURN(s||t);
END;
@@ -763,26 +763,26 @@ BEGIN
SET np = np + 1;
END WHILE;
SET d = ABS(deg/15.0);
- -- degrees
+ -- sys.degrees
SET nd = FLOOR(d);
SET q = LTRIM(CAST(nd as varchar(2)));
- SET t = MS_STUFF(t,3-LENGTH(q),LENGTH(q), q);
+ SET t = SYS.MS_STUFF(t,3-LENGTH(q),LENGTH(q), q);
-- minutes
SET d = 60.0 * (d-nd);
SET nd = FLOOR(d);
SET q = LTRIM(CAST(nd as varchar(4)));
- SET t = MS_STUFF(t,6-LENGTH(q),LENGTH(q), q);
+ SET t = SYS.MS_STUFF(t,6-LENGTH(q),LENGTH(q), q);
-- seconds
- SET d = MS_ROUND( 60.0 * (d-nd),precision,truncat );
+ SET d = SYS.MS_ROUND( 60.0 * (d-nd),precision,truncat );
IF (precision = 1)
THEN SET q = LTRIM(cast( round(d, precision) as varchar(7)));
END IF;
IF (precision = 10)
THEN SET q = LTRIM(cast( round(d, precision) as varchar(16)));
END IF;
- SET t = MS_STUFF(t,10+precision-LENGTH(q),LENGTH(q), q);
+ SET t = SYS.MS_STUFF(t,10+precision-LENGTH(q),LENGTH(q), q);
-- SET d = 60.0 * (d-nd);
--- SET t = MS_STUFF(t,13-LENGTH(q),LENGTH(q), q);
+-- SET t = SYS.MS_STUFF(t,13-LENGTH(q),LENGTH(q), q);
--
RETURN(t);
END;
@@ -835,8 +835,8 @@ RETURNS TABLE (x float, y float, z float
BEGIN
--
DECLARE x float, y float, z float;
- SET x = SIN(RADIANS(eta));
- SET y = COS(RADIANS(eta));
+ SET x = SIN(SYS.RADIANS(eta));
+ SET y = COS(SYS.RADIANS(eta));
SET z = 0.0;
--
RETURN TABLE(SELECT v2.x, v2.y, v2.z
@@ -863,8 +863,8 @@ BEGIN
ELSE SET eta = (stripe-82)*2.5 -32.5;
END CASE;
--
- SET x = SIN(RADIANS(eta));
- SET y = COS(RADIANS(eta));
+ SET x = SIN(SYS.RADIANS(eta));
+ SET y = COS(SYS.RADIANS(eta));
SET z = 0.0;
--
RETURN TABLE(SELECT v2.x, v2.y, v2.z
@@ -875,7 +875,7 @@ CREATE FUNCTION fGetLat(mode varchar(8),
RETURNS float
BEGIN
DECLARE lat float;
- SELECT DEGREES(ASIN(v3.z)) INTO lat FROM fRotateV3(mode,cx,cy,cz) v3;
+ SELECT SYS.DEGREES(ASIN(v3.z)) INTO lat FROM fRotateV3(mode,cx,cy,cz) v3;
RETURN lat;
END;
@@ -883,7 +883,7 @@ CREATE FUNCTION fGetLon(mode varchar(8),
RETURNS float
BEGIN
DECLARE lon float;
- SELECT DEGREES(ATAN(v3.y,v3.x)) INTO lon FROM fRotateV3(mode,cx,cy,cz) v3;
+ SELECT SYS.DEGREES(ATAN(v3.y,v3.x)) INTO lon FROM fRotateV3(mode,cx,cy,cz)
v3;
IF lon<0
THEN SET lon=lon+360;
END IF;
@@ -896,7 +896,7 @@ BEGIN
--
DECLARE lon float, lat float;
--
- SELECT DEGREES(ATAN(v3.y,v3.x)), DEGREES(ASIN(v3.z)) INTO lon, lat
+ SELECT SYS.DEGREES(ATAN(v3.y,v3.x)), SYS.DEGREES(ASIN(v3.z)) INTO lon, lat
FROM fRotateV3(mode,cx,cy,cz) v3;
--
IF lon<0
@@ -919,10 +919,10 @@ BEGIN
cx float, cy float, cz float,
gx float, gy float, gz float;
--
- -- convert to radians
- SET rmu = RADIANS(mu-node);
- SET rnu = RADIANS(nu);
- SET rin = RADIANS(incl);
+ -- convert to sys.radians
+ SET rmu = SYS.RADIANS(mu-node);
+ SET rnu = SYS.RADIANS(nu);
+ SET rin = SYS.RADIANS(incl);
--
SET gx = cos(rmu)*cos(rnu);
SET gy = sin(rmu)*cos(rnu);
@@ -932,14 +932,14 @@ BEGIN
SET cy = gy*cos(rin)-gz*sin(rin);
SET cz = gy*sin(rin)+gz*cos(rin);
--
- SET deci = DEGREES(asin(cz));
- SET ra = DEGREES(ATAN(cy,cx)) + node;
+ SET deci = SYS.DEGREES(asin(cz));
+ SET ra = SYS.DEGREES(ATAN(cy,cx)) + node;
IF ra<0
THEN SET ra = ra+360 ;
END IF;
--
- SET cx = cos(RADIANS(ra))*cos(RADIANS(deci));
- SET cy = sin(RADIANS(ra))*cos(RADIANS(deci));
+ SET cx = cos(SYS.RADIANS(ra))*cos(SYS.RADIANS(deci));
+ SET cy = sin(SYS.RADIANS(ra))*cos(SYS.RADIANS(deci));
--
RETURN TABLE (SELECT ra, deci, cx, cy, cz);
END;
@@ -964,15 +964,15 @@ BEGIN
mu float, nu float,
stripeEta float;
--
- SET cx = cos(radians(deci))* cos(radians(ra-95.0));
- SET cy = cos(radians(deci))* sin(radians(ra-95.0));
- SET cz = sin(radians(deci));
+ SET cx = cos(sys.radians(deci))* cos(sys.radians(ra-95.0));
+ SET cy = cos(sys.radians(deci))* sin(sys.radians(ra-95.0));
+ SET cz = sin(sys.radians(deci));
--
- SET lambda = -degrees(asin(cx));
+ SET lambda = -sys.degrees(asin(cx));
IF (cy = 0.0 and cz = 0.0)
THEN SET cy = 1e-16;
END IF;
- SET eta = degrees(ATAN(cz,cy))-32.5;
+ SET eta = sys.degrees(ATAN(cz,cy))-32.5;
SET stripeEta = eta;
--
IF lambda < -180.0
@@ -1030,11 +1030,11 @@ BEGIN
END IF;
--
SET qx = cx;
- SET qy = cy*cos(radians(incl))+cz*sin(radians(incl));
- SET qz =-cy*sin(radians(incl))+cz*cos(radians(incl));
+ SET qy = cy*cos(sys.radians(incl))+cz*sin(sys.radians(incl));
+ SET qz =-cy*sin(sys.radians(incl))+cz*cos(sys.radians(incl));
--
- SET mu = degrees(ATAN(qy,qx))+95.0;
- SET nu = degrees(asin(qz));
+ SET mu = sys.degrees(ATAN(qy,qx))+95.0;
+ SET nu = sys.degrees(asin(qz));
IF stripe>50
THEN SET mu = mu+360;
END IF;
@@ -1053,11 +1053,11 @@ BEGIN
stripe int, incl float,
mu float;
--
- SET cx = cos(radians(deci))* cos(radians(ra-95.0));
- SET cy = cos(radians(deci))* sin(radians(ra-95.0));
- SET cz = sin(radians(deci));
+ SET cx = cos(sys.radians(deci))* cos(sys.radians(ra-95.0));
+ SET cy = cos(sys.radians(deci))* sin(sys.radians(ra-95.0));
+ SET cz = sin(sys.radians(deci));
--
- SET eta = degrees(ATAN(cz,cy));
+ SET eta = sys.degrees(ATAN(cz,cy));
SET eta = eta -32.5;
IF eta<-180
THEN SET eta = eta+360;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
