fs: improve error performance of renameSync

PR-URL: #49962
Refs: nodejs/performance#106
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Vinícius Lourenço Claro Cardoso <contact@viniciusl.com.br>

Author: anonrig

benchmark/fs/bench-renameSync.js

@@ -0,0 +1,49 @@
+'use strict';
+
+constcommon=require('../common');
+constfs=require('fs');
+constassert=require('assert');
+consttmpdir=require('../../test/common/tmpdir');
+
+constbench=common.createBenchmark(main,{
+type: ['invalid','valid'],
+n: [2e3],
+});
+
+functionmain({ n, type }){
+switch(type){
+case'invalid': {
+lethasError=false;
+bench.start();
+for(leti=0;i<n;i++){
+try{
+fs.renameSync(tmpdir.resolve(`.non-existing-file-${i}`),tmpdir.resolve(`.new-file-${i}`));
+}catch{
+hasError=true;
+}
+}
+bench.end(n);
+assert(hasError);
+break;
+}
+case'valid': {
+tmpdir.refresh();
+for(leti=0;i<n;i++){
+fs.writeFileSync(tmpdir.resolve(`.existing-file-${i}`),'bench','utf8');
+}
+
+bench.start();
+for(leti=0;i<n;i++){
+fs.renameSync(
+tmpdir.resolve(`.existing-file-${i}`),
+tmpdir.resolve(`.new-existing-file-${i}`),
+);
+}
+
+bench.end(n);
+break;
+}
+default:
+thrownewError('Invalid type');
+}
+}

lib/fs.js

@@ -1034,10 +1034,10 @@ function rename(oldPath, newPath, callback) {
 functionrenameSync(oldPath,newPath){
 oldPath=getValidatedPath(oldPath,'oldPath');
 newPath=getValidatedPath(newPath,'newPath');
-constctx={path: oldPath,dest: newPath};
-binding.rename(pathModule.toNamespacedPath(oldPath),
-pathModule.toNamespacedPath(newPath),undefined,ctx);
-handleErrorFromBinding(ctx);
+binding.rename(
+pathModule.toNamespacedPath(oldPath),
+pathModule.toNamespacedPath(newPath),
+);
 }
 
 /**

src/node_file.cc

@@ -1432,7 +1432,7 @@ static void Rename(const FunctionCallbackInfo<Value>& args) {
  Isolate* isolate = env->isolate();
 
 constint argc = args.Length();
-CHECK_GE(argc, 3);
+CHECK_GE(argc, 2);
 
  BufferValue old_path(isolate, args[0]);
 CHECK_NOT_NULL(*old_path);
@@ -1449,8 +1449,8 @@ static void Rename(const FunctionCallbackInfo<Value>& args) {
  permission::PermissionScope::kFileSystemWrite,
  new_path.ToStringView());
 
-FSReqBase* req_wrap_async = GetReqWrap(args, 2);
-if (req_wrap_async != nullptr) {
+if (argc > 2) { // rename(old_path, new_path, req)
+ FSReqBase* req_wrap_async = GetReqWrap(args, 2);
 FS_ASYNC_TRACE_BEGIN2(UV_FS_RENAME,
  req_wrap_async,
 "old_path",
@@ -1460,12 +1460,11 @@ static void Rename(const FunctionCallbackInfo<Value>& args) {
 AsyncDestCall(env, req_wrap_async, args, "rename", *new_path,
  new_path.length(), UTF8, AfterNoArgs, uv_fs_rename,
  *old_path, *new_path);
- } else {
-CHECK_EQ(argc, 4);
- FSReqWrapSync req_wrap_sync;
+ } else { // rename(old_path, new_path)
+ FSReqWrapSync req_wrap_sync("rename", *old_path, *new_path);
 FS_SYNC_TRACE_BEGIN(rename);
-SyncCall(env, args[3], &req_wrap_sync, "rename", uv_fs_rename,
- *old_path, *new_path);
+SyncCallAndThrowOnError(
+env, &req_wrap_sync, uv_fs_rename, *old_path, *new_path);
 FS_SYNC_TRACE_END(rename);
  }
 }

typings/internalBinding/fs.d.ts

@@ -183,6 +183,7 @@ declare namespace InternalFSBinding {
 functionrename(oldPath: string,newPath: string,req: FSReqCallback): void;
 functionrename(oldPath: string,newPath: string,req: undefined,ctx: FSSyncContext): void;
 functionrename(oldPath: string,newPath: string,usePromises: typeofkUsePromises): Promise<void>;
+functionrename(oldPath: string,newPath: string): void;
 
 functionrmdir(path: string,req: FSReqCallback): void;
 functionrmdir(path: string,req: undefined,ctx: FSSyncContext): void;