facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity

revisionstore: use Bytes instead of Rc<Box<[u8]>> in loosefiles module

Browse Source 
Summary: Use `Bytes` instead of `Rc<Box<[u8]>>` since the former is a nicer type to represent a reference counted heap allocated byte buffer. (Note that `Rc<Box<[u8]>>` should have originally been `Rc<[u8]>` -- the former introduces an unnecessary allocation and layer of indirection.)

Differential Revision: D13769306

fbshipit-source-id: 5f3e788426e28c7e9ccc478f993c717b23663f56
This commit is contained in:
Arun Kulshreshtha 2019-01-22 14:00:20 -08:00 committed by Facebook Github Bot
parent d3839ffb07
commit a642954e27
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/revisionstore/src/loosefile.rs
View File

@ -3,11 +3,12 @@
// hg/hgext/remotefilelog/remotefilelog.py:_createfileblob()
// into the size of text, text and ancestors information.
use bytes::Bytes;
use failure::{Fail, Fallible};
use types::node::Node;
use std::{fs::File, io::prelude::*, rc::Rc};
use std::{fs::File, io::prelude::*};
use crate::error::KeyError;
use crate::historystore::{Ancestors, NodeInfo};
@ -25,7 +26,7 @@ impl From<LooseFileError> for KeyError {
pub struct LooseFile {
pub size: usize,
pub text: Rc<Box<[u8]>>,
pub text: Bytes,
pub ancestors: Ancestors,
}
@ -52,7 +53,7 @@ fn atoi(content: &[u8]) -> Fallible<(usize, usize)> {
}
impl LooseFile {
pub fn new(size: usize, text: Rc<Box<[u8]>>, ancestors: Ancestors) -> Self {
pub fn new(size: usize, text: Bytes, ancestors: Ancestors) -> Self {
LooseFile {
size,
text,
@ -60,10 +61,11 @@ impl LooseFile {
}
}
pub fn from_content(content: &Vec<u8>) -> Fallible<Self> {
let (textsize, size) = atoi(&content)?;
pub fn from_content(content: impl AsRef<[u8]>) -> Fallible<Self> {
let content = content.as_ref();
let (textsize, size) = atoi(content)?;
let mut start = size + 1;
let text = content[start..start + textsize].to_vec();
let text = content[start..start + textsize].into();
start += textsize;
let mut ancestors: Ancestors = Ancestors::new();
while start + 80 < content.len() {
@ -83,11 +85,7 @@ impl LooseFile {
}
start += 1;
}
Ok(LooseFile::new(
textsize,
Rc::new(text.into_boxed_slice()),
ancestors,
))
Ok(LooseFile::new(textsize, text, ancestors))
}
pub fn from_file(spath: &str) -> Fallible<Self> {