Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add hash() to FileContent #6062

Merged
merged 1 commit into from
Sep 29, 2023
Merged

add hash() to FileContent #6062

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions crates/turbo-tasks-fs/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ use turbo_tasks::{
mark_stateful, spawn_thread, trace::TraceRawVcs, Completion, InvalidationReason, Invalidator,
ReadRef, ValueToString, Vc,
};
use turbo_tasks_hash::hash_xxh3_hash64;
use turbo_tasks_hash::{hash_xxh3_hash64, DeterministicHash, DeterministicHasher};
use util::{extract_disk_access, join_path, normalize_path, sys_to_unix, unix_to_sys};
pub use virtual_fs::VirtualFileSystem;

Expand Down Expand Up @@ -1471,7 +1471,7 @@ impl RealPathResult {
}
}

#[derive(Clone, Copy, Debug)]
#[derive(Clone, Copy, Debug, DeterministicHash)]
#[turbo_tasks::value(shared)]
pub enum Permissions {
Readable,
Expand Down Expand Up @@ -1524,7 +1524,7 @@ impl From<std::fs::Permissions> for Permissions {
}

#[turbo_tasks::value(shared)]
#[derive(Clone, Debug)]
#[derive(Clone, Debug, DeterministicHash)]
pub enum FileContent {
Content(File),
NotFound,
Expand Down Expand Up @@ -1629,7 +1629,7 @@ pub enum LinkContent {
}

#[turbo_tasks::value(shared)]
#[derive(Clone)]
#[derive(Clone, DeterministicHash)]
pub struct File {
meta: FileMeta,
#[turbo_tasks(debug_ignore)]
Expand Down Expand Up @@ -1677,6 +1677,7 @@ impl File {
self.meta.content_type = Some(content_type);
self
}

/// Returns a Read/AsyncRead/Stream/Iterator to access the File's contents.
pub fn read(&self) -> RopeReader {
self.content.read()
Expand Down Expand Up @@ -1752,7 +1753,6 @@ impl File {
&self.content
}
}

mod mime_option_serde {
use std::{fmt, str::FromStr};

Expand Down Expand Up @@ -1821,6 +1821,15 @@ impl From<std::fs::Metadata> for FileMeta {
}
}

impl DeterministicHash for FileMeta {
fn deterministic_hash<H: DeterministicHasher>(&self, state: &mut H) {
self.permissions.deterministic_hash(state);
if let Some(content_type) = &self.content_type {
content_type.to_string().deterministic_hash(state);
}
}
}

impl FileContent {
pub fn new(file: File) -> Self {
FileContent::Content(file)
Expand Down Expand Up @@ -1912,16 +1921,23 @@ impl FileContent {
let this = self.await?;
Ok(this.parse_json_ref().into())
}

#[turbo_tasks::function]
pub async fn parse_json_with_comments(self: Vc<Self>) -> Result<Vc<FileJsonContent>> {
let this = self.await?;
Ok(this.parse_json_with_comments_ref().into())
}

#[turbo_tasks::function]
pub async fn lines(self: Vc<Self>) -> Result<Vc<FileLinesContent>> {
let this = self.await?;
Ok(this.lines_ref().into())
}

#[turbo_tasks::function]
pub async fn hash(self: Vc<Self>) -> Result<Vc<u64>> {
Ok(Vc::cell(hash_xxh3_hash64(&self.await?)))
}
}

/// A file's content interpreted as a JSON value.
Expand Down
Loading