Handle T_OpExpr for fixed length datatypes with other operand as numeric (#3821) (#3861)

This PR fixes typmod handling for queries where sub-expressions have a resultant type of fixed-size datatypes (money, smallmoney,int,bigint,smallint,tinyint) and the overall query have arithmetic operation involves numeric datatype.

Previously in babelfish, this either leads to producing incorrect results, or throw "Arithmetic overflow error". This PR ensures correct precision/scale calculations for fixed sized datatypes in T_OpExpr node.

Signed-off-by: Tanya Gupta tanyagp@amazon.com

Issues Resolved
BABEL-5899

Author: tanyagupta17

contrib/babelfishpg_tds/src/backend/tds/tds_srv.c

@@ -205,7 +205,6 @@ pe_tds_init(void)
 	pltsql_plugin_handler_ptr->get_datum_from_date_time_struct = &TdsDateTimeTypeToDatum;
 	pltsql_plugin_handler_ptr->set_reset_tds_connection_flag = &SetResetTDSConnectionFlag;
 	pltsql_plugin_handler_ptr->get_reset_tds_connection_flag = &GetResetTDSConnectionFlag;
-	pltsql_plugin_handler_ptr->get_tds_numeric_get_typmod = &tds_numeric_get_typmod;
 
 	invalidate_stat_table_hook = invalidate_stat_table;
 	guc_newval_hook = TdsSetGucStatVariable;

contrib/babelfishpg_tds/src/backend/utils/adt/numeric.c

@@ -749,44 +749,3 @@ TdsSetVarFromStrWrapper(const char *str)
 	return res;
 }
 
-/*
- * Fix Me: It is a duplicate function of tsql_numeric_get_typmod
- * Get Precision & Scale from Numeric Value
- */
-int32_t
-tds_numeric_get_typmod(Numeric num)
-{
-	int32_t		scale = NUMERIC_DSCALE(num);
-	int32_t		weight = NUMERIC_WEIGHT(num);
-	int32_t		precision;
-
-	if (weight >= 0 && NUMERIC_NDIGITS(num) != 0)
-	{
-		static const int32 timescales[DEC_DIGITS] = {
-			1000,
-			100,
-			10,
-			1,
-		};
-		int			leading_digits = NUMERIC_DIGITS(num)[0];
-
-		precision = weight * DEC_DIGITS + scale;
-
-		for (int i = 0; i < DEC_DIGITS; i++)
-		{
-			if (leading_digits >= timescales[i])
-			{
-				precision += (4 - i);
-				break;
-			}
-		}
-	}
-	else if (NUMERIC_NDIGITS(num) == 0 && scale == 0)
-		/* NUMERIC_NDIGITS(num) == 0 && scale == 0 means number is 0 */
-		precision = 1;
-	else
-		/* weight < 0 means the integral part of the number is 0 */
-		precision = scale;
-
-	return (((precision & 0xFFFF) << 16) | (scale & 0xFFFF)) + VARHDRSZ;
-}

contrib/babelfishpg_tds/src/include/tds_int.h

@@ -369,7 +369,6 @@ extern void pe_fin(void);
 
 /* Functions in backend/utils/adt/numeric.c */
 extern Numeric TdsSetVarFromStrWrapper(const char *str);
-extern int32_t tds_numeric_get_typmod(Numeric num);
 
 /* Functions in backend/utils/adt/varchar.c */
 extern void *tds_varchar_input(const char *s, size_t len, int32 atttypmod);

contrib/babelfishpg_tsql/src/pltsql.h

@@ -1808,7 +1808,6 @@ typedef struct PLtsql_protocol_plugin
 	bool		(*get_reset_tds_connection_flag) ();
 	void 		(*get_tvp_typename_typeschemaname) (char *proc_name, char *target_arg_name, 
 													char **tvp_type_name, char **tvp_type_schema_name);
-	int32_t 	(*get_tds_numeric_get_typmod) (Numeric num);
 
 	/* Session level GUCs */
 	bool		quoted_identifier;

contrib/babelfishpg_tsql/src/pltsql_coerce.c

@@ -82,11 +82,12 @@ static bool is_tsql_numeric_fixeddecimal(Oid oid);
 static bool is_tsql_bit_numeric(Oid oid);
 static bool is_tsql_int4_bit(Oid oid);
 
-#define SMALLINT_PRECISION_RADIX	5
-#define INT_PRECISION_RADIX		10
-#define BIGINT_PRECISION_RADIX		19
-#define TINYINT_PRECISION_RADIX		3
+#define TINYINT_PRECISION_RADIX 	3
+#define SMALLINT_PRECISION_RADIX 	5
+#define INT_PRECISION_RADIX 		10
+#define BIGINT_PRECISION_RADIX 		19
 
