Skip to content

M
MariaDB
Commit 7edd4294 authored by Olivier Bertrand's avatar Olivier Bertrand
Browse files
Options

- Continue BSON development 

  modified:   storage/connect/bson.cpp
  modified:   storage/connect/bson.h
  modified:   storage/connect/bsonudf.cpp
  modified:   storage/connect/bsonudf.h
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/mysql-test/connect/r/bson.result
  modified:   storage/connect/mysql-test/connect/r/bson_udf.result
  modified:   storage/connect/mysql-test/connect/t/bson_udf.inc
  modified:   storage/connect/mysql-test/connect/t/bson_udf.test
  modified:   storage/connect/mysql-test/connect/t/bson_udf2.inc
  modified:   storage/connect/tabbson.cpp
  modified:   storage/connect/tabbson.h
parent 9a07f30b
Show whitespace changes
Inline Side-by-side
Showing with 341 additions and 131 deletions
storage/connect/bson.cpp
View file @ 7edd4294
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#undef SE_CATCH // Does not work for Linux #undef SE_CATCH // Does not work for Linux
#endif #endif
int GetJsonDefPrec(void);
#if defined(SE_CATCH) #if defined(SE_CATCH)
/**************************************************************************/ /**************************************************************************/
/* This is the support of catching C interrupts to prevent crashes. */ /* This is the support of catching C interrupts to prevent crashes. */
...@@ -1722,14 +1724,22 @@ void BJSON::SetBigint(PBVAL vlp, longlong ll) ...@@ -1722,14 +1724,22 @@ void BJSON::SetBigint(PBVAL vlp, longlong ll)
/***********************************************************************/ /***********************************************************************/
/* Set the Value's value as the given DOUBLE. */ /* Set the Value's value as the given DOUBLE. */
/***********************************************************************/ /***********************************************************************/
void BJSON::SetFloat(PBVAL vlp, double d, int nd) void BJSON::SetFloat(PBVAL vlp, double d, int prec)
{ {
int nd = MY_MIN((prec < 0) ? GetJsonDefPrec() : prec, 16);
if (nd < 6 && d >= FLT_MIN && d <= FLT_MAX) {
vlp->F = (float)d;
vlp->Type = TYPE_FLOAT;
} else {
double* dp = (double*)BsonSubAlloc(sizeof(double)); double* dp = (double*)BsonSubAlloc(sizeof(double));
*dp = d; *dp = d;
vlp->To_Val = MOF(dp); vlp->To_Val = MOF(dp);
vlp->Nd = MY_MIN(nd, 16);
vlp->Type = TYPE_DBL; vlp->Type = TYPE_DBL;
} // endif nd
vlp->Nd = nd;
} // end of SetFloat } // end of SetFloat
/***********************************************************************/ /***********************************************************************/
...@@ -1746,13 +1756,7 @@ void BJSON::SetFloat(PBVAL vlp, PSZ s) ...@@ -1746,13 +1756,7 @@ void BJSON::SetFloat(PBVAL vlp, PSZ s)
for (--p; *p == '0'; nd--, p--); for (--p; *p == '0'; nd--, p--);
} // endif p } // endif p
if (nd < 6 && d >= FLT_MIN && d <= FLT_MAX) {
vlp->F = (float)d;
vlp->Nd = nd;
vlp->Type = TYPE_FLOAT;
} else
SetFloat(vlp, d, nd); SetFloat(vlp, d, nd);
} // end of SetFloat } // end of SetFloat
/***********************************************************************/ /***********************************************************************/
......
storage/connect/bson.h
View file @ 7edd4294
...@@ -149,7 +149,7 @@ class BJSON : public BLOCK { ...@@ -149,7 +149,7 @@ class BJSON : public BLOCK {
void SetString(PBVAL vlp, PSZ s, int ci = 0); void SetString(PBVAL vlp, PSZ s, int ci = 0);
void SetInteger(PBVAL vlp, int n); void SetInteger(PBVAL vlp, int n);
void SetBigint(PBVAL vlp, longlong ll); void SetBigint(PBVAL vlp, longlong ll);
void SetFloat(PBVAL vlp, double f, int nd = 16); void SetFloat(PBVAL vlp, double f, int nd = -1);
void SetFloat(PBVAL vlp, PSZ s); void SetFloat(PBVAL vlp, PSZ s);
void SetBool(PBVAL vlp, bool b); void SetBool(PBVAL vlp, bool b);
void Clear(PBVAL vlp) { vlp->N = 0; vlp->Nd = 0; vlp->Next = 0; } void Clear(PBVAL vlp) { vlp->N = 0; vlp->Nd = 0; vlp->Next = 0; }
......
storage/connect/bsonudf.cpp
View file @ 7edd4294
...@@ -27,11 +27,20 @@ ...@@ -27,11 +27,20 @@
#endif #endif
#define M 6 #define M 6
int JsonDefPrec = -1;
int GetDefaultPrec(void);
int IsArgJson(UDF_ARGS* args, uint i); int IsArgJson(UDF_ARGS* args, uint i);
void SetChanged(PBSON bsp); void SetChanged(PBSON bsp);
/* --------------------------------- JSON UDF ---------------------------------- */ /* --------------------------------- JSON UDF ---------------------------------- */
/*********************************************************************************/
/* Replaces GetJsonGrpSize not usable when CONNECT is not installed. */
/*********************************************************************************/
int GetJsonDefPrec(void) {
return (JsonDefPrec < 0) ? GetDefaultPrec() : JsonDefPrec;
} /* end of GetJsonDefPrec */
/*********************************************************************************/ /*********************************************************************************/
/* Program for saving the status of the memory pools. */ /* Program for saving the status of the memory pools. */
/*********************************************************************************/ /*********************************************************************************/
...@@ -262,6 +271,7 @@ my_bool BJNX::SetArrayOptions(PGLOBAL g, char* p, int i, PSZ nm) ...@@ -262,6 +271,7 @@ my_bool BJNX::SetArrayOptions(PGLOBAL g, char* p, int i, PSZ nm)
return true; return true;
} // endif's } // endif's
#if 0
// For calculated arrays, a local Value must be used // For calculated arrays, a local Value must be used
switch (jnp->Op) { switch (jnp->Op) {
case OP_NUM: case OP_NUM:
...@@ -293,6 +303,7 @@ my_bool BJNX::SetArrayOptions(PGLOBAL g, char* p, int i, PSZ nm) ...@@ -293,6 +303,7 @@ my_bool BJNX::SetArrayOptions(PGLOBAL g, char* p, int i, PSZ nm)
if (jnp->Valp) if (jnp->Valp)
MulVal = AllocateValue(g, jnp->Valp); MulVal = AllocateValue(g, jnp->Valp);
#endif // 0
return false; return false;
} // end of SetArrayOptions } // end of SetArrayOptions
...@@ -376,7 +387,7 @@ my_bool BJNX::ParseJpath(PGLOBAL g) ...@@ -376,7 +387,7 @@ my_bool BJNX::ParseJpath(PGLOBAL g)
} // endfor i, p } // endfor i, p
Nod = i; Nod = i;
MulVal = AllocateValue(g, Value); //MulVal = AllocateValue(g, Value);
if (trace(1)) if (trace(1))
for (i = 0; i < Nod; i++) for (i = 0; i < Nod; i++)
...@@ -433,20 +444,42 @@ PSZ BJNX::MakeKey(UDF_ARGS *args, int i) ...@@ -433,20 +444,42 @@ PSZ BJNX::MakeKey(UDF_ARGS *args, int i)
} // end of MakeKey } // end of MakeKey
/*********************************************************************************/ /*********************************************************************************/
/* MakeJson: Serialize the json item and set value to it. */ /* MakeJson: Make the Json tree to serialize. */
/*********************************************************************************/ /*********************************************************************************/
PVAL BJNX::MakeJson(PGLOBAL g, PBVAL bvp) PBVAL BJNX::MakeJson(PGLOBAL g, PBVAL bvp, int n)
{ {
if (Value->IsTypeNum()) { PBVAL vlp, jvp = bvp;
strcpy(g->Message, "Cannot make Json for a numeric value");
Value->Reset();
} else if (bvp->Type != TYPE_JAR && bvp->Type != TYPE_JOB) {
strcpy(g->Message, "Target is not an array or object");
Value->Reset();
} else
Value->SetValue_psz(Serialize(g, bvp, NULL, 0));
return Value; if (n < Nod -1) {
if (bvp->Type == TYPE_JAR) {
int ars = GetArraySize(bvp);
PJNODE jnp = &Nodes[n];
jvp = NewVal(TYPE_JAR);
jnp->Op = OP_EQ;
for (int i = 0; i < ars; i++) {
jnp->Rank = i;
vlp = GetRowValue(g, bvp, n);
AddArrayValue(jvp, DupVal(vlp));
} // endfor i
jnp->Op = OP_XX;
jnp->Rank = 0;
} else if(bvp->Type == TYPE_JOB) {
jvp = NewVal(TYPE_JOB);
for (PBPR prp = GetObject(bvp); prp; prp = GetNext(prp)) {
vlp = GetRowValue(g, GetVlp(prp), n + 1);
SetKeyValue(jvp, vlp, MZP(prp->Key));
} // endfor prp
} // endif Type
} // endif n
Jb = true;
return jvp;
} // end of MakeJson } // end of MakeJson
/*********************************************************************************/ /*********************************************************************************/
...@@ -459,15 +492,18 @@ void BJNX::SetJsonValue(PGLOBAL g, PVAL vp, PBVAL vlp) ...@@ -459,15 +492,18 @@ void BJNX::SetJsonValue(PGLOBAL g, PVAL vp, PBVAL vlp)
if (Jb) { if (Jb) {
vp->SetValue_psz(Serialize(g, vlp, NULL, 0)); vp->SetValue_psz(Serialize(g, vlp, NULL, 0));
Jb = false;
} else switch (vlp->Type) { } else switch (vlp->Type) {
case TYPE_DTM: case TYPE_DTM:
case TYPE_STRG: case TYPE_STRG:
vp->SetValue_psz(GetString(vlp)); vp->SetValue_psz(GetString(vlp));
break; break;
case TYPE_INTG: case TYPE_INTG:
case TYPE_BINT:
vp->SetValue(GetInteger(vlp)); vp->SetValue(GetInteger(vlp));
break; break;
case TYPE_BINT:
vp->SetValue(GetBigint(vlp));
break;
case TYPE_DBL: case TYPE_DBL:
case TYPE_FLOAT: case TYPE_FLOAT:
if (vp->IsTypeNum()) if (vp->IsTypeNum())
...@@ -532,7 +568,7 @@ PVAL BJNX::GetColumnValue(PGLOBAL g, PBVAL row, int i) ...@@ -532,7 +568,7 @@ PVAL BJNX::GetColumnValue(PGLOBAL g, PBVAL row, int i)
/*********************************************************************************/ /*********************************************************************************/
/* GetRowValue: */ /* GetRowValue: */
/*********************************************************************************/ /*********************************************************************************/
PBVAL BJNX::GetRowValue(PGLOBAL g, PBVAL row, int i, my_bool b) PBVAL BJNX::GetRowValue(PGLOBAL g, PBVAL row, int i)
{ {
my_bool expd = false; my_bool expd = false;
PBVAL bap; PBVAL bap;
...@@ -544,9 +580,7 @@ PBVAL BJNX::GetRowValue(PGLOBAL g, PBVAL row, int i, my_bool b) ...@@ -544,9 +580,7 @@ PBVAL BJNX::GetRowValue(PGLOBAL g, PBVAL row, int i, my_bool b)
vlp = NewVal(Value); vlp = NewVal(Value);
return vlp; return vlp;
} else if (Nodes[i].Op == OP_XX) { } else if (Nodes[i].Op == OP_XX) {
Jb = b; return MakeJson(g, row, i);
// return DupVal(g, row);
return row; // or last line ???
} else if (Nodes[i].Op == OP_EXP) { } else if (Nodes[i].Op == OP_EXP) {
PUSH_WARNING("Expand not supported by this function"); PUSH_WARNING("Expand not supported by this function");
return NULL; return NULL;
...@@ -611,14 +645,95 @@ PVAL BJNX::ExpandArray(PGLOBAL g, PBVAL arp, int n) ...@@ -611,14 +645,95 @@ PVAL BJNX::ExpandArray(PGLOBAL g, PBVAL arp, int n)
} // end of ExpandArray } // end of ExpandArray
/*********************************************************************************/ /*********************************************************************************/
/* CalculateArray: NIY */ /* Get the value used for calculating the array. */
/*********************************************************************************/
PVAL BJNX::GetCalcValue(PGLOBAL g, PBVAL bap, int n)
{
// For calculated arrays, a local Value must be used
int lng = 0;
short type, prec = 0;
bool b = n < Nod - 1;
PVAL valp;
PBVAL vlp, vp;
OPVAL op = Nodes[n].Op;
switch (op) {
case OP_NUM:
type = TYPE_INT;
break;
case OP_ADD:
case OP_MULT:
if (!IsTypeNum(Buf_Type)) {
type = TYPE_INT;
prec = 0;
for (vlp = GetArray(bap); vlp; vlp = GetNext(vlp)) {
vp = (b && IsJson(vlp)) ? GetRowValue(g, vlp, n + 1) : vlp;
switch (vp->Type) {
case TYPE_BINT:
if (type == TYPE_INT)
type = TYPE_BIGINT;
break;
case TYPE_DBL:
case TYPE_FLOAT:
type = TYPE_DOUBLE;
prec = MY_MAX(prec, vp->Nd);
break;
default:
break;
} // endswitch Type
} // endfor vlp
} else {
type = Buf_Type;
prec = GetPrecision();
} // endif Buf_Type
break;
case OP_SEP:
if (IsTypeChar(Buf_Type)) {
type = TYPE_DOUBLE;
prec = 2;
} else
type = Buf_Type;
break;
case OP_MIN:
case OP_MAX:
type = Buf_Type;
lng = Long;
prec = GetPrecision();
break;
case OP_CNC:
type = TYPE_STRING;
if (IsTypeChar(Buf_Type)) {
lng = Long;
prec = GetPrecision();
} else
lng = 512;
break;
default:
break;
} // endswitch Op
return valp = AllocateValue(g, type, lng, prec);
} // end of GetCalcValue
/*********************************************************************************/
/* CalculateArray */
/*********************************************************************************/ /*********************************************************************************/
PVAL BJNX::CalculateArray(PGLOBAL g, PBVAL bap, int n) PVAL BJNX::CalculateArray(PGLOBAL g, PBVAL bap, int n)
{ {
int i, ars = GetArraySize(bap), nv = 0; int i, ars = GetArraySize(bap), nv = 0;
bool err; bool err;
OPVAL op = Nodes[n].Op; OPVAL op = Nodes[n].Op;
PVAL val[2], vp = Nodes[n].Valp; PVAL val[2], vp = GetCalcValue(g, bap, n);
PVAL mulval = AllocateValue(g, vp);
PBVAL bvrp, bvp; PBVAL bvrp, bvp;
BVAL bval; BVAL bval;
...@@ -647,9 +762,9 @@ PVAL BJNX::CalculateArray(PGLOBAL g, PBVAL bap, int n) ...@@ -647,9 +762,9 @@ PVAL BJNX::CalculateArray(PGLOBAL g, PBVAL bap, int n)
SetJsonValue(g, vp, bvp); SetJsonValue(g, vp, bvp);
continue; continue;
} else } else
SetJsonValue(g, MulVal, bvp); SetJsonValue(g, mulval, bvp);
if (!MulVal->IsNull()) { if (!mulval->IsNull()) {
switch (op) { switch (op) {
case OP_CNC: case OP_CNC:
if (Nodes[n].CncVal) { if (Nodes[n].CncVal) {
...@@ -657,18 +772,18 @@ PVAL BJNX::CalculateArray(PGLOBAL g, PBVAL bap, int n) ...@@ -657,18 +772,18 @@ PVAL BJNX::CalculateArray(PGLOBAL g, PBVAL bap, int n)
err = vp->Compute(g, val, 1, op); err = vp->Compute(g, val, 1, op);
} // endif CncVal } // endif CncVal
val[0] = MulVal; val[0] = mulval;
err = vp->Compute(g, val, 1, op); err = vp->Compute(g, val, 1, op);
break; break;
// case OP_NUM: // case OP_NUM:
case OP_SEP: case OP_SEP:
val[0] = Nodes[n].Valp; val[0] = vp;
val[1] = MulVal; val[1] = mulval;
err = vp->Compute(g, val, 2, OP_ADD); err = vp->Compute(g, val, 2, OP_ADD);
break; break;
default: default:
val[0] = Nodes[n].Valp; val[0] = vp;
val[1] = MulVal; val[1] = mulval;
err = vp->Compute(g, val, 2, op); err = vp->Compute(g, val, 2, op);
} // endswitch Op } // endswitch Op
...@@ -690,9 +805,9 @@ PVAL BJNX::CalculateArray(PGLOBAL g, PBVAL bap, int n) ...@@ -690,9 +805,9 @@ PVAL BJNX::CalculateArray(PGLOBAL g, PBVAL bap, int n)
if (op == OP_SEP) { if (op == OP_SEP) {
// Calculate average // Calculate average
MulVal->SetValue(nv); mulval->SetValue(nv);
val[0] = vp; val[0] = vp;
val[1] = MulVal; val[1] = mulval;
if (vp->Compute(g, val, 2, OP_DIV)) if (vp->Compute(g, val, 2, OP_DIV))
vp->Reset(); vp->Reset();
...@@ -2698,6 +2813,45 @@ void bson_object_values_deinit(UDF_INIT* initid) ...@@ -2698,6 +2813,45 @@ void bson_object_values_deinit(UDF_INIT* initid)
JsonFreeMem((PGLOBAL)initid->ptr); JsonFreeMem((PGLOBAL)initid->ptr);
} // end of bson_object_values_deinit } // end of bson_object_values_deinit
/*********************************************************************************/
/* Set the value of JsonGrpSize. */
/*********************************************************************************/
my_bool bsonset_def_prec_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
{
if (args->arg_count != 1 || args->arg_type[0] != INT_RESULT) {
strcpy(message, "This function must have 1 integer argument");
return true;
} else
return false;
} // end of bsonset_def_prec_init
long long bsonset_def_prec(UDF_INIT *initid, UDF_ARGS *args, char *, char *)
{
long long n = *(long long*)args->args[0];
JsonDefPrec = (int)n;
return (long long)GetJsonDefPrec();
} // end of bsonset_def_prec
/*********************************************************************************/
/* Get the value of JsonGrpSize. */
/*********************************************************************************/
my_bool bsonget_def_prec_init(UDF_INIT *initid, UDF_ARGS *args, char *message)
{
if (args->arg_count != 0) {
strcpy(message, "This function must have no arguments");
return true;
} else
return false;
} // end of bsonget_def_prec_init
long long bsonget_def_prec(UDF_INIT *initid, UDF_ARGS *args, char *, char *)
{
return (long long)GetJsonDefPrec();
} // end of bsonget_def_prec
/*********************************************************************************/ /*********************************************************************************/
/* Set the value of JsonGrpSize. */ /* Set the value of JsonGrpSize. */
/*********************************************************************************/ /*********************************************************************************/
...@@ -4714,7 +4868,8 @@ char *bson_serialize(UDF_INIT *initid, UDF_ARGS *args, char *result, ...@@ -4714,7 +4868,8 @@ char *bson_serialize(UDF_INIT *initid, UDF_ARGS *args, char *result,
BJNX bnx(bsp->G); BJNX bnx(bsp->G);
PBVAL bvp = (args->arg_count == 1) ? (PBVAL)bsp->Jsp : (PBVAL)bsp->Top; PBVAL bvp = (args->arg_count == 1) ? (PBVAL)bsp->Jsp : (PBVAL)bsp->Top;
if (!(str = bnx.Serialize(g, bvp, bsp->Filename, bsp->Pretty))) // if (!(str = bnx.Serialize(g, bvp, bsp->Filename, bsp->Pretty)))
if (!(str = bnx.Serialize(g, bvp, NULL, 0)))
str = strcpy(result, g->Message); str = strcpy(result, g->Message);
// Keep result of constant function // Keep result of constant function
......
storage/connect/bsonudf.h
View file @ 7edd4294
...@@ -81,6 +81,7 @@ typedef struct _jpn { ...@@ -81,6 +81,7 @@ typedef struct _jpn {
extern uint JsonGrpSize; extern uint JsonGrpSize;
uint GetJsonGroupSize(void); uint GetJsonGroupSize(void);
typedef class BJNX* PBJNX; typedef class BJNX* PBJNX;
/*********************************************************************************/ /*********************************************************************************/
...@@ -102,7 +103,7 @@ class BJNX : public BDOC { ...@@ -102,7 +103,7 @@ class BJNX : public BDOC {
my_bool SetJpath(PGLOBAL g, char* path, my_bool jb = false); my_bool SetJpath(PGLOBAL g, char* path, my_bool jb = false);
my_bool ParseJpath(PGLOBAL g); my_bool ParseJpath(PGLOBAL g);
void ReadValue(PGLOBAL g); void ReadValue(PGLOBAL g);
PBVAL GetRowValue(PGLOBAL g, PBVAL row, int i, my_bool b = true); PBVAL GetRowValue(PGLOBAL g, PBVAL row, int i);
PBVAL GetJson(PGLOBAL g); PBVAL GetJson(PGLOBAL g);
my_bool CheckPath(PGLOBAL g); my_bool CheckPath(PGLOBAL g);
my_bool CheckPath(PGLOBAL g, UDF_ARGS* args, PBVAL jsp, PBVAL& jvp, int n); my_bool CheckPath(PGLOBAL g, UDF_ARGS* args, PBVAL jsp, PBVAL& jvp, int n);
...@@ -123,7 +124,8 @@ class BJNX : public BDOC { ...@@ -123,7 +124,8 @@ class BJNX : public BDOC {
PVAL GetColumnValue(PGLOBAL g, PBVAL row, int i); PVAL GetColumnValue(PGLOBAL g, PBVAL row, int i);
PVAL ExpandArray(PGLOBAL g, PBVAL arp, int n); PVAL ExpandArray(PGLOBAL g, PBVAL arp, int n);
PVAL CalculateArray(PGLOBAL g, PBVAL arp, int n); PVAL CalculateArray(PGLOBAL g, PBVAL arp, int n);
PVAL MakeJson(PGLOBAL g, PBVAL bvp); PVAL GetCalcValue(PGLOBAL g, PBVAL bap, int n);
PBVAL MakeJson(PGLOBAL g, PBVAL bvp, int n);
void SetJsonValue(PGLOBAL g, PVAL vp, PBVAL vlp); void SetJsonValue(PGLOBAL g, PVAL vp, PBVAL vlp);
PBVAL GetRow(PGLOBAL g); PBVAL GetRow(PGLOBAL g);
PBVAL MoveVal(PBVAL vlp); PBVAL MoveVal(PBVAL vlp);
...@@ -259,6 +261,12 @@ extern "C" { ...@@ -259,6 +261,12 @@ extern "C" {
DllExport double bsonget_real(UDF_INIT*, UDF_ARGS*, char*, char*); DllExport double bsonget_real(UDF_INIT*, UDF_ARGS*, char*, char*);
DllExport void bsonget_real_deinit(UDF_INIT*); DllExport void bsonget_real_deinit(UDF_INIT*);
DllExport my_bool bsonset_def_prec_init(UDF_INIT*, UDF_ARGS*, char*);
DllExport long long bsonset_def_prec(UDF_INIT*, UDF_ARGS*, char*, char*);
DllExport my_bool bsonget_def_prec_init(UDF_INIT*, UDF_ARGS*, char*);
DllExport long long bsonget_def_prec(UDF_INIT*, UDF_ARGS*, char*, char*);
DllExport my_bool bsonset_grp_size_init(UDF_INIT*, UDF_ARGS*, char*); DllExport my_bool bsonset_grp_size_init(UDF_INIT*, UDF_ARGS*, char*);
DllExport long long bsonset_grp_size(UDF_INIT*, UDF_ARGS*, char*, char*); DllExport long long bsonset_grp_size(UDF_INIT*, UDF_ARGS*, char*, char*);
......
storage/connect/ha_connect.cc
View file @ 7edd4294
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
#define JSONMAX 10 // JSON Default max grp size #define JSONMAX 10 // JSON Default max grp size
extern "C" { extern "C" {
char version[]= "Version 1.07.0002 December 25, 2020"; char version[]= "Version 1.07.0002 January 27, 2021";
#if defined(__WIN__) #if defined(__WIN__)
char compver[]= "Version 1.07.0002 " __DATE__ " " __TIME__; char compver[]= "Version 1.07.0002 " __DATE__ " " __TIME__;
char slash= '\\'; char slash= '\\';
...@@ -255,6 +255,7 @@ USETEMP UseTemp(void); ...@@ -255,6 +255,7 @@ USETEMP UseTemp(void);
int GetConvSize(void); int GetConvSize(void);
TYPCONV GetTypeConv(void); TYPCONV GetTypeConv(void);
int GetDefaultDepth(void); int GetDefaultDepth(void);
int GetDefaultPrec(void);
bool JsonAllPath(void); bool JsonAllPath(void);
char *GetJsonNull(void); char *GetJsonNull(void);
uint GetJsonGrpSize(void); uint GetJsonGrpSize(void);
...@@ -420,6 +421,12 @@ static MYSQL_THDVAR_INT(default_depth, ...@@ -420,6 +421,12 @@ static MYSQL_THDVAR_INT(default_depth,
"Default depth used by Json, XML and Mongo discovery", "Default depth used by Json, XML and Mongo discovery",
NULL, NULL, 5, -1, 16, 1); // Defaults to 5 NULL, NULL, 5, -1, 16, 1); // Defaults to 5
// Default precision for doubles
static MYSQL_THDVAR_INT(default_prec,
PLUGIN_VAR_RQCMDARG,
"Default precision used for doubles",
NULL, NULL, 6, 0, 16, 1); // Defaults to 6
// Estimate max number of rows for JSON aggregate functions // Estimate max number of rows for JSON aggregate functions
static MYSQL_THDVAR_UINT(json_grp_size, static MYSQL_THDVAR_UINT(json_grp_size,
PLUGIN_VAR_RQCMDARG, // opt PLUGIN_VAR_RQCMDARG, // opt
...@@ -495,6 +502,7 @@ TYPCONV GetTypeConv(void) {return (TYPCONV)THDVAR(current_thd, type_conv);} ...@@ -495,6 +502,7 @@ TYPCONV GetTypeConv(void) {return (TYPCONV)THDVAR(current_thd, type_conv);}
char *GetJsonNull(void) char *GetJsonNull(void)
{return connect_hton ? THDVAR(current_thd, json_null) : NULL;} {return connect_hton ? THDVAR(current_thd, json_null) : NULL;}
int GetDefaultDepth(void) {return THDVAR(current_thd, default_depth);} int GetDefaultDepth(void) {return THDVAR(current_thd, default_depth);}
int GetDefaultPrec(void) {return THDVAR(current_thd, default_prec);}
uint GetJsonGrpSize(void) uint GetJsonGrpSize(void)
{return connect_hton ? THDVAR(current_thd, json_grp_size) : 10;} {return connect_hton ? THDVAR(current_thd, json_grp_size) : 10;}
size_t GetWorkSize(void) {return (size_t)THDVAR(current_thd, work_size);} size_t GetWorkSize(void) {return (size_t)THDVAR(current_thd, work_size);}
...@@ -4834,6 +4842,7 @@ int ha_connect::start_stmt(THD *thd, thr_lock_type lock_type) ...@@ -4834,6 +4842,7 @@ int ha_connect::start_stmt(THD *thd, thr_lock_type lock_type)
lock.cc by lock_external() and unlock_external() in lock.cc; lock.cc by lock_external() and unlock_external() in lock.cc;
the section "locking functions for mysql" in lock.cc; the section "locking functions for mysql" in lock.cc;
copy_data_between_tables() in sql_table.cc. copy_data_between_tables() in sql_table.cc.
*/ */
int ha_connect::external_lock(THD *thd, int lock_type) int ha_connect::external_lock(THD *thd, int lock_type)
{ {
...@@ -7445,6 +7454,7 @@ static struct st_mysql_sys_var* connect_system_variables[]= { ...@@ -7445,6 +7454,7 @@ static struct st_mysql_sys_var* connect_system_variables[]= {
MYSQL_SYSVAR(json_null), MYSQL_SYSVAR(json_null),
MYSQL_SYSVAR(json_all_path), MYSQL_SYSVAR(json_all_path),
MYSQL_SYSVAR(default_depth), MYSQL_SYSVAR(default_depth),
MYSQL_SYSVAR(default_prec),
MYSQL_SYSVAR(json_grp_size), MYSQL_SYSVAR(json_grp_size),
#if defined(JAVA_SUPPORT) #if defined(JAVA_SUPPORT)
MYSQL_SYSVAR(jvm_path), MYSQL_SYSVAR(jvm_path),
......
storage/connect/jsonudf.cpp
View file @ 7edd4294
...@@ -354,9 +354,11 @@ void JSNX::SetJsonValue(PGLOBAL g, PVAL vp, PJVAL val) ...@@ -354,9 +354,11 @@ void JSNX::SetJsonValue(PGLOBAL g, PVAL vp, PJVAL val)
vp->SetValue_psz(val->GetString(g)); vp->SetValue_psz(val->GetString(g));
break; break;
case TYPE_INTG: case TYPE_INTG:
case TYPE_BINT:
vp->SetValue(val->GetInteger()); vp->SetValue(val->GetInteger());
break; break;
case TYPE_BINT:
vp->SetValue(val->GetBigint());
break;
case TYPE_DBL: case TYPE_DBL:
if (vp->IsTypeNum()) if (vp->IsTypeNum())
vp->SetValue(val->GetFloat()); vp->SetValue(val->GetFloat());
......
storage/connect/mysql-test/connect/r/bson.result
View file @ 7edd4294
...@@ -279,7 +279,7 @@ SELECT * FROM t1; ...@@ -279,7 +279,7 @@ SELECT * FROM t1;
WHO WEEKS SUMS SUM AVGS SUMAVG AVGSUM AVGAVG AVERAGE WHO WEEKS SUMS SUM AVGS SUMAVG AVGSUM AVGAVG AVERAGE
Joe 3, 4, 5 69.00+83.00+26.00 178.00 17.25+16.60+13.00 46.85 59.33 15.62 16.18 Joe 3, 4, 5 69.00+83.00+26.00 178.00 17.25+16.60+13.00 46.85 59.33 15.62 16.18
Beth 3, 4, 5 16.00+32.00+32.00 80.00 16.00+16.00+16.00 48.00 26.67 16.00 16.00 Beth 3, 4, 5 16.00+32.00+32.00 80.00 16.00+16.00+16.00 48.00 26.67 16.00 16.00
Janet 3, 4, 5 55.00+17.00+57.00 129.00 18.33+17.00+14.25 49.58 43.00 16.53 16.12 Janet 3, 4, 5 55.00+17.00+57.00 129.00 18.33+17.00+14.25 49.58 43.00 16.53 16.13
DROP TABLE t1; DROP TABLE t1;
# #
# Expand expense in 3 one week tables # Expand expense in 3 one week tables
......
storage/connect/mysql-test/connect/r/bson_udf.result
View file @ 7edd4294
...@@ -176,6 +176,9 @@ Value List ...@@ -176,6 +176,9 @@ Value List
# #
# Test UDF's with column arguments # Test UDF's with column arguments
# #
SELECT Bsonset_Def_Prec(2);
Bsonset_Def_Prec(2)
2
CREATE TABLE t2 CREATE TABLE t2
( (
ISBN CHAR(15), ISBN CHAR(15),
...@@ -213,7 +216,7 @@ SALARY DOUBLE(8,2) NOT NULL FLAG=52 ...@@ -213,7 +216,7 @@ SALARY DOUBLE(8,2) NOT NULL FLAG=52
) ENGINE=CONNECT TABLE_TYPE=FIX BLOCK_SIZE=8 FILE_NAME='employee.dat' ENDING=1; ) ENGINE=CONNECT TABLE_TYPE=FIX BLOCK_SIZE=8 FILE_NAME='employee.dat' ENDING=1;
SELECT Bson_Make_Object(SERIALNO, NAME, TITLE, SALARY) FROM t3 WHERE NAME = 'MERCHANT'; SELECT Bson_Make_Object(SERIALNO, NAME, TITLE, SALARY) FROM t3 WHERE NAME = 'MERCHANT';
Bson_Make_Object(SERIALNO, NAME, TITLE, SALARY) Bson_Make_Object(SERIALNO, NAME, TITLE, SALARY)
{"SERIALNO":"78943","NAME":"MERCHANT","TITLE":"SALESMAN","SALARY":8700.0000000000000000} {"SERIALNO":"78943","NAME":"MERCHANT","TITLE":"SALESMAN","SALARY":8700.00}
SELECT DEPARTMENT, Bson_Array_Grp(NAME) FROM t3 GROUP BY DEPARTMENT; SELECT DEPARTMENT, Bson_Array_Grp(NAME) FROM t3 GROUP BY DEPARTMENT;
DEPARTMENT Bson_Array_Grp(NAME) DEPARTMENT Bson_Array_Grp(NAME)
0021 ["STRONG","SHORTSIGHT"] 0021 ["STRONG","SHORTSIGHT"]
...@@ -249,30 +252,30 @@ Bson_Make_Object(DEPARTMENT, Bson_Array_Grp(NAME) json_NAMES) ...@@ -249,30 +252,30 @@ Bson_Make_Object(DEPARTMENT, Bson_Array_Grp(NAME) json_NAMES)
{"DEPARTMENT":"2452","NAMES":["BIGHEAD","ORELLY","BIGHORN","SMITH","CHERRY"]} {"DEPARTMENT":"2452","NAMES":["BIGHEAD","ORELLY","BIGHORN","SMITH","CHERRY"]}
SELECT Bson_Make_Object(DEPARTMENT, Bson_Array_Grp(Bson_Make_Object(SERIALNO, NAME, TITLE, SALARY)) json_EMPLOYES) FROM t3 GROUP BY DEPARTMENT; SELECT Bson_Make_Object(DEPARTMENT, Bson_Array_Grp(Bson_Make_Object(SERIALNO, NAME, TITLE, SALARY)) json_EMPLOYES) FROM t3 GROUP BY DEPARTMENT;
Bson_Make_Object(DEPARTMENT, Bson_Array_Grp(Bson_Make_Object(SERIALNO, NAME, TITLE, SALARY)) json_EMPLOYES) Bson_Make_Object(DEPARTMENT, Bson_Array_Grp(Bson_Make_Object(SERIALNO, NAME, TITLE, SALARY)) json_EMPLOYES)
{"DEPARTMENT":"0021","EMPLOYES":[{"SERIALNO":"87777","NAME":"STRONG","TITLE":"DIRECTOR","SALARY":23000.0000000000000000},{"SERIALNO":"22222","NAME":"SHORTSIGHT","TITLE":"SECRETARY","SALARY":5500.0000000000000000}]} {"DEPARTMENT":"0021","EMPLOYES":[{"SERIALNO":"87777","NAME":"STRONG","TITLE":"DIRECTOR","SALARY":23000.00},{"SERIALNO":"22222","NAME":"SHORTSIGHT","TITLE":"SECRETARY","SALARY":5500.00}]}
{"DEPARTMENT":"0318","EMPLOYES":[{"SERIALNO":"74200","NAME":"BANCROFT","TITLE":"SALESMAN","SALARY":9600.0000000000000000},{"SERIALNO":"24888","NAME":"PLUMHEAD","TITLE":"TYPIST","SALARY":2800.0000000000000000},{"SERIALNO":"27845","NAME":"HONEY","TITLE":"SECRETARY","SALARY":4900.0000000000000000},{"SERIALNO":"73452","NAME":"TONGHO","TITLE":"ENGINEER","SALARY":6800.0000000000000000},{"SERIALNO":"74234","NAME":"WALTER","TITLE":"ENGINEER","SALARY":7400.0000000000000000},{"SERIALNO":"77777","NAME":"SHRINKY","TITLE":"ADMINISTRATOR","SALARY":7500.0000000000000000},{"SERIALNO":"70012","NAME":"WERTHER","TITLE":"DIRECTOR","SALARY":14500.0000000000000000},{"SERIALNO":"78943","NAME":"MERCHANT","TITLE":"SALESMAN","SALARY":8700.0000000000000000},{"SERIALNO":"73111","NAME":"WHEELFOR","TITLE":"SALESMAN","SALARY":10030.0000000000000000}]} {"DEPARTMENT":"0318","EMPLOYES":[{"SERIALNO":"74200","NAME":"BANCROFT","TITLE":"SALESMAN","SALARY":9600.00},{"SERIALNO":"24888","NAME":"PLUMHEAD","TITLE":"TYPIST","SALARY":2800.00},{"SERIALNO":"27845","NAME":"HONEY","TITLE":"SECRETARY","SALARY":4900.00},{"SERIALNO":"73452","NAME":"TONGHO","TITLE":"ENGINEER","SALARY":6800.00},{"SERIALNO":"74234","NAME":"WALTER","TITLE":"ENGINEER","SALARY":7400.00},{"SERIALNO":"77777","NAME":"SHRINKY","TITLE":"ADMINISTRATOR","SALARY":7500.00},{"SERIALNO":"70012","NAME":"WERTHER","TITLE":"DIRECTOR","SALARY":14500.00},{"SERIALNO":"78943","NAME":"MERCHANT","TITLE":"SALESMAN","SALARY":8700.00},{"SERIALNO":"73111","NAME":"WHEELFOR","TITLE":"SALESMAN","SALARY":10030.00}]}
{"DEPARTMENT":"0319","EMPLOYES":[{"SERIALNO":"76543","NAME":"BULLOZER","TITLE":"SALESMAN","SALARY":14800.0000000000000000},{"SERIALNO":"40567","NAME":"QUINN","TITLE":"DIRECTOR","SALARY":14000.0000000000000000},{"SERIALNO":"00137","NAME":"BROWNY","TITLE":"ENGINEER","SALARY":10500.0000000000000000},{"SERIALNO":"12345","NAME":"KITTY","TITLE":"TYPIST","SALARY":3000.4499999999998181},{"SERIALNO":"33333","NAME":"MONAPENNY","TITLE":"SECRETARY","SALARY":3800.0000000000000000},{"SERIALNO":"00023","NAME":"MARTIN","TITLE":"ENGINEER","SALARY":10000.0000000000000000},{"SERIALNO":"07654","NAME":"FUNNIGUY","TITLE":"ADMINISTRATOR","SALARY":8500.0000000000000000},{"SERIALNO":"45678","NAME":"BUGHAPPY","TITLE":"PROGRAMMER","SALARY":8500.0000000000000000},{"SERIALNO":"56789","NAME":"FODDERMAN","TITLE":"SALESMAN","SALARY":7000.0000000000000000},{"SERIALNO":"55555","NAME":"MESSIFUL","TITLE":"SECRETARY","SALARY":5000.5000000000000000},{"SERIALNO":"98765","NAME":"GOOSEPEN","TITLE":"ADMINISTRATOR","SALARY":4700.0000000000000000}]} {"DEPARTMENT":"0319","EMPLOYES":[{"SERIALNO":"76543","NAME":"BULLOZER","TITLE":"SALESMAN","SALARY":14800.00},{"SERIALNO":"40567","NAME":"QUINN","TITLE":"DIRECTOR","SALARY":14000.00},{"SERIALNO":"00137","NAME":"BROWNY","TITLE":"ENGINEER","SALARY":10500.00},{"SERIALNO":"12345","NAME":"KITTY","TITLE":"TYPIST","SALARY":3000.45},{"SERIALNO":"33333","NAME":"MONAPENNY","TITLE":"SECRETARY","SALARY":3800.00},{"SERIALNO":"00023","NAME":"MARTIN","TITLE":"ENGINEER","SALARY":10000.00},{"SERIALNO":"07654","NAME":"FUNNIGUY","TITLE":"ADMINISTRATOR","SALARY":8500.00},{"SERIALNO":"45678","NAME":"BUGHAPPY","TITLE":"PROGRAMMER","SALARY":8500.00},{"SERIALNO":"56789","NAME":"FODDERMAN","TITLE":"SALESMAN","SALARY":7000.00},{"SERIALNO":"55555","NAME":"MESSIFUL","TITLE":"SECRETARY","SALARY":5000.50},{"SERIALNO":"98765","NAME":"GOOSEPEN","TITLE":"ADMINISTRATOR","SALARY":4700.00}]}
{"DEPARTMENT":"2452","EMPLOYES":[{"SERIALNO":"34567","NAME":"BIGHEAD","TITLE":"SCIENTIST","SALARY":8000.0000000000000000},{"SERIALNO":"31416","NAME":"ORELLY","TITLE":"ENGINEER","SALARY":13400.0000000000000000},{"SERIALNO":"36666","NAME":"BIGHORN","TITLE":"SCIENTIST","SALARY":11000.0000000000000000},{"SERIALNO":"02345","NAME":"SMITH","TITLE":"ENGINEER","SALARY":9000.0000000000000000},{"SERIALNO":"11111","NAME":"CHERRY","TITLE":"SECRETARY","SALARY":4500.0000000000000000}]} {"DEPARTMENT":"2452","EMPLOYES":[{"SERIALNO":"34567","NAME":"BIGHEAD","TITLE":"SCIENTIST","SALARY":8000.00},{"SERIALNO":"31416","NAME":"ORELLY","TITLE":"ENGINEER","SALARY":13400.00},{"SERIALNO":"36666","NAME":"BIGHORN","TITLE":"SCIENTIST","SALARY":11000.00},{"SERIALNO":"02345","NAME":"SMITH","TITLE":"ENGINEER","SALARY":9000.00},{"SERIALNO":"11111","NAME":"CHERRY","TITLE":"SECRETARY","SALARY":4500.00}]}
SELECT Bson_Make_Object(DEPARTMENT, TITLE, Bson_Array_Grp(Bson_Make_Object(SERIALNO, NAME, SALARY)) json_EMPLOYES) FROM t3 GROUP BY DEPARTMENT, TITLE; SELECT Bson_Make_Object(DEPARTMENT, TITLE, Bson_Array_Grp(Bson_Make_Object(SERIALNO, NAME, SALARY)) json_EMPLOYES) FROM t3 GROUP BY DEPARTMENT, TITLE;
Bson_Make_Object(DEPARTMENT, TITLE, Bson_Array_Grp(Bson_Make_Object(SERIALNO, NAME, SALARY)) json_EMPLOYES) Bson_Make_Object(DEPARTMENT, TITLE, Bson_Array_Grp(Bson_Make_Object(SERIALNO, NAME, SALARY)) json_EMPLOYES)
{"DEPARTMENT":"0021","TITLE":"DIRECTOR","EMPLOYES":[{"SERIALNO":"87777","NAME":"STRONG","SALARY":23000.0000000000000000}]} {"DEPARTMENT":"0021","TITLE":"DIRECTOR","EMPLOYES":[{"SERIALNO":"87777","NAME":"STRONG","SALARY":23000.00}]}
{"DEPARTMENT":"0021","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"22222","NAME":"SHORTSIGHT","SALARY":5500.0000000000000000}]} {"DEPARTMENT":"0021","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"22222","NAME":"SHORTSIGHT","SALARY":5500.00}]}
{"DEPARTMENT":"0318","TITLE":"ADMINISTRATOR","EMPLOYES":[{"SERIALNO":"77777","NAME":"SHRINKY","SALARY":7500.0000000000000000}]} {"DEPARTMENT":"0318","TITLE":"ADMINISTRATOR","EMPLOYES":[{"SERIALNO":"77777","NAME":"SHRINKY","SALARY":7500.00}]}
{"DEPARTMENT":"0318","TITLE":"DIRECTOR","EMPLOYES":[{"SERIALNO":"70012","NAME":"WERTHER","SALARY":14500.0000000000000000}]} {"DEPARTMENT":"0318","TITLE":"DIRECTOR","EMPLOYES":[{"SERIALNO":"70012","NAME":"WERTHER","SALARY":14500.00}]}
{"DEPARTMENT":"0318","TITLE":"ENGINEER","EMPLOYES":[{"SERIALNO":"73452","NAME":"TONGHO","SALARY":6800.0000000000000000},{"SERIALNO":"74234","NAME":"WALTER","SALARY":7400.0000000000000000}]} {"DEPARTMENT":"0318","TITLE":"ENGINEER","EMPLOYES":[{"SERIALNO":"73452","NAME":"TONGHO","SALARY":6800.00},{"SERIALNO":"74234","NAME":"WALTER","SALARY":7400.00}]}
{"DEPARTMENT":"0318","TITLE":"SALESMAN","EMPLOYES":[{"SERIALNO":"74200","NAME":"BANCROFT","SALARY":9600.0000000000000000},{"SERIALNO":"78943","NAME":"MERCHANT","SALARY":8700.0000000000000000},{"SERIALNO":"73111","NAME":"WHEELFOR","SALARY":10030.0000000000000000}]} {"DEPARTMENT":"0318","TITLE":"SALESMAN","EMPLOYES":[{"SERIALNO":"74200","NAME":"BANCROFT","SALARY":9600.00},{"SERIALNO":"78943","NAME":"MERCHANT","SALARY":8700.00},{"SERIALNO":"73111","NAME":"WHEELFOR","SALARY":10030.00}]}
{"DEPARTMENT":"0318","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"27845","NAME":"HONEY","SALARY":4900.0000000000000000}]} {"DEPARTMENT":"0318","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"27845","NAME":"HONEY","SALARY":4900.00}]}
{"DEPARTMENT":"0318","TITLE":"TYPIST","EMPLOYES":[{"SERIALNO":"24888","NAME":"PLUMHEAD","SALARY":2800.0000000000000000}]} {"DEPARTMENT":"0318","TITLE":"TYPIST","EMPLOYES":[{"SERIALNO":"24888","NAME":"PLUMHEAD","SALARY":2800.00}]}
{"DEPARTMENT":"0319","TITLE":"ADMINISTRATOR","EMPLOYES":[{"SERIALNO":"98765","NAME":"GOOSEPEN","SALARY":4700.0000000000000000},{"SERIALNO":"07654","NAME":"FUNNIGUY","SALARY":8500.0000000000000000}]} {"DEPARTMENT":"0319","TITLE":"ADMINISTRATOR","EMPLOYES":[{"SERIALNO":"98765","NAME":"GOOSEPEN","SALARY":4700.00},{"SERIALNO":"07654","NAME":"FUNNIGUY","SALARY":8500.00}]}
{"DEPARTMENT":"0319","TITLE":"DIRECTOR","EMPLOYES":[{"SERIALNO":"40567","NAME":"QUINN","SALARY":14000.0000000000000000}]} {"DEPARTMENT":"0319","TITLE":"DIRECTOR","EMPLOYES":[{"SERIALNO":"40567","NAME":"QUINN","SALARY":14000.00}]}
{"DEPARTMENT":"0319","TITLE":"ENGINEER","EMPLOYES":[{"SERIALNO":"00023","NAME":"MARTIN","SALARY":10000.0000000000000000},{"SERIALNO":"00137","NAME":"BROWNY","SALARY":10500.0000000000000000}]} {"DEPARTMENT":"0319","TITLE":"ENGINEER","EMPLOYES":[{"SERIALNO":"00023","NAME":"MARTIN","SALARY":10000.00},{"SERIALNO":"00137","NAME":"BROWNY","SALARY":10500.00}]}
{"DEPARTMENT":"0319","TITLE":"PROGRAMMER","EMPLOYES":[{"SERIALNO":"45678","NAME":"BUGHAPPY","SALARY":8500.0000000000000000}]} {"DEPARTMENT":"0319","TITLE":"PROGRAMMER","EMPLOYES":[{"SERIALNO":"45678","NAME":"BUGHAPPY","SALARY":8500.00}]}
{"DEPARTMENT":"0319","TITLE":"SALESMAN","EMPLOYES":[{"SERIALNO":"76543","NAME":"BULLOZER","SALARY":14800.0000000000000000},{"SERIALNO":"56789","NAME":"FODDERMAN","SALARY":7000.0000000000000000}]} {"DEPARTMENT":"0319","TITLE":"SALESMAN","EMPLOYES":[{"SERIALNO":"76543","NAME":"BULLOZER","SALARY":14800.00},{"SERIALNO":"56789","NAME":"FODDERMAN","SALARY":7000.00}]}
{"DEPARTMENT":"0319","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"33333","NAME":"MONAPENNY","SALARY":3800.0000000000000000},{"SERIALNO":"55555","NAME":"MESSIFUL","SALARY":5000.5000000000000000}]} {"DEPARTMENT":"0319","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"33333","NAME":"MONAPENNY","SALARY":3800.00},{"SERIALNO":"55555","NAME":"MESSIFUL","SALARY":5000.50}]}
{"DEPARTMENT":"0319","TITLE":"TYPIST","EMPLOYES":[{"SERIALNO":"12345","NAME":"KITTY","SALARY":3000.4499999999998181}]} {"DEPARTMENT":"0319","TITLE":"TYPIST","EMPLOYES":[{"SERIALNO":"12345","NAME":"KITTY","SALARY":3000.45}]}
{"DEPARTMENT":"2452","TITLE":"ENGINEER","EMPLOYES":[{"SERIALNO":"31416","NAME":"ORELLY","SALARY":13400.0000000000000000},{"SERIALNO":"02345","NAME":"SMITH","SALARY":9000.0000000000000000}]} {"DEPARTMENT":"2452","TITLE":"ENGINEER","EMPLOYES":[{"SERIALNO":"31416","NAME":"ORELLY","SALARY":13400.00},{"SERIALNO":"02345","NAME":"SMITH","SALARY":9000.00}]}
{"DEPARTMENT":"2452","TITLE":"SCIENTIST","EMPLOYES":[{"SERIALNO":"34567","NAME":"BIGHEAD","SALARY":8000.0000000000000000},{"SERIALNO":"36666","NAME":"BIGHORN","SALARY":11000.0000000000000000}]} {"DEPARTMENT":"2452","TITLE":"SCIENTIST","EMPLOYES":[{"SERIALNO":"34567","NAME":"BIGHEAD","SALARY":8000.00},{"SERIALNO":"36666","NAME":"BIGHORN","SALARY":11000.00}]}
{"DEPARTMENT":"2452","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"11111","NAME":"CHERRY","SALARY":4500.0000000000000000}]} {"DEPARTMENT":"2452","TITLE":"SECRETARY","EMPLOYES":[{"SERIALNO":"11111","NAME":"CHERRY","SALARY":4500.00}]}
SELECT Bson_Object_Grp(SALARY) FROM t3; SELECT Bson_Object_Grp(SALARY) FROM t3;
ERROR HY000: Can't initialize function 'bson_object_grp'; This function requires 2 arguments (key, value) ERROR HY000: Can't initialize function 'bson_object_grp'; This function requires 2 arguments (key, value)
SELECT Bson_Object_Grp(NAME, SALARY) FROM t3; SELECT Bson_Object_Grp(NAME, SALARY) FROM t3;
...@@ -325,7 +328,7 @@ BsonGet_String(Bson_Make_Array(45,28,36,45,89),'3') ...@@ -325,7 +328,7 @@ BsonGet_String(Bson_Make_Array(45,28,36,45,89),'3')
45 45
SELECT BsonGet_String(Bson_Make_Array(45,28,36,45,89),'["+"]') "list",'=' as "egal",BsonGet_String(Bson_Make_Array(45,28,36,45,89),'[+]') "sum"; SELECT BsonGet_String(Bson_Make_Array(45,28,36,45,89),'["+"]') "list",'=' as "egal",BsonGet_String(Bson_Make_Array(45,28,36,45,89),'[+]') "sum";
list egal sum list egal sum
45+28+36+45+89 = 243.00 45+28+36+45+89 = 243
SELECT BsonGet_String(Bson_Make_Array(Bson_Make_Array(45,28),Bson_Make_Array(36,45,89)),'1.0'); SELECT BsonGet_String(Bson_Make_Array(Bson_Make_Array(45,28),Bson_Make_Array(36,45,89)),'1.0');
BsonGet_String(Bson_Make_Array(Bson_Make_Array(45,28),Bson_Make_Array(36,45,89)),'1.0') BsonGet_String(Bson_Make_Array(Bson_Make_Array(45,28),Bson_Make_Array(36,45,89)),'1.0')
36 36
......
storage/connect/mysql-test/connect/t/bson_udf.inc
View file @ 7edd4294
...@@ -22,6 +22,8 @@ if (!$HA_CONNECT_SO) { ...@@ -22,6 +22,8 @@ if (!$HA_CONNECT_SO) {
--eval CREATE FUNCTION bson_object_delete RETURNS STRING SONAME '$HA_CONNECT_SO'; --eval CREATE FUNCTION bson_object_delete RETURNS STRING SONAME '$HA_CONNECT_SO';
--eval CREATE FUNCTION bson_object_list RETURNS STRING SONAME '$HA_CONNECT_SO'; --eval CREATE FUNCTION bson_object_list RETURNS STRING SONAME '$HA_CONNECT_SO';
--eval CREATE FUNCTION bson_object_values RETURNS STRING SONAME '$HA_CONNECT_SO'; --eval CREATE FUNCTION bson_object_values RETURNS STRING SONAME '$HA_CONNECT_SO';
--eval CREATE FUNCTION bsonset_def_prec RETURNS INTEGER SONAME '$HA_CONNECT_SO';
--eval CREATE FUNCTION bsonget_def_prec RETURNS INTEGER SONAME '$HA_CONNECT_SO';
--eval CREATE FUNCTION bsonset_grp_size RETURNS INTEGER SONAME '$HA_CONNECT_SO'; --eval CREATE FUNCTION bsonset_grp_size RETURNS INTEGER SONAME '$HA_CONNECT_SO';
--eval CREATE FUNCTION bsonget_grp_size RETURNS INTEGER SONAME '$HA_CONNECT_SO'; --eval CREATE FUNCTION bsonget_grp_size RETURNS INTEGER SONAME '$HA_CONNECT_SO';
--eval CREATE AGGREGATE FUNCTION bson_array_grp RETURNS STRING SONAME '$HA_CONNECT_SO'; --eval CREATE AGGREGATE FUNCTION bson_array_grp RETURNS STRING SONAME '$HA_CONNECT_SO';
......
storage/connect/mysql-test/connect/t/bson_udf.test
View file @ 7edd4294
...@@ -77,6 +77,7 @@ SELECT Bson_Object_Values('{"One":1,"Two":2,"Three":3}') "Value List"; ...@@ -77,6 +77,7 @@ SELECT Bson_Object_Values('{"One":1,"Two":2,"Three":3}') "Value List";
--echo # --echo #
--echo # Test UDF's with column arguments --echo # Test UDF's with column arguments
--echo # --echo #
SELECT Bsonset_Def_Prec(2);
CREATE TABLE t2 CREATE TABLE t2
( (
ISBN CHAR(15), ISBN CHAR(15),
......
storage/connect/mysql-test/connect/t/bson_udf2.inc
View file @ 7edd4294
...@@ -13,6 +13,8 @@ DROP FUNCTION bson_object_add; ...@@ -13,6 +13,8 @@ DROP FUNCTION bson_object_add;
DROP FUNCTION bson_object_delete; DROP FUNCTION bson_object_delete;
DROP FUNCTION bson_object_list; DROP FUNCTION bson_object_list;
DROP FUNCTION bson_object_values; DROP FUNCTION bson_object_values;
DROP FUNCTION bsonset_def_prec;
DROP FUNCTION bsonget_def_prec;
DROP FUNCTION bsonset_grp_size; DROP FUNCTION bsonset_grp_size;
DROP FUNCTION bsonget_grp_size; DROP FUNCTION bsonget_grp_size;
DROP FUNCTION bson_array_grp; DROP FUNCTION bson_array_grp;
......
storage/connect/tabbson.cpp
View file @ 7edd4294
...@@ -719,7 +719,10 @@ void BCUTIL::SetJsonValue(PGLOBAL g, PVAL vp, PBVAL jvp) ...@@ -719,7 +719,10 @@ void BCUTIL::SetJsonValue(PGLOBAL g, PVAL vp, PBVAL jvp)
if (jvp) { if (jvp) {
vp->SetNull(false); vp->SetNull(false);
switch (jvp->Type) { if (Jb) {
vp->SetValue_psz(Serialize(g, jvp, NULL, 0));
Jb = false;
} else switch (jvp->Type) {
case TYPE_STRG: case TYPE_STRG:
case TYPE_INTG: case TYPE_INTG:
case TYPE_BINT: case TYPE_BINT:
...@@ -780,53 +783,59 @@ void BCUTIL::SetJsonValue(PGLOBAL g, PVAL vp, PBVAL jvp) ...@@ -780,53 +783,59 @@ void BCUTIL::SetJsonValue(PGLOBAL g, PVAL vp, PBVAL jvp)
/***********************************************************************/ /***********************************************************************/
/* MakeJson: Serialize the json item and set value to it. */ /* MakeJson: Serialize the json item and set value to it. */
/***********************************************************************/ /***********************************************************************/
PVAL BCUTIL::MakeBson(PGLOBAL g, PBVAL jsp) PBVAL BCUTIL::MakeBson(PGLOBAL g, PBVAL jsp, int n)
{ {
if (Cp->Value->IsTypeNum()) { PBVAL vlp, jvp = jsp;
strcpy(g->Message, "Cannot make Json for a numeric column");
if (!Cp->Warned) { if (n < Cp->Nod - 1) {
PushWarning(g, Tp); if (jsp->Type == TYPE_JAR) {
Cp->Warned = true; int ars = GetArraySize(jsp);
} // endif Warned PJNODE jnp = &Cp->Nodes[n];
Cp->Value->Reset(); jvp = NewVal(TYPE_JAR);
#if 0 jnp->Op = OP_EQ;
} else if (Value->GetType() == TYPE_BIN) {
if ((unsigned)Value->GetClen() >= sizeof(BSON)) {
ulong len = Tjp->Lrecl ? Tjp->Lrecl : 500;
PBSON bsp = JbinAlloc(g, NULL, len, jsp);
strcat(bsp->Msg, " column"); for (int i = 0; i < ars; i++) {
((BINVAL*)Value)->SetBinValue(bsp, sizeof(BSON)); jnp->Rank = i;
} else { vlp = GetRowValue(g, jsp, n);
strcpy(g->Message, "Column size too small"); AddArrayValue(jvp,DupVal(vlp));
Value->SetValue_char(NULL, 0); } // endfor i
} // endif Clen
#endif // 0 jnp->Op = OP_XX;
} else jnp->Rank = 0;
Cp->Value->SetValue_psz(Serialize(g, jsp, NULL, 0)); } else if (jsp->Type == TYPE_JOB) {
jvp = NewVal(TYPE_JOB);
for (PBPR prp = GetObject(jsp); prp; prp = GetNext(prp)) {
vlp = GetRowValue(g, GetVlp(prp), n + 1);
SetKeyValue(jvp, vlp, MZP(prp->Key));
} // endfor prp
} // endif Type
} // endif's
return Cp->Value; Jb = true;
} // end of MakeJson return jvp;
} // end of MakeBson
/***********************************************************************/ /***********************************************************************/
/* GetColumnValue: */ /* GetRowValue: */
/***********************************************************************/ /***********************************************************************/
PVAL BCUTIL::GetColumnValue(PGLOBAL g, PBVAL row, int i) PBVAL BCUTIL::GetRowValue(PGLOBAL g, PBVAL row, int i)
{ {
int nod = Cp->Nod, n = nod - 1; int nod = Cp->Nod, n = nod - 1;
JNODE *nodes = Cp->Nodes; JNODE *nodes = Cp->Nodes;
PVAL value = Cp->Value;
PBVAL arp; PBVAL arp;
PBVAL bvp = NULL; PBVAL bvp = NULL;
for (; i < nod && row; i++) { for (; i < nod && row; i++) {
if (nodes[i].Op == OP_NUM) { if (nodes[i].Op == OP_NUM) {
value->SetValue(row->Type == TYPE_JAR ? GetSize(row) : 1); bvp = NewVal(TYPE_INT);
return(value); bvp->N = (row->Type == TYPE_JAR) ? GetSize(row) : 1;
return(bvp);
} else if (nodes[i].Op == OP_XX) { } else if (nodes[i].Op == OP_XX) {
return MakeBson(g, row); return MakeBson(g, row, i);
} else switch (row->Type) { } else switch (row->Type) {
case TYPE_JOB: case TYPE_JOB:
if (!nodes[i].Key) { if (!nodes[i].Key) {
...@@ -847,9 +856,9 @@ PVAL BCUTIL::GetColumnValue(PGLOBAL g, PBVAL row, int i) ...@@ -847,9 +856,9 @@ PVAL BCUTIL::GetColumnValue(PGLOBAL g, PBVAL row, int i)
if (nodes[i].Op == OP_EQ) if (nodes[i].Op == OP_EQ)
bvp = GetArrayValue(arp, nodes[i].Rank); bvp = GetArrayValue(arp, nodes[i].Rank);
else if (nodes[i].Op == OP_EXP) else if (nodes[i].Op == OP_EXP)
return ExpandArray(g, arp, i); return NewVal(ExpandArray(g, arp, i));
else else
return CalculateArray(g, arp, i); return NewVal(CalculateArray(g, arp, i));
} else { } else {
// Unexpected array, unwrap it as [0] // Unexpected array, unwrap it as [0]
...@@ -871,6 +880,17 @@ PVAL BCUTIL::GetColumnValue(PGLOBAL g, PBVAL row, int i) ...@@ -871,6 +880,17 @@ PVAL BCUTIL::GetColumnValue(PGLOBAL g, PBVAL row, int i)
} // endfor i } // endfor i
return bvp;
} // end of GetColumnValue
/***********************************************************************/
/* GetColumnValue: */
/***********************************************************************/
PVAL BCUTIL::GetColumnValue(PGLOBAL g, PBVAL row, int i)
{
PVAL value = Cp->Value;
PBVAL bvp = GetRowValue(g, row, i);
SetJsonValue(g, value, bvp); SetJsonValue(g, value, bvp);
return value; return value;
} // end of GetColumnValue } // end of GetColumnValue
......
storage/connect/tabbson.h
View file @ 7edd4294
...@@ -127,11 +127,13 @@ class BTUTIL : public BDOC { ...@@ -127,11 +127,13 @@ class BTUTIL : public BDOC {
class BCUTIL : public BTUTIL { class BCUTIL : public BTUTIL {
public: public:
// Constructor // Constructor
BCUTIL(PGLOBAL G, PBSCOL cp, TDBBSN* tp) : BTUTIL(G, tp) { Cp = cp; } BCUTIL(PGLOBAL G, PBSCOL cp, TDBBSN* tp) : BTUTIL(G, tp)
{ Cp = cp; Jb = false; }
// Utility functions // Utility functions
void SetJsonValue(PGLOBAL g, PVAL vp, PBVAL jvp); void SetJsonValue(PGLOBAL g, PVAL vp, PBVAL jvp);
PVAL MakeBson(PGLOBAL g, PBVAL jsp); PBVAL MakeBson(PGLOBAL g, PBVAL jsp, int n);
PBVAL GetRowValue(PGLOBAL g, PBVAL row, int i);
PVAL GetColumnValue(PGLOBAL g, PBVAL row, int i); PVAL GetColumnValue(PGLOBAL g, PBVAL row, int i);
PVAL ExpandArray(PGLOBAL g, PBVAL arp, int n); PVAL ExpandArray(PGLOBAL g, PBVAL arp, int n);
PVAL CalculateArray(PGLOBAL g, PBVAL arp, int n); PVAL CalculateArray(PGLOBAL g, PBVAL arp, int n);
...@@ -140,6 +142,7 @@ class BCUTIL : public BTUTIL { ...@@ -140,6 +142,7 @@ class BCUTIL : public BTUTIL {
protected: protected:
// Member // Member
PBSCOL Cp; PBSCOL Cp;
bool Jb;
}; // end of class BCUTIL }; // end of class BCUTIL
/* -------------------------- TDBBSN class --------------------------- */ /* -------------------------- TDBBSN class --------------------------- */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7