Changeset: 4481e51c2ca1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4481e51c2ca1
Removed Files:
debian/monetdb5-server-hugeint.install
debian/monetdb5-sql-hugeint.install
Modified Files:
MonetDB.spec
ctest/tools/monetdbe/example2.c
debian/control
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_parser.c
monetdb5/modules/mal/batcalc.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/common/sql_types.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_utils.c
tools/monetdbe/monetdbe.c
tools/monetdbe/monetdbe.h
Branch: oscar
Log Message:
Remove separate "hugeint" packages.
Since we don't have separate "hugeint" files anymore, we can't install
without hugeint support if the system was compiled with hugeint support.
diffs (truncated from 1037 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# The --with OPTION and --without OPTION arguments can be passed on
# the commandline of both rpmbuild and mock.
-# On 64 bit architectures we build "hugeint" packages.
+# On 64 bit architectures compile with 128 bit integer support.
%if "%{?_lib}" == "lib64"
%bcond_without hugeint
%endif
@@ -465,10 +465,12 @@ Summary: MonetDB - Monet Database Manage
Group: Applications/Databases
Requires(pre): shadow-utils
Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Obsoletes: MonetDB5-server-hugeint < 11.38.0
+%if %{with hugeint}
+Provides: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
+%endif
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
-%if %{with hugeint}
-Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
%endif
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
@@ -536,10 +538,6 @@ exit 0
%exclude %{_libdir}/monetdb5/rapi.mal
%endif
%exclude %{_libdir}/monetdb5/sql*.mal
-%if %{with hugeint}
-%exclude %{_libdir}/monetdb5/*_hge.mal
-%exclude %{_libdir}/monetdb5/autoload/*_hge.mal
-%endif
%{_libdir}/monetdb5/*.mal
%if %{with geos}
%exclude %{_libdir}/monetdb5/autoload/*_geom.mal
@@ -560,28 +558,6 @@ exit 0
%docdir %{_datadir}/doc/MonetDB
%{_datadir}/doc/MonetDB/*
-%if %{with hugeint}
-%package -n MonetDB5-server-hugeint
-Summary: MonetDB - 128-bit integer support for MonetDB5-server
-Group: Applications/Databases
-Requires: MonetDB5-server%{?_isa}
-
-%description -n MonetDB5-server-hugeint
-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 front end.
-
-This package provides HUGEINT (128-bit integer) support for the
-MonetDB5-server component.
-
-%files -n MonetDB5-server-hugeint
-%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%{_libdir}/monetdb5/*_hge.mal
-%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal
-%{_libdir}/monetdb5/autoload/*_hge.mal
-%endif
-
%package -n MonetDB5-server-devel
Summary: MonetDB development files
Group: Applications/Databases
@@ -608,10 +584,11 @@ used from the MAL level.
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release}
-%if (0%{?fedora} >= 22)
+Obsoletes: %{name}-SQL-server5-hugeint < 11.38.0
%if %{with hugeint}
-Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
+Provides: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release}
%endif
+%if (0%{?fedora} >= 22)
Suggests: %{name}-client%{?_isa} = %{version}-%{release}
%endif
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
@@ -668,39 +645,12 @@ use SQL with MonetDB, you will need to i
%endif
%{_libdir}/monetdb5/createdb/*.sql
%{_libdir}/monetdb5/sql*.mal
-%if %{with hugeint}
-%exclude %{_libdir}/monetdb5/createdb/*_hge.sql
-%exclude %{_libdir}/monetdb5/sql*_hge.mal
-%endif
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
%docdir %{_datadir}/doc/MonetDB-SQL
%{_datadir}/doc/MonetDB-SQL/*
-%if %{with hugeint}
-%package SQL-server5-hugeint
-Summary: MonetDB5 128 bit integer (hugeint) support for SQL
-Group: Applications/Databases
-Requires: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
-
-%description SQL-server5-hugeint
-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 front end.
-
-This package provides HUGEINT (128-bit integer) support for the SQL
-front end of MonetDB.
-
-%files SQL-server5-hugeint
-%defattr(-,root,root)
-%{_libdir}/monetdb5/autoload/??_sql_hge.mal
-%{_libdir}/monetdb5/createdb/*_hge.sql
-%{_libdir}/monetdb5/sql*_hge.mal
-%endif
-
%package testing
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
diff --git a/ctest/tools/monetdbe/example2.c b/ctest/tools/monetdbe/example2.c
--- a/ctest/tools/monetdbe/example2.c
+++ b/ctest/tools/monetdbe/example2.c
@@ -19,11 +19,7 @@ main(void)
char* err = NULL;
monetdbe_database mdbe = NULL;
monetdbe_result* result = NULL;
-#ifdef HAVE_HGE
- monetdbe_options opts = { .have_hge = 1 };
-#else
monetdbe_options opts = { 0 };
-#endif
// second argument is a string for the db directory or NULL for
in-memory mode
if (monetdbe_open(&mdbe, NULL, &opts))
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -170,9 +170,10 @@ Description: MonetDB5 SQL GIS support mo
Package: monetdb5-server
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Recommends: monetdb5-server-hugeint (= ${source:Version}) [amd64],
- monetdb5-sql (= ${source:Version})
+Recommends: monetdb5-sql (= ${source:Version})
Suggests: monetdb-client (= ${source:Version})
+Conflicts: monetdb5-server-hugeint (<< 11.38.0)
+Replaces: monetdb5-server-hugeint (<< 11.38.0)
Conflicts: python-pymonetdb (<< 1.0.6)
Description: MonetDB database server version 5
MonetDB is a database management system that is developed from a
@@ -184,18 +185,6 @@ Description: MonetDB database server ver
package if you want to use the MonetDB database system. If you want
to use the SQL front end, you also need monetdb5-sql.
-Package: monetdb5-server-hugeint
-Architecture: amd64
-Depends: monetdb5-server (= ${source:Version})
-Description: MonetDB - 128-bit integer support for MonetDB5-server
- 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 front end.
- .
- This package provides HUGEINT (128-bit integer) support for the
- MonetDB5-server component.
-
Package: monetdb5-server-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
@@ -213,7 +202,8 @@ Package: monetdb5-sql
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
monetdb5-server (= ${source:Version})
-Recommends: monetdb5-sql-hugeint (= ${source:Version}) [amd64]
+Conflicts: monetdb5-sql-hugeint (<< 11.38.0)
+Replaces: monetdb5-sql-hugeint (<< 11.38.0)
Suggests: monetdb-client (= ${source:Version})
Description: MonetDB SQL support for monetdb5
MonetDB is a database management system that is developed from a
@@ -223,19 +213,6 @@ Description: MonetDB SQL support for mon
.
This package contains the SQL front end for MonetDB.
-Package: monetdb5-sql-hugeint
-Architecture: amd64
-Depends: monetdb5-sql (= ${source:Version}),
- monetdb5-server-hugeint (= ${source:Version})
-Description: MonetDB5 128 bit integer (hugeint) support for SQL
- 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 front end.
- .
- This package provides HUGEINT (128-bit integer) support for the SQL
- front end of MonetDB.
-
Package: monetdb-python3
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
diff --git a/debian/monetdb5-server-hugeint.install
b/debian/monetdb5-server-hugeint.install
deleted file mode 100644
--- a/debian/monetdb5-server-hugeint.install
+++ /dev/null
@@ -1,5 +0,0 @@
-# usr/lib/x86_64-linux-gnu/monetdb5/*_hge.mal EXCEPT: sql*_hge.mal
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/[!s]*_hge.mal
usr/lib/x86_64-linux-gnu/monetdb5
-
-# usr/lib/x86_64-linux-gnu/monetdb5/autoload/*_hge.mal EXCEPT: ??_sql_hge.mal
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/[0-9][0-9]_[!s]*_hge.mal
diff --git a/debian/monetdb5-sql-hugeint.install
b/debian/monetdb5-sql-hugeint.install
deleted file mode 100644
--- a/debian/monetdb5-sql-hugeint.install
+++ /dev/null
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql*_hge.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/autoload/??_sql_hge.mal
usr/lib/x86_64-linux-gnu/monetdb5/autoload
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/createdb/*_hge.sql
usr/lib/x86_64-linux-gnu/monetdb5/createdb
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -17,10 +17,6 @@ stream *maleventstream = 0;
/* The compile time debugging flags are turned into bit masks, akin to GDK */
lng MALdebug;
-#ifdef HAVE_HGE
-int have_hge = 1;
-#endif
-
#include "mal_stack.h"
#include "mal_linker.h"
#include "mal_authorize.h"
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -50,10 +50,6 @@ mal_export char monet_cwd[FILENAME_M
mal_export char monet_characteristics[4096];
mal_export stream *maleventstream;
-#ifdef HAVE_HGE
-mal_export int have_hge;
-#endif
-
/*
See gdk/gdk.h for the definition of all debug masks.
See `man mserver5` or tools/mserver/mserver5.1
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1365,10 +1365,6 @@ parseCommandPattern(Client cntxt, int ki
curInstr->fcn = address;
}
helpInfo(cntxt, &curBlk->help);
-#ifdef HAVE_HGE
- if (!have_hge)
- have_hge = strcmp(modnme, "calc") == 0 &&
strcmp(getFunctionId(curInstr), "hge") == 0;
-#endif
return curBlk;
}
diff --git a/monetdb5/modules/mal/batcalc.c b/monetdb5/modules/mal/batcalc.c
--- a/monetdb5/modules/mal/batcalc.c
+++ b/monetdb5/modules/mal/batcalc.c
@@ -1546,8 +1546,7 @@ batcalc_init(void)
types[cur++] = TYPE_int;
types[cur++] = TYPE_lng;
#ifdef HAVE_HGE
- if (have_hge)
- types[cur++] = TYPE_hge;
+ types[cur++] = TYPE_hge;
#endif
floats = types+cur;
types[cur++] = TYPE_flt;
@@ -2326,10 +2325,6 @@ batcalc_init(void)
int typeopslen = 9;
#endif
for(int t = 0; t<typeopslen; t++) {
-#ifdef HAVE_HGE
- if (!have_hge && strcmp(typeops[t].name, "hge")==0)
- continue;
-#endif
/* from any 2 string */
if (strcmp(typeops[t].name, "str")==0) {
mel_func_arg ret = { .type = typeops[t].type, .isbat =1
};
@@ -2346,10 +2341,6 @@ batcalc_init(void)
err += melFunction(false, "batcalc",
typeops[t].name_ne, typeops[t].fcn_ne, typeops[t].fname_ne, false, "", 1, 4,
ret, arg, cand, condexec);
} else {
for(int p = 0; p<typeopslen; p++) {
-#ifdef HAVE_HGE
- if (!have_hge && strcmp(typeops[p].name, "hge")==0)
- continue;
-#endif
mel_func_arg ret = { .type = typeops[t].type, .isbat =1
};
mel_func_arg arg = { .type = typeops[p].type, .isbat =1
};
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -436,12 +436,6 @@ SQLinit(Client c)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
