typedef struct
{
- Oid reloid; /* hash key */
+ RelFileNumber relnumber; /* hash key */
} unlogged_relation_entry;
/*
while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
{
ForkNumber forkNum;
- int relnumchars;
+ unsigned segno;
unlogged_relation_entry ent;
/* Skip anything that doesn't look like a relation data file. */
- if (!parse_filename_for_nontemp_relation(de->d_name, &relnumchars,
- &forkNum))
+ if (!parse_filename_for_nontemp_relation(de->d_name,
+ &ent.relnumber,
+ &forkNum, &segno))
continue;
/* Also skip it unless this is the init fork. */
continue;
/*
- * Put the OID portion of the name into the hash table, if it
- * isn't already.
+ * Put the RelFileNumber into the hash table, if it isn't already.
*/
- ent.reloid = atooid(de->d_name);
(void) hash_search(hash, &ent, HASH_ENTER, NULL);
}
while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
{
ForkNumber forkNum;
- int relnumchars;
+ unsigned segno;
unlogged_relation_entry ent;
/* Skip anything that doesn't look like a relation data file. */
- if (!parse_filename_for_nontemp_relation(de->d_name, &relnumchars,
- &forkNum))
+ if (!parse_filename_for_nontemp_relation(de->d_name,
+ &ent.relnumber,
+ &forkNum, &segno))
continue;
/* We never remove the init fork. */
* See whether the OID portion of the name shows up in the hash
* table. If so, nuke it!
*/
- ent.reloid = atooid(de->d_name);
if (hash_search(hash, &ent, HASH_FIND, NULL))
{
snprintf(rm_path, sizeof(rm_path), "%s/%s",
while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
{
ForkNumber forkNum;
- int relnumchars;
- char relnumbuf[OIDCHARS + 1];
+ RelFileNumber relNumber;
+ unsigned segno;
char srcpath[MAXPGPATH * 2];
char dstpath[MAXPGPATH];
/* Skip anything that doesn't look like a relation data file. */
- if (!parse_filename_for_nontemp_relation(de->d_name, &relnumchars,
- &forkNum))
+ if (!parse_filename_for_nontemp_relation(de->d_name, &relNumber,
+ &forkNum, &segno))
continue;
/* Also skip it unless this is the init fork. */
dbspacedirname, de->d_name);
/* Construct destination pathname. */
- memcpy(relnumbuf, de->d_name, relnumchars);
- relnumbuf[relnumchars] = '\0';
- snprintf(dstpath, sizeof(dstpath), "%s/%s%s",
- dbspacedirname, relnumbuf, de->d_name + relnumchars + 1 +
- strlen(forkNames[INIT_FORKNUM]));
+ if (segno == 0)
+ snprintf(dstpath, sizeof(dstpath), "%s/%u",
+ dbspacedirname, relNumber);
+ else
+ snprintf(dstpath, sizeof(dstpath), "%s/%u.%u",
+ dbspacedirname, relNumber, segno);
/* OK, we're ready to perform the actual copy. */
elog(DEBUG2, "copying %s to %s", srcpath, dstpath);
dbspace_dir = AllocateDir(dbspacedirname);
while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
{
+ RelFileNumber relNumber;
ForkNumber forkNum;
- int relnumchars;
- char relnumbuf[OIDCHARS + 1];
+ unsigned segno;
char mainpath[MAXPGPATH];
/* Skip anything that doesn't look like a relation data file. */
- if (!parse_filename_for_nontemp_relation(de->d_name, &relnumchars,
- &forkNum))
+ if (!parse_filename_for_nontemp_relation(de->d_name, &relNumber,
+ &forkNum, &segno))
continue;
/* Also skip it unless this is the init fork. */
continue;
/* Construct main fork pathname. */
- memcpy(relnumbuf, de->d_name, relnumchars);
- relnumbuf[relnumchars] = '\0';
- snprintf(mainpath, sizeof(mainpath), "%s/%s%s",
- dbspacedirname, relnumbuf, de->d_name + relnumchars + 1 +
- strlen(forkNames[INIT_FORKNUM]));
+ if (segno == 0)
+ snprintf(mainpath, sizeof(mainpath), "%s/%u",
+ dbspacedirname, relNumber);
+ else
+ snprintf(mainpath, sizeof(mainpath), "%s/%u.%u",
+ dbspacedirname, relNumber, segno);
fsync_fname(mainpath, false);
}
* This function returns true if the file appears to be in the correct format
* for a non-temporary relation and false otherwise.
*
- * NB: If this function returns true, the caller is entitled to assume that
- * *relnumchars has been set to a value no more than OIDCHARS, and thus
- * that a buffer of OIDCHARS+1 characters is sufficient to hold the
- * RelFileNumber portion of the filename. This is critical to protect against
- * a possible buffer overrun.
+ * If it returns true, it sets *relnumber, *fork, and *segno to the values
+ * extracted from the filename. If it returns false, these values are set to
+ * InvalidRelFileNumber, InvalidForkNumber, and 0, respectively.
*/
bool
-parse_filename_for_nontemp_relation(const char *name, int *relnumchars,
- ForkNumber *fork)
+parse_filename_for_nontemp_relation(const char *name, RelFileNumber *relnumber,
+ ForkNumber *fork, unsigned *segno)
{
- int pos;
+ unsigned long n,
+ s;
+ ForkNumber f;
+ char *endp;
- /* Look for a non-empty string of digits (that isn't too long). */
- for (pos = 0; isdigit((unsigned char) name[pos]); ++pos)
- ;
- if (pos == 0 || pos > OIDCHARS)
+ *relnumber = InvalidRelFileNumber;
+ *fork = InvalidForkNumber;
+ *segno = 0;
+
+ /*
+ * Relation filenames should begin with a digit that is not a zero. By
+ * rejecting cases involving leading zeroes, the caller can assume that
+ * there's only one possible string of characters that could have produced
+ * any given value for *relnumber.
+ *
+ * (To be clear, we don't expect files with names like 0017.3 to exist at
+ * all -- but if 0017.3 does exist, it's a non-relation file, not part of
+ * the main fork for relfilenode 17.)
+ */
+ if (name[0] < '1' || name[0] > '9')
+ return false;
+
+ /*
+ * Parse the leading digit string. If the value is out of range, we
+ * conclude that this isn't a relation file at all.
+ */
+ errno = 0;
+ n = strtoul(name, &endp, 10);
+ if (errno || name == endp || n <= 0 || n > PG_UINT32_MAX)
return false;
- *relnumchars = pos;
+ name = endp;
/* Check for a fork name. */
- if (name[pos] != '_')
- *fork = MAIN_FORKNUM;
+ if (*name != '_')
+ f = MAIN_FORKNUM;
else
{
int forkchar;
- forkchar = forkname_chars(&name[pos + 1], fork);
+ forkchar = forkname_chars(name + 1, &f);
if (forkchar <= 0)
return false;
- pos += forkchar + 1;
+ name += forkchar + 1;
}
/* Check for a segment number. */
- if (name[pos] == '.')
+ if (*name != '.')
+ s = 0;
+ else
{
- int segchar;
+ /* Reject leading zeroes, just like we do for RelFileNumber. */
+ if (name[0] < '1' || name[0] > '9')
+ return false;
- for (segchar = 1; isdigit((unsigned char) name[pos + segchar]); ++segchar)
- ;
- if (segchar <= 1)
+ errno = 0;
+ s = strtoul(name + 1, &endp, 10);
+ if (errno || name + 1 == endp || s <= 0 || s > PG_UINT32_MAX)
return false;
- pos += segchar;
+ name = endp;
}
/* Now we should be at the end. */
- if (name[pos] != '\0')
+ if (*name != '\0')
return false;
+
+ /* Set out parameters and return. */
+ *relnumber = (RelFileNumber) n;
+ *fork = f;
+ *segno = (unsigned) s;
return true;
}
projects / users / rhaas / postgres.git / commitdiff