Changeset: e2d4ff539102 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2d4ff539102 Added Files: java/tests/BugDatabaseMetaData_Bug_3356.java sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.bat sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.SQL.sh sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.err sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.Windows clients/Tests/MAL-signatures_nogeom.stable.out clients/mapiclient/tomograph.c java/ChangeLog.Feb2013 java/Makefile.ag java/build.properties java/pom.xml java/release.txt java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/tests/Makefile.ag java/tests/build.xml monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h sql/backends/monet5/sql.mx sql/backends/monet5/sql_hge.mx sql/jdbc/tests/Tests/All Branch: int128 Log Message:
Merge with default branch. diffs (truncated from 790 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -3308,6 +3308,14 @@ command batsql.dec_round(v:bat[:oid,:hge address hge_bat_dec_round_wrap; comment round off the value v to nearests multiple of r +command batsql.dec_round(v:bat[:oid,:dbl],r:dbl):bat[:oid,:dbl] +address dbl_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + +command batsql.dec_round(v:bat[:oid,:flt],r:flt):bat[:oid,:flt] +address flt_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:lng],r:lng):bat[:oid,:lng] address lng_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -3328,6 +3336,10 @@ pattern batsql.next_value(sname:bat[:oid address mvc_bat_next_value; comment return the next value of the sequence +command batsql.round(v:bat[:oid,:hge],d:int,s:int,r:bte):bat[:oid,:hge] +address hge_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batsql.round(v:bat[:oid,:dbl],r:bte):bat[:oid,:dbl] address dbl_bat_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) @@ -3336,6 +3348,22 @@ command batsql.round(v:bat[:oid,:flt],r: address flt_bat_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:lng],d:int,s:int,r:bte):bat[:oid,:lng] +address lng_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] +address int_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:sht],d:int,s:int,r:bte):bat[:oid,:sht] +address sht_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:bte],d:int,s:int,r:bte):bat[:oid,:bte] +address bte_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batgeom.point(x:bat[:oid,:dbl],y:bat[:oid,:dbl]):bat[:oid,:wkb] address wkbcreatepoint_bat; comment Construct a point-BAT from two geometry-BATs @@ -52888,18 +52916,10 @@ command sql.dense_rank_grp(b:bat[:oid,:a address sql_dense_rank_grp; comment return the densely ranked groups -command sql.dec_round(v:bat[:oid,:dbl],r:dbl):bat[:oid,:dbl] -address dbl_bat_dec_round_wrap; -comment round off the value v to nearests multiple of r - command sql.dec_round(v:dbl,r:dbl):dbl address dbl_dec_round_wrap; comment round off the value v to nearests multiple of r -command sql.dec_round(v:bat[:oid,:flt],r:flt):bat[:oid,:flt] -address flt_bat_dec_round_wrap; -comment round off the value v to nearests multiple of r - command sql.dec_round(v:flt,r:flt):flt address flt_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -53108,10 +53128,6 @@ pattern sql.querylog_catalog() (id:bat[: address sql_querylog_catalog; comment Obtain the query log catalog -command sql.round(v:bat[:oid,:hge],d:int,s:int,r:bte):bat[:oid,:hge] -address hge_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:hge,d:int,s:int,r:bte):hge address hge_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) @@ -53140,34 +53156,18 @@ command sql.round(v:flt,r:bte):flt address flt_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:lng],d:int,s:int,r:bte):bat[:oid,:lng] -address lng_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:lng,d:int,s:int,r:bte):lng address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] -address int_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:sht],d:int,s:int,r:bte):bat[:oid,:sht] -address sht_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:sht,d:int,s:int,r:bte):sht address sht_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:bte],d:int,s:int,r:bte):bat[:oid,:bte] -address bte_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:bte,d:int,s:int,r:bte):bte address bte_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) diff --git a/clients/Tests/MAL-signatures.stable.out.Windows b/clients/Tests/MAL-signatures.stable.out.Windows --- a/clients/Tests/MAL-signatures.stable.out.Windows +++ b/clients/Tests/MAL-signatures.stable.out.Windows @@ -2908,6 +2908,14 @@ command batsql.alpha(dec:bat[:oid,:dbl], address SQLbat_alpha_cst; comment BAT implementation of astronomy alpha function +command batsql.dec_round(v:bat[:oid,:dbl],r:dbl):bat[:oid,:dbl] +address dbl_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + +command batsql.dec_round(v:bat[:oid,:flt],r:flt):bat[:oid,:flt] +address flt_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:lng],r:lng):bat[:oid,:lng] address lng_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -2936,6 +2944,22 @@ command batsql.round(v:bat[:oid,:flt],r: address flt_bat_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:lng],d:int,s:int,r:bte):bat[:oid,:lng] +address lng_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] +address int_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:sht],d:int,s:int,r:bte):bat[:oid,:sht] +address sht_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:bte],d:int,s:int,r:bte):bat[:oid,:bte] +address bte_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batgeom.point(x:bat[:oid,:dbl],y:bat[:oid,:dbl]):bat[:oid,:wkb] address wkbcreatepoint_bat; comment Construct a point-BAT from two geometry-BATs @@ -42062,18 +42086,10 @@ command sql.dense_rank_grp(b:bat[:oid,:a address sql_dense_rank_grp; comment return the densely ranked groups -command sql.dec_round(v:bat[:oid,:dbl],r:dbl):bat[:oid,:dbl] -address dbl_bat_dec_round_wrap; -comment round off the value v to nearests multiple of r - command sql.dec_round(v:dbl,r:dbl):dbl address dbl_dec_round_wrap; comment round off the value v to nearests multiple of r -command sql.dec_round(v:bat[:oid,:flt],r:flt):bat[:oid,:flt] -address flt_bat_dec_round_wrap; -comment round off the value v to nearests multiple of r - command sql.dec_round(v:flt,r:flt):flt address flt_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -42306,34 +42322,18 @@ command sql.round(v:flt,r:bte):flt address flt_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:lng],d:int,s:int,r:bte):bat[:oid,:lng] -address lng_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:lng,d:int,s:int,r:bte):lng address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] -address int_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:sht],d:int,s:int,r:bte):bat[:oid,:sht] -address sht_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:sht,d:int,s:int,r:bte):sht address sht_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:bte],d:int,s:int,r:bte):bat[:oid,:bte] -address bte_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:bte,d:int,s:int,r:bte):bte address bte_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) diff --git a/clients/Tests/MAL-signatures_nogeom.stable.out b/clients/Tests/MAL-signatures_nogeom.stable.out --- a/clients/Tests/MAL-signatures_nogeom.stable.out +++ b/clients/Tests/MAL-signatures_nogeom.stable.out @@ -2908,6 +2908,14 @@ command batsql.alpha(dec:bat[:oid,:dbl], address SQLbat_alpha_cst; comment BAT implementation of astronomy alpha function +command batsql.dec_round(v:bat[:oid,:dbl],r:dbl):bat[:oid,:dbl] +address dbl_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + +command batsql.dec_round(v:bat[:oid,:flt],r:flt):bat[:oid,:flt] +address flt_bat_dec_round_wrap; +comment round off the value v to nearests multiple of r + command batsql.dec_round(v:bat[:oid,:lng],r:lng):bat[:oid,:lng] address lng_bat_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -2936,6 +2944,22 @@ command batsql.round(v:bat[:oid,:flt],r: address flt_bat_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) +command batsql.round(v:bat[:oid,:lng],d:int,s:int,r:bte):bat[:oid,:lng] +address lng_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] +address int_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:sht],d:int,s:int,r:bte):bat[:oid,:sht] +address sht_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + +command batsql.round(v:bat[:oid,:bte],d:int,s:int,r:bte):bat[:oid,:bte] +address bte_bat_round_wrap; +comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) + command batcolor.blue(c:bat[:oid,:color]):bat[:oid,:int] address CLRbatBlue; comment Extracts blue component from a color atom @@ -41902,18 +41926,10 @@ command sql.dense_rank_grp(b:bat[:oid,:a address sql_dense_rank_grp; comment return the densely ranked groups -command sql.dec_round(v:bat[:oid,:dbl],r:dbl):bat[:oid,:dbl] -address dbl_bat_dec_round_wrap; -comment round off the value v to nearests multiple of r - command sql.dec_round(v:dbl,r:dbl):dbl address dbl_dec_round_wrap; comment round off the value v to nearests multiple of r -command sql.dec_round(v:bat[:oid,:flt],r:flt):bat[:oid,:flt] -address flt_bat_dec_round_wrap; -comment round off the value v to nearests multiple of r - command sql.dec_round(v:flt,r:flt):flt address flt_dec_round_wrap; comment round off the value v to nearests multiple of r @@ -42146,34 +42162,18 @@ command sql.round(v:flt,r:bte):flt address flt_round_wrap; comment round off the floating point v to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:lng],d:int,s:int,r:bte):bat[:oid,:lng] -address lng_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:lng,d:int,s:int,r:bte):lng address lng_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:int],d:int,s:int,r:bte):bat[:oid,:int] -address int_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:int,d:int,s:int,r:bte):int address int_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) -command sql.round(v:bat[:oid,:sht],d:int,s:int,r:bte):bat[:oid,:sht] -address sht_bat_round_wrap; -comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) - command sql.round(v:sht,d:int,s:int,r:bte):sht address sht_round_wrap; comment round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot) _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
