diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-04 14:49:31 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-04 14:49:31 +0300 |
| commit | a8a925dd22ae00494cc9ffdc1ff68906106a408c (patch) | |
| tree | a857c565a22ec7f6f41d3efa72053a726a346af2 /storage/connect/jsonudf.h | |
| parent | 2820f30dde3148df71e1d748ac705d98d60e0787 (diff) | |
| parent | 72fa9dabadb4b0011f483ccbf1ef59e62d0ef1e0 (diff) | |
| download | mariadb-git-a8a925dd22ae00494cc9ffdc1ff68906106a408c.tar.gz | |
Merge branch bb-10.2-release into bb-10.3-release
Diffstat (limited to 'storage/connect/jsonudf.h')
| -rw-r--r-- | storage/connect/jsonudf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/connect/jsonudf.h b/storage/connect/jsonudf.h index 689a02ebbc5..ada0dbcd96b 100644 --- a/storage/connect/jsonudf.h +++ b/storage/connect/jsonudf.h @@ -44,7 +44,6 @@ typedef struct _jnode { PSZ Key; // The key used for object OPVAL Op; // Operator used for this node PVAL CncVal; // To cont value used for OP_CNC - PVAL Valp; // The internal array VALUE int Rank; // The rank in array int Rx; // Read row number int Nx; // Next to read row number @@ -334,8 +333,9 @@ protected: my_bool SetArrayOptions(PGLOBAL g, char *p, int i, PSZ nm); PVAL GetColumnValue(PGLOBAL g, PJSON row, int i); PVAL ExpandArray(PGLOBAL g, PJAR arp, int n); + PVAL GetCalcValue(PGLOBAL g, PJAR bap, int n); PVAL CalculateArray(PGLOBAL g, PJAR arp, int n); - PVAL MakeJson(PGLOBAL g, PJSON jsp); + PJVAL MakeJson(PGLOBAL g, PJSON jsp, int i); void SetJsonValue(PGLOBAL g, PVAL vp, PJVAL val); PJSON GetRow(PGLOBAL g); my_bool CompareValues(PJVAL v1, PJVAL v2); @@ -358,7 +358,7 @@ protected: JOUTSTR *Jp; JNODE *Nodes; // The intermediate objects PVAL Value; - PVAL MulVal; // To value used by multiple column + //PVAL MulVal; // To value used by multiple column char *Jpath; // The json path int Buf_Type; int Long; |