+#define DEFAULT_TINYINT_TYPMOD		((TINYINT_PRECISION_RADIX << 16) | 0) + VARHDRSZ
 #define DEFAULT_SMALLINT_TYPMOD		((SMALLINT_PRECISION_RADIX << 16) | 0) + VARHDRSZ
 #define DEFAULT_INT_TYPMOD		((INT_PRECISION_RADIX << 16) | 0) + VARHDRSZ
 #define DEFAULT_BIGINT_TYPMOD		((BIGINT_PRECISION_RADIX << 16) | 0) + VARHDRSZ
@@ -1205,15 +1206,43 @@ is_numeric_datatype(Oid typid)
 	return false;
 }
 
+/*
+ * get_default_typmod_for_fixedsize_dataypes
+ *
+ * Assigns predefined typmod values for fixed-length datatypes
+ * (int, bigint, smallint, tinyint) and money/smallmoney.
+ * These typmods represent the maximum allowed precision for each type
+ * and are used during typmod resolution to ensure consistent handling
+ * in expressions involving fixed-size numeric types.
+ */
+static int32
+get_default_typmod_for_fixedsize_dataypes(Oid resulttype)
+{
+	if (resulttype == INT4OID)
+		return DEFAULT_INT_TYPMOD;
+	else if (resulttype == INT8OID)
+		return DEFAULT_BIGINT_TYPMOD;
+	else if (resulttype == INT2OID)
+		return DEFAULT_SMALLINT_TYPMOD;
+	else if ((*common_utility_plugin_ptr->is_tsql_tinyint_datatype)(resulttype))
+		return DEFAULT_TINYINT_TYPMOD;
+	else if ((*common_utility_plugin_ptr->is_tsql_money_datatype)(resulttype))
+		return TSQL_MONEY_TYPMOD;
+	else if ((*common_utility_plugin_ptr->is_tsql_smallmoney_datatype)(resulttype))
+		return TSQL_SMALLMONEY_TYPMOD;
+
+	return -1;
+}
+
 /* 
- * look for a typmod to return from a numeric expression,
- * Also for cases where we cannot compute the expression typmod return -1 and set found as false.
+ * Look for a typmod to return from a numeric expression,
+ * also for cases where we cannot compute the expression typmod return -1 and set found as false.
  */
 int32
 resolve_numeric_typmod_from_exp(Plan *plan, Node *expr, bool *found)
 {
 	/*
-	 * set found value as true by default, if we are unable to 
+	 * Set found value as true by default, if we are unable to 
 	 * find the expression typmod found will be set to false.
 	 */
 	if (found != NULL)
@@ -1231,6 +1260,7 @@ resolve_numeric_typmod_from_exp(Plan *plan, Node *expr, bool *found)
 				Param *param = (Param *) expr;
 				if (param->paramtypmod == -1)
 				{
+					int32 		fixlen_default_typmod;
 					/* UDT handling in T_Param */
 					Oid immediate_base_type = get_immediate_base_type_of_UDT_internal(param->paramtype);
 					if (OidIsValid(immediate_base_type))
@@ -1241,15 +1271,14 @@ resolve_numeric_typmod_from_exp(Plan *plan, Node *expr, bool *found)
 							return typmod;
 					}
 
-					/* handling for fixed length datatypes */
-					if (param->paramtype == INT4OID)
-						return DEFAULT_INT_TYPMOD;
-					else if (param->paramtype == INT8OID)
-						return DEFAULT_BIGINT_TYPMOD;
-					else if (param->paramtype == INT2OID)
-						return DEFAULT_SMALLINT_TYPMOD;
-					else if ((*common_utility_plugin_ptr->is_tsql_tinyint_datatype) (param->paramtype))
-						return DEFAULT_TINYINT_TYPMOD;
+					/*
+					 * Handle default typmod for supported fixed-length datatypes
+					 * such as bigint, int, smallint, and tinyint.
+					 * These typmods represent the maximum allowed digits for each type.
+					 */
+					fixlen_default_typmod = get_default_typmod_for_fixedsize_dataypes(param->paramtype);
+					if (fixlen_default_typmod != -1)
+						return fixlen_default_typmod;
 				}
 
 				if (!is_numeric_datatype(param->paramtype) &&
@@ -1302,17 +1331,20 @@ resolve_numeric_typmod_from_exp(Plan *plan, Node *expr, bool *found)
 					{
 						val = con->constvalue;
 						num = int64_to_numeric(val);
-						if (*pltsql_protocol_plugin_ptr && (*pltsql_protocol_plugin_ptr)->get_tds_numeric_get_typmod)
-							return (*pltsql_protocol_plugin_ptr)->get_tds_numeric_get_typmod(num);
+						if ((*common_utility_plugin_ptr->tsql_numeric_get_typmod))
+						{
+							return ((*common_utility_plugin_ptr->tsql_numeric_get_typmod)(num));
+						}
 
 						if (found != NULL) *found = false;
 						return -1;
 					}
 
 					num = (Numeric) con->constvalue;
-					if (*pltsql_protocol_plugin_ptr && (*pltsql_protocol_plugin_ptr)->get_tds_numeric_get_typmod)
-						return (*pltsql_protocol_plugin_ptr)->get_tds_numeric_get_typmod(num);
-					
+					if ((*common_utility_plugin_ptr->tsql_numeric_get_typmod))
+					{
+						return ((*common_utility_plugin_ptr->tsql_numeric_get_typmod)(num));
+					}
 					if (found != NULL) *found = false;
 					return -1;
 				}
