Changeset: 61c68d415221 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61c68d415221
Removed Files:
sql/backends/monet5/dummy.c
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
sql/backends/monet5/sql.mx
Branch: default
Log Message:
Merge with Apr2012 branch.
diffs (135 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -4327,6 +4327,14 @@ end main;
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:flt] ",
"CMDconvert_bte_flt;"
]
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:flt]):bat[:any_1,:flt] ",
"CMDconvert_flt;"
]
[ "hash", "command", "batcalc",
"(b:bat[:oid,:any_1]):bat[:oid,:wrd] ",
"MKEYbathash;" ]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:dbl]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:flt]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:wrd]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:oid]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:lng]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:int]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:sht]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:bte]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
[ "int", "command", "batcalc",
"(s1:int,v:bat[:oid,:lng],d2:int,s2:int):bat[:oid,:int] ",
"batlng_dec2dec_int;" ]
[ "int", "command", "batcalc",
"(s1:int,v:bat[:oid,:lng]):bat[:oid,:int] ",
"batlng_dec2_int;" ]
[ "int", "command", "batcalc",
"(v:bat[:oid,:lng],digits:int,scale:int):bat[:oid,:int] ",
"batlng_num2dec_int;" ]
@@ -6746,6 +6754,14 @@ end main;
[ "getBAT", "command", "calc",
"(b:BAT):bat[:any_1,:any_2] ",
"CALCbat2batid;" ]
[ "getBATidentifier", "command", "calc",
"(b:bat[:any_1,:any_2]):BAT ",
"CALCbat2batid;"
]
[ "hash", "pattern", "calc", "(v:any):wrd
",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:dbl):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:flt):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:wrd):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:oid):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:lng):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:int):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:sht):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:bte):wrd ",
"MKEYhash;" ]
[ "int", "command", "calc",
"(s1:int,v:lng,d2:int,s2:int):int ",
"lng_dec2dec_int;" ]
[ "int", "command", "calc",
"(s1:int,v:lng):int ",
"lng_dec2_int;" ]
[ "int", "command", "calc",
"(v:lng,digits:int,scale:int):int ",
"lng_num2dec_int;" ]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -2777,6 +2777,14 @@ end main;
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:flt] ",
"CMDconvert_bte_flt;"
]
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:flt]):bat[:any_1,:flt] ",
"CMDconvert_flt;"
]
[ "hash", "command", "batcalc",
"(b:bat[:oid,:any_1]):bat[:oid,:wrd] ",
"MKEYbathash;" ]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:dbl]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:flt]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:wrd]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:oid]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:lng]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:int]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:sht]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
+[ "hash", "command", "batcalc",
"(b:bat[:oid,:bte]):bat[:oid,:wrd] ",
"MKEYbathash;"
]
[ "int", "command", "batcalc",
"(s1:int,v:bat[:oid,:lng],d2:int,s2:int):bat[:oid,:int] ",
"batlng_dec2dec_int;" ]
[ "int", "command", "batcalc",
"(s1:int,v:bat[:oid,:lng]):bat[:oid,:int] ",
"batlng_dec2_int;" ]
[ "int", "command", "batcalc",
"(v:bat[:oid,:lng],digits:int,scale:int):bat[:oid,:int] ",
"batlng_num2dec_int;" ]
@@ -4268,6 +4276,14 @@ end main;
[ "getBAT", "command", "calc",
"(b:BAT):bat[:any_1,:any_2] ",
"CALCbatid2bat;"
]
[ "getBATidentifier", "command", "calc",
"(b:bat[:any_1,:any_2]):BAT ",
"CALCbat2batid;"
]
[ "hash", "pattern", "calc", "(v:any):wrd
",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:dbl):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:flt):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:wrd):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:oid):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:lng):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:int):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:sht):wrd ",
"MKEYhash;" ]
+[ "hash", "pattern", "calc", "(v:bte):wrd ",
"MKEYhash;" ]
[ "int", "command", "calc",
"(s1:int,v:lng,d2:int,s2:int):int ",
"lng_dec2dec_int;" ]
[ "int", "command", "calc",
"(s1:int,v:lng):int ",
"lng_dec2_int;" ]
[ "int", "command", "calc",
"(v:lng,digits:int,scale:int):int ",
"lng_num2dec_int;" ]
diff --git a/sql/backends/monet5/dummy.c b/sql/backends/monet5/dummy.c
deleted file mode 100644
--- a/sql/backends/monet5/dummy.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2012 MonetDB B.V.
- * All Rights Reserved.
- */
-
-#include "monetdb_config.h"
-
-#ifdef WIN32
-#ifndef LIBSQL_CACHE
-#define dummy_export extern __declspec(dllimport)
-#else
-#define dummy_export extern __declspec(dllexport)
-#endif
-#else
-#define dummy_export extern
-#endif
-
-/* declare and export a dummy function so that on Windows the .lib
- * file is also produced */
-dummy_export void dummy(void);
-void
-dummy(void)
-{
-}
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -504,6 +504,22 @@ comment "return a table with storage inf
#
# The routine below are added to the calc module to
# ease code generation.
+pattern calc.hash( v:bte ) :wrd address MKEYhash;
+command batcalc.hash( b:bat[:oid,:bte] ) :bat[:oid,:wrd] address MKEYbathash;
+pattern calc.hash( v:sht ) :wrd address MKEYhash;
+command batcalc.hash( b:bat[:oid,:sht] ) :bat[:oid,:wrd] address MKEYbathash;
+pattern calc.hash( v:int ) :wrd address MKEYhash;
+command batcalc.hash( b:bat[:oid,:int] ) :bat[:oid,:wrd] address MKEYbathash;
+pattern calc.hash( v:lng ) :wrd address MKEYhash;
+command batcalc.hash( b:bat[:oid,:lng] ) :bat[:oid,:wrd] address MKEYbathash;
+pattern calc.hash( v:oid ) :wrd address MKEYhash;
+command batcalc.hash( b:bat[:oid,:oid] ) :bat[:oid,:wrd] address MKEYbathash;
+pattern calc.hash( v:wrd ) :wrd address MKEYhash;
+command batcalc.hash( b:bat[:oid,:wrd] ) :bat[:oid,:wrd] address MKEYbathash;
+pattern calc.hash( v:flt ) :wrd address MKEYhash;
+command batcalc.hash( b:bat[:oid,:flt] ) :bat[:oid,:wrd] address MKEYbathash;
+pattern calc.hash( v:dbl ) :wrd address MKEYhash;
+command batcalc.hash( b:bat[:oid,:dbl] ) :bat[:oid,:wrd] address MKEYbathash;
pattern calc.hash( v:any ) :wrd address MKEYhash;
command batcalc.hash( b:bat[:oid,:any_1] ) :bat[:oid,:wrd] address MKEYbathash;
pattern calc.rotate_xor_hash(h:wrd, nbits:int, v:any_1) :wrd address
MKEYrotate_xor_hash;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
