Changeset: 2b9175f1984d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b9175f1984d
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-Geom-Module.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-Geom-Module.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
configure.ag
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_parser.c
monetdb5/modules/atoms/json.c
monetdb5/modules/kernel/array.c
Branch: bamloader
Log Message:
Merge with default branch.
diffs (238 lines):
diff --git a/NT/installer32/MonetDB5-Geom-Module.vdproj
b/NT/installer32/MonetDB5-Geom-Module.vdproj
--- a/NT/installer32/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer32/MonetDB5-Geom-Module.vdproj
@@ -94,11 +94,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
@@ -428,6 +423,7 @@
"ProductCode" = "8:{66BABD32-D69D-4A89-A7F3-2655D4CD0641}"
"PackageCode" = "8:{D9B2D386-1461-43BC-9A63-93F1BA0D7921}"
"UpgradeCode" = "8:{92C89C36-0E86-45E1-B3D8-0D6C91108F30}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -982,11 +982,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -1207,7 +1207,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
"Properties"
{
}
diff --git a/NT/installer64/MonetDB5-Geom-Module.vdproj
b/NT/installer64/MonetDB5-Geom-Module.vdproj
--- a/NT/installer64/MonetDB5-Geom-Module.vdproj
+++ b/NT/installer64/MonetDB5-Geom-Module.vdproj
@@ -94,11 +94,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
@@ -428,6 +423,7 @@
"ProductCode" = "8:{BD1A3C71-3A8E-421D-922D-2B7A19926B5C}"
"PackageCode" = "8:{471DD1DA-9C69-4289-821D-4CC329A8BA94}"
"UpgradeCode" = "8:{8E6CDFDE-39B9-43D9-97B3-2440C012845C}"
+ "AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
@@ -992,7 +988,7 @@
{
"UseDynamicProperties" = "11:TRUE"
"IsDependency" = "11:FALSE"
- "SourcePath" = "8:C:\\Program Files (x86)\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
+ "SourcePath" = "8:C:\\Program Files\\Common Files\\Merge
Modules\\Microsoft_VC100_CRT_x64.msm"
"Properties"
{
}
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -982,11 +982,6 @@
"ComponentsUrl" = "8:"
"Items"
{
-
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:Microsoft.Windows.Installer.2.0"
- {
- "Name" = "8:Windows Installer 2.0"
- "ProductCode" = "8:Microsoft.Windows.Installer.2.0"
- }
}
}
}
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2197,7 +2197,7 @@ org_have_sphinxclient="auto"
have_sphinxclient=$org_have_sphinxclient
AC_ARG_WITH(sphinxclient,
AS_HELP_STRING([--with-sphinxclient=DIR],[sphinxclient library is
installed in DIR]),
- [have_sphinxclient="$withval"], [have_sphinxclient="auto"])
+ [have_sphinxclient="$withval"])
if test "x$have_sphinxclient" != xno; then
case "$have_sphinxclient" in
auto|yes)
@@ -2328,7 +2328,7 @@ org_have_mseed="auto"
have_mseed=$org_have_mseed
AC_ARG_WITH(mseed,
AS_HELP_STRING([--with-mseed=DIR],[mseed library is installed in DIR]),
- [have_mseed="$withval"], [have_mseed="auto"])
+ [have_mseed="$withval"])
if test "x$have_mseed" != xno; then
case "$have_mseed" in
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -1577,13 +1577,7 @@ pushArgument(MalBlkPtr mb, InstrPtr p, i
InstrPtr pn;
int pc = 0, pclimit;
int space = p->maxarg * sizeof(p->argv[0]) +
sizeof(InstrRecord);
- pn = GDKmalloc(space + MAXARG * sizeof(p->maxarg));
- if (pn == NULL) {
- freeInstruction(p);
- return NULL;
- }
- memcpy((char *) pn, (char *) p, space);
- pn->maxarg += MAXARG;
+
/* instructions are either created in isolation or are stored
* on the program instruction stack already. In the latter
* case, we may have to adjust their reference. It does not
@@ -1599,15 +1593,25 @@ pushArgument(MalBlkPtr mb, InstrPtr p, i
pclimit = mb->stop - 8;
pclimit = pclimit < 0 ? 0 : pclimit;
for (pc = mb->stop - 1; pc >= pclimit; pc--)
- if (mb->stmt[pc] == p) {
- mb->stmt[pc] = pn;
+ if (mb->stmt[pc] == p)
break;
- }
+
+ pn = GDKmalloc(space + MAXARG * sizeof(p->maxarg));
+ if (pn == NULL) {
+ freeInstruction(p);
+ return NULL;
+ }
+ memcpy((char *) pn, (char *) p, space);
+ GDKfree(p);
+ pn->maxarg += MAXARG;
/* we have to keep track on the maximal arguments/block
* because it is needed by the interpreter */
if (mb->maxarg < pn->maxarg)
mb->maxarg = pn->maxarg;
- GDKfree(p);
+ if( pc >= pclimit)
+ mb->stmt[pc] = pn;
+ //else
+ // Keep it referenced from the block, assert(0);
p = pn;
}
p->argv[p->argc++] = varid;
diff --git a/monetdb5/mal/mal_module.c b/monetdb5/mal/mal_module.c
--- a/monetdb5/mal/mal_module.c
+++ b/monetdb5/mal/mal_module.c
@@ -633,8 +633,11 @@ showHelp(Module m, str txt, stream *fs){
mnstr_printf(fs,"%s\n",msg[i]);
if( i == 0){
msg = getHelp(m,txt,0);
- for(i=0; msg[i]; i++)
+ for(i=0; msg[i]; i++){
mnstr_printf(fs,"%s\n",msg[i]);
+ GDKfree(msg[i]);
+ }
+ GDKfree(msg);
}
}
/*
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
@@ -1883,7 +1883,7 @@ parseMAL(Client cntxt, Symbol curPrg)
* Comment lines produced by Mx, i.e. #line directives are not saved.
* The deadcode optimizer removes all comment information.
*/
- curInstr = newInstruction(NULL, REMsymbol);
+ curInstr = newInstruction(curBlk, REMsymbol);
cst.vtype = TYPE_str;
cst.len = (int) strlen(start);
cst.val.sval = GDKstrdup(start);
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -1809,10 +1809,24 @@ JSONjsonaggr(BAT **bnp, BAT *b, BAT *g,
break;
}
if (!v||strNil(v)) {
- if (skip_nils)
- continue;
- strncpy(buf, str_nil, buflen);
- isnil = 1;
+ if (skip_nils) {
+ /*
+ * if q is 1 and the value is
+ * null, then we need to fill
+ * in a value. Otherwise
+ * BATproject will fail.
+ */
+ if ((p == 0 ) && (q == 1)) {
+ strncpy(buf, "[ null
]", maxlen - buflen);
+ buflen += strlen("[
null ]");
+ isnil = 1;
+ } else {
+ continue;
+ }
+ } else {
+ strncpy(buf, str_nil, buflen);
+ isnil = 1;
+ }
} else {
len = strlen(v);
if (len >= maxlen - buflen) {
diff --git a/monetdb5/modules/kernel/array.c b/monetdb5/modules/kernel/array.c
--- a/monetdb5/modules/kernel/array.c
+++ b/monetdb5/modules/kernel/array.c
@@ -103,7 +103,7 @@ grid_int(BAT **out, int *groups, int *gr
return GDK_FAIL;
}
new_bat(*out, (i * (n - o) * r), int);
- if (out == NULL) {
+ if (*out == NULL) {
GDKerror("grid: cannot create the bat (%d BUNs)\n", (i * (n -
o) * r));
return GDK_FAIL;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
