diff --git a/storage/connect/bsonudf.cpp b/storage/connect/bsonudf.cpp index 33a462944b5..bed40a05249 100644 --- a/storage/connect/bsonudf.cpp +++ b/storage/connect/bsonudf.cpp @@ -191,7 +191,7 @@ my_bool BJNX::SetJpath(PGLOBAL g, char* path, my_bool jb) /*********************************************************************************/ /* Analyse array processing options. */ /*********************************************************************************/ -my_bool BJNX::SetArrayOptions(PGLOBAL g, char* p, int i, PSZ nm) +my_bool BJNX::SetArrayOptions(PGLOBAL g, char* p, int i) { int n = (int)strlen(p); my_bool dg = true, b = false; @@ -339,7 +339,7 @@ my_bool BJNX::ParseJpath(PGLOBAL g) // Jpath must be explicit if (a || *p == 0 || *p == '[' || IsNum(p)) { // Analyse intermediate array processing - if (SetArrayOptions(g, p, i, Nodes[i - 1].Key)) + if (SetArrayOptions(g, p, i)) return true; } else if (*p == '*') { diff --git a/storage/connect/bsonudf.h b/storage/connect/bsonudf.h index 90cabf72e21..7d7598574c0 100644 --- a/storage/connect/bsonudf.h +++ b/storage/connect/bsonudf.h @@ -116,7 +116,7 @@ public: PBSON MakeBinResult(UDF_ARGS* args, PBVAL top, ulong len, int n = 2); protected: - my_bool SetArrayOptions(PGLOBAL g, char* p, int i, PSZ nm); + my_bool SetArrayOptions(PGLOBAL g, char* p, int i); PVAL GetColumnValue(PGLOBAL g, PBVAL row, int i); PVAL ExpandArray(PGLOBAL g, PBVAL arp, int n); PVAL CalculateArray(PGLOBAL g, PBVAL arp, int n); diff --git a/storage/connect/jsonudf.cpp b/storage/connect/jsonudf.cpp index 60870dc3618..9ce1ff5e48b 100644 --- a/storage/connect/jsonudf.cpp +++ b/storage/connect/jsonudf.cpp @@ -112,7 +112,7 @@ my_bool JSNX::SetJpath(PGLOBAL g, char *path, my_bool jb) /*********************************************************************************/ /* Analyse array processing options. */ /*********************************************************************************/ -my_bool JSNX::SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm) +my_bool JSNX::SetArrayOptions(PGLOBAL g, char *p, int i) { int n = (int)strlen(p); my_bool dg = true, b = false; @@ -262,7 +262,7 @@ my_bool JSNX::ParseJpath(PGLOBAL g) // Jpath must be explicit if (a || *p == 0 || *p == '[' || IsNum(p)) { // Analyse intermediate array processing - if (SetArrayOptions(g, p, i, Nodes[i-1].Key)) + if (SetArrayOptions(g, p, i)) return true; } else if (*p == '*') { diff --git a/storage/connect/jsonudf.h b/storage/connect/jsonudf.h index 782d17acb12..a7defed8e54 100644 --- a/storage/connect/jsonudf.h +++ b/storage/connect/jsonudf.h @@ -330,7 +330,7 @@ public: char *LocateAll(PGLOBAL g, PJSON jsp, PJVAL jvp, int mx = 10); protected: - my_bool SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm); + my_bool SetArrayOptions(PGLOBAL g, char *p, int i); PVAL GetColumnValue(PGLOBAL g, PJSON row, int i); PVAL ExpandArray(PGLOBAL g, PJAR arp, int n); PVAL GetCalcValue(PGLOBAL g, PJAR bap, int n);