Changeset: 3416b3273582 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3416b3273582
Added Files:
monetdb5/extras/jaql/jaqltests/Tests/imenu.json
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/mal/Tests/tst810.mal
monetdb5/mal/Tests/tst810.stable.err
monetdb5/mal/Tests/tst810.stable.out
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_debugger.h
monetdb5/mal/mal_import.c
monetdb5/mal/mal_import.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_parser.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_runtime.h
sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.sql
sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.err
sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.sql
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.err
sql/test/BugTracker-2012/Tests/name_resolution_in_proc.Bug-3074.stable.out
sql/test/BugTracker-2012/Tests/segfault_incorrect_head.Bug-3028.sql
sql/test/BugTracker-2012/Tests/segfault_incorrect_head.Bug-3028.stable.err
sql/test/BugTracker-2012/Tests/segfault_incorrect_head.Bug-3028.stable.out
sql/test/Tests/systemfunctions.sql
sql/test/Tests/systemfunctions.stable.err
sql/test/Tests/systemfunctions.stable.out
Removed Files:
monetdb5/mal/mal_debugger.mx
monetdb5/mal/mal_import.mx
monetdb5/mal/mal_instruction.mx
monetdb5/mal/mal_parser.mx
monetdb5/mal/mal_profiler.mx
monetdb5/mal/mal_syntax.mx
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
buildtools/ChangeLog
buildtools/autogen/autogen/msc.py
clients/mapiclient/stethoscope.c
common/stream/stream.c
configure.ag
debian/monetdb5-server.install
debian/rules
gdk/ChangeLog.Apr2012
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_bbp.mx
gdk/gdk_heap.c
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_private.h
gdk/gdk_search.mx
gdk/gdk_utils.c
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaqlfunc.mal
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/jaql/jaqltests/Tests/All
monetdb5/extras/jaql/json.c
monetdb5/extras/jaql/json.h
monetdb5/extras/jaql/json.mal
monetdb5/mal/Makefile.ag
monetdb5/mal/Tests/All
monetdb5/mal/Tests/tst804.stable.out
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_builder.h
monetdb5/mal/mal_client.h
monetdb5/mal/mal_interpreter.mx
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/batcast.mx
monetdb5/modules/kernel/batmtime.mx
monetdb5/modules/mal/Tests/inspect05.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/optimizer/opt_centipede.mx
monetdb5/optimizer/opt_groups.mx
monetdb5/optimizer/opt_octopus.mx
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/operator_-_vs_sign_-.SF-1120397.stable.out
sql/backends/monet5/UDF/80_udf.sql
sql/backends/monet5/UDF/udf.c
sql/backends/monet5/UDF/udf.h
sql/backends/monet5/UDF/udf.mal
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_scenario.c
sql/server/rel_bin.c
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2012/Tests/bart-crash.Bug-3057.stable.out
sql/test/BugTracker-2012/Tests/multiple-arithmetic-operations.Bug-3048.stable.err
sql/test/BugTracker-2012/Tests/multiple-arithmetic-operations.Bug-3048.stable.out
sql/test/BugTracker-2012/Tests/parent-table-alias.Bug-3047.stable.err
sql/test/BugTracker-2012/Tests/parent-table-alias.Bug-3047.stable.out
sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.err
sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out
sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.err
sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out
sql/test/Tests/All
testing/Mtest.py.in
Branch: sciql
Log Message:
merged from default
diffs (truncated from 35599 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -48,7 +48,9 @@ BuildRequires: python
BuildRequires: readline-devel
BuildRequires: ruby
BuildRequires: rubygems
+%if %{?centos:0}%{!?centos:1}
BuildRequires: rubygems-devel
+%endif
BuildRequires: unixODBC-devel
BuildRequires: zlib-devel
@@ -244,13 +246,14 @@ program.
%defattr(-,root,root)
%{_prefix}/%{perl_libdir}/*
-%package client-ruby
+%package -n rubygem-monetdb-sql
Summary: MonetDB ruby interface
Group: Applications/Databases
Requires: ruby
+Obsoletes: %{name}-client-ruby
BuildArch: noarch
-%description client-ruby
+%description -n rubygem-monetdb-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
@@ -259,18 +262,39 @@ accelerators. It also has an SQL fronte
This package contains the files needed to use MonetDB from a Ruby
program.
-%files client-ruby
+%files -n rubygem-monetdb-sql
+%defattr(-,root,root)
+%docdir %{gem_dir}/doc/ruby-monetdb-sql-0.1
+%{gem_dir}/doc/ruby-monetdb-sql-0.1/*
+%{gem_dir}/cache/ruby-monetdb-sql-0.1.gem
+# %dir %{gem_dir}/gems/ruby-monetdb-sql-0.1
+%{gem_dir}/gems/ruby-monetdb-sql-0.1
+%{gem_dir}/specifications/ruby-monetdb-sql-0.1.gemspec
+
+%package -n rubygem-activerecord-monetdb-adapter
+Summary: MonetDB ruby interface
+Group: Applications/Databases
+Requires: ruby
+Requires: rubygem-activerecord
+Requires: rubygem-monetdb-sql
+BuildArch: noarch
+
+%description -n rubygem-activerecord-monetdb-adapter
+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 activerecord adapter for MonetDB.
+
+%files -n rubygem-activerecord-monetdb-adapter
%defattr(-,root,root)
%docdir %{gem_dir}/doc/activerecord-monetdb-adapter-0.1
-%docdir %{gem_dir}/doc/ruby-monetdb-sql-0.1
%{gem_dir}/doc/activerecord-monetdb-adapter-0.1/*
-%{gem_dir}/doc/ruby-monetdb-sql-0.1/*
-%{gem_dir}/cache/*.gem
+%{gem_dir}/cache/activerecord-monetdb-adapter-0.1.gem
# %dir %{gem_dir}/gems/activerecord-monetdb-adapter-0.1
-# %dir %{gem_dir}/gems/ruby-monetdb-sql-0.1
%{gem_dir}/gems/activerecord-monetdb-adapter-0.1
-%{gem_dir}/gems/ruby-monetdb-sql-0.1
-%{gem_dir}/specifications/*.gemspec
+%{gem_dir}/specifications/activerecord-monetdb-adapter-0.1.gemspec
%package client-tests
Summary: MonetDB Client tests package
@@ -390,10 +414,11 @@ fi
%{_libdir}/monetdb5/*.mal
# %{_libdir}/monetdb5/autoload/*_fits.mal
# %{_libdir}/monetdb5/autoload/*_geotiff.mal
+%{_libdir}/monetdb5/autoload/*_jaql.mal
+%{_libdir}/monetdb5/autoload/*_lsst.mal
+%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal
+%{_libdir}/monetdb5/autoload/*_udf.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
-%{_libdir}/monetdb5/autoload/*_lsst.mal
-%{_libdir}/monetdb5/autoload/*_udf.mal
-%{_libdir}/monetdb5/autoload/*_opt_sql_append.mal
%if %{?centos:0}%{!?centos:1}
%exclude %{_libdir}/monetdb5/lib_geom.so
%endif
@@ -568,6 +593,7 @@ developer, but if you do want to test, t
--enable-gdk=yes \
--enable-geom=%{?centos:no}%{!?centos:yes} \
--enable-instrument=no \
+ --enable-jaql=yes \
--enable-jdbc=no \
--enable-merocontrol=no \
--enable-monetdb5=yes \
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
@@ -171,6 +171,9 @@
/* Define to 1 if you have the `getopt_long' function. */
/* #undef HAVE_GETOPT_LONG */
+/* Define to 1 if you have the `GetProcessMemoryInfo' function. */
+#define HAVE_GETPROCESSMEMORYINFO 1
+
/* Define to 1 if you have the `getrlimit' function. */
/* #undef HAVE_GETRLIMIT */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -290,9 +290,9 @@ create_winconfig_conds_new_py:
$(ECHO) ENABLE_DATACELL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_CFITSIO
- $(ECHO) "HAVE_CFITSIO_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_CFITSIO_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_CFITSIO_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_CFITSIO_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_DEVELOPER
$(ECHO) HAVE_DEVELOPER_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
@@ -347,9 +347,9 @@ create_winconfig_conds_new_py:
$(ECHO) HAVE_MONETDB5_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_MSEED
- $(ECHO) "HAVE_MSEED_FALSE='#'" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_MSEED_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
- $(ECHO) "HAVE_MSEED_FALSE=''" >> "$(TOPDIR)\winconfig_conds_new.py"
+ $(ECHO) HAVE_MSEED_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
!IFDEF HAVE_ODBC
$(ECHO) HAVE_ODBC_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Thu Apr 19 2012 Sjoerd Mullender <[email protected]>
+- Split the MonetDB-client-ruby RPM package into two and named them in
+ accordance with the Fedora packaging guidelines as rubygem-<gem-name>.
+
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -985,6 +985,7 @@ def msc_gem(fd, var, gem, msc):
if gem.has_key('DIR'):
rd = gem['DIR'][0]
rd = msc_translate_dir(rd, msc)
+ rd = '$(prefix)\\' + rd
fd.write('!IF defined(HAVE_RUBYGEM)\n')
for f in gem['FILES']:
msc['SCRIPTS'].append(f[:-4])
diff --git a/clients/mapiclient/stethoscope.c b/clients/mapiclient/stethoscope.c
--- a/clients/mapiclient/stethoscope.c
+++ b/clients/mapiclient/stethoscope.c
@@ -204,14 +204,16 @@ doProfile(void *d)
mapi_reconnect(dbh);
if (mapi_error(dbh))
die(dbh, hdl);
-#ifdef _DEBUG_STETHOSCOPE_
if (wthr->tid > 0) {
snprintf(id, 10, "[%d] ", wthr->tid);
+#ifdef _DEBUG_STETHOSCOPE_
printf("-- connection with server %s is %s\n", wthr->uri, id);
+#endif
} else {
+#ifdef _DEBUG_STETHOSCOPE_
printf("-- connection with server %s\n", wthr->uri);
+#endif
}
-#endif
/* set counters */
x = NULL;
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -656,7 +656,7 @@ dupFileStream(stream *s)
static ssize_t
stream_gzread(stream *s, void *buf, size_t elmsize, size_t cnt)
{
- gzFile *fp = (gzFile *) s->stream_data.p;
+ gzFile fp = (gzFile) s->stream_data.p;
int size = (int) (elmsize * cnt);
if (!gzeof(fp)) {
@@ -673,7 +673,7 @@ stream_gzwrite(stream *s, const void *bu
int size = (int) (elmsize * cnt);
if (size) {
- size = gzwrite((gzFile *) s->stream_data.p, buf, size);
+ size = gzwrite((gzFile) s->stream_data.p, buf, size);
return (ssize_t) (size / elmsize);
}
return (ssize_t) cnt;
@@ -683,7 +683,7 @@ static void
stream_gzclose(stream *s)
{
if (s->stream_data.p)
- gzclose((gzFile *) s->stream_data.p);
+ gzclose((gzFile) s->stream_data.p);
s->stream_data.p = NULL;
}
@@ -691,7 +691,7 @@ static int
stream_gzflush(stream *s)
{
if (s->access == ST_WRITE)
- gzflush((gzFile *) s->stream_data.p, Z_SYNC_FLUSH);
+ gzflush((gzFile) s->stream_data.p, Z_SYNC_FLUSH);
return 0;
}
@@ -699,7 +699,7 @@ static stream *
open_gzstream(const char *filename, const char *flags)
{
stream *s;
- gzFile *fp;
+ gzFile fp;
if ((s = create_stream(filename)) == NULL)
return NULL;
@@ -722,7 +722,7 @@ open_gzrstream(const char *filename)
return NULL;
s->type = ST_BIN;
if (s->errnr == MNSTR_NO__ERROR &&
- gzread((gzFile *) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder)) < (int) sizeof(s->byteorder)) {
+ gzread((gzFile) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder)) < (int) sizeof(s->byteorder)) {
stream_gzclose(s);
s->errnr = MNSTR_OPEN_ERROR;
}
@@ -739,7 +739,7 @@ open_gzwstream_(const char *filename, co
s->access = ST_WRITE;
s->type = ST_BIN;
if (s->errnr == MNSTR_NO__ERROR)
- gzwrite((gzFile *) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder));
+ gzwrite((gzFile) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder));
return s;
}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -372,7 +372,7 @@ dnl we try where UNIX domain sockets als
dnl following simple implementation for now.
case $host in
*-solaris*)
- dnl Solaris needs this to get msg_control and msg_controllen
+ dnl Solaris needs this to get msg_control and msg_controllen
dnl it disables, however, the availability of madvise, which is
dnl in use use by GDK, so we cannot just AC_DEFINE this, but
dnl rather have to enable it where it is necessary
@@ -2376,6 +2376,8 @@ AC_CHECK_HEADERS([crypt.h \
limits.h \
locale.h \
mach-o/dyld.h \
+ mach/mach_init.h \
+ mach/task.h \
malloc.h \
netdb.h \
netinet/in.h \
@@ -2658,6 +2660,8 @@ AC_CHECK_FUNCS([\
strtoll \
strtoull \
sysconf \
+ task_for_pid \
+ task_info \
times \
trunc \
uname \
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -71,7 +71,8 @@ debian/tmp/usr/lib/monetdb5/urlbox.mal u
debian/tmp/usr/lib/monetdb5/vault.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/xml.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/zorder.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/autoload/*_jaql.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/*_lsst.mal usr/lib/monetdb5/autoload
+debian/tmp/usr/lib/monetdb5/autoload/*_opt_sql_append.mal
usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/*_udf.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/autoload/*_vault.mal usr/lib/monetdb5/autoload
-debian/tmp/usr/lib/monetdb5/autoload/*_opt_sql_append.mal
usr/lib/monetdb5/autoload
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ DEB_CONFIGURE_EXTRA_FLAGS := \
--enable-gdk=yes \
--enable-geom=yes \
--enable-instrument=no \
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
