jrgemignani commented on code in PR #1339:
URL: https://github.com/apache/age/pull/1339#discussion_r1379424212
##########
src/backend/utils/adt/agtype.c:
##########
@@ -2724,41 +2839,105 @@ PG_FUNCTION_INFO_V1(agtype_to_int2);
*/
Datum agtype_to_int2(PG_FUNCTION_ARGS)
{
- agtype *agtype_in = AG_GET_ARG_AGTYPE_P(0);
agtype_value agtv;
+ agtype_value *agtv_p = NULL;
+ agtype_value *container = NULL;
int16 result = 0x0;
- agtype *arg_agt;
+ agtype *arg_agt = NULL;
/* get the agtype equivalence of any convertable input type */
arg_agt = get_one_agtype_from_variadic_args(fcinfo, 0, 1);
/* Return null if arg_agt is null. This covers SQL and Agtype NULLS */
if (arg_agt == NULL)
+ {
PG_RETURN_NULL();
+ }
if (!agtype_extract_scalar(&arg_agt->root, &agtv) ||
(agtv.type != AGTV_FLOAT &&
agtv.type != AGTV_INTEGER &&
agtv.type != AGTV_NUMERIC &&
- agtv.type != AGTV_STRING))
+ agtv.type != AGTV_STRING &&
+ agtv.type != AGTV_BOOL))
+ {
cannot_cast_agtype_value(agtv.type, "int");
+ }
- PG_FREE_IF_COPY(agtype_in, 0);
+ agtv_p = &agtv;
+
+ /*
+ * If it is an agtype string, we need to convert the string component
first.
+ * We need to do this because the string could be any type of value. Fx,
+ * integer, float, boolean, numeric, object, or array. Once converted, we
+ * need to remember scalar values are returned as a scalar array. We only
+ * care about scalar arrays.
+ */
+ if (agtv_p->type == AGTV_STRING)
+ {
+ agtype_value *temp = NULL;
+
+ /* convert the string to an agtype_value */
+ temp = agtype_value_from_cstring(agtv_p->val.string.val,
+ agtv_p->val.string.len);
+
+ if (temp->type != AGTV_ARRAY ||
+ !temp->val.array.raw_scalar)
+ {
+ elog(ERROR, "invalid agtype type: %d", (int)agtv_p->type);
+ }
+
+ /* save the top agtype_value */
+ container = temp;
+ /* get the wrapped agtype_value */
+ temp = &temp->val.array.elems[0];
+
+ if (temp->type == AGTV_FLOAT ||
+ temp->type == AGTV_INTEGER ||
+ temp->type == AGTV_NUMERIC ||
+ temp->type == AGTV_BOOL)
+ {
+ agtv_p = temp;
+ }
+ }
- if (agtv.type == AGTV_INTEGER)
+ /* now check the rest */
+ if (agtv_p->type == AGTV_INTEGER)
+ {
result = DatumGetInt16(DirectFunctionCall1(int82,
- Int64GetDatum(agtv.val.int_value)));
- else if (agtv.type == AGTV_FLOAT)
+ Int64GetDatum(agtv_p->val.int_value)));
+ }
+ else if (agtv_p->type == AGTV_FLOAT)
+ {
result = DatumGetInt32(DirectFunctionCall1(dtoi2,
Review Comment:
Yep, it looks like this was an artifact from the original code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
