Changeset: 4ca043c00339 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ca043c00339
Modified Files:
monetdb5/optimizer/opt_remap.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_statement.c
Branch: Jun2020
Log Message:
Use existing references if possible
diffs (90 lines):
diff --git a/monetdb5/optimizer/opt_remap.c b/monetdb5/optimizer/opt_remap.c
--- a/monetdb5/optimizer/opt_remap.c
+++ b/monetdb5/optimizer/opt_remap.c
@@ -447,7 +447,7 @@ OPTremapImplementation(Client cntxt, Mal
pushInstruction(mb, sum);
pushInstruction(mb, cnt);
- t = newInstruction(mb, batcalcRef, putName("=="));
+ t = newInstruction(mb, batcalcRef, eqRef);
getArg(t,0) = newTmpVariable(mb, newBatType(TYPE_bit));
t = addArgument(mb, t, getDestVar(cnt));
t = pushLng(mb, t, 0);
@@ -460,7 +460,7 @@ OPTremapImplementation(Client cntxt, Mal
pushInstruction(mb, t);
sum = t;
- t = newInstruction(mb, batcalcRef,
putName("ifthenelse"));
+ t = newInstruction(mb, batcalcRef, ifthenelseRef);
getArg(t,0) = newTmpVariable(mb, getArgType(mb, p, 0));
t = addArgument(mb, t, getDestVar(iszero));
t = pushNil(mb, t, TYPE_dbl);
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -176,12 +176,12 @@ SQLsetTrace(Client cntxt, MalBlkPtr mb)
/* add the ticks column */
- q = newStmt(mb, profilerRef, "getTrace");
+ q = newStmt(mb, profilerRef, getTraceRef);
q = pushStr(mb, q, putName("usec"));
resultset= addArgument(mb,resultset, getArg(q,0));
/* add the stmt column */
- q = newStmt(mb, profilerRef, "getTrace");
+ q = newStmt(mb, profilerRef, getTraceRef);
q = pushStr(mb, q, putName("stmt"));
resultset= addArgument(mb,resultset, getArg(q,0));
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -718,7 +718,7 @@ backend_dumpstmt(backend *be, MalBlkPtr
}
/* announce the transaction mode */
- q = newStmt(mb, sqlRef, "mvc");
+ q = newStmt(mb, sqlRef, mvcRef);
if (q == NULL) {
sql_error(m, 001, SQLSTATE(HY013) MAL_MALLOC_FAIL);
return -1;
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -132,7 +132,7 @@ add_to_merge_partitions_accumulator(back
{
MalBlkPtr mb = be->mb;
int help = be->cur_append;
- InstrPtr q = newStmt(mb, calcRef, "+");
+ InstrPtr q = newStmt(mb, calcRef, plusRef);
getArg(q, 0) = be->cur_append = newTmpVariable(mb, TYPE_lng);
q = pushArgument(mb, q, help);
@@ -1064,7 +1064,7 @@ stmt_limit(backend *be, stmt *col, stmt
if (order) {
int topn = 0;
- q = newStmt(mb, calcRef, "+");
+ q = newStmt(mb, calcRef, plusRef);
q = pushArgument(mb, q, offset->nr);
q = pushArgument(mb, q, limit->nr);
if (q == NULL)
@@ -1091,7 +1091,7 @@ stmt_limit(backend *be, stmt *col, stmt
} else {
int len;
- q = newStmt(mb, calcRef, "+");
+ q = newStmt(mb, calcRef, plusRef);
q = pushArgument(mb, q, offset->nr);
q = pushArgument(mb, q, limit->nr);
if (q == NULL)
@@ -1101,7 +1101,7 @@ stmt_limit(backend *be, stmt *col, stmt
/* since both arguments of algebra.subslice are
inclusive correct the LIMIT value by
subtracting 1 */
- q = newStmt(mb, calcRef, "-");
+ q = newStmt(mb, calcRef, minusRef);
q = pushArgument(mb, q, len);
q = pushInt(mb, q, 1);
if (q == NULL)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
