Add strict requirements for default tablespace relfilenode parsing (w…

…al-g#1503)
citusdata · Jun 23, 2023 · 68afeb2 · 68afeb2
1 parent e8388a1
commit 68afeb2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/internal/databases/postgres/paged_file_delta_map.go b/internal/databases/postgres/paged_file_delta_map.go
@@ -123,7 +123,7 @@ func GetRelFileNodeFrom(filePath string) (*walparser.RelFileNode, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "GetRelFileNodeFrom: can't get dbNode from: '%s'", filePath)
 	}
-	if strings.Contains(filePath, DefaultTablespace) { // base
+	if folderPathParts[len(folderPathParts)-2] == DefaultTablespace { // base
 		return &walparser.RelFileNode{SpcNode: DefaultSpcNode,
 			DBNode:  walparser.Oid(dbNode),
 			RelNode: walparser.Oid(relNode)}, nil

diff --git a/internal/databases/postgres/paged_file_delta_map_test.go b/internal/databases/postgres/paged_file_delta_map_test.go
@@ -28,6 +28,21 @@ func TestGetRelFileNodeFrom_DefaultTableSpace(t *testing.T) {
 	assert.Equal(t, walparser.RelFileNode{SpcNode: postgres.DefaultSpcNode, DBNode: 123, RelNode: 100500}, *relFileNode)
 }
 
+func TestGetRelFileNodeFrom_IncorrectDefaultTableSpace_v1(t *testing.T) {
+	_, err := postgres.GetRelFileNodeFrom("~/DemoDb/base.old/123/100500")
+	assert.Error(t, err)
+}
+
+func TestGetRelFileNodeFrom_IncorrectDefaultTableSpace_v2(t *testing.T) {
+	_, err := postgres.GetRelFileNodeFrom("~/DemoDb/base/some_garbage/123/100500")
+	assert.Error(t, err)
+}
+
+func TestGetRelFileNodeFrom_IncorrectDefaultTableSpace_v3(t *testing.T) {
+	_, err := postgres.GetRelFileNodeFrom("~/DemoDb/garbage/123/100500")
+	assert.Error(t, err)
+}
+
 func TestGetRelFileNodeFrom_NonDefaultTableSpace(t *testing.T) {
 	relFileNode, err := postgres.GetRelFileNodeFrom("~/DemoDb/pg_tblspc/16709/PG_9.3_201306121/16499/19401")
 	assert.NoError(t, err)