Changeset: 0312aebf9e45 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0312aebf9e45
Modified Files:
sql/server/rel_select.c
sql/test/mapi/Tests/php_int128.stable.out
sql/test/mapi/Tests/sql_int128.stable.out
Branch: int128
Log Message:
small fix in sum_scales for the new hugeint case.
diffs (69 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -2032,7 +2032,11 @@ exp_sum_scales(mvc *sql, sql_subfunc *f,
f->res.digits = 19;
#endif
if (f->res.type->radix == 2 && f->res.digits > 53)
+#ifdef HAVE_HGE
+ f->res.digits = 128;
+#else
f->res.digits = 53;
+#endif
/* sum of digits may mean we need a bigger result type
* as the function don't support this we need to
diff --git a/sql/test/mapi/Tests/php_int128.stable.out
b/sql/test/mapi/Tests/php_int128.stable.out
--- a/sql/test/mapi/Tests/php_int128.stable.out
+++ b/sql/test/mapi/Tests/php_int128.stable.out
@@ -60,10 +60,10 @@ Ready.
Array
(
- [i] => 123456789098765432101234567890987654321,
+ [i] => 123456789098765432101234567890987654321
)
i
-123456789098765432101234567890987654321,
+123456789098765432101234567890987654321
# 16:20:35 >
# 16:20:35 > "Done."
diff --git a/sql/test/mapi/Tests/sql_int128.stable.out
b/sql/test/mapi/Tests/sql_int128.stable.out
--- a/sql/test/mapi/Tests/sql_int128.stable.out
+++ b/sql/test/mapi/Tests/sql_int128.stable.out
@@ -84,9 +84,9 @@ end s3_1;
function user.s4_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_5:hge := sql.getVariable(X_2,"a");
- X_8:hge := sql.getVariable(X_2,"b");
- X_9 := calc.*(X_6,X_8);
- sql.setVariable(X_2,"c",X_9);
+ X_7:hge := sql.getVariable(X_2,"b");
+ X_8 := calc.*(X_5,X_7);
+ sql.setVariable(X_2,"c",X_8);
sql.exportOperation("");
end s4_1;
# querylog.define("explain set c = cast(a * b as hugeint);","default_pipe")
@@ -98,9 +98,9 @@ end s4_1;
function user.s5_1{autoCommit=true}():void;
X_2 := sql.mvc();
X_5:hge := sql.getVariable(X_2,"c");
- X_8:hge := sql.getVariable(X_2,"b");
- X_9 := calc.*(X_6,X_8);
- sql.setVariable(X_2,"d",X_9);
+ X_7:hge := sql.getVariable(X_2,"b");
+ X_8 := calc.*(X_5,X_7);
+ sql.setVariable(X_2,"d",X_8);
sql.exportOperation("");
end s5_1;
# querylog.define("explain set d = c * b;","default_pipe")
@@ -127,7 +127,7 @@ end s6_1;
% .L1, .L2, .L3, .L4, .L4 # table_name
% L1, L2, L3, L4, single_value # name
% hugeint, hugeint, hugeint, hugeint, hugeint # type
-% 19, 11, 29, 40, 40 # length
+% 19, 11, 29, 39, 39 # length
[ 1234567890987654321, 10000000000, 12345678909876543210000000000,
123456789098765432100000000000000000000,
123456789098765432101234567890987654321 ]
#SELECT 123456789098765432101234567890987654321;
% .L # table_name
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
