summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2020-09-04 18:32:10 +0000
committerTom Lane2020-09-04 18:32:19 +0000
commit38a2d703298c9a891dc9c24c0c087f417f555c70 (patch)
tree5c8dfa0662efa40432bf05f7f2029c2ad198bac4
parent3eb3d3e7822d5eecfcaba871a90263c6025c5216 (diff)
Remove some more useless assignments.
Found with clang's scan-build tool. It also whines about a lot of other dead stores that we should *not* change IMO, either as a matter of style or future-proofing. But these places seem like clear oversights. Discussion: https://postgr.es/m/CAEudQAo1+AcGppxDSg8k+zF4+Kv+eJyqzEDdbpDg58-=MQcerQ@mail.gmail.com
-rw-r--r--src/backend/access/brin/brin_tuple.c1
-rw-r--r--src/backend/access/gin/ginbtree.c1
-rw-r--r--src/backend/catalog/pg_depend.c6
-rw-r--r--src/backend/optimizer/plan/planner.c2
-rw-r--r--src/backend/parser/parse_utilcmd.c1
-rw-r--r--src/backend/partitioning/partbounds.c4
-rw-r--r--src/backend/statistics/extended_stats.c2
-rw-r--r--src/backend/tsearch/spell.c4
8 files changed, 7 insertions, 14 deletions
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index 6cb7c26b39..46e6b23c87 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -243,7 +243,6 @@ brin_form_tuple(BrinDesc *brdesc, BlockNumber blkno, BrinMemTuple *tuple,
*bitP |= bitmask;
}
- bitP = ((bits8 *) (rettuple + SizeOfBrinTuple)) - 1;
}
if (tuple->bt_placeholder)
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index 8d08b05f51..82788a5c36 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -241,7 +241,6 @@ ginFindParents(GinBtree btree, GinBtreeStack *stack)
blkno = root->blkno;
buffer = root->buffer;
- offset = InvalidOffsetNumber;
ptr = (GinBtreeStack *) palloc(sizeof(GinBtreeStack));
diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c
index 70baf03178..f263ff13e5 100644
--- a/src/backend/catalog/pg_depend.c
+++ b/src/backend/catalog/pg_depend.c
@@ -478,7 +478,7 @@ changeDependenciesOf(Oid classId, Oid oldObjectId,
while (HeapTupleIsValid((tup = systable_getnext(scan))))
{
- Form_pg_depend depform = (Form_pg_depend) GETSTRUCT(tup);
+ Form_pg_depend depform;
/* make a modifiable copy */
tup = heap_copytuple(tup);
@@ -561,12 +561,12 @@ changeDependenciesOn(Oid refClassId, Oid oldRefObjectId,
while (HeapTupleIsValid((tup = systable_getnext(scan))))
{
- Form_pg_depend depform = (Form_pg_depend) GETSTRUCT(tup);
-
if (newIsPinned)
CatalogTupleDelete(depRel, &tup->t_self);
else
{
+ Form_pg_depend depform;
+
/* make a modifiable copy */
tup = heap_copytuple(tup);
depform = (Form_pg_depend) GETSTRUCT(tup);
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index b40a112c25..139c5e3dc2 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -5097,7 +5097,7 @@ create_ordered_paths(PlannerInfo *root,
foreach(lc, input_rel->partial_pathlist)
{
Path *input_path = (Path *) lfirst(lc);
- Path *sorted_path = input_path;
+ Path *sorted_path;
bool is_sorted;
int presorted_keys;
double total_groups;
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 6c49554def..ec944371dd 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -1765,7 +1765,6 @@ generateClonedIndexStmt(RangeVar *heapRel, Relation source_idx,
char *attname;
attname = get_attname(indrelid, attnum, false);
- keycoltype = get_atttype(indrelid, attnum);
iparam->name = attname;
iparam->expr = NULL;
diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index 7553d55987..419c8fe845 100644
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -4259,10 +4259,6 @@ get_qual_for_range(Relation parent, PartitionBoundSpec *spec,
return result;
}
- lower_or_start_datum = list_head(spec->lowerdatums);
- upper_or_start_datum = list_head(spec->upperdatums);
- num_or_arms = key->partnatts;
-
/*
* If it is the recursive call for default, we skip the get_range_nulltest
* to avoid accumulating the NullTest on the same keys for each partition.
diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
index ab6f1e1c9d..9336f9bc5e 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -232,7 +232,7 @@ ComputeExtStatisticsRows(Relation onerel,
foreach(lc, lstats)
{
StatExtEntry *stat = (StatExtEntry *) lfirst(lc);
- int stattarget = stat->stattarget;
+ int stattarget;
VacAttrStats **stats;
int nattrs = bms_num_members(stat->columns);
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
index 8aab96d3b0..49735bc06a 100644
--- a/src/backend/tsearch/spell.c
+++ b/src/backend/tsearch/spell.c
@@ -2124,7 +2124,6 @@ CheckAffix(const char *word, size_t len, AFFIX *Affix, int flagflags, char *neww
}
else
{
- int err;
pg_wchar *data;
size_t data_len;
int newword_len;
@@ -2134,7 +2133,8 @@ CheckAffix(const char *word, size_t len, AFFIX *Affix, int flagflags, char *neww
data = (pg_wchar *) palloc((newword_len + 1) * sizeof(pg_wchar));
data_len = pg_mb2wchar_with_len(newword, data, newword_len);
- if (!(err = pg_regexec(&(Affix->reg.regex), data, data_len, 0, NULL, 0, NULL, 0)))
+ if (pg_regexec(&(Affix->reg.regex), data, data_len,
+ 0, NULL, 0, NULL, 0) == REG_OKAY)
{
pfree(data);
return newword;