Changeset: 382c3b0f4118 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=382c3b0f4118
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
        monetdb5/mal/Tests/tst867.mal
        monetdb5/mal/Tests/tst867.stable.out
        monetdb5/modules/kernel/Tests/vacuum.mal
        monetdb5/modules/kernel/Tests/vacuum.stable.out
        monetdb5/modules/mal/Tests/cluster00.mal
        monetdb5/modules/mal/Tests/cluster00.stable.err
        monetdb5/modules/mal/Tests/cluster00.stable.out
        monetdb5/modules/mal/trader.c
        monetdb5/modules/mal/trader.h
        monetdb5/modules/mal/trader.mal
        monetdb5/optimizer/Tests/SRexample.mal
        monetdb5/optimizer/Tests/SRexample.stable.err
        monetdb5/optimizer/Tests/SRexample.stable.out
        monetdb5/optimizer/Tests/octopus00.mal
        monetdb5/optimizer/Tests/octopus01.mal
        monetdb5/optimizer/Tests/tst4820.mal
        monetdb5/optimizer/Tests/tst4820.stable.err
        monetdb5/optimizer/Tests/tst4820.stable.out
        monetdb5/optimizer/opt_centipede.c
        monetdb5/optimizer/opt_centipede.h
        monetdb5/optimizer/opt_cluster.c
        monetdb5/optimizer/opt_cluster.h
        monetdb5/optimizer/opt_mapreduce.c
        monetdb5/optimizer/opt_mapreduce.h
        monetdb5/optimizer/opt_octopus.c
        monetdb5/optimizer/opt_octopus.h
        monetdb5/optimizer/opt_strengthReduction.c
        monetdb5/optimizer/opt_strengthReduction.h
        monetdb5/scheduler/run_octopus.c
        monetdb5/scheduler/run_octopus.h
        monetdb5/scheduler/run_octopus.mal
        sql/backends/monet5/sql_octopus.mal
        sql/backends/monet5/sql_rdf.c
        sql/backends/monet5/sql_rdf.mal
        sql/backends/monet5/vaults/71_mseed.mal
        sql/backends/monet5/vaults/mseed.c
        sql/backends/monet5/vaults/mseed.h
        sql/backends/monet5/vaults/mseed.mal
        sql/backends/monet5/vaults/mseed.sql
        sql/scripts/30_rdf.sql
        sql/scripts/cache.sql
        sql/scripts/octopus.sql
        sql/scripts/parts.sql
        sql/test/centipede/Tests/All
        sql/test/centipede/Tests/olap.sql
        sql/test/centipede/Tests/olap.stable.err
        sql/test/centipede/Tests/olap.stable.out
        sql/test/octopus/Tests/All
        sql/test/octopus/Tests/lhminit.sql
        sql/test/octopus/Tests/lhmquery00.sql
        sql/test/octopus/Tests/lhmviews00.sql
        sql/test/octopus/Tests/squid.sql
        sql/test/octopus/Tests/squid.stable.err
        sql/test/octopus/Tests/squid.stable.out
        sql/test/octopus/Tests/squid00.sql
        sql/test/octopus/Tests/squid00.stable.err
        sql/test/octopus/Tests/squid00.stable.out
        sql/test/octopus/Tests/squid01.sql
        sql/test/octopus/Tests/squid01.stable.err
        sql/test/octopus/Tests/squid01.stable.out
        sql/test/octopus/Tests/squidtrace.mal
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/All
        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
        clients/Tests/exports.stable.out
        configure.ag
        debian/control
        debian/rules
        gdk/gdk.h
        gdk/gdk_select.c
        monetdb5/extras/Makefile.ag
        
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
        monetdb5/mal/Tests/All
        monetdb5/mal/mal_exception.c
        monetdb5/mal/mal_exception.h
        monetdb5/mal/mal_import.c
        monetdb5/modules/kernel/Tests/All
        monetdb5/modules/kernel/algebra.mal
        monetdb5/modules/kernel/bat5.mal
        monetdb5/modules/mal/Makefile.ag
        monetdb5/modules/mal/Tests/All
        monetdb5/modules/mal/Tests/inspect05.stable.out.int128
        monetdb5/modules/mal/mal_init.mal
        monetdb5/optimizer/Makefile.ag
        monetdb5/optimizer/Tests/All
        monetdb5/optimizer/Tests/dataflow3.mal
        monetdb5/optimizer/Tests/dataflow3.stable.out
        monetdb5/optimizer/opt_joinpath.c
        monetdb5/optimizer/opt_mitosis.c
        monetdb5/optimizer/opt_pipes.c
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/optimizer/opt_reorder.c
        monetdb5/optimizer/opt_support.c
        monetdb5/optimizer/opt_support.h
        monetdb5/optimizer/opt_wrapper.c
        monetdb5/optimizer/optimizer.mal
        monetdb5/scheduler/Makefile.ag
        monetdb5/scheduler/srvpool.c
        monetdb5/scheduler/srvpool.h
        monetdb5/tests/gdkTests/Tests/casts.stable.out
        monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
        monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows.64bit.oid64
        monetdb5/tests/gdkTests/Tests/str_heap.mal
        monetdb5/tests/gdkTests/Tests/str_heap.stable.out
        sql/ChangeLog
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql.h
        sql/backends/monet5/sql.mal
        sql/backends/monet5/vaults/Makefile.ag
        sql/backends/monet5/vaults/vault.c
        sql/backends/monet5/vaults/vault.sql
        sql/scripts/Makefile.ag
        sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out
        sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.err
        sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out
        sql/test/Tests/setoptimizer.stable.err
        sql/test/Tests/setoptimizer.stable.out
        sql/test/Tests/systemfunctions_bam.stable.out.int128
        sql/test/leaks/Tests/check1.stable.out
        sql/test/leaks/Tests/check1.stable.out.int128
        sql/test/leaks/Tests/check1_bam.stable.out
        sql/test/leaks/Tests/check1_bam.stable.out.int128
        sql/test/leaks/Tests/check1_gsl.stable.out
        sql/test/leaks/Tests/check1_gsl.stable.out.int128
        sql/test/leaks/Tests/check1_nogeom.stable.out
        sql/test/leaks/Tests/check1_nogeom.stable.out.int128
        sql/test/leaks/Tests/check2.stable.out
        sql/test/leaks/Tests/check2.stable.out.int128
        sql/test/leaks/Tests/check2_bam.stable.out
        sql/test/leaks/Tests/check2_bam.stable.out.int128
        sql/test/leaks/Tests/check2_gsl.stable.out
        sql/test/leaks/Tests/check2_gsl.stable.out.int128
        sql/test/leaks/Tests/check2_nogeom.stable.out
        sql/test/leaks/Tests/check2_nogeom.stable.out.int128
        sql/test/leaks/Tests/check3.stable.out
        sql/test/leaks/Tests/check3.stable.out.int128
        sql/test/leaks/Tests/check3_bam.stable.out
        sql/test/leaks/Tests/check3_bam.stable.out.int128
        sql/test/leaks/Tests/check3_gsl.stable.out
        sql/test/leaks/Tests/check3_gsl.stable.out.int128
        sql/test/leaks/Tests/check3_nogeom.stable.out
        sql/test/leaks/Tests/check3_nogeom.stable.out.int128
        sql/test/leaks/Tests/check4.stable.out
        sql/test/leaks/Tests/check4.stable.out.int128
        sql/test/leaks/Tests/check4_bam.stable.out
        sql/test/leaks/Tests/check4_bam.stable.out.int128
        sql/test/leaks/Tests/check4_gsl.stable.out
        sql/test/leaks/Tests/check4_gsl.stable.out.int128
        sql/test/leaks/Tests/check4_nogeom.stable.out
        sql/test/leaks/Tests/check4_nogeom.stable.out.int128
        sql/test/leaks/Tests/check5.stable.out
        sql/test/leaks/Tests/check5.stable.out.int128
        sql/test/leaks/Tests/check5_bam.stable.out
        sql/test/leaks/Tests/check5_bam.stable.out.int128
        sql/test/leaks/Tests/check5_gsl.stable.out
        sql/test/leaks/Tests/check5_gsl.stable.out.int128
        sql/test/leaks/Tests/check5_nogeom.stable.out
        sql/test/leaks/Tests/check5_nogeom.stable.out.int128
        testing/Mtest.py.in