@@ -1416,15 +1448,21 @@ resolve_numeric_typmod_from_exp(Plan *plan, Node *expr, bool *found)
 							return typmod;
 					}
 
-					/* handling for fixed length datatypes */
-					if (plan && var->vartype == INT4OID)
-						return DEFAULT_INT_TYPMOD;
-					else if (plan && var->vartype == INT8OID)
-						return DEFAULT_BIGINT_TYPMOD;
-					else if (plan && var->vartype == INT2OID)
-						return DEFAULT_SMALLINT_TYPMOD;
-					else if (plan && (*common_utility_plugin_ptr->is_tsql_tinyint_datatype) (var->vartype))
-						return DEFAULT_TINYINT_TYPMOD;
+					/*
+					 * Handle default typmod for supported fixed-length datatypes
+					 * such as bigint, int, smallint, and tinyint.
+					 * These typmods represent the maximum allowed digits for each type.
+					 *
+					 * Plan check ensures typmod consistency to preventing incorrect values,
+					 * ensuring plan is not changed if typmod is calculated in execution stage.
+					 */
+					if (plan)
+					{
+						int32 		fixlen_default_typmod;
+						fixlen_default_typmod = get_default_typmod_for_fixedsize_dataypes(var->vartype);
+						if (fixlen_default_typmod != -1)
+							return fixlen_default_typmod;
+					}
 
 					if (found != NULL) *found = false;
 				}
@@ -1447,8 +1485,19 @@ resolve_numeric_typmod_from_exp(Plan *plan, Node *expr, bool *found)
 						precision;
 				uint8_t		integralDigitCount = 0;
 				bool		found_typmod;
+				int32 		fixsize_default_typmod;
 
 				Assert(list_length(op->args) == 2 || list_length(op->args) == 1);
