Changeset: 6c690c19484a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c690c19484a
Modified Files:
monetdb5/mal/mal.h
monetdb5/mal/mal_instruction.c
Branch: default
Log Message:
Minor reordering of field and their types
diffs (80 lines):
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -146,14 +146,14 @@ typedef struct SYMDEF {
typedef struct VARRECORD {
char id[IDLENGTH]; /* use the space for the full
name */
malType type; /* internal type signature */
- int flags; /* see below, reserve
some space */
+ short flags; /* see below, reserve
some space */
+ short depth; /* scope block depth, set to -1
if not used */
+ short worker; /* thread id of last worker
producing it */
ValRecord value;
int declared; /* pc index when it was first
assigned */
int updated; /* pc index when it was first
updated */
int eolife; /* pc index when it
should be garbage collected */
- int depth; /* scope block depth,
set to -1 if not used */
- int worker; /* thread id of last
worker producing it */
- int stc; /* pc for rendering
schema.table.column */
+ int stc; /* pc index for rendering
schema.table.column */
BUN rowcnt; /* estimated row count*/
} *VarPtr, VarRecord;
@@ -185,12 +185,12 @@ typedef struct {
/* the core admin */
str modname; /* module context, reference
into namespace */
str fcnname; /* function name, reference
into namespace */
- int argc, retc, maxarg; /* total and result argument
count */
- int argv[FLEXIBLE_ARRAY_MEMBER]; /* at least a few entries */
+ int argc, retc, maxarg; /* total and result argument count */
+ int argv[FLEXIBLE_ARRAY_MEMBER]; /* at least a few entries */
} *InstrPtr, InstrRecord;
typedef struct MALBLK {
- char binding[IDLENGTH]; /* related C-function */
+ char binding[IDLENGTH]; /* related C-function */
str help; /* supportive commentary */
oid tag; /* unique block tag */
struct MALBLK *alternative;
@@ -207,19 +207,19 @@ typedef struct MALBLK {
sealedProp:1; /* sealed property (opertions
for sealed object should be on the full object once) */
int errors; /* left over errors */
- int typefixed; /* no undetermined instruction
*/
- int flowfixed; /* all flow instructions are
fixed */
- struct MALBLK *history; /* of optimizer actions */
- short keephistory; /* do we need the history at
all */
- short dotfile; /* send dot file to
stethoscope? */
+ int typefixed; /* no undetermined instruction */
+ int flowfixed; /* all flow instructions are fixed */
+ struct MALBLK *history; /* of optimizer actions */
+ short keephistory; /* do we need the history at all */
+ short dotfile; /* send dot file to stethoscope? */
int maxarg; /* keep track on the maximal
arguments used */
- ptr replica; /* for the replicator tests */
+ ptr replica; /* for the replicator tests */
sht trap; /* call debugger when called */
- lng starttime; /* track when the query
started, for resource management */
- lng runtime; /* average execution time of
block in ticks */
+ lng starttime; /* track when the query started, for
resource management */
+ lng runtime; /* average execution time of block in
ticks */
int calls; /* number of calls */
- lng optimize; /* total optimizer time */
- int activeClients; /* load during mitosis
optimization */
+ lng optimize; /* total optimizer time */
+ int activeClients; /* load during mitosis optimization */
} *MalBlkPtr, MalBlkRecord;
#define STACKINCR 128
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
@@ -790,7 +790,7 @@ cloneVariable(MalBlkPtr tm, MalBlkPtr mb
setVarUDFtype(tm, res);
if (isVarCleanup(mb, x))
setVarCleanup(tm, res);
- tm->var[x]->stc = mb->var[x]->stc;
+ getSTC(tm,x) = getSTC(mb,x);
return res;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
