[b/354783600] Count files and directories separately (GoogleCloudPlatform#489)

Author: sten1ee

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/hdfs/SingleDirScanJob.java

@@ -46,12 +46,12 @@ public Void call() {
       for (FileStatus file : scanCtx.listDirectory(dir)) {
         // Process file or dir (in this case - just collect statistics)
         accumFileSize += file.getLen();
-        numFiles++;
 
         if (file.isDirectory()) {
           numDirs++;
           execManager.submit(new SingleDirScanJob(scanCtx, execManager, file));
         } else {
+          numFiles++;
           scanCtx.walkFile(file);
         }
       }

dumper/lib-dumper-spi/src/main/java/com/google/edwmigration/dumper/plugin/lib/dumper/spi/HdfsPermissionExtractionDumpFormat.java

@@ -29,8 +29,8 @@ enum Header {
       Permission,
       FileSize, // For a directory it is the sum of sizes of (immediately) contained files
       ModificationTime,
-      NumberOfFilesAndSubdirs,
-      NumberOfSubdirs,
+      FileCount,
+      DirCount,
       StoragePolicy,
     }
   }