Branch: datacell
Log Message:

Merge with default branch. Resolve merge conflicts stemming from the DataCell 
removal on default, as in keep DataCell on this branch.


diffs (truncated from 28969 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
@@ -898,7 +873,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 \
@@ -907,7 +881,6 @@ developer, but if you do want to test, t
        --with-bz2=yes \
        --with-geos=%{?with_geos:yes}%{!?with_geos:no} \
        --with-java=no \
-       --with-mseed=no \
        --with-perl=yes \
        --with-perl-libdir=lib/perl5 \
        --with-pthread=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
@@ -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
@@ -357,9 +357,6 @@
 /* Define to 1 if you have the `mremap' function. */
 /* #undef HAVE_MREMAP */
 
-/* Define if you have the mseed library */
-/* #undef HAVE_MSEED */
-
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 /* #undef HAVE_NDIR_H */
 
@@ -435,9 +432,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
@@ -389,11 +389,6 @@ create_winconfig_conds_new_py:
 !ELSE
        $(ECHO) HAVE_MONETDB5_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ENDIF
-!IFDEF HAVE_MSEED
-       $(ECHO) HAVE_MSEED_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
-       $(ECHO) HAVE_MSEED_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
 !IFDEF HAVE_ODBC
        $(ECHO) HAVE_ODBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ELSE
@@ -424,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/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,9 +1,9 @@
 exports
 
HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT&!HAVE_DATACELL&!HAVE_JSONSTORE?MAL-signatures_all
-HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!HAVE_DATACELL&!HAVE_JSONSTORE?MAL-signatures_fits_geom
+HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!HAVE_JSONSTORE?MAL-signatures_fits_geom
 
!HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!HAVE_DATACELL&!HAVE_JSONSTORE?MAL-signatures_geom
 
!HAVE_FITS&!HAVE_GEOM&!HAVE_GSL&!HAVE_LIBR&!HAVE_SAMTOOLS&!HAVE_SPHINXCLIENT&!HAVE_DATACELL&!HAVE_JSONSTORE?MAL-signatures_none
-HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!HAVE_DATACELL&!BITS32?SQL-dump_all
-HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!HAVE_DATACELL?SQL-dump_geom
-!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!HAVE_DATACELL&!BITS32?SQL-dump_none
+HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_SAMTOOLS&!BITS32?SQL-dump_all
+HAVE_FITS&HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!HAVE_DATACELL?SQL-dump_geom
+!HAVE_FITS&!HAVE_GEOM&!HAVE_GSL&!HAVE_SAMTOOLS&!HAVE_DATACELL&!BITS32?SQL-dump_none
 MERCURIAL?malcheck
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
@@ -2364,9 +2364,9 @@ command algebra.leftfetchjoin(left:bat[:
 address ALGleftfetchjoin;
 comment Hook directly into the left fetch join implementation.
 
-command 
algebra.leftjoin(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3],estimate:lng):bat[:any_1,:any_3]
 
+command 
algebra.leftjoin(left:bat[:oid,:any_2],right:bat[:any_2,:any_3],estimate:lng):bat[:oid,:any_3]
 
 address ALGleftjoinestimate;
-command 
algebra.leftjoin(left:bat[:any_1,:any_2],right:bat[:any_2,:any_3]):bat[:any_1,:any_3]
 
+command 
algebra.leftjoin(left:bat[:oid,:any_2],right:bat[:any_2,:any_3]):bat[:oid,:any_3]
 
 address ALGleftjoin;
 command 
algebra.mark_grp(b:bat[:any_1,:oid],g:bat[:oid,:any_2],s:oid):bat[:any_1,:oid] 
 address ALGmark_grp_2;
@@ -2551,9 +2551,9 @@ command algebra.thetasubselect(b:bat[:oi
 address ALGthetasubselect1;
 comment Select all head values for which the tail value obeys the relation     
value OP VAL.   Input is a dense-headed BAT, output is a dense-headed BAT with 
in       the tail the head value of the input BAT for which the  relationship 
holds.  The output BAT is sorted on the tail value.
 
-command 
algebra.tdifference(left:bat[:any_1,:any_2],right:bat[:any_1,:any]):bat[:any_1,:any_2]
 
+command 
algebra.tdifference(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid] 
 address ALGtdifference;
-command 
algebra.tintersect(left:bat[:any_1,:any_2],right:bat[:any_1,:any]):bat[:any_1,:any_2]
 
+command 
algebra.tintersect(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid] 
 address ALGtintersect;
 command alarm.ctime{unsafe}():str 
 address ALARMctime;
@@ -31186,10 +31186,6 @@ command bat.delete(b:bat[:oid,:any_1],h:
 address BKCdelete;
 comment Delete all BUNs with a certain head value.
 
-command bat.delete(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] 
-address BKCdelete_bun;
-comment Delete one specific BUN.
-
 command bat.getName(b:bat[:oid,:any_1]):str 
 address BKCgetBBPname;
 comment Gives back the logical name of a BAT.
@@ -31218,14 +31214,6 @@ command bat.getSize(b:bat[:oid,:any_1]):
 address BKCgetSize;
 comment Calculate the actual size of the BAT descriptor, heaps, hashes and 
imprint indices in bytes         rounded to the memory page size (see 
bbp.getPageSize()).
 
-command bat.getDelta(b:bat[:oid,:any_1]):bat[:oid,:any_1] 
-address BKCgetDelta;
-comment Obtain the list of BUNs deleted
-
-command bat.getAlpha(b:bat[:oid,:any_1]):bat[:oid,:any_1] 
-address BKCgetAlpha;
-comment Obtain the list of BUNs added
-
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to