Changeset: 346cbca575dd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=346cbca575dd
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
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.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump.stable.out.64bit.oid32
clients/Tests/SQL-dump_gsl.stable.out
clients/Tests/SQL-dump_gsl.stable.out.oid32
clients/Tests/SQL-dump_nogeom.stable.out
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
clients/python2/monetdb/sql/monetize.py
clients/python2/test/test_monetize.py
clients/python3/monetdb/sql/monetize.py
clients/python3/test/test_monetize.py
configure.ag
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_storage.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_parser.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/kernel/array.c
sql/backends/monet5/sql_scenario.c
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions_gsl.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/pg_regress/Tests/char.sql
sql/test/pg_regress/Tests/char.stable.err
sql/test/pg_regress/Tests/char.stable.out
sql/test/pg_regress/Tests/float4.sql
sql/test/pg_regress/Tests/float4.stable.err
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.sql
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/int2.sql
sql/test/pg_regress/Tests/int2.stable.err
sql/test/pg_regress/Tests/int2.stable.out
sql/test/pg_regress/Tests/int4.sql
sql/test/pg_regress/Tests/int4.stable.err
sql/test/pg_regress/Tests/int4.stable.out
sql/test/pg_regress/Tests/int8.sql
sql/test/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/int8.stable.out
sql/test/pg_regress/Tests/numerology.sql
sql/test/pg_regress/Tests/polygon.sql
sql/test/pg_regress/postgresql2sql99.sh
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: multifarm
Log Message:
Merge with default branch.
diffs (truncated from 4771 to 300 lines):
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -94,11 +94,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
@@ -428,6 +423,7 @@
"ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"
"PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
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
@@ -982,11 +982,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -1207,7 +1207,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
"Properties"
{
}
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -94,11 +94,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
@@ -428,6 +423,7 @@
"ProductCode" = "8:{BD1A3C71-3A8E-421D-922D-2B7A19926B5C}"
"PackageCode" = "8:{471DD1DA-9C69-4289-821D-4CC329A8BA94}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
@@ -992,7 +988,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
"Properties"
{
}
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
@@ -982,11 +982,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
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
@@ -236,6 +236,14 @@ command aggr.histogram(b:bat[:any_1,:any
address ALGhistogram;
comment Produce a BAT containing the histogram over the tail values.
+command aggr.jsonaggr(val:bat[:oid,:dbl]):str
+address JSONgroupStr;
+comment Aggregate the double values to array.
+
+command aggr.jsonaggr(val:bat[:oid,:str]):str
+address JSONgroupStr;
+comment Aggregate the string values to array.
+
function aggr.median(b:bat[:oid,:any_1]):any_1;
command
aggr.median(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1]
address AGGRmedian3;
@@ -774,6 +782,22 @@ command aggr.quantile(b:bat[:oid,:any_1]
address AGGRquantile3;
comment Grouped quantile aggregate
+command
aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
+address JSONsubjsoncand;
+comment Grouped aggregation of values with candidates list.
+
+command
aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
+address JSONsubjsoncand;
+comment Grouped aggregation of values with candidates list.
+
+command
aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
+address JSONsubjson;
+comment Grouped aggregation of values.
+
+command
aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
+address JSONsubjson;
+comment Grouped aggregation of values.
+
command
aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1]
address AGGRsubquantilecand;
comment Grouped median quantile with candidate list
@@ -39420,14 +39444,6 @@ command iterator.new(b:bat[:oid,:any_2],
address ITRnewChunk;
comment Create an iterator with fixed granule size. The result is a view.
-command json.aggr(val:bat[:oid,:dbl]):str
-address JSONgroupStr;
-comment Aggregate the double values to array.
-
-command json.aggr(val:bat[:oid,:str]):str
-address JSONgroupStr;
-comment Aggregate the string values to array.
-
command json.dump(j:json):void
address JSONdump;
pattern json.fold(k:bat[:oid,:any]):json
@@ -39530,22 +39546,6 @@ pattern json.renderarray(val:any...):jso
address JSONrenderarray;
pattern json.renderobject(val:any...):json
address JSONrenderobject;
-command
json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
-address JSONsubjsoncand;
-comment Grouped aggregation of values with candidates list.
-
-command
json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
-address JSONsubjsoncand;
-comment Grouped aggregation of values with candidates list.
-
-command
json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
-address JSONsubjson;
-comment Grouped aggregation of values.
-
-command
json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
-address JSONsubjson;
-comment Grouped aggregation of values.
-
command
json.suboutput(b:bat[:oid,:any_1],gid:bat[:oid,:oid],ext:bat[:oid,:wrd],flg:bit):bat[:oid,:str]
address JSONtextGrouped;
comment Pack the values into a json structure
diff --git a/clients/Tests/MAL-signatures_gsl.stable.out
b/clients/Tests/MAL-signatures_gsl.stable.out
--- a/clients/Tests/MAL-signatures_gsl.stable.out
+++ b/clients/Tests/MAL-signatures_gsl.stable.out
@@ -236,6 +236,14 @@ command aggr.histogram(b:bat[:any_1,:any
address ALGhistogram;
comment Produce a BAT containing the histogram over the tail values.
+command aggr.jsonaggr(val:bat[:oid,:dbl]):str
+address JSONgroupStr;
+comment Aggregate the double values to array.
+
+command aggr.jsonaggr(val:bat[:oid,:str]):str
+address JSONgroupStr;
+comment Aggregate the string values to array.
+
function aggr.median(b:bat[:oid,:any_1]):any_1;
command
aggr.median(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1]
address AGGRmedian3;
@@ -774,6 +782,22 @@ command aggr.quantile(b:bat[:oid,:any_1]
address AGGRquantile3;
comment Grouped quantile aggregate
+command
aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
+address JSONsubjsoncand;
+comment Grouped aggregation of values with candidates list.
+
+command
aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
+address JSONsubjsoncand;
+comment Grouped aggregation of values with candidates list.
+
+command
aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
+address JSONsubjson;
+comment Grouped aggregation of values.
+
+command
aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
+address JSONsubjson;
+comment Grouped aggregation of values.
+
command
aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1]
address AGGRsubquantilecand;
comment Grouped median quantile with candidate list
@@ -39436,14 +39460,6 @@ command iterator.new(b:bat[:oid,:any_2],
address ITRnewChunk;
comment Create an iterator with fixed granule size. The result is a view.
-command json.aggr(val:bat[:oid,:dbl]):str
-address JSONgroupStr;
-comment Aggregate the double values to array.
-
-command json.aggr(val:bat[:oid,:str]):str
-address JSONgroupStr;
-comment Aggregate the string values to array.
-
command json.dump(j:json):void
address JSONdump;
pattern json.fold(k:bat[:oid,:any]):json
@@ -39546,22 +39562,6 @@ pattern json.renderarray(val:any...):jso
address JSONrenderarray;
pattern json.renderobject(val:any...):json
address JSONrenderobject;
-command
json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
-address JSONsubjsoncand;
-comment Grouped aggregation of values with candidates list.
-
-command
json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
-address JSONsubjsoncand;
-comment Grouped aggregation of values with candidates list.
-
-command
json.subaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
-address JSONsubjson;
-comment Grouped aggregation of values.
-
-command
json.subaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
-address JSONsubjson;
-comment Grouped aggregation of values.
-
command
json.suboutput(b:bat[:oid,:any_1],gid:bat[:oid,:oid],ext:bat[:oid,:wrd],flg:bit):bat[:oid,:str]
address JSONtextGrouped;
comment Pack the values into a json structure
diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out
b/clients/Tests/MAL-signatures_nocfitsio.stable.out
--- a/clients/Tests/MAL-signatures_nocfitsio.stable.out
+++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out
@@ -236,6 +236,14 @@ command aggr.histogram(b:bat[:any_1,:any
address ALGhistogram;
comment Produce a BAT containing the histogram over the tail values.
+command aggr.jsonaggr(val:bat[:oid,:dbl]):str
+address JSONgroupStr;
+comment Aggregate the double values to array.
+
+command aggr.jsonaggr(val:bat[:oid,:str]):str
+address JSONgroupStr;
+comment Aggregate the string values to array.
+
function aggr.median(b:bat[:oid,:any_1]):any_1;
command
aggr.median(b:bat[:oid,:any_1],g:bat[:oid,:oid],e:bat[:oid,:any_2]):bat[:oid,:any_1]
address AGGRmedian3;
@@ -774,6 +782,22 @@ command aggr.quantile(b:bat[:oid,:any_1]
address AGGRquantile3;
comment Grouped quantile aggregate
+command
aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
+address JSONsubjsoncand;
+comment Grouped aggregation of values with candidates list.
+
+command
aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:str]
+address JSONsubjsoncand;
+comment Grouped aggregation of values with candidates list.
+
+command
aggr.subjsonaggr(val:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
+address JSONsubjson;
+comment Grouped aggregation of values.
+
+command
aggr.subjsonaggr(val:bat[:oid,:str],g:bat[:oid,:oid],e:bat[:oid,:any_1],skip_nils:bit):bat[:oid,:str]
+address JSONsubjson;
+comment Grouped aggregation of values.
+
command
aggr.subquantile(b:bat[:oid,:any_1],q:bat[:oid,:dbl],g:bat[:oid,:oid],e:bat[:oid,:any_2],s:bat[:oid,:oid],skip_nils:bit):bat[:oid,:any_1]
address AGGRsubquantilecand;
comment Grouped median quantile with candidate list
@@ -39396,14 +39420,6 @@ command iterator.new(b:bat[:oid,:any_2],
address ITRnewChunk;
comment Create an iterator with fixed granule size. The result is a view.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