+
+				/*
+				 * Handle default typmod for supported fixed-size datatypes
+				 * such as money, smallmoney, bigint, int, smallint, and tinyint.
+				 * These typmods represent the maximum allowed digits for each type.
+				 */
+				fixsize_default_typmod = get_default_typmod_for_fixedsize_dataypes(op->opresulttype);
+				if (fixsize_default_typmod != -1)
+					return fixsize_default_typmod;
+
 				if (list_length(op->args) == 2)
 				{
 					arg1 = linitial(op->args);

test/JDBC/expected/Numeric_Decimal_tests.out

@@ -1428,7 +1428,7 @@ SELECT CAST(123.45 AS NUMERIC(5,2)) * CAST(678.90 AS NUMERIC(5,2)) / (CAST(2 AS
 GO
 ~~START~~
 numeric
-16762.041000000000
+16762.041000000000000
 ~~END~~
 
 
@@ -2098,7 +2098,7 @@ SELECT (@num1 * @num2) / (@int1 + @int2) AS result;
 GO
 ~~START~~
 numeric
-16762.0410000000000000
+16762.041000000000000
 ~~END~~
 
 

test/JDBC/expected/TestExactNumeric.out

@@ -229,32 +229,32 @@ SELECT
 	CEILING(smallint_col + 0.5) AS ceil_smallint,
 	CEILING(integer_col + 0.5) AS ceil_int,
 	CEILING(bigint_col + 0.5) AS ceil_bigint
-FROM exactnumeric_table;
+FROM exactnumeric_table order by ceil_tinyint;
 GO
 ~~START~~
 numeric#!#numeric#!#numeric#!#numeric
-1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
-<NULL>#!#-32767.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#-2147483647.00000000#!#<NULL>
+<NULL>#!#1.00000000#!#<NULL>#!#<NULL>
+<NULL>#!#<NULL>#!#1.00000000#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#-9223372036854775807.00000000
-128.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+<NULL>#!#<NULL>#!#<NULL>#!#1.00000000
 <NULL>#!#32768.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#2147483648.00000000#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#9223372036854775808.00000000
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
-1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+<NULL>#!#-32767.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#1.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#1.00000000#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#1.00000000
 1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
-<NULL>#!#1.00000000#!#<NULL>#!#<NULL>
-<NULL>#!#<NULL>#!#1.00000000#!#<NULL>
-<NULL>#!#<NULL>#!#<NULL>#!#1.00000000
-129.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
 6.00000000#!#101.00000000#!#10001.00000000#!#1000000001.00000000
+128.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+129.00000000#!#<NULL>#!#<NULL>#!#<NULL>
 ~~END~~
 
 
@@ -263,32 +263,32 @@ SELECT
 	FLOOR(smallint_col + 0.5) AS floor_smallint,
 	FLOOR(integer_col + 0.5) AS floor_int,
 	FLOOR(bigint_col + 0.5) AS floor_bigint
-FROM exactnumeric_table;
+FROM exactnumeric_table order by floor_tinyint;
 GO
 ~~START~~
 numeric#!#numeric#!#numeric#!#numeric
-0E-8#!#<NULL>#!#<NULL>#!#<NULL>
-<NULL>#!#-32768.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#-2147483648.00000000#!#<NULL>
+<NULL>#!#0E-8#!#<NULL>#!#<NULL>
+<NULL>#!#<NULL>#!#0E-8#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#-9223372036854775808.00000000
-127.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+<NULL>#!#<NULL>#!#<NULL>#!#0E-8
 <NULL>#!#32767.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#2147483647.00000000#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#9223372036854775807.00000000
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
-0E-8#!#<NULL>#!#<NULL>#!#<NULL>
+<NULL>#!#-32768.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#0E-8#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#0E-8#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#0E-8
 0E-8#!#<NULL>#!#<NULL>#!#<NULL>
-<NULL>#!#0E-8#!#<NULL>#!#<NULL>
-<NULL>#!#<NULL>#!#0E-8#!#<NULL>
-<NULL>#!#<NULL>#!#<NULL>#!#0E-8
-128.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+0E-8#!#<NULL>#!#<NULL>#!#<NULL>
+0E-8#!#<NULL>#!#<NULL>#!#<NULL>
 5.00000000#!#100.00000000#!#10000.00000000#!#1000000000.00000000
+127.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+128.00000000#!#<NULL>#!#<NULL>#!#<NULL>
 ~~END~~
 
 
@@ -580,32 +580,32 @@ SELECT
 	ROUND(smallint_col + 0.5) AS round_smallint,
 	ROUND(integer_col + 0.5) AS round_int,
 	ROUND(bigint_col + 0.5) AS round_bigint
-FROM exactnumeric_table;
+FROM exactnumeric_table order by round_tinyint;
 GO
 ~~START~~
 numeric#!#numeric#!#numeric#!#numeric
-1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
-<NULL>#!#-32768.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#-2147483648.00000000#!#<NULL>
+<NULL>#!#1.00000000#!#<NULL>#!#<NULL>
+<NULL>#!#<NULL>#!#1.00000000#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#-9223372036854775808.00000000
-128.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+<NULL>#!#<NULL>#!#<NULL>#!#1.00000000
 <NULL>#!#32768.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#2147483648.00000000#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#9223372036854775808.00000000
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#<NULL>
-1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+<NULL>#!#-32768.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#1.00000000#!#<NULL>#!#<NULL>
 <NULL>#!#<NULL>#!#1.00000000#!#<NULL>
 <NULL>#!#<NULL>#!#<NULL>#!#1.00000000
 1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
-<NULL>#!#1.00000000#!#<NULL>#!#<NULL>
-<NULL>#!#<NULL>#!#1.00000000#!#<NULL>
-<NULL>#!#<NULL>#!#<NULL>#!#1.00000000
-129.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+1.00000000#!#<NULL>#!#<NULL>#!#<NULL>
 6.00000000#!#101.00000000#!#10001.00000000#!#1000000001.00000000
+128.00000000#!#<NULL>#!#<NULL>#!#<NULL>
+129.00000000#!#<NULL>#!#<NULL>#!#<NULL>
 ~~END~~