Changeset: 6708295716e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6708295716e0
Modified Files:
clients/python2/monetdb/mapi.py
gdk/gdk_heap.c
monetdb5/modules/kernel/algebra.mx
Branch: default
Log Message:
Merge branches
diffs (142 lines):
diff --git a/clients/python2/monetdb/mapi.py b/clients/python2/monetdb/mapi.py
--- a/clients/python2/monetdb/mapi.py
+++ b/clients/python2/monetdb/mapi.py
@@ -84,12 +84,7 @@ class Connection(object):
self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 0)
self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
- try:
- self.socket.connect((hostname, port))
- except socket.error, error:
- (error_code, error_str) = error
- raise OperationalError(error_str + " (%s:%s)" % (self.hostname,
self.port))
-
+ self.socket.connect((hostname, port))
self.__login()
@@ -232,13 +227,10 @@ class Connection(object):
result = StringIO()
count = bytes
while count > 0:
- try:
- recv = self.socket.recv(count)
- if len(recv) == 0:
- time.sleep(1)
- #logger.debug("II: package size: %i payload: %s" % (len(recv),
recv))
- except socket.error, error:
- raise OperationalError(error[1])
+ recv = self.socket.recv(count)
+ if len(recv) == 0:
+ time.sleep(1)
+ #logger.debug("II: package size: %i payload: %s" % (len(recv),
recv))
count -= len(recv)
result.write(recv)
return result.getvalue()
@@ -256,11 +248,8 @@ class Connection(object):
flag = struct.pack( '<H', ( length << 1 ) + last )
#logger.debug("II: sending %i bytes, last: %s" % (length,
bool(last)))
#logger.debug("TX: %s" % data)
- try:
- self.socket.send(flag)
- self.socket.send(data)
- except socket.error, error:
- raise OperationalError(error[1])
+ self.socket.send(flag)
+ self.socket.send(data)
pos += length
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -84,6 +84,7 @@ static MT_Lock HEAPcacheLock MT_LOCK_INI
void
HEAPcacheInit(void)
{
+#if HEAP_CACHE_SIZE > 0
if (!hc) {
int i;
@@ -105,6 +106,7 @@ HEAPcacheInit(void)
}
MT_lock_unset(&HEAPcacheLock, "HEAPcache_init");
}
+#endif
}
static int
diff --git a/monetdb5/modules/kernel/algebra.mx
b/monetdb5/modules/kernel/algebra.mx
--- a/monetdb5/modules/kernel/algebra.mx
+++ b/monetdb5/modules/kernel/algebra.mx
@@ -327,61 +327,61 @@ address ALGsubsort11
comment "Returns a copy of the BAT sorted on tail values.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command subsort(b:bat[:oid,:any_1], reverse:bit, stable:bit)
(:bat[:oid,:any_1], :bat[:oid,:oid])
address ALGsubsort12
comment "Returns a copy of the BAT sorted on tail values and a BAT that
specifies how the input was reordered.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command subsort(b:bat[:oid,:any_1], reverse:bit, stable:bit)
(:bat[:oid,:any_1], :bat[:oid,:oid], :bat[:oid,:oid])
address ALGsubsort13
comment "Returns a copy of the BAT sorted on tail values, a BAT that specifies
how the input was reordered, and a BAT with group information.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command subsort(b:bat[:oid,:any_1], o:bat[:oid,:oid], reverse:bit, stable:bit)
:bat[:oid,:any_1]
address ALGsubsort21
comment "Returns a copy of the BAT sorted on tail values.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command subsort(b:bat[:oid,:any_1], o:bat[:oid,:oid], reverse:bit, stable:bit)
(:bat[:oid,:any_1], :bat[:oid,:oid])
address ALGsubsort22
comment "Returns a copy of the BAT sorted on tail values and a BAT that
specifies how the input was reordered.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command subsort(b:bat[:oid,:any_1], o:bat[:oid,:oid], reverse:bit, stable:bit)
(:bat[:oid,:any_1], :bat[:oid,:oid], :bat[:oid,:oid])
address ALGsubsort23
comment "Returns a copy of the BAT sorted on tail values, a BAT that specifies
how the input was reordered, and a BAT with group information.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command subsort(b:bat[:oid,:any_1], o:bat[:oid,:oid], g:bat[:oid,:oid],
reverse:bit, stable:bit) :bat[:oid,:any_1]
address ALGsubsort31
comment "Returns a copy of the BAT sorted on tail values.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command subsort(b:bat[:oid,:any_1], o:bat[:oid,:oid], g:bat[:oid,:oid],
reverse:bit, stable:bit) (:bat[:oid,:any_1], :bat[:oid,:oid])
address ALGsubsort32
comment "Returns a copy of the BAT sorted on tail values and a BAT that
specifies how the input was reordered.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command subsort(b:bat[:oid,:any_1], o:bat[:oid,:oid], g:bat[:oid,:oid],
reverse:bit, stable:bit) (:bat[:oid,:any_1], :bat[:oid,:oid], :bat[:oid,:oid])
address ALGsubsort33
comment "Returns a copy of the BAT sorted on tail values, a BAT that specifies
how the input was reordered, and a BAT with group information.
The input and output are (must be) dense headed.
The order is descending if the reverse bit is set.
- This is a stable sort of the stable bit is set.";
+ This is a stable sort if the stable bit is set.";
command revert( b:bat[:any_1,:any_2]) :bat[:any_1,:any_2]
address ALGrevert
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
