Changeset: 2ab152297f18 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ab152297f18
Modified Files:
clients/mapiclient/Tests/mclient--help.stable.err.Windows
gdk/gdk_select.c
sql/backends/monet5/sql_scenario.c
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (97 lines):
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -27,6 +27,7 @@ Options are:
-s stmt | --statement=stmt run single statement
-X | --Xdebug trace mapi network interaction
-z | --timezone do not tell server our timezone
+ -v | --version show version information and exit
-? | --help show this usage message
SQL specific opions
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -21,19 +21,19 @@
#include "gdk.h"
#include "gdk_private.h"
-#define buninsfix(B,C,A,I,T,V,G,M,R) \
- do { \
- if ((I) == BATcapacity((B))) { \
- BATsetcount((B), (I)); \
- if (BATextend((B), \
- MIN(BATcapacity((B)) + (G), \
- (M))) == NULL) { \
- BBPreclaim((B)); \
- return (R); \
- } \
- A = (T *) C##loc((B), BUNfirst((B))); \
- } \
- A[(I)] = (V); \
+#define buninsfix(B,C,A,I,T,V,G,M,R) \
+ do { \
+ if ((I) == BATcapacity(B)) { \
+ BATsetcount((B), (I)); \
+ if (BATextend((B), \
+ MIN(BATcapacity(B) + (G), \
+ (M))) == NULL) { \
+ BBPreclaim(B); \
+ return (R); \
+ } \
+ A = (T *) C##loc((B), BUNfirst(B)); \
+ } \
+ A[(I)] = (V); \
} while (0)
static BAT *
@@ -183,8 +183,8 @@ do {
\
READ; \
buninsfix(bn, T, dst, cnt, oid, o, \
(BUN) ((dbl) cnt / (dbl) (p-r) \
- * (dbl) (q-p) * 1.1), \
- maximum, BUN_NONE); \
+ * (dbl) (q-p) * 1.1 + 1024), \
+ BATcapacity(bn) + q - p, BUN_NONE); \
cnt += (TEST); \
p++; \
} \
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
@@ -1584,7 +1584,7 @@ SQLparser(Client c)
}
m->emode = m_inplace;
scanner_query_processed(&(m->scanner));
- } else if (cachable(m, NULL) &&
+ } else if (cachable(m, NULL) && m->emode != m_prepare &&
(be->q = qc_match(m->qc, m->sym, m->args, m->argc,
m->scanner.key ^ m->session->schema->base.id)) != NULL) {
if (m->emod & mod_debug)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2640,7 +2640,22 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
SrvrOut.write(ln)
SrvrOut.flush()
if ln[:6] != 'Ready.':
- ServerReady = False
+ # If not ready, it may be that there are far to many
+ # network connections in use, all in TIME_WAIT status.
+ # We'll just wait a while for that to clear and try
+ # again.
+ pSrvr.stdin.close()
+ CollectIt(pSrvr.stdout, SrvrOut)
+ pSrvr.wait()
+ time.sleep(120)
+ pSrvr, pSrvrTimer = LaunchIt(Srvr,
'\nio.printf("\\nReady.\\n");\n', SrvrOut, SrvrErr, TIMEOUT)
+ ln="dummy"
+ while 0 < len(ln) and ln[:6] != 'Ready.':
+ ln=pSrvr.stdout.readline()
+ SrvrOut.write(ln)
+ SrvrOut.flush()
+ if ln[:6] != 'Ready.':
+ ServerReady = False
if ServerReady:
port = int(env['MAPIPORT'])
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
