Changeset 27481 for gs2-extensions

Timestamp:

2013-05-27T12:27:31+12:00 (11 years ago)

Author:

jmt12

Message:

Adding makeAllDirectories() (which I'd only implemented in LocalFS) to FileUtils (which in turn calls the Driver specific makeDirectory() recursively) and added test for this function

Location:

gs2-extensions/parallel-building/trunk/src

Files:

• bin/script/test_fileutils.pl (modified) (2 diffs)
• perllib/FileUtils.pm (modified) (2 diffs)
• perllib/FileUtils/HDThriftFS.pm (modified) (1 diff)
• perllib/FileUtils/LocalFS.pm (modified) (1 diff)

gs2-extensions/parallel-building/trunk/src/bin/script/test_fileutils.pl

@@ -10 +10 @@
 my $display_errors = 0;
 
-my $test_localfs = 1;
+my $test_localfs = 0;
 my $test_hdthriftfs = 1;
-my $test_hdfsshell = 1;
+my $test_hdfsshell = 0;
 
 # Globals
@@ -467 +467 @@
   $pass_count += &testAction(\$test_count, 'makeDirectory() to create a new directory', 1, &FileUtils::makeDirectory($path));
   $pass_count += &testAction(\$test_count, 'makeDirectory() for an existing directory', 1, &FileUtils::makeDirectory($path));
+
+  my $multiple_dirs_path = $path . '/foo/bar/wibble';
+  $pass_count += &testAction(\$test_count, 'makeAllDirectories() to create several nested directories', 1, &FileUtils::makeAllDirectories($multiple_dirs_path));
+  &FileUtils::removeFilesRecursive($path . '/foo');
 }
 

gs2-extensions/parallel-building/trunk/src/perllib/FileUtils.pm

@@ -398 +398 @@
 
 
+## @function makeAllDirectories()
+#
+# in case anyone cares - I did some testing (using perls Benchmark module)
+# on this subroutine against File::Path::mkpath (). mk_all_dir() is apparently
+# slightly faster (surprisingly) - Stefan.
+#
+sub makeAllDirectories
+{
+  my ($raw_dir) = @_;
+  # use / for the directory separator, remove duplicate and
+  # trailing slashes
+  &sanitizePath($raw_dir);
+  # ensure the directory doesn't already exist
+  if (&directoryExists($raw_dir))
+  {
+    return 0;
+  }
+  if ($raw_dir =~ /^(.+?:\/\/)(.*)/)
+  {
+    my $dirsofar = '';
+    if (defined $1)
+    {
+      $dirsofar = $1;
+    }
+    my $dir = $2;
+    my $first = 1;
+    foreach my $dirname (split ("/", $dir))
+    {
+      $dirsofar .= "/" unless $first;
+      $first = 0;
+      $dirsofar .= $dirname;
+      next if $dirname =~ /^(|[a-z]:)$/i;
+      if (!-e $dirsofar)
+      {
+        my $mkdir_ok = &makeDirectory($dirsofar);
+        if (!$mkdir_ok)
+        {
+          &FileUtils::printError('Could not create directory: ' . $dirsofar);
+          return 0;
+        }
+      }
+    }
+  }
+  return (&directoryExists($raw_dir));
+}
+## makeAllDirectories()
+
+
 ## @function sanitizePath()
 #
@@ -543 +591 @@
 ## isSymbolicLink()
 
-# /** @function makeAllDirectories
-#  */
-sub makeAllDirectories
-{
-  my $path = shift(@_);
-  my $driver = &FileUtils::_determineDriver($path);
-  return &FileUtils::_callFunction($driver, 'makeAllDirectories', $path);
-}
-# /** makeAllDirectories() **/
 
 # /**

gs2-extensions/parallel-building/trunk/src/perllib/FileUtils/HDThriftFS.pm

@@ -130 +130 @@
     if ($path !~ /HDThriftFS:\/\//)
     {
-      &_printError('Not a valid thrift URI: ' . $path);
+      &FileUtils::printError('Not a valid thrift URI: ' . $path);
     }
     else

gs2-extensions/parallel-building/trunk/src/perllib/FileUtils/LocalFS.pm

@@ -215 +215 @@
 }
 # /** linkFile() **/
-
-## @function makeAllDirectories()
-#
-# in case anyone cares - I did some testing (using perls Benchmark module)
-# on this subroutine against File::Path::mkpath (). mk_all_dir() is apparently
-# slightly faster (surprisingly) - Stefan.
-#
-sub makeAllDirectories
-{
-  my ($dir) = @_;
-
-  # use / for the directory separator, remove duplicate and
-  # trailing slashes
-  $dir=~s/[\\\/]+/\//g;
-  $dir=~s/[\\\/]+$//;
-
-  # ensure the directory doesn't already exist
-  if (-e $dir)
-  {
-    return 0;
-  }
-
-  # make sure the cache directory exists
-  my $dirsofar = "";
-  my $first = 1;
-  foreach my $dirname (split ("/", $dir))
-  {
-    $dirsofar .= "/" unless $first;
-    $first = 0;
-
-    $dirsofar .= $dirname;
-
-    next if $dirname =~ /^(|[a-z]:)$/i;
-    if (!-e $dirsofar)
-    {
-      my $store_umask = umask(0002);
-      my $mkdir_ok = mkdir ($dirsofar, 0777);
-      umask($store_umask);
-      if (!$mkdir_ok)
-      {
-        &FileUtils::printError('Could not create directory: ' . $dirsofar);
-        return 0;
-      }
-    }
-  }
-  return (-e $dir);
-}
-## makeAllDirectories()
-
 
 ## @function makeDirectory()