summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAsher Gomez <ashersaupingomez@gmail.com>2024-09-09 21:09:57 +1000
committerGitHub <noreply@github.com>2024-09-09 21:09:57 +1000
commit39f2704bd73971867301a7d424d9f2464916785d (patch)
tree9078c96685422de9e060b2ed1b5ac4f2359df9be
parentce1d668929a91da2dc204f6bcc53afd5173c0a33 (diff)
BREAKING(fs): remove `Deno.fdatasync[Sync]()` (#25520)
-rw-r--r--cli/tools/test/fmt.rs2
-rw-r--r--cli/tsc/dts/lib.deno.ns.d.ts34
-rw-r--r--ext/fs/30_fs.js18
-rw-r--r--ext/fs/lib.rs4
-rw-r--r--ext/fs/ops.rs4
-rw-r--r--runtime/js/90_deno_ns.js2
-rw-r--r--tests/unit/sync_test.ts33
7 files changed, 9 insertions, 88 deletions
diff --git a/cli/tools/test/fmt.rs b/cli/tools/test/fmt.rs
index 7a24c854a..a1c3922a9 100644
--- a/cli/tools/test/fmt.rs
+++ b/cli/tools/test/fmt.rs
@@ -318,7 +318,7 @@ pub const OP_DETAILS: phf::Map<&'static str, [&'static str; 2]> = phf_map! {
"op_fs_chown_async" => ["change the owner of a file", "awaiting the result of a `Deno.chown` call"],
"op_fs_copy_file_async" => ["copy a file", "awaiting the result of a `Deno.copyFile` call"],
"op_fs_events_poll" => ["get the next file system event", "breaking out of a for await loop looping over `Deno.FsEvents`"],
- "op_fs_fdatasync_async" => ["flush pending data operations for a file to disk", "awaiting the result of a `Deno.fdatasync` or `Deno.FsFile.syncData` call"],
+ "op_fs_file_sync_data_async" => ["flush pending data operations for a file to disk", "awaiting the result of a `Deno.FsFile.prototype.syncData` call"],
"op_fs_file_stat_async" => ["get file metadata", "awaiting the result of a `Deno.FsFile.prototype.stat` call"],
"op_fs_flock_async" => ["lock a file", "awaiting the result of a `Deno.FsFile.lock` call"],
"op_fs_fsync_async" => ["flush pending data operations for a file to disk", "awaiting the result of a `Deno.fsync` or `Deno.FsFile.sync` call"],
diff --git a/cli/tsc/dts/lib.deno.ns.d.ts b/cli/tsc/dts/lib.deno.ns.d.ts
index 320e6f29b..309f6ade8 100644
--- a/cli/tsc/dts/lib.deno.ns.d.ts
+++ b/cli/tsc/dts/lib.deno.ns.d.ts
@@ -1958,40 +1958,6 @@ declare namespace Deno {
*/
export function fsyncSync(rid: number): void;
- /**
- * Flushes any pending data operations of the given file stream to disk.
- * ```ts
- * const file = await Deno.open(
- * "my_file.txt",
- * { read: true, write: true, create: true },
- * );
- * await file.write(new TextEncoder().encode("Hello World"));
- * await Deno.fdatasync(file.rid);
- * console.log(await Deno.readTextFile("my_file.txt")); // Hello World
- * ```
- *
- * @category File System
- */
- export function fdatasync(rid: number): Promise<void>;
-
- /**
- * Synchronously flushes any pending data operations of the given file stream
- * to disk.
- *
- * ```ts
- * const file = Deno.openSync(
- * "my_file.txt",
- * { read: true, write: true, create: true },
- * );
- * file.writeSync(new TextEncoder().encode("Hello World"));
- * Deno.fdatasyncSync(file.rid);
- * console.log(Deno.readTextFileSync("my_file.txt")); // Hello World
- * ```
- *
- * @category File System
- */
- export function fdatasyncSync(rid: number): void;
-
/** The Deno abstraction for reading and writing files.
*
* This is the most straight forward way of handling files within Deno and is
diff --git a/ext/fs/30_fs.js b/ext/fs/30_fs.js
index b284b7fce..8def881aa 100644
--- a/ext/fs/30_fs.js
+++ b/ext/fs/30_fs.js
@@ -15,10 +15,10 @@ import {
op_fs_copy_file_async,
op_fs_copy_file_sync,
op_fs_cwd,
- op_fs_fdatasync_async,
- op_fs_fdatasync_sync,
op_fs_file_stat_async,
op_fs_file_stat_sync,
+ op_fs_file_sync_data_async,
+ op_fs_file_sync_data_sync,
op_fs_file_truncate_async,
op_fs_flock_async,
op_fs_flock_sync,
@@ -517,14 +517,6 @@ async function symlink(
);
}
-function fdatasyncSync(rid) {
- op_fs_fdatasync_sync(rid);
-}
-
-async function fdatasync(rid) {
- await op_fs_fdatasync_async(rid);
-}
-
function fsyncSync(rid) {
op_fs_fsync_sync(rid);
}
@@ -648,11 +640,11 @@ class FsFile {
}
async syncData() {
- await op_fs_fdatasync_async(this.#rid);
+ await op_fs_file_sync_data_async(this.#rid);
}
syncDataSync() {
- op_fs_fdatasync_sync(this.#rid);
+ op_fs_file_sync_data_sync(this.#rid);
}
close() {
@@ -914,8 +906,6 @@ export {
create,
createSync,
cwd,
- fdatasync,
- fdatasyncSync,
FsFile,
fsync,
fsyncSync,
diff --git a/ext/fs/lib.rs b/ext/fs/lib.rs
index 1725b4dd5..b84565d72 100644
--- a/ext/fs/lib.rs
+++ b/ext/fs/lib.rs
@@ -229,8 +229,8 @@ deno_core::extension!(deno_fs,
op_fs_seek_sync,
op_fs_seek_async,
- op_fs_fdatasync_sync,
- op_fs_fdatasync_async,
+ op_fs_file_sync_data_sync,
+ op_fs_file_sync_data_async,
op_fs_fsync_sync,
op_fs_fsync_async,
op_fs_file_stat_sync,
diff --git a/ext/fs/ops.rs b/ext/fs/ops.rs
index 0ac4f5016..c9eec94fa 100644
--- a/ext/fs/ops.rs
+++ b/ext/fs/ops.rs
@@ -1430,7 +1430,7 @@ pub async fn op_fs_seek_async(
}
#[op2(fast)]
-pub fn op_fs_fdatasync_sync(
+pub fn op_fs_file_sync_data_sync(
state: &mut OpState,
#[smi] rid: ResourceId,
) -> Result<(), AnyError> {
@@ -1440,7 +1440,7 @@ pub fn op_fs_fdatasync_sync(
}
#[op2(async)]
-pub async fn op_fs_fdatasync_async(
+pub async fn op_fs_file_sync_data_async(
state: Rc<RefCell<OpState>>,
#[smi] rid: ResourceId,
) -> Result<(), AnyError> {
diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js
index 19f3e46a9..e14dc506e 100644
--- a/runtime/js/90_deno_ns.js
+++ b/runtime/js/90_deno_ns.js
@@ -100,8 +100,6 @@ const denoNs = {
startTls: tls.startTls,
fsyncSync: fs.fsyncSync,
fsync: fs.fsync,
- fdatasyncSync: fs.fdatasyncSync,
- fdatasync: fs.fdatasync,
symlink: fs.symlink,
symlinkSync: fs.symlinkSync,
link: fs.link,
diff --git a/tests/unit/sync_test.ts b/tests/unit/sync_test.ts
index 6112f3520..a683c7acb 100644
--- a/tests/unit/sync_test.ts
+++ b/tests/unit/sync_test.ts
@@ -3,39 +3,6 @@ import { assertEquals, DENO_FUTURE } from "./test_util.ts";
Deno.test(
{ ignore: DENO_FUTURE, permissions: { read: true, write: true } },
- function fdatasyncSyncSuccess() {
- const filename = Deno.makeTempDirSync() + "/test_fdatasyncSync.txt";
- using file = Deno.openSync(filename, {
- read: true,
- write: true,
- create: true,
- });
- const data = new Uint8Array(64);
- file.writeSync(data);
- Deno.fdatasyncSync(file.rid);
- Deno.removeSync(filename);
- },
-);
-
-Deno.test(
- { ignore: DENO_FUTURE, permissions: { read: true, write: true } },
- async function fdatasyncSuccess() {
- const filename = (await Deno.makeTempDir()) + "/test_fdatasync.txt";
- using file = await Deno.open(filename, {
- read: true,
- write: true,
- create: true,
- });
- const data = new Uint8Array(64);
- await file.write(data);
- await Deno.fdatasync(file.rid);
- assertEquals(await Deno.readFile(filename), data);
- await Deno.remove(filename);
- },
-);
-
-Deno.test(
- { ignore: DENO_FUTURE, permissions: { read: true, write: true } },
function fsyncSyncSuccess() {
const filename = Deno.makeTempDirSync() + "/test_fsyncSync.txt";
using file = Deno.openSync(filename, {