Changeset: 2a969b021fa4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a969b021fa4
Removed Files:
monetdb5/extras/rdf/30_rdf.mal
monetdb5/extras/rdf/Makefile.ag
monetdb5/extras/rdf/rdf.h
monetdb5/extras/rdf/rdf_shredder.c
monetdb5/extras/rdf/rdfalgebra.c
monetdb5/extras/rdf/rdfalgebra.mal
sql/backends/monet5/sql_rdf.c
sql/backends/monet5/sql_rdf.mal
sql/scripts/30_rdf.sql
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
NT/monetdb_config.h.in
NT/rules.msc
buildtools/doc/windowsbuild.rst
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_all.stable.out.int128
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out.int128
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out.int128
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/MAL-signatures_none.stable.out.int128
configure.ag
debian/control
debian/rules
monetdb5/extras/Makefile.ag
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_exception.h
monetdb5/modules/mal/Tests/All
sql/ChangeLog
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/scripts/Makefile.ag
sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out
testing/Mtest.py.in
Branch: default
Log Message:
Remove RDF support.
RDF support has not been used in a long time, it depends on an old
Raptor library, and there is another branch with more up-to-date
support.
diffs (truncated from 1824 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -115,7 +115,6 @@ BuildRequires: python-devel
%if %{?rhel:0}%{!?rhel:1}
BuildRequires: python3-devel
%endif
-# BuildRequires: raptor-devel >= 1.4.16
BuildRequires: readline-devel
# On RedHat Enterprise Linux and derivatives (CentOS, Scientific
# Linux), the rubygem-activerecord package is not available (also not
@@ -636,7 +635,6 @@ fi
%if %{?with_rintegration:1}%{!?with_rintegration:0}
%exclude %{_libdir}/monetdb5/rapi.mal
%endif
-# %exclude %{_libdir}/monetdb5/rdf.mal
%exclude %{_libdir}/monetdb5/sql.mal
%{_libdir}/monetdb5/*.mal
%if %{?with_geos:1}%{!?with_geos:0}
@@ -646,7 +644,6 @@ fi
%if %{?with_rintegration:1}%{!?with_rintegration:0}
%exclude %{_libdir}/monetdb5/autoload/*_rapi.mal
%endif
-# %exclude %{_libdir}/monetdb5/autoload/*_rdf.mal
%exclude %{_libdir}/monetdb5/autoload/*_sql.mal
%{_libdir}/monetdb5/autoload/*.mal
%if %{?with_geos:1}%{!?with_geos:0}
@@ -661,7 +658,6 @@ fi
%exclude %{_libdir}/monetdb5/autoload/*_bam.mal
%exclude %{_libdir}/monetdb5/lib_bam.so
%endif
-# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
%{_libdir}/monetdb5/*.so
%doc %{_mandir}/man1/mserver5.1.gz
@@ -687,26 +683,6 @@ used from the MAL level.
%{_libdir}/libmonetdb5.so
%{_libdir}/pkgconfig/monetdb5.pc
-# %package -n MonetDB5-server-rdf
-# Summary: MonetDB RDF interface
-# Group: Applications/Databases
-# Requires: MonetDB5-server = %{version}-%{release}
-
-# %description -n MonetDB5-server-rdf
-# 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 MonetDB5 RDF module.
-
-# %files -n MonetDB5-server-rdf
-# %defattr(-,root,root)
-# %{_libdir}/monetdb5/autoload/*_rdf.mal
-# %{_libdir}/monetdb5/lib_rdf.so
-# %{_libdir}/monetdb5/rdf.mal
-# %{_libdir}/monetdb5/createdb/*_rdf.sql
-
%package SQL-server5
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
@@ -757,7 +733,6 @@ systemd-tmpfiles --create %{_sysconfdir}
%if %{?with_samtools:1}%{!?with_samtools:0}
%exclude %{_libdir}/monetdb5/createdb/*_bam.sql
%endif
-# %exclude %{_libdir}/monetdb5/createdb/*_rdf.sql
%{_libdir}/monetdb5/createdb/*
%{_libdir}/monetdb5/sql*.mal
%doc %{_mandir}/man1/monetdb.1.gz
@@ -897,7 +872,6 @@ developer, but if you do want to test, t
--enable-oid32=%{?oid32:yes}%{!?oid32:no} \
--enable-optimize=yes \
--enable-profile=no \
- --enable-rdf=no \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
--enable-sql=yes \
--enable-strict=no \
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
@@ -723,12 +723,6 @@
}
"Entry"
{
- "MsmKey" = "8:_C5AD1E812B9C4B44B3979D10204E8C97"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_C765F3D75F654D7886C488ED196F6CBF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3378,26 +3372,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C5AD1E812B9C4B44B3979D10204E8C97"
- {
- "SourcePath" = "8:lib\\monetdb5\\sql_rdf.mal"
- "TargetName" = "8:sql_rdf.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}:_C765F3D75F654D7886C488ED196F6CBF"
{
"SourcePath" = "8:lib\\monetdb5\\bat5.mal"
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
@@ -723,12 +723,6 @@
}
"Entry"
{
- "MsmKey" = "8:_C5AD1E812B9C4B44B3979D10204E8C97"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_C765F3D75F654D7886C488ED196F6CBF"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3378,26 +3372,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C5AD1E812B9C4B44B3979D10204E8C97"
- {
- "SourcePath" = "8:lib\\monetdb5\\sql_rdf.mal"
- "TargetName" = "8:sql_rdf.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}:_C765F3D75F654D7886C488ED196F6CBF"
{
"SourcePath" = "8:lib\\monetdb5\\bat5.mal"
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
@@ -435,9 +435,6 @@
/* Define to 1 if you have the <pwd.h> header file. */
/* #undef HAVE_PWD_H */
-/* Define if you have the raptor library */
-/* #undef HAVE_RAPTOR */
-
/* Define to 1 if you have the <regex.h> header file. */
/* #undef HAVE_REGEX_H */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -419,11 +419,6 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_PYTHON3_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
-!IFDEF HAVE_RAPTOR
- $(ECHO) HAVE_RAPTOR_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
- $(ECHO) HAVE_RAPTOR_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
!IFDEF HAVE_RUBYGEM
$(ECHO) HAVE_RUBYGEM_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -856,7 +856,6 @@ possible:
- ``HAVE_TESTING=1`` - include the testing component;
- ``HAVE_PYTHON=1`` - include the Python component;
- ``HAVE_ICONV=1`` - the iconv library is available;
-- ``HAVE_RAPTOR=1`` - the raptor library is available;
- ``HAVE_OPENSSL=1`` - the OpenSSL library is available;
- ``HAVE_PERL=1`` - include the Perl component.
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -40978,10 +40978,6 @@ pattern sql.querylog_catalog() (id:bat[:
address sql_querylog_catalog;
comment Obtain the query log catalog
-pattern sql.rdfshred(location:str,gname:str,schema:str):void
-address SQLrdfShred;
-comment Procedure that wraps around the shredder of the rdf module in MAL.
Shredding an RDF data file from location results in 7 new tables (6
permutations of SPO and a mapping) in the RDF schema and an entry to table
rdf.graph We can then query with SQL queries the RDF triple storeby quering
tables gid_spo, gid_pso etc., where gid is looked up in rdf.graph
-
command sql.rank(b:bat[:oid,:any_1]):bat[:oid,:int]
address sql_rank;
comment return the rank bat
diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128
b/clients/Tests/MAL-signatures_all.stable.out.int128
--- a/clients/Tests/MAL-signatures_all.stable.out.int128
+++ b/clients/Tests/MAL-signatures_all.stable.out.int128
@@ -51921,10 +51921,6 @@ command sql.round(v:hge,d:int,s:int,r:bt
address hge_round_wrap;
comment round off the decimal v(d,s) to r digits behind the dot (if r < 0,
before the dot)
-pattern sql.rdfshred(location:str,gname:str,schema:str):void
-address SQLrdfShred;
-comment Procedure that wraps around the shredder of the rdf module in MAL.
Shredding an RDF data file from location results in 7 new tables (6
permutations of SPO and a mapping) in the RDF schema and an entry to table
rdf.graph We can then query with SQL queries the RDF triple storeby quering
tables gid_spo, gid_pso etc., where gid is looked up in rdf.graph
-
command sql.rank(b:bat[:oid,:any_1]):bat[:oid,:int]
address sql_rank;
comment return the rank bat
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -40868,10 +40868,6 @@ pattern sql.querylog_catalog() (id:bat[:
address sql_querylog_catalog;
comment Obtain the query log catalog
-pattern sql.rdfshred(location:str,gname:str,schema:str):void
-address SQLrdfShred;
-comment Procedure that wraps around the shredder of the rdf module in MAL.
Shredding an RDF data file from location results in 7 new tables (6
permutations of SPO and a mapping) in the RDF schema and an entry to table
rdf.graph We can then query with SQL queries the RDF triple storeby quering
tables gid_spo, gid_pso etc., where gid is looked up in rdf.graph
-
command sql.rank(b:bat[:oid,:any_1]):bat[:oid,:int]
address sql_rank;
comment return the rank bat
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128
@@ -51816,10 +51816,6 @@ command sql.round(v:hge,d:int,s:int,r:bt
address hge_round_wrap;
comment round off the decimal v(d,s) to r digits behind the dot (if r < 0,
before the dot)
-pattern sql.rdfshred(location:str,gname:str,schema:str):void
-address SQLrdfShred;
-comment Procedure that wraps around the shredder of the rdf module in MAL.
Shredding an RDF data file from location results in 7 new tables (6
permutations of SPO and a mapping) in the RDF schema and an entry to table
rdf.graph We can then query with SQL queries the RDF triple storeby quering
tables gid_spo, gid_pso etc., where gid is looked up in rdf.graph
-
command sql.rank(b:bat[:oid,:any_1]):bat[:oid,:int]
address sql_rank;
comment return the rank bat
diff --git a/clients/Tests/MAL-signatures_geom.stable.out
b/clients/Tests/MAL-signatures_geom.stable.out
--- a/clients/Tests/MAL-signatures_geom.stable.out
+++ b/clients/Tests/MAL-signatures_geom.stable.out
@@ -40844,10 +40844,6 @@ pattern sql.querylog_catalog() (id:bat[:
address sql_querylog_catalog;
comment Obtain the query log catalog
-pattern sql.rdfshred(location:str,gname:str,schema:str):void
-address SQLrdfShred;
-comment Procedure that wraps around the shredder of the rdf module in MAL.
Shredding an RDF data file from location results in 7 new tables (6
permutations of SPO and a mapping) in the RDF schema and an entry to table
rdf.graph We can then query with SQL queries the RDF triple storeby quering
tables gid_spo, gid_pso etc., where gid is looked up in rdf.graph
-
command sql.rank(b:bat[:oid,:any_1]):bat[:oid,:int]
address sql_rank;
comment return the rank bat
diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128
b/clients/Tests/MAL-signatures_geom.stable.out.int128
--- a/clients/Tests/MAL-signatures_geom.stable.out.int128
+++ b/clients/Tests/MAL-signatures_geom.stable.out.int128
@@ -51792,10 +51792,6 @@ command sql.round(v:hge,d:int,s:int,r:bt
address hge_round_wrap;
comment round off the decimal v(d,s) to r digits behind the dot (if r < 0,
before the dot)
-pattern sql.rdfshred(location:str,gname:str,schema:str):void
-address SQLrdfShred;
-comment Procedure that wraps around the shredder of the rdf module in MAL.
Shredding an RDF data file from location results in 7 new tables (6
permutations of SPO and a mapping) in the RDF schema and an entry to table
rdf.graph We can then query with SQL queries the RDF triple storeby quering
tables gid_spo, gid_pso etc., where gid is looked up in rdf.graph
-
command sql.rank(b:bat[:oid,:any_1]):bat[:oid,:int]
address sql_rank;
comment return the rank bat
diff --git a/clients/Tests/MAL-signatures_none.stable.out
b/clients/Tests/MAL-signatures_none.stable.out
--- a/clients/Tests/MAL-signatures_none.stable.out
+++ b/clients/Tests/MAL-signatures_none.stable.out
@@ -40661,10 +40661,6 @@ pattern sql.querylog_catalog() (id:bat[:
address sql_querylog_catalog;
comment Obtain the query log catalog
-pattern sql.rdfshred(location:str,gname:str,schema:str):void
-address SQLrdfShred;
-comment Procedure that wraps around the shredder of the rdf module in MAL.
Shredding an RDF data file from location results in 7 new tables (6
permutations of SPO and a mapping) in the RDF schema and an entry to table
rdf.graph We can then query with SQL queries the RDF triple storeby quering
tables gid_spo, gid_pso etc., where gid is looked up in rdf.graph
-
command sql.rank(b:bat[:oid,:any_1]):bat[:oid,:int]
address sql_rank;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
