Changeset: 5886283efb7c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5886283efb7c
Modified Files:
MonetDB.spec
NT/rules.msc
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 363 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -551,8 +551,7 @@
--with-mseed=no \
--with-geos=%{?centos:no}%{!?centos:yes}
%{?oid32:--enable-oid32} \
- %{?comp_cc:CC="%{comp_cc}"} \
- %{?_with_netcdf} %{?_without_netcdf}
+ %{?comp_cc:CC="%{comp_cc}"}
make
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
@@ -234,9 +234,6 @@
/* Define to 1 if you have the <libintl.h> header file. */
/* #undef HAVE_LIBINTL_H */
-/* Define if you have the netcdf library */
-/* #undef HAVE_LIBNETCDF */
-
/* Define if you have the pcl library */
/* #undef HAVE_LIBPCL */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -271,9 +271,6 @@
!IFDEF HAVE_RAPTOR
HAVE_RAPTOR_FALSE=^#
!ENDIF
-!IFDEF HAVE_NETCDF
-HAVE_NETCDF_FALSE=^#
-!ENDIF
!IFDEF HAVE_ODBC
HAVE_ODBC_FALSE=^#
!ENDIF
@@ -318,7 +315,6 @@
"HAVE_LIBZ_FALSE=$(HAVE_LIBZ_FALSE)" \
"HAVE_MONETDB5_FALSE=$(HAVE_MONETDB5_FALSE)" \
"HAVE_MSEED_FALSE=$(HAVE_MSEED_FALSE)" \
- "HAVE_NETCDF_FALSE=$(HAVE_NETCDF_FALSE)" \
"HAVE_OPENSSL_FALSE=$(HAVE_OPENSSL_FALSE)" \
"HAVE_ODBC_FALSE=$(HAVE_ODBC_FALSE)" \
"HAVE_PCRE_FALSE=$(HAVE_PCRE_FALSE)" \
diff --git a/buildtools/doc/HowToRelease.rst b/buildtools/doc/HowToRelease.rst
--- a/buildtools/doc/HowToRelease.rst
+++ b/buildtools/doc/HowToRelease.rst
@@ -63,8 +63,7 @@
- Set version numbers in the new stable branch (e.g. ``vertoo.py -m
MonetDB set 1.24.0``).
- Change defaults in ``configure.ag`` for release builds
- (``dft_strict=no``, ``dft_assert=no``, ``dft_optimi=yes``,
- ``dft_netcdf=no``).
+ (``dft_strict=no``, ``dft_assert=no``, ``dft_optimi=yes``).
- Create a tag on the head of the new branch for propagation purposes
(e.g. ``cvs tag MonetDB_1-24_sync``).
- Update the nightly testing setup to use the new branch for nightly
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -755,7 +755,6 @@
- ``HAVE_ICONV=1`` - the iconv library is available;
- ``HAVE_LIBXML2=1`` - the libxml2 library is available;
- ``HAVE_RAPTOR=1`` - the raptor library is available;
-- ``HAVE_NETCDF=1`` - the netcdf library is available;
- ``HAVE_OPENSSL=1`` - the OpenSSL library is available;
- ``HAVE_PERL=1`` - Perl is available;
- ``HAVE_PERL_DEVEL=1`` - Perl development is possible (include files
diff --git a/monetdb5/modules/mal/remote.mx b/monetdb5/modules/mal/remote.mx
--- a/monetdb5/modules/mal/remote.mx
+++ b/monetdb5/modules/mal/remote.mx
@@ -1208,7 +1208,6 @@
BAT *b = BBPquickdesc(ABS(bid), FALSE);
char sendhead = 0;
char sendtheap = 0;
- oid Hseqbase = 0;
(void)mb;
(void)stk;
@@ -1221,16 +1220,9 @@
BBPincref(bid, FALSE);
- sendhead = b->htype != TYPE_void && (b->htype != TYPE_oid ||
!b->H->dense);
+ sendhead = !BAThvoid(b);
sendtheap = b->ttype != TYPE_void && b->tvarsized;
- if (b->htype == TYPE_oid && b->H->dense) {
- BATiter bi = bat_iterator(b);
- Hseqbase = *(oid *)BUNhead(bi, BUNfirst(b));
- } else {
- Hseqbase = b->hseqbase;
- }
-
mnstr_printf(cntxt->fdout, /*JSON*/"{"
"\"version\":1,"
"\"htype\":%d,"
@@ -1244,20 +1236,20 @@
"\"hnonil\":%d,"
"\"tnonil\":%d,"
"\"tdense\":%d,"
- "\"size\":" SZFMT ","
+ "\"size\":" BUNFMT ","
"\"headsize\":" SZFMT ","
"\"tailsize\":" SZFMT ","
"\"theapsize\":" SZFMT
"}\n",
sendhead ? b->htype : TYPE_void, b->ttype,
- Hseqbase, b->tseqbase,
+ b->hseqbase, b->tseqbase,
b->hsorted, b->tsorted,
b->hkey, b->tkey,
b->H->nonil, b->T->nonil,
b->tdense,
b->batCount,
- sendhead ? b->batCount * Hsize(b) : 0,
- b->batCount * Tsize(b),
+ sendhead ? (size_t)b->batCount * Hsize(b) : 0,
+ (size_t)b->batCount * Tsize(b),
sendtheap && b->batCount > 0 ? b->T->vheap->free : 0
);
@@ -1294,7 +1286,7 @@
Hnonil:1,
Tnonil:1,
Tdense:1;
- size_t size;
+ BUN size;
size_t headsize;
size_t tailsize;
size_t theapsize;
@@ -1366,7 +1358,7 @@
} else if (strcmp(nme, "tdense") == 0) {
bb.Tdense = *val != '0';
} else if (strcmp(nme, "size") == 0) {
- bb.size = atol(val);
+ bb.size = (BUN)atol(val);
} else if (strcmp(nme, "headsize") == 0) {
bb.headsize = atol(val);
} else if (strcmp(nme, "tailsize") == 0) {
@@ -1424,12 +1416,12 @@
b->tdense = bb.Tdense;
if (bb.Ttype == TYPE_str && bb.size)
BATsetcapacity(b, bb.tailsize >> b->T->shift);
- BATsetcount(b, (oid)bb.size);
+ BATsetcount(b, bb.size);
b->batDirty = TRUE;
/* read blockmode flush */
- while (mnstr_read(in, &tmp, 1, 1) != 0) {
- mnstr_printf(GDKout, "!MALexception:remote.bincopyfrom:
expected flush, got: %c", tmp);
+ while (mnstr_read(in, &tmp, 1, 1) > 0) {
+ mnstr_printf(GDKout, "!MALexception:remote.bincopyfrom:
expected flush, got: %c\n", tmp);
}
BATpropcheck(b, BATPROPS_ALL);
diff --git a/sql/backends/monet5/datacell/Tests/All
b/sql/backends/monet5/datacell/Tests/All
--- a/sql/backends/monet5/datacell/Tests/All
+++ b/sql/backends/monet5/datacell/Tests/All
@@ -1,4 +1,4 @@
-basket00
-receptor00
-emitter00
-pair00
+ENABLE_DATACELL?basket00
+ENABLE_DATACELL?receptor00
+ENABLE_DATACELL?emitter00
+ENABLE_DATACELL?pair00
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -205,9 +205,12 @@
'BITS64' : "@BITS64_FALSE@",
'CROSS_COMPILING' : "@CROSS_COMPILING_FALSE@",
'DOCTOOLS' : "@DOCTOOLS_FALSE@",
+ 'ENABLE_CRACKERS' : "@ENABLE_CRACKERS_FALSE@",
+ 'ENABLE_DATACELL' : "@ENABLE_DATACELL_FALSE@",
'HAVE_ANT' : "@HAVE_ANT_FALSE@",
'HAVE_CFITSIO' : "@HAVE_CFITSIO_FALSE@",
'HAVE_DEVELOPER' : "@HAVE_DEVELOPER_FALSE@",
+ 'HAVE_GDK' : "@HAVE_GDK_FALSE@",
'HAVE_GEOM' : "@HAVE_GEOM_FALSE@",
'HAVE_JAVA' : "@HAVE_JAVA_FALSE@",
'HAVE_JAVAJDBC' : "@HAVE_JAVAJDBC_FALSE@",
@@ -216,7 +219,6 @@
'HAVE_LIBZ' : "@HAVE_LIBZ_FALSE@",
'HAVE_MONETDB5' : "@HAVE_MONETDB5_FALSE@",
'HAVE_MSEED' : "@HAVE_MSEED_FALSE@",
- 'HAVE_NETCDF' : "@HAVE_NETCDF_FALSE@",
'HAVE_ODBC' : "@HAVE_ODBC_FALSE@",
'HAVE_PCRE' : "@HAVE_PCRE_FALSE@",
'HAVE_PERL_DEVEL' : "@HAVE_PERL_DEVEL_FALSE@",
@@ -238,8 +240,6 @@
'HAVE_JDBCTESTS_JAR' : "",
'HAVE_JDBCTESTS_DIR' : "",
'HAVE_JDBCTESTS' : "",
- 'WITH_ALGEBRA' : "",
- 'NOT_ALGEBRA' : "",
}
# a bunch of classes to help with generating (X)HTML files
@@ -1305,7 +1305,6 @@
env['TST_MODS'] = []
env['TST_BITS'] = ""
env['TST_OIDS'] = ""
- env['TST_FIVE'] = ""
env['TST_STATIC'] = ""
if qOut:
tbs = re.compile("^# Compiled for .*/([63][42]bit) with ([63][42])bit
OIDs;? (.*) linked", re.MULTILINE)
@@ -1351,9 +1350,6 @@
STDERR.write("\n")
STDERR.flush()
os.environ['TST_MODS'] = str(env['TST_MODS'])
- if par['M5']:
- env['TST_FIVE'] = "Five"
- os.environ['TST_FIVE'] = "Five"
return rtrn
### GetBitsAndOIDsAndModsAndStatic(env) #
@@ -1480,18 +1476,11 @@
def StableOutErr(env,par,TST,SYST,RELEASE,DIST,VERSION) :
BITS = env['TST_BITS']
OIDS = env['TST_OIDS']
- FIVE = env['TST_FIVE']
STATIC = env['TST_STATIC']
- ALGEBRA = env['TST_ALGEBRA']
- NOALGEBRA = env['TST_NOALGEBRA']
- if FIVE:
- FIVE = "(\.Five)?"
if STATIC:
STATIC = "(\.STATIC)?"
- if ALGEBRA:
- ALGEBRA = "(\.Algebra)?"
dir,file = os.path.split(TST)
- outre =
re.compile('^'+re.escape(file)+'\.stable\.(?P<tp>out|err)(\.(%s(%s)?|%s(%s)?))?(\.%s)?(\.%s)?%s%s%s$'
% (re.escape(SYST), re.escape(RELEASE), re.escape(DIST), re.escape(VERSION),
BITS, OIDS, FIVE, STATIC, ALGEBRA))
+ outre =
re.compile('^'+re.escape(file)+'\.stable\.(?P<tp>out|err)(\.(%s(%s)?|%s(%s)?))?(\.%s)?(\.%s)?%s$'
% (re.escape(SYST), re.escape(RELEASE), re.escape(DIST), re.escape(VERSION),
BITS, OIDS, STATIC))
bestout = besterr = ''
for f in os.listdir(dir or os.curdir):
res = outre.match(f)
@@ -2689,10 +2678,7 @@
v['VERSION'] = VERSION
v['BITS'] = ''
v['OIDS'] = ''
- v['FIVE'] = ''
v['STATIC'] = ''
- v['ALGEBRA'] = ''
- v['NOALGEBRA'] = ''
if os.path.isfile(f):
r = re.compile('^([A-Z]+) = "(.*)".*$')
for l in open(f):
@@ -3001,7 +2987,7 @@
elif THISFILE == 'Mapprove.py':
f = _configure(os.path.join('@QXprefix@',dftTSTPREF,'.Mapprove.rc'))
v = ReadMapproveRc(f)
- for i in 'BITS', 'OIDS', 'FIVE', 'STATIC', 'ALGEBRA', 'NOALGEBRA':
+ for i in 'BITS', 'OIDS', 'STATIC':
if v[i]:
v[i] = '[.%s]' % v[i]
options = cmd_options + [
@@ -3010,9 +2996,9 @@
"(default: <ext> = 'out' & 'err')"),
(None, 'S', 'sys', '<sys>',
"approve specific output *.<ext><sys>\n"
- "(<sys> =
'[.(<SYST>[<RELEASE>]|<DIST>[<VERSION>])][.(32|64)bit][.oid(32|64)][.Five][.STATIC][.Algebra]',\n"
- "(default: longest match for <sys> =
'[.(%s[%s]|%s[%s])]%s%s%s%s%s')"
- % (v['SYST'], v['RELEASE'], v['DIST'], v['VERSION'], v['BITS'],
v['OIDS'], v['FIVE'], v['STATIC'], v['ALGEBRA'])),
+ "(<sys> =
'[.(<SYST>[<RELEASE>]|<DIST>[<VERSION>])][.(32|64)bit][.oid(32|64)][.STATIC]',\n"
+ "(default: longest match for <sys> = '[.(%s[%s]|%s[%s])]%s%s%s')"
+ % (v['SYST'], v['RELEASE'], v['DIST'], v['VERSION'], v['BITS'],
v['OIDS'], v['STATIC'])),
(None, 'f', 'force', None,
"force approval of error messages (i.e., lines starting with
'!')"),
]
@@ -3044,10 +3030,6 @@
if config:
config = ' "--config=%s"' % config
- par['ALGEBRA'] = opts.get('algebra', 0)
- par['NOALGEBRA'] = opts.get('no-algebra', 0)
- if par['ALGEBRA'] and par['NOALGEBRA']:
- ErrXit('"-G/--algebra" conflicts with "-g/--no-algebra"!')
par['RECURSIVE'] = opts.get('recursive', 0)
par['QUIET'] = opts.get('quiet', 0)
verbose = opts.get('verbose', 0)
@@ -3135,23 +3117,6 @@
else:
CONDITIONALS['HAVE_MONETDB5'] = ''
CheckClassPath(quiet)
- if par['ALGEBRA']:
- CONDITIONALS['WITH_ALGEBRA'] = '#'
- CONDITIONALS['NOT_ALGEBRA'] = ''
- elif par['NOALGEBRA']:
- CONDITIONALS['WITH_ALGEBRA'] = ''
- CONDITIONALS['NOT_ALGEBRA'] = '#'
- else:
- CONDITIONALS['WITH_ALGEBRA'] = ''
- CONDITIONALS['NOT_ALGEBRA'] = '#'
- env['TST_ALGEBRA'] = ""
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
