postgres/timescaledb
1
0
Fork 0
mirror of https://github.com/timescale/timescaledb.git synced 2025-05-18 03:23:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove the rest of Value* type usage

Browse Source 
This is a follow-up to 8afac602. In this commit we refactored the code that
used Value* type because the type was removed in the upstream. However, we
missed a few places. This patch fixes it.
This commit is contained in:
Aleksander Alekseev 2021-12-09 15:14:07 +03:00 committed by Aleksander Alekseev
parent 19fa286200
commit ea342f1396
4 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tsl/src/continuous_aggs/create.c
View File

@ -1658,8 +1658,7 @@ finalizequery_get_select_query(FinalizeQueryInfo *inp, List *matcollist,
foreach (lc, matcollist) foreach (lc, matcollist)
{ {
ColumnDef *cdef = (ColumnDef *) lfirst(lc); ColumnDef *cdef = (ColumnDef *) lfirst(lc);
Value *attrname = makeString(cdef->colname); rte->eref->colnames = lappend(rte->eref->colnames, makeString(cdef->colname));
rte->eref->colnames = lappend(rte->eref->colnames, attrname);
rte->selectedCols = rte->selectedCols =
bms_add_member(rte->selectedCols, bms_add_member(rte->selectedCols,
list_length(rte->eref->colnames) - FirstLowInvalidHeapAttributeNumber); list_length(rte->eref->colnames) - FirstLowInvalidHeapAttributeNumber);

12
tsl/src/nodes/decompress_chunk/decompress_chunk.c
View File

@ -1089,15 +1089,9 @@ decompress_chunk_make_rte(Oid compressed_relid, LOCKMODE lockmode)
for (varattno = 0; varattno < r->rd_att->natts; varattno++) for (varattno = 0; varattno < r->rd_att->natts; varattno++)
{ {
Form_pg_attribute attr = TupleDescAttr(r->rd_att, varattno); Form_pg_attribute attr = TupleDescAttr(r->rd_att, varattno);
Value *attrname; /* Always insert an empty string for a dropped column */
const char *attrname = attr->attisdropped ? "" : NameStr(attr->attname);
if (attr->attisdropped) rte->eref->colnames = lappend(rte->eref->colnames, makeString(pstrdup(attrname)));
/* Always insert an empty string for a dropped column */
attrname = makeString(pstrdup(""));
else
attrname = makeString(pstrdup(NameStr(attr->attname)));
rte->eref->colnames = lappend(rte->eref->colnames, attrname);
} }
/* /*

4
tsl/src/nodes/decompress_chunk/planner.c
View File

@ -179,13 +179,13 @@ build_scan_tlist(DecompressChunkPath *path)
foreach (lc, path->info->ht_rte->eref->colnames) foreach (lc, path->info->ht_rte->eref->colnames)
{ {
Value *chunk_col = (Value *) lfirst(lc); const char *chunk_col = strVal(lfirst(lc));
ht_attno++; ht_attno++;
/* /*
* dropped columns have empty string * dropped columns have empty string
*/ */
if (IsA(lfirst(lc), String) && strlen(chunk_col->val.str) > 0) if (IsA(lfirst(lc), String) && strlen(chunk_col) > 0)
{ {
tle = make_compressed_scan_targetentry(path, ht_attno, list_length(scan_tlist) + 1); tle = make_compressed_scan_targetentry(path, ht_attno, list_length(scan_tlist) + 1);
scan_tlist = lappend(scan_tlist, tle); scan_tlist = lappend(scan_tlist, tle);

4
tsl/src/remote/dist_ddl.c
View File

@ -489,9 +489,7 @@ dist_ddl_process_grant_on_database(const GrantStmt *stmt)
dbmatch = false; dbmatch = false;
foreach (i, stmt->objects) foreach (i, stmt->objects)
{ {
Value *value = lfirst(i); if (!strcmp(dbname, strVal(lfirst(i))))
if (!strcmp(dbname, strVal(value)))
{ {
dbmatch = true; dbmatch = true;
break; break;