bvfs: remove BVFS_FilenameId

is it not needed anymore after the denormalization
bareos · Apr 12, 2017 · 55580c1 · 55580c1
1 parent 4c27e75
commit 55580c1
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 10 deletions.
diff --git a/src/cats/bvfs.h b/src/cats/bvfs.h
@@ -45,13 +45,12 @@ typedef enum {
 typedef enum {
    BVFS_Type    = 0,            /**< Could be D, F, V */
    BVFS_PathId  = 1,
-   BVFS_FilenameId = 2,
 
-   BVFS_Name    = 3,
-   BVFS_JobId   = 4,
+   BVFS_Name    = 2,
+   BVFS_JobId   = 3,
 
-   BVFS_LStat   = 5,            /**< Can be empty for missing directories */
-   BVFS_FileId  = 6,            /**< Can be empty for missing directories */
+   BVFS_LStat   = 4,            /**< Can be empty for missing directories */
+   BVFS_FileId  = 5,            /**< Can be empty for missing directories */
 
    /* Only if File Version record */
    BVFS_Md5     = 3,

diff --git a/src/cats/dml/0048_sql_bvfs_list_files b/src/cats/dml/0048_sql_bvfs_list_files
@@ -1,6 +1,5 @@
 SELECT 'F',
        T1.PathId,
-       -1 AS FilenameId,
        File.Name,
        File.JobId,
        File.LStat,

diff --git a/src/cats/dml/0048_sql_bvfs_list_files.postgresql b/src/cats/dml/0048_sql_bvfs_list_files.postgresql
@@ -1,6 +1,5 @@
 SELECT TYPE,
        PathId,
-       -1 AS FilenameId,
        Name,
        JobId,
        LStat,

diff --git a/src/cats/mysql_queries.inc b/src/cats/mysql_queries.inc
@@ -670,7 +670,6 @@ WHERE T1.JobTDate = Job.JobTDate
 SQL_QUERY(
 SELECT 'F',
        T1.PathId,
-       -1 AS FilenameId,
        File.Name,
        File.JobId,
        File.LStat,

diff --git a/src/cats/postgresql_queries.inc b/src/cats/postgresql_queries.inc
@@ -642,7 +642,6 @@ CREATE TABLE %s AS
 SQL_QUERY(
 SELECT TYPE,
        PathId,
-       -1 AS FilenameId,
        Name,
        JobId,
        LStat,

diff --git a/src/cats/sqlite_queries.inc b/src/cats/sqlite_queries.inc
@@ -670,7 +670,6 @@ WHERE T1.JobTDate = Job.JobTDate
 SQL_QUERY(
 SELECT 'F',
        T1.PathId,
-       -1 AS FilenameId,
        File.Name,
        File.JobId,
        File.LStat,