[Move Object] Fs level integration move object

internal/fs/fs.go

@@ -1994,13 +1994,44 @@ func (fs *fileSystem) Rename(
 		}
 		return fs.renameNonHierarchicalDir(ctx, oldParent, op.OldName, newParent, op.NewName)
 	}
-	return fs.renameFile(ctx, oldParent, op.OldName, child.MinObject, newParent, op.NewName)
+	if child.Bucket.BucketType() == gcs.Hierarchical {
+		return fs.renameHierarchicalFile(ctx, oldParent, op.OldName, child.MinObject, newParent, op.NewName)
+	}
+	return fs.renameNonHierarchicalFile(ctx, oldParent, op.OldName, child.MinObject, newParent, op.NewName)
+}
+
+// LOCKS_EXCLUDED(fs.mu)
+// LOCKS_EXCLUDED(oldParent)
+// LOCKS_EXCLUDED(newParent)
+func (fs *fileSystem) renameHierarchicalFile(ctx context.Context, oldParent inode.DirInode, oldName string, oldObject *gcs.MinObject, newParent inode.DirInode, newName string) error {
+	oldParent.Lock()
+	defer oldParent.Unlock()
+
+	if newParent != oldParent {
+		newParent.Lock()
+		defer newParent.Unlock()
+	}
+
+	newFileName := inode.NewFileName(newParent.Name(), newName)
+
+	if _, err := oldParent.RenameFile(ctx, oldObject, newFileName.GcsObjectName()); err != nil {
+		return fmt.Errorf("RenameFile: while renaming file: %w", err)
+	}
+
+	if err := fs.invalidateChildFileCacheIfExist(oldParent, oldName); err != nil {
+		return fmt.Errorf("renameHierarchicalFile: while invalidating cache for delete file: %w", err)
+	}
+
+	// Insert new file in type cache.
+	newParent.InsertFileIntoTypeCache(newName)
+
+	return nil
 }
 
 // LOCKS_EXCLUDED(fs.mu)
 // LOCKS_EXCLUDED(oldParent)
 // LOCKS_EXCLUDED(newParent)
-func (fs *fileSystem) renameFile(
+func (fs *fileSystem) renameNonHierarchicalFile(
 	ctx context.Context,
 	oldParent inode.DirInode,
 	oldName string,
@@ -2027,7 +2058,7 @@ func (fs *fileSystem) renameFile(
 		&oldObject.MetaGeneration)
 
 	if err := fs.invalidateChildFileCacheIfExist(oldParent, oldObject.Name); err != nil {
-		return fmt.Errorf("renameFile: while invalidating cache for delete file: %w", err)
+		return fmt.Errorf("renameNonHierarchicalFile: while invalidating cache for delete file: %w", err)
 	}
 
 	oldParent.Unlock()

internal/fs/hns_bucket_test.go

@@ -379,3 +379,71 @@ func (t *HNSBucketTests) TestCreateLocalFileInSamePathAfterDeletingParentDirecto
 	_, err = os.Stat(filePath)
 	assert.NoError(t.T(), err)
 }
+
+func (t *HNSBucketTests) TestRenameFileWithSrcFileDoesNotExist() {
+	oldDirPath := path.Join(mntDir, "file")
+	newDirPath := path.Join(mntDir, "file_rename")
+
+	err := os.Rename(oldDirPath, newDirPath)
+
+	assert.Error(t.T(), err)
+	assert.True(t.T(), strings.Contains(err.Error(), "no such file or directory"))
+	_, err = os.Stat(newDirPath)
+	assert.Error(t.T(), err)
+	assert.True(t.T(), strings.Contains(err.Error(), "no such file or directory"))
+}
+
+func (t *HNSBucketTests) TestRenameFileWithDstDestFileExist() {
+	oldFilePath := path.Join(mntDir, "foo", "file1.txt")
+	_, err := os.Stat(oldFilePath)
+	assert.NoError(t.T(), err)
+	// In the setup phase, we created file1.txt within the bar directory.
+	newFilePath := path.Join(mntDir, "foo", "file2.txt")
+	_, err = os.Stat(newFilePath)
+	assert.NoError(t.T(), err)
+
+	err = os.Rename(oldFilePath, newFilePath)
+
+	assert.NoError(t.T(), err)
+	_, err = os.Stat(oldFilePath)
+	assert.Error(t.T(), err)
+	assert.True(t.T(), strings.Contains(err.Error(), "no such file or directory"))
+}
+
+func (t *HNSBucketTests) TestRenameFileWithDifferentParent() {
+	oldFilePath := path.Join(mntDir, "foo", "file1.txt")
+	_, err := os.Stat(oldFilePath)
+	assert.NoError(t.T(), err)
+	// In the setup phase, we created file1.txt within the bar directory.
+	newFilePath := path.Join(mntDir, "bar", "file3.txt")
+	_, err = os.Stat(newFilePath)
+	assert.True(t.T(), strings.Contains(err.Error(), "no such file or directory"))
+
+	err = os.Rename(oldFilePath, newFilePath)
+
+	assert.NoError(t.T(), err)
+	_, err = os.Stat(oldFilePath)
+	assert.Error(t.T(), err)
+	assert.True(t.T(), strings.Contains(err.Error(), "no such file or directory"))
+	_, err = os.Stat(newFilePath)
+	assert.NoError(t.T(), err)
+}
+
+func (t *HNSBucketTests) TestRenameFileWithSameParent() {
+	oldFilePath := path.Join(mntDir, "foo", "file1.txt")
+	_, err := os.Stat(oldFilePath)
+	assert.NoError(t.T(), err)
+	// In the setup phase, we created file1.txt within the bar directory.
+	newFilePath := path.Join(mntDir, "foo", "file3.txt")
+	_, err = os.Stat(newFilePath)
+	assert.True(t.T(), strings.Contains(err.Error(), "no such file or directory"))
+
+	err = os.Rename(oldFilePath, newFilePath)
+
+	assert.NoError(t.T(), err)
+	_, err = os.Stat(oldFilePath)
+	assert.Error(t.T(), err)
+	assert.True(t.T(), strings.Contains(err.Error(), "no such file or directory"))
+	_, err = os.Stat(newFilePath)
+	assert.NoError(t.T(), err)
+}