D8160: rust-nodemap: add binding to `nodemap_update_data`
Closed by commit rHG15febf99a9c6: rust-nodemap: add binding to
`nodemap_update_data` (authored by gracinet).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs
Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8160?vs=20659=20698
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8160/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8160
AFFECTED FILES
rust/hg-cpython/src/revlog.rs
CHANGE DETAILS
diff --git a/rust/hg-cpython/src/revlog.rs b/rust/hg-cpython/src/revlog.rs
--- a/rust/hg-cpython/src/revlog.rs
+++ b/rust/hg-cpython/src/revlog.rs
@@ -10,6 +10,7 @@
utils::{node_from_py_bytes, node_from_py_object},
};
use cpython::{
+buffer::{Element, PyBuffer},
exc::{IndexError, ValueError},
ObjectProtocol, PyBytes, PyClone, PyDict, PyErr, PyModule, PyObject,
PyResult, PyString, PyTuple, Python, PythonObject, ToPyObject,
@@ -36,6 +37,8 @@
data cindex: RefCell;
data nt: RefCell>;
data docket: RefCell>;
+// Holds a reference to the mmap'ed persistent nodemap data
+data mmap: RefCell>;
def __new__(_cls, cindex: PyObject) -> PyResult {
Self::new(py, cindex)
@@ -268,6 +271,14 @@
def nodemap_data_incremental() -> PyResult {
self.inner_nodemap_data_incremental(py)
}
+def update_nodemap_data(
+,
+docket: PyObject,
+nm_data: PyObject
+) -> PyResult {
+self.inner_update_nodemap_data(py, docket, nm_data)
+}
+
});
@@ -278,6 +289,7 @@
RefCell::new(cindex::Index::new(py, cindex)?),
RefCell::new(None),
RefCell::new(None),
+RefCell::new(None),
)
}
@@ -374,6 +386,56 @@
.to_py_object(py)
.into_object())
}
+
+/// Update the nodemap from the new (mmaped) data.
+/// The docket is kept as a reference for later incremental calls.
+fn inner_update_nodemap_data(
+,
+py: Python,
+docket: PyObject,
+nm_data: PyObject,
+) -> PyResult {
+let buf = PyBuffer::get(py, _data)?;
+let len = buf.item_count();
+
+// Build a slice from the mmap'ed buffer data
+let cbuf = buf.buf_ptr();
+let bytes = if std::mem::size_of::() == buf.item_size()
+&& buf.is_c_contiguous()
+&& u8::is_compatible_format(buf.format())
+{
+unsafe { std::slice::from_raw_parts(cbuf as *const u8, len) }
+} else {
+return Err(PyErr::new::(
+py,
+"Nodemap data buffer has an invalid memory representation"
+.to_string(),
+));
+};
+
+// Keep a reference to the mmap'ed buffer, otherwise we get a dangling
+// pointer.
+self.mmap(py).borrow_mut().replace(buf);
+
+let mut nt = NodeTree::load_bytes(Box::new(bytes), len);
+
+let data_tip =
+docket.getattr(py, "tip_rev")?.extract::(py)?;
+self.docket(py).borrow_mut().replace(docket.clone_ref(py));
+let idx = self.cindex(py).borrow();
+let current_tip = idx.len();
+
+for r in (data_tip + 1)..current_tip as Revision {
+let rev = r as Revision;
+// in this case node() won't ever return None
+nt.insert(&*idx, idx.node(rev).unwrap(), rev)
+.map_err(|e| nodemap_error(py, e))?
+}
+
+*self.nt(py).borrow_mut() = Some(nt);
+
+Ok(py.None())
+}
}
fn revlog_error(py: Python) -> PyErr {
To: Alphare, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D8160: rust-nodemap: add binding to `nodemap_update_data`
Alphare updated this revision to Diff 20659.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8160?vs=20379=20659
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8160/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8160
AFFECTED FILES
rust/hg-cpython/src/revlog.rs
CHANGE DETAILS
diff --git a/rust/hg-cpython/src/revlog.rs b/rust/hg-cpython/src/revlog.rs
--- a/rust/hg-cpython/src/revlog.rs
+++ b/rust/hg-cpython/src/revlog.rs
@@ -10,6 +10,7 @@
utils::{node_from_py_bytes, node_from_py_object},
};
use cpython::{
+buffer::{Element, PyBuffer},
exc::{IndexError, ValueError},
ObjectProtocol, PyBytes, PyClone, PyDict, PyErr, PyModule, PyObject,
PyResult, PyString, PyTuple, Python, PythonObject, ToPyObject,
@@ -36,6 +37,8 @@
data cindex: RefCell;
data nt: RefCell>;
data docket: RefCell>;
+// Holds a reference to the mmap'ed persistent nodemap data
+data mmap: RefCell>;
def __new__(_cls, cindex: PyObject) -> PyResult {
Self::new(py, cindex)
@@ -268,6 +271,14 @@
def nodemap_data_incremental() -> PyResult {
self.inner_nodemap_data_incremental(py)
}
+def update_nodemap_data(
+,
+docket: PyObject,
+nm_data: PyObject
+) -> PyResult {
+self.inner_update_nodemap_data(py, docket, nm_data)
+}
+
});
@@ -278,6 +289,7 @@
RefCell::new(cindex::Index::new(py, cindex)?),
RefCell::new(None),
RefCell::new(None),
+RefCell::new(None),
)
}
@@ -374,6 +386,56 @@
.to_py_object(py)
.into_object())
}
+
+/// Update the nodemap from the new (mmaped) data.
+/// The docket is kept as a reference for later incremental calls.
+fn inner_update_nodemap_data(
+,
+py: Python,
+docket: PyObject,
+nm_data: PyObject,
+) -> PyResult {
+let buf = PyBuffer::get(py, _data)?;
+let len = buf.item_count();
+
+// Build a slice from the mmap'ed buffer data
+let cbuf = buf.buf_ptr();
+let bytes = if std::mem::size_of::() == buf.item_size()
+&& buf.is_c_contiguous()
+&& u8::is_compatible_format(buf.format())
+{
+unsafe { std::slice::from_raw_parts(cbuf as *const u8, len) }
+} else {
+return Err(PyErr::new::(
+py,
+"Nodemap data buffer has an invalid memory representation"
+.to_string(),
+));
+};
+
+// Keep a reference to the mmap'ed buffer, otherwise we get a dangling
+// pointer.
+self.mmap(py).borrow_mut().replace(buf);
+
+let mut nt = NodeTree::load_bytes(Box::new(bytes), len);
+
+let data_tip =
+docket.getattr(py, "tip_rev")?.extract::(py)?;
+self.docket(py).borrow_mut().replace(docket.clone_ref(py));
+let idx = self.cindex(py).borrow();
+let current_tip = idx.len();
+
+for r in (data_tip + 1)..current_tip as Revision {
+let rev = r as Revision;
+// in this case node() won't ever return None
+nt.insert(&*idx, idx.node(rev).unwrap(), rev)
+.map_err(|e| nodemap_error(py, e))?
+}
+
+*self.nt(py).borrow_mut() = Some(nt);
+
+Ok(py.None())
+}
}
fn revlog_error(py: Python) -> PyErr {
To: Alphare, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D8160: rust-nodemap: add binding to `nodemap_update_data`
marmoute updated this revision to Diff 20379.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D8160?vs=20335=20379
BRANCH
default
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D8160/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D8160
AFFECTED FILES
rust/hg-cpython/src/revlog.rs
CHANGE DETAILS
diff --git a/rust/hg-cpython/src/revlog.rs b/rust/hg-cpython/src/revlog.rs
--- a/rust/hg-cpython/src/revlog.rs
+++ b/rust/hg-cpython/src/revlog.rs
@@ -10,6 +10,7 @@
utils::{node_from_py_bytes, node_from_py_object},
};
use cpython::{
+buffer::{Element, PyBuffer},
exc::{IndexError, ValueError},
ObjectProtocol, PyBytes, PyClone, PyDict, PyErr, PyModule, PyObject,
PyResult, PyString, PyTuple, Python, PythonObject, ToPyObject,
@@ -36,6 +37,8 @@
data cindex: RefCell;
data nt: RefCell>;
data docket: RefCell>;
+// Holds a reference to the mmap'ed persistent nodemap data
+data mmap: RefCell>;
def __new__(_cls, cindex: PyObject) -> PyResult {
Self::new(py, cindex)
@@ -268,6 +271,10 @@
def nodemap_data_incremental() -> PyResult {
self.inner_nodemap_data_incremental(py)
}
+def update_nodemap_data(, docket: PyObject, nm_data: PyObject) ->
PyResult {
+self.inner_update_nodemap_data(py, docket, nm_data)
+}
+
});
@@ -278,6 +285,7 @@
RefCell::new(cindex::Index::new(py, cindex)?),
RefCell::new(None),
RefCell::new(None),
+RefCell::new(None),
)
}
@@ -374,6 +382,56 @@
.to_py_object(py)
.into_object())
}
+
+/// Update the nodemap from the new (mmaped) data.
+/// The docket is kept as a reference for later incremental calls.
+fn inner_update_nodemap_data(
+,
+py: Python,
+docket: PyObject,
+nm_data: PyObject,
+) -> PyResult {
+let buf = PyBuffer::get(py, _data)?;
+let len = buf.item_count();
+
+// Build a slice from the mmap'ed buffer data
+let cbuf = buf.buf_ptr();
+let bytes = if std::mem::size_of::() == buf.item_size()
+&& buf.is_c_contiguous()
+&& u8::is_compatible_format(buf.format())
+{
+unsafe { std::slice::from_raw_parts(cbuf as *const u8, len) }
+} else {
+return Err(PyErr::new::(
+py,
+"Nodemap data buffer has an invalid memory representation"
+.to_string(),
+));
+};
+
+// Keep a reference to the mmap'ed buffer, otherwise we get a dangling
+// pointer.
+self.mmap(py).borrow_mut().replace(buf);
+
+let mut nt = NodeTree::load_bytes(Box::new(bytes), len);
+
+let data_tip =
+docket.getattr(py, "tip_rev")?.extract::(py)?;
+self.docket(py).borrow_mut().replace(docket.clone_ref(py));
+let idx = self.cindex(py).borrow();
+let current_tip = idx.len();
+
+for r in (data_tip + 1)..current_tip as Revision {
+let rev = r as Revision;
+// in this case node() won't ever return None
+nt.insert(&*idx, idx.node(rev).unwrap(), rev)
+.map_err(|e| nodemap_error(py, e))?
+}
+
+*self.nt(py).borrow_mut() = Some(nt);
+
+Ok(py.None())
+}
}
fn revlog_error(py: Python) -> PyErr {
To: Alphare, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
D8160: rust-nodemap: add binding to `nodemap_update_data`
Alphare created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8160
AFFECTED FILES
rust/hg-cpython/src/revlog.rs
CHANGE DETAILS
diff --git a/rust/hg-cpython/src/revlog.rs b/rust/hg-cpython/src/revlog.rs
--- a/rust/hg-cpython/src/revlog.rs
+++ b/rust/hg-cpython/src/revlog.rs
@@ -10,6 +10,7 @@
utils::{node_from_py_bytes, node_from_py_object},
};
use cpython::{
+buffer::{Element, PyBuffer},
exc::{IndexError, ValueError},
ObjectProtocol, PyBytes, PyClone, PyDict, PyErr, PyModule, PyObject,
PyResult, PyString, PyTuple, Python, PythonObject, ToPyObject,
@@ -36,6 +37,8 @@
data cindex: RefCell;
data nt: RefCell>;
data docket: RefCell>;
+// Holds a reference to the mmap'ed persistent nodemap data
+data mmap: RefCell>;
def __new__(_cls, cindex: PyObject) -> PyResult {
Self::new(py, cindex)
@@ -259,6 +262,10 @@
def nodemap_data_incremental() -> PyResult {
self.inner_nodemap_data_incremental(py)
}
+def update_nodemap_data(, docket: PyObject, nm_data: PyObject) ->
PyResult {
+self.inner_update_nodemap_data(py, docket, nm_data)
+}
+
});
@@ -269,6 +276,7 @@
RefCell::new(cindex::Index::new(py, cindex)?),
RefCell::new(None),
RefCell::new(None),
+RefCell::new(None),
)
}
@@ -365,6 +373,56 @@
.to_py_object(py)
.into_object())
}
+
+/// Update the nodemap from the new (mmaped) data.
+/// The docket is kept as a reference for later incremental calls.
+fn inner_update_nodemap_data(
+,
+py: Python,
+docket: PyObject,
+nm_data: PyObject,
+) -> PyResult {
+let buf = PyBuffer::get(py, _data)?;
+let len = buf.item_count();
+
+// Build a slice from the mmap'ed buffer data
+let cbuf = buf.buf_ptr();
+let bytes = if std::mem::size_of::() == buf.item_size()
+&& buf.is_c_contiguous()
+&& u8::is_compatible_format(buf.format())
+{
+unsafe { std::slice::from_raw_parts(cbuf as *const u8, len) }
+} else {
+return Err(PyErr::new::(
+py,
+"Nodemap data buffer has an invalid memory representation"
+.to_string(),
+));
+};
+
+// Keep a reference to the mmap'ed buffer, otherwise we get a dangling
+// pointer.
+self.mmap(py).borrow_mut().replace(buf);
+
+let mut nt = NodeTree::load_bytes(Box::new(bytes), len);
+
+let data_tip =
+docket.getattr(py, "tip_rev")?.extract::(py)?;
+self.docket(py).borrow_mut().replace(docket.clone_ref(py));
+let idx = self.cindex(py).borrow();
+let current_tip = idx.len();
+
+for r in (data_tip + 1)..current_tip as Revision {
+let rev = r as Revision;
+// in this case node() won't ever return None
+nt.insert(&*idx, idx.node(rev).unwrap(), rev)
+.map_err(|e| nodemap_error(py, e))?
+}
+
+*self.nt(py).borrow_mut() = Some(nt);
+
+Ok(py.None())
+}
}
fn revlog_error(py: Python) -> PyErr {
To: Alphare, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
