Changeset: d1b596957164 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1b596957164
Removed Files:
debian/monetdb5-jaql.install
monetdb5/extras/jaql/30_jaql.mal
monetdb5/extras/jaql/Makefile.ag
monetdb5/extras/jaql/Tests/All
monetdb5/extras/jaql/Tests/expand00.mal
monetdb5/extras/jaql/Tests/expand00.stable.err
monetdb5/extras/jaql/Tests/expand00.stable.out
monetdb5/extras/jaql/Tests/expand01.mal
monetdb5/extras/jaql/Tests/expand01.stable.err
monetdb5/extras/jaql/Tests/expand01.stable.out
monetdb5/extras/jaql/Tests/filter00.mal
monetdb5/extras/jaql/Tests/filter00.stable.err
monetdb5/extras/jaql/Tests/filter00.stable.out
monetdb5/extras/jaql/Tests/filter01.mal
monetdb5/extras/jaql/Tests/filter01.stable.err
monetdb5/extras/jaql/Tests/filter01.stable.out
monetdb5/extras/jaql/Tests/func00.mal
monetdb5/extras/jaql/Tests/func00.stable.err
monetdb5/extras/jaql/Tests/func00.stable.out
monetdb5/extras/jaql/Tests/func01.mal
monetdb5/extras/jaql/Tests/func01.stable.err
monetdb5/extras/jaql/Tests/func01.stable.out
monetdb5/extras/jaql/Tests/group00.mal
monetdb5/extras/jaql/Tests/group00.stable.err
monetdb5/extras/jaql/Tests/group00.stable.out
monetdb5/extras/jaql/Tests/group01.mal
monetdb5/extras/jaql/Tests/group01.stable.err
monetdb5/extras/jaql/Tests/group01.stable.out
monetdb5/extras/jaql/Tests/group02.mal
monetdb5/extras/jaql/Tests/group02.stable.err
monetdb5/extras/jaql/Tests/group02.stable.out
monetdb5/extras/jaql/Tests/join00.mal
monetdb5/extras/jaql/Tests/join00.stable.err
monetdb5/extras/jaql/Tests/join00.stable.out
monetdb5/extras/jaql/Tests/join01.mal
monetdb5/extras/jaql/Tests/join01.stable.err
monetdb5/extras/jaql/Tests/join01.stable.out
monetdb5/extras/jaql/Tests/join02.mal
monetdb5/extras/jaql/Tests/join02.stable.err
monetdb5/extras/jaql/Tests/join02.stable.out
monetdb5/extras/jaql/Tests/join03.mal
monetdb5/extras/jaql/Tests/join03.stable.err
monetdb5/extras/jaql/Tests/join03.stable.out
monetdb5/extras/jaql/Tests/json00.mal
monetdb5/extras/jaql/Tests/json00.stable.err
monetdb5/extras/jaql/Tests/json00.stable.out
monetdb5/extras/jaql/Tests/json01.mal
monetdb5/extras/jaql/Tests/json01.stable.err
monetdb5/extras/jaql/Tests/json01.stable.out
monetdb5/extras/jaql/Tests/json02.mal
monetdb5/extras/jaql/Tests/json02.stable.err
monetdb5/extras/jaql/Tests/json02.stable.out
monetdb5/extras/jaql/Tests/json03.mal
monetdb5/extras/jaql/Tests/json03.stable.err
monetdb5/extras/jaql/Tests/json03.stable.out
monetdb5/extras/jaql/Tests/json04.mal
monetdb5/extras/jaql/Tests/json04.stable.err
monetdb5/extras/jaql/Tests/json04.stable.out
monetdb5/extras/jaql/Tests/json05.mal
monetdb5/extras/jaql/Tests/json05.stable.err
monetdb5/extras/jaql/Tests/json05.stable.out
monetdb5/extras/jaql/Tests/plan00.mal
monetdb5/extras/jaql/Tests/plan00.stable.err
monetdb5/extras/jaql/Tests/plan00.stable.out
monetdb5/extras/jaql/Tests/plan01.mal
monetdb5/extras/jaql/Tests/plan01.stable.err
monetdb5/extras/jaql/Tests/plan01.stable.out
monetdb5/extras/jaql/Tests/plan02.mal
monetdb5/extras/jaql/Tests/plan02.stable.err
monetdb5/extras/jaql/Tests/plan02.stable.out
monetdb5/extras/jaql/Tests/sort00.mal
monetdb5/extras/jaql/Tests/sort00.stable.err
monetdb5/extras/jaql/Tests/sort00.stable.out
monetdb5/extras/jaql/Tests/sort01.mal
monetdb5/extras/jaql/Tests/sort01.stable.err
monetdb5/extras/jaql/Tests/sort01.stable.out
monetdb5/extras/jaql/Tests/top00.mal
monetdb5/extras/jaql/Tests/top00.stable.err
monetdb5/extras/jaql/Tests/top00.stable.out
monetdb5/extras/jaql/Tests/top01.mal
monetdb5/extras/jaql/Tests/top01.stable.err
monetdb5/extras/jaql/Tests/top01.stable.out
monetdb5/extras/jaql/Tests/transform00.mal
monetdb5/extras/jaql/Tests/transform00.stable.err
monetdb5/extras/jaql/Tests/transform00.stable.out
monetdb5/extras/jaql/Tests/transform01.mal
monetdb5/extras/jaql/Tests/transform01.stable.err
monetdb5/extras/jaql/Tests/transform01.stable.out
monetdb5/extras/jaql/Tests/transform02.mal
monetdb5/extras/jaql/Tests/transform02.stable.err
monetdb5/extras/jaql/Tests/transform02.stable.out
monetdb5/extras/jaql/Tests/variable00.mal
monetdb5/extras/jaql/Tests/variable00.stable.err
monetdb5/extras/jaql/Tests/variable00.stable.out
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaql.h
monetdb5/extras/jaql/jaql.mal
monetdb5/extras/jaql/jaqlfunc.mal
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/jaqlgencode.h
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/jaql/jaqlscenario.h
monetdb5/extras/jaql/jaqltests/Tests/All
monetdb5/extras/jaql/jaqltests/Tests/calculations.jaql
monetdb5/extras/jaql/jaqltests/Tests/calculations.stable.err
monetdb5/extras/jaql/jaqltests/Tests/calculations.stable.out
monetdb5/extras/jaql/jaqltests/Tests/documents.jaql
monetdb5/extras/jaql/jaqltests/Tests/documents.stable.err
monetdb5/extras/jaql/jaqltests/Tests/documents.stable.out
monetdb5/extras/jaql/jaqltests/Tests/expand.jaql
monetdb5/extras/jaql/jaqltests/Tests/expand.stable.err
monetdb5/extras/jaql/jaqltests/Tests/expand.stable.out
monetdb5/extras/jaql/jaqltests/Tests/filter.jaql
monetdb5/extras/jaql/jaqltests/Tests/filter.stable.err
monetdb5/extras/jaql/jaqltests/Tests/filter.stable.out
monetdb5/extras/jaql/jaqltests/Tests/group.jaql
monetdb5/extras/jaql/jaqltests/Tests/group.stable.err
monetdb5/extras/jaql/jaqltests/Tests/group.stable.out
monetdb5/extras/jaql/jaqltests/Tests/imenu.json
monetdb5/extras/jaql/jaqltests/Tests/in.jaql
monetdb5/extras/jaql/jaqltests/Tests/in.stable.err
monetdb5/extras/jaql/jaqltests/Tests/in.stable.out
monetdb5/extras/jaql/jaqltests/Tests/info.jaql
monetdb5/extras/jaql/jaqltests/Tests/info.stable.err
monetdb5/extras/jaql/jaqltests/Tests/info.stable.out
monetdb5/extras/jaql/jaqltests/Tests/join.jaql
monetdb5/extras/jaql/jaqltests/Tests/join.stable.err
monetdb5/extras/jaql/jaqltests/Tests/join.stable.out
monetdb5/extras/jaql/jaqltests/Tests/multiline.jaql
monetdb5/extras/jaql/jaqltests/Tests/multiline.stable.err
monetdb5/extras/jaql/jaqltests/Tests/multiline.stable.out
monetdb5/extras/jaql/jaqltests/Tests/shred.jaql.in
monetdb5/extras/jaql/jaqltests/Tests/shred.stable.err
monetdb5/extras/jaql/jaqltests/Tests/shred.stable.out
monetdb5/extras/jaql/jaqltests/Tests/sort.jaql
monetdb5/extras/jaql/jaqltests/Tests/sort.stable.err
monetdb5/extras/jaql/jaqltests/Tests/sort.stable.out
monetdb5/extras/jaql/jaqltests/Tests/top.jaql
monetdb5/extras/jaql/jaqltests/Tests/top.stable.err
monetdb5/extras/jaql/jaqltests/Tests/top.stable.out
monetdb5/extras/jaql/jaqltests/Tests/transform.jaql
monetdb5/extras/jaql/jaqltests/Tests/transform.stable.err
monetdb5/extras/jaql/jaqltests/Tests/transform.stable.out
monetdb5/extras/jaql/jaqltests/Tests/unroll.jaql
monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.err
monetdb5/extras/jaql/jaqltests/Tests/unroll.stable.out
monetdb5/extras/jaql/jaqltree.h
monetdb5/extras/jaql/json_jaql.c
monetdb5/extras/jaql/json_jaql.h
monetdb5/extras/jaql/json_jaql.mal
monetdb5/extras/jaql/parser/Makefile.ag
monetdb5/extras/jaql/parser/jaql.l
monetdb5/extras/jaql/parser/jaql.y
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
buildtools/ChangeLog
configure.ag
debian/control
debian/monetdb5-server.install
monetdb5/extras/Makefile.ag
monetdb5/mal/mal_client.h
Branch: multifarm
Log Message:
Merge with default branch.
diffs (truncated from 19553 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -449,29 +449,6 @@ numerical analysis (gsl).
%{_libdir}/monetdb5/gsl.mal
%{_libdir}/monetdb5/lib_gsl.so
-%package jaql
-Summary: MonetDB5 JAQL
-Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
-
-%description jaql
-MonetDB is a database management system that is developed from a
-main-memory perspective with use of a fully decomposed storage model,
-automatic index management, extensibility of data types and search
-accelerators. It also has an SQL frontend.
-
-This package contains the JAQL extension for MonetDB. JAQL is a
-query language for JavaScript Object Notation (JSON).
-
-%files jaql
-%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/*_jaql.mal
-%{_libdir}/monetdb5/jaql*.mal
-%{_libdir}/monetdb5/json.mal
-%{_libdir}/monetdb5/json_util.mal
-%{_libdir}/monetdb5/lib_jaql.so
-%{_libdir}/monetdb5/lib_json_jaql.so
-
%package -n MonetDB5-server
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
@@ -523,9 +500,6 @@ fi
%exclude %{_libdir}/monetdb5/gsl.mal
# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
-%exclude %{_libdir}/monetdb5/jaql*.mal
-%exclude %{_libdir}/monetdb5/json.mal
-%exclude %{_libdir}/monetdb5/json_util.mal
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_lsst.mal
@@ -538,8 +512,6 @@ fi
%exclude %{_libdir}/monetdb5/lib_gsl.so
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
-%exclude %{_libdir}/monetdb5/lib_jaql.so
-%exclude %{_libdir}/monetdb5/lib_json_jaql.so
%{_libdir}/monetdb5/*.so
%doc %{_mandir}/man1/mserver5.1.gz
@@ -763,7 +735,6 @@ developer, but if you do want to test, t
--enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-gsl=yes \
--enable-instrument=no \
- --enable-jaql=yes \
--enable-jdbc=no \
--enable-merocontrol=no \
--enable-monetdb5=yes \
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
@@ -153,18 +153,6 @@
}
"Entry"
{
- "MsmKey" = "8:_1F84594549F24A96A4EF15ED9EC7184F"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
- "MsmKey" = "8:_1FE6775741C5492FA9A67BAF75C9F430"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_1FE7B02CBBA5493DA5E90CC441A198FC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -669,12 +657,6 @@
}
"Entry"
{
- "MsmKey" = "8:_A5CCC27A6B2340FBB90FEB21070FCA24"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_A7F05B4CF16E4015B830AAD23130BCCC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -747,12 +729,6 @@
}
"Entry"
{
- "MsmKey" = "8:_BA07EF9B9C544A88A8581D25BBDC6675"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_BE303DEAED0D4E118580EE3384FBE335"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -855,12 +831,6 @@
}
"Entry"
{
- "MsmKey" = "8:_D97860156B224184BAB2241D9EBA94D1"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_D986512B4FEA496091D4629A748B641D"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -909,12 +879,6 @@
}
"Entry"
{
- "MsmKey" = "8:_E3D3A6E532B2461D9F86BB1492BC66C6"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_E6785DD8A5FF4C3EB096C7A547EB3EFC"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1533,46 +1497,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_1F84594549F24A96A4EF15ED9EC7184F"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_json_jaql.dll"
- "TargetName" = "8:lib_json_jaql.dll"
- "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}:_1FE6775741C5492FA9A67BAF75C9F430"
- {
- "SourcePath" = "8:lib\\monetdb5\\json_jaql.mal"
- "TargetName" = "8:json_jaql.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}:_1FE7B02CBBA5493DA5E90CC441A198FC"
{
"SourcePath" = "8:banner.bmp"
@@ -3233,26 +3157,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A5CCC27A6B2340FBB90FEB21070FCA24"
- {
- "SourcePath" = "8:lib\\monetdb5\\autoload\\30_jaql.mal"
- "TargetName" = "8:30_jaql.mal"
- "Tag" = "8:"
- "Folder" = "8:_A4A821D237B943CFACE8D54F3F3971E3"
- "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}:_A7F05B4CF16E4015B830AAD23130BCCC"
{
"SourcePath" = "8:stethoscope.bat"
@@ -3493,26 +3397,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_BA07EF9B9C544A88A8581D25BBDC6675"
- {
- "SourcePath" = "8:lib\\monetdb5\\lib_jaql.dll"
- "TargetName" = "8:lib_jaql.dll"
- "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}:_BE303DEAED0D4E118580EE3384FBE335"
{
"SourcePath" = "8:lib\\monetdb5\\sql_decimal.mal"
@@ -3853,26 +3737,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D97860156B224184BAB2241D9EBA94D1"
- {
- "SourcePath" = "8:lib\\monetdb5\\jaql.mal"
- "TargetName" = "8:jaql.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}:_D986512B4FEA496091D4629A748B641D"
{
"SourcePath" = "8:lib\\monetdb5\\sql.mal"
@@ -4033,26 +3897,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E3D3A6E532B2461D9F86BB1492BC66C6"
- {
- "SourcePath" = "8:lib\\monetdb5\\jaqlfunc.mal"
- "TargetName" = "8:jaqlfunc.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}:_E6785DD8A5FF4C3EB096C7A547EB3EFC"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\15_querylog.sql"
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
@@ -153,18 +153,6 @@
}
"Entry"
{
- "MsmKey" = "8:_1F84594549F24A96A4EF15ED9EC7184F"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
