Changeset: 6e970b1b1309 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6e970b1b1309
Modified Files:
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
Branch: cleanup_types
Log Message:
removed useless SCALE_NOFIX, use SCALE_NONE instead
diffs (88 lines):
diff --git a/sql/common/sql_types.c b/sql/common/sql_types.c
--- a/sql/common/sql_types.c
+++ b/sql/common/sql_types.c
@@ -995,8 +995,8 @@ sqltypeinit( sql_allocator *sa)
/* this requires a type definition */
floats = t;
- FLT = *t++ = sql_create_type(sa, "REAL", 24, SCALE_NOFIX, 2, EC_FLT,
"flt");
- DBL = *t++ = sql_create_type(sa, "DOUBLE", 53, SCALE_NOFIX, 2, EC_FLT,
"dbl");
+ FLT = *t++ = sql_create_type(sa, "REAL", 24, SCALE_NONE, 2, EC_FLT,
"flt");
+ DBL = *t++ = sql_create_type(sa, "DOUBLE", 53, SCALE_NONE, 2, EC_FLT,
"dbl");
dates = t;
MONINT = *t++ = sql_create_type(sa, "MONTH_INTERVAL", 3, 0, 10,
EC_MONTH, "int"); /* 1 .. 13 enumerates the 13 different interval types */
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -82,13 +82,12 @@ typedef enum sql_dependency {
#define SCALE_NONE 0
#define SCALE_FIX 1 /* many numerical functions require equal
scales/precision for all
their inputs */
-#define SCALE_NOFIX 2
-#define MAX_BITS 3
-#define SCALE_MUL 4 /* multiplication gives the sum of scales */
-#define SCALE_DIV 5 /* div on the other hand reduces the scales */
-#define DIGITS_ADD 6 /* some types grow under functions (concat) */
-#define INOUT 7 /* output type equals input type (of first
input) */
-#define SCALE_EQ 8 /* user defined functions need equal scales */
+#define MAX_BITS 2
+#define SCALE_MUL 3 /* multiplication gives the sum of scales */
+#define SCALE_DIV 4 /* div on the other hand reduces the scales */
+#define DIGITS_ADD 5 /* some types grow under functions (concat) */
+#define INOUT 6 /* output type equals input type (of first
input) */
+#define SCALE_EQ 7 /* user defined functions need equal scales */
#define RDONLY 0
#define RD_INS 1
@@ -500,7 +499,7 @@ typedef struct sql_func {
private:1; /* certain functions cannot be bound from user queries
*/
int fix_scale;
/*
- SCALE_NOFIX/SCALE_NONE => nothing
+ SCALE_NONE => nothing
SCALE_FIX => input scale fixing,
SCALE_ADD => leave inputs as is and do add scales
example numerical multiplication
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -5174,8 +5174,8 @@ select 'null in fkeys.delete_action', de
[ "sys.types", "sys", "date", "date", 0, 0, 0, "DATE" ]
[ "sys.types", "sys", "daytime", "time", 7, 0, 0, "TIME"
]
[ "sys.types", "sys", "daytime", "timetz", 7, 1, 0,
"TIME_TZ" ]
-[ "sys.types", "sys", "dbl", "double", 53, 2, 2, "FLT"
]
-[ "sys.types", "sys", "flt", "real", 24, 2, 2, "FLT" ]
+[ "sys.types", "sys", "dbl", "double", 53, 0, 2, "FLT"
]
+[ "sys.types", "sys", "flt", "real", 24, 0, 2, "FLT" ]
[ "sys.types", "sys", "inet", "inet", 0, 0, 0, "EXTERNAL"
]
[ "sys.types", "sys", "int", "decimal", 9, 1, 10, "DEC"
]
[ "sys.types", "sys", "int", "int", 32, 1, 2, "NUM" ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -4832,8 +4832,8 @@ select 'null in fkeys.delete_action', de
[ "sys.types", "sys", "date", "date", 0, 0, 0, "DATE" ]
[ "sys.types", "sys", "daytime", "time", 7, 0, 0, "TIME"
]
[ "sys.types", "sys", "daytime", "timetz", 7, 1, 0,
"TIME_TZ" ]
-[ "sys.types", "sys", "dbl", "double", 53, 2, 2, "FLT"
]
-[ "sys.types", "sys", "flt", "real", 24, 2, 2, "FLT" ]
+[ "sys.types", "sys", "dbl", "double", 53, 0, 2, "FLT"
]
+[ "sys.types", "sys", "flt", "real", 24, 0, 2, "FLT" ]
[ "sys.types", "sys", "inet", "inet", 0, 0, 0, "EXTERNAL"
]
[ "sys.types", "sys", "int", "decimal", 9, 1, 10, "DEC"
]
[ "sys.types", "sys", "int", "int", 32, 1, 2, "NUM" ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -5305,8 +5305,8 @@ select 'null in fkeys.delete_action', de
[ "sys.types", "sys", "date", "date", 0, 0, 0, "DATE" ]
[ "sys.types", "sys", "daytime", "time", 7, 0, 0, "TIME"
]
[ "sys.types", "sys", "daytime", "timetz", 7, 1, 0,
"TIME_TZ" ]
-[ "sys.types", "sys", "dbl", "double", 53, 2, 2, "FLT"
]
-[ "sys.types", "sys", "flt", "real", 24, 2, 2, "FLT" ]
+[ "sys.types", "sys", "dbl", "double", 53, 0, 2, "FLT"
]
+[ "sys.types", "sys", "flt", "real", 24, 0, 2, "FLT" ]
[ "sys.types", "sys", "hge", "decimal", 38, 1, 10, "DEC"
]
[ "sys.types", "sys", "hge", "hugeint", 127, 1, 2, "NUM"
]
[ "sys.types", "sys", "inet", "inet", 0, 0, 0, "EXTERNAL"
]
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
