Changeset: fe740d4d9808 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fe740d4d9808
Removed Files:
monetdb5/modules/atoms/Tests/json00.mal
monetdb5/modules/atoms/Tests/json00.stable.err
monetdb5/modules/atoms/Tests/json00.stable.out
monetdb5/modules/atoms/Tests/json01.mal
monetdb5/modules/atoms/Tests/json01.stable.err
monetdb5/modules/atoms/Tests/json01.stable.out
monetdb5/modules/atoms/Tests/json02.mal
monetdb5/modules/atoms/Tests/json02.stable.err
monetdb5/modules/atoms/Tests/json02.stable.out
monetdb5/modules/atoms/Tests/json03.mal
monetdb5/modules/atoms/Tests/json03.stable.err
monetdb5/modules/atoms/Tests/json03.stable.out
monetdb5/modules/atoms/Tests/json04.mal
monetdb5/modules/atoms/Tests/json04.stable.err
monetdb5/modules/atoms/Tests/json04.stable.out
monetdb5/modules/atoms/Tests/json05.mal
monetdb5/modules/atoms/Tests/json05.stable.err
monetdb5/modules/atoms/Tests/json05.stable.out
monetdb5/modules/atoms/Tests/json06.stable.err
monetdb5/modules/atoms/Tests/json06.stable.out
monetdb5/modules/atoms/Tests/json07.mal
monetdb5/modules/atoms/Tests/json07.stable.err
monetdb5/modules/atoms/Tests/json07.stable.out
monetdb5/modules/atoms/Tests/jsonrender.mal
monetdb5/modules/atoms/Tests/jsonrender.stable.err
monetdb5/modules/atoms/Tests/jsonrender.stable.out
monetdb5/modules/atoms/json_atom.c
monetdb5/modules/atoms/json_atom.h
monetdb5/modules/atoms/json_atom.mal
sql/scripts/40_json.sql
sql/test/json/Tests/All
sql/test/json/Tests/books.sql
sql/test/json/Tests/books.stable.err
sql/test/json/Tests/books.stable.out
sql/test/json/Tests/miniexample.sql
sql/test/json/Tests/parsing.sql
sql/test/json/Tests/parsing.stable.err
sql/test/json/Tests/parsing.stable.out
sql/test/json/Tests/pgexample.sql
sql/test/json/Tests/pgexample.stable.err
sql/test/json/Tests/pgexample.stable.out
sql/test/json/Tests/spaceissue.sql
sql/test/json/Tests/spaceissue.stable.err
sql/test/json/Tests/spaceissue.stable.out
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_gsl.stable.out
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/SQL-dump.sql
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_gsl.stable.out
clients/Tests/SQL-dump_nogeom.stable.out
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
debian/monetdb5-sql.install
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/Tests/All
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/modules/mal/mal_init.mal
monetdb5/optimizer/opt_prelude.h
sql/backends/monet5/mal_backend.c
sql/backends/monet5/mal_backend.h
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/scripts/Makefile.ag
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions_gsl.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/Tests/trace.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check0_gsl.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3_gsl.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1_gsl.stable.out
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2_gsl.stable.out
sql/test/leaks/Tests/select2_nogeom.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1_gsl.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2_gsl.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3_gsl.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: Jan2014
Log Message:
Removed json atom: not ready for prime time.
This change will not be propagated.
diffs (truncated from 10038 to 300 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -537,12 +537,6 @@
}
"Entry"
{
- "MsmKey" = "8:_8AA04892E2F54DCEBC1F065A2226A6E2"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_8EDD51724DB946129DBC8522FA61A486"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -801,12 +795,6 @@
}
"Entry"
{
- "MsmKey" = "8:_C90422E0CE4D4BF69D662615898CB31F"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_CA3CFDD1291E474EAE85329E4C5E5D45"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2817,26 +2805,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8AA04892E2F54DCEBC1F065A2226A6E2"
- {
- "SourcePath" = "8:lib\\monetdb5\\createdb\\40_json.sql"
- "TargetName" = "8:40_json.sql"
- "Tag" = "8:"
- "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8EDD51724DB946129DBC8522FA61A486"
{
"SourcePath" = "8:lib\\monetdb5\\lock.mal"
@@ -3697,26 +3665,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C90422E0CE4D4BF69D662615898CB31F"
- {
- "SourcePath" = "8:lib\\monetdb5\\json_atom.mal"
- "TargetName" = "8:json_atom.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA3CFDD1291E474EAE85329E4C5E5D45"
{
"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win32-vs10\\lib\\libbz2.lib"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -537,12 +537,6 @@
}
"Entry"
{
- "MsmKey" = "8:_8AA04892E2F54DCEBC1F065A2226A6E2"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_8EDD51724DB946129DBC8522FA61A486"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -801,12 +795,6 @@
}
"Entry"
{
- "MsmKey" = "8:_C90422E0CE4D4BF69D662615898CB31F"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_CA3CFDD1291E474EAE85329E4C5E5D45"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -2817,26 +2805,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8AA04892E2F54DCEBC1F065A2226A6E2"
- {
- "SourcePath" = "8:lib\\monetdb5\\createdb\\40_json.sql"
- "TargetName" = "8:40_json.sql"
- "Tag" = "8:"
- "Folder" = "8:_7F962DDBDF894636B6CAFE6FE4887567"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_8EDD51724DB946129DBC8522FA61A486"
{
"SourcePath" = "8:lib\\monetdb5\\lock.mal"
@@ -3697,26 +3665,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C90422E0CE4D4BF69D662615898CB31F"
- {
- "SourcePath" = "8:lib\\monetdb5\\json_atom.mal"
- "TargetName" = "8:json_atom.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_CA3CFDD1291E474EAE85329E4C5E5D45"
{
"SourcePath" =
"8:C:\\Libraries\\bzip2-1.0.6.win64-vs10\\lib\\libbz2.lib"
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -239,9 +239,6 @@
/* Define to 1 if you have the `isinf' function. */
/* #undef HAVE_ISINF */
-/* Define that you want to build the jsonstore library */
-/* #undef HAVE_JSONSTORE */
-
/* Define to 1 if you have the `kill' function. */
/* #undef HAVE_KILL */
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -36701,10 +36701,6 @@ pattern calc.isnil(v:date):bit
address CMDvarISNIL;
comment Nil test for date value
-pattern calc.isnil(v:json):bit
-address CMDvarISNIL;
-comment Nil test for json value
-
command calc.isnil(v:sqlblob):bit
address BLOB_isnil;
comment Nil test for blob value
@@ -36885,14 +36881,6 @@ pattern calc.iszero(v:bte):bit
address CMDvarISZERO;
comment Unary check for zero of V
-command calc.json(j:json):json
-address JSONstr2json;
-comment Convert JSON to JSON. Dealing with escape characters
-
-command calc.json(j:str):json
-address JSONstr2json;
-comment Convert string to its JSON. Dealing with escape characters
-
command calc.lng(s1:int,v:lng,d2:int,s2:int):lng
address lng_dec2dec_lng;
comment cast decimal(lng) to decimal(lng) and check for overflow
@@ -39680,95 +39668,19 @@ command json.exportResult(o:streams,kind
address JSONexportResult;
comment Serialise the given JSON pointer into JSON format, respecting the MAPI
protocol
-command json.filter(name:json,i:int):json
-address JSONfilterArray;
-comment Extract a single element from an array
-
-command json.filterall(name:json,s:str):json
-address JSONfilterObjectAll;
-comment Filter the members of an object by name
-
-command json.filter(name:json,s:str):json
-address JSONfilterObject;
-comment Filter the members of an object by name
-
-command json.#fromstr():json
-address JSONfromString;
-comment Validate a string to be JSON compliant. A NOOP if valid json, NULL
otherwise.
-
-command json.isvalidarray(val:json):bit
-address JSONisarray;
-comment Validate the string as a valid JSON array
-
-command json.isvalidobject(val:json):bit
-address JSONisobject;
-comment Validate the string as a valid JSON object
-
-command json.isvalid(val:str):bit
-address JSONisvalid;
-comment Validate the string as a valid JSON document
-
-command json.keys(val:json):bat[:oid,:str]
-address JSONkeys;
-comment Expands the outermost JSON object names.
-
-command json.keyArray(val:json):str
-address JSONkeyArray;
-comment Expands the outermost JSON object keys into a JSON array.
-
command json.load(nme:str)
(kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str])
address JSONload;
comment Load the JSON object name from the database
-command json.length(val:json):int
-address JSONlength;
-comment Returns the number of elements in the outermost JSON object.
-
command json.nextid(kind:bat[:oid,:bte]):oid
address JSONnextid;
comment Returns the next free id for the kind BAT
-pattern json.nest(k:bat[:oid,:dbl]):json
-address JSONnest;
-comment Combine the value list into a single json array object.
-
-pattern json.nest(k:bat[:oid,:flt]):json
-address JSONnest;
-pattern json.nest(k:bat[:oid,:lng]):json
-address JSONnest;
-pattern json.nest(k:bat[:oid,:int]):json
-address JSONnest;
-pattern json.nest(k:bat[:oid,:sht]):json
-address JSONnest;
-pattern json.nest(k:bat[:oid,:str]):json
-address JSONnest;
-pattern json.nest(k:bat[:oid,:str],v:bat[:oid,:any]):json
-address JSONnest;
-comment Combine the key-value pairs into a single json object list.
-
-pattern json.nest(o:bat[:oid,:oid],k:bat[:oid,:str],v:bat[:oid,:any]):json
-address JSONnest;
-comment Nest the key-value pairs with object identity into a list of JSON
objects
-
-command json.new(j:str):json
-address JSONstr2json;
-comment Convert string to its JSON. Dealing with escape characters
-
function
json.print(o:streams,kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str]):void;
command
json.print(o:streams,kind:bat[:oid,:bte],string:bat[:oid,:str],integer:bat[:oid,:lng],double:bat[:oid,:dbl],array:bat[:oid,:oid],object:bat[:oid,:oid],name:bat[:oid,:str],start:oid,pretty:bit):void
address JSONprint;
comment Serialise the given JSON pointer into JSON format
-command json.path(js:json,e:str):json
-address JSONpath;
-comment Simple JSON path accessor
-
-command json.prelude():void
-address JSONprelude;
-pattern json.renderarray(val:any...):json
-address JSONrenderarray;
-pattern json.renderobject(val:any...):json
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
