This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1470

nodemap: implement Python interface
ClosedPublic

Authored by quark on Nov 20 2017, 7:11 PM.
Tags
None
Subscribers
durham

Details

Reviewers
durham
Group Reviewers
Restricted Project
Commits
rFBHGXb62a54a44024: nodemap: implement Python interface
Summary

This patch exposes the nodemap APIs in a CPython importable library.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

quark created this revision.Nov 20 2017, 7:11 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 20 2017, 7:11 PM
quark updated this revision to Diff 3790.Nov 22 2017, 8:45 PM
quark edited the summary of this revision. (Show Details)Nov 22 2017, 9:31 PM
quark updated this revision to Diff 3794.
quark updated this revision to Diff 3797.Nov 22 2017, 9:42 PM
quark updated this revision to Diff 3800.Nov 22 2017, 10:40 PM
durham accepted this revision.Dec 1 2017, 7:49 PM
durham added a subscriber: durham.
durham added inline comments.
rust/indexes/src/pyext.rs
13

We can't use ? here instead of try?

20

This isn't the actual changelog python object right? This is a byte array of the .i data? Maybe we should rename it to make that clear, since we might introduce an actual changelog concept in the future.

41

Is the unsafe just needed to convert the u32 to a u8 quickly?

This revision is now accepted and ready to land.Dec 1 2017, 7:49 PM
quark added inline comments.Dec 1 2017, 9:10 PM
rust/indexes/src/pyext.rs
13

try! was from GitHub README.md. Will change.

20

Will rename to changelogi.

41

Yes.

quark updated this revision to Diff 4453.Dec 14 2017, 9:21 PM
Closed by commit rFBHGXb62a54a44024: nodemap: implement Python interface (authored by quark). · Explain WhyDec 15 2017, 2:35 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 4511

rust/indexes/src/errors.rs

// Copyright 2017 Facebook, Inc. // Copyright 2017 Facebook, Inc.
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use cpython::{Python, PyErr};
use cpython::exc::RuntimeError;
error_chain! { error_chain! {
foreign_links { foreign_links {
Radix(::radixbuf::errors::Error); Radix(::radixbuf::errors::Error);
} }
errors { errors {
IndexCorrupted { IndexCorrupted {
description("corrupted index") description("corrupted index")
} }
} }
} }
/// Convert `Error` to Python `RuntimeError`s
impl From<Error> for PyErr {
fn from(e: Error) -> PyErr {
let gil = Python::acquire_gil();
let py = gil.python();
PyErr::new::<RuntimeError, _>(py, format!("{}", e))
}
}

rust/indexes/src/lib.rs

// Copyright 2017 Facebook, Inc. // Copyright 2017 Facebook, Inc.
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
extern crate python27_sys; extern crate python27_sys;
#[macro_use] #[macro_use]
extern crate cpython; extern crate cpython;
#[macro_use] #[macro_use]
extern crate error_chain; extern crate error_chain;
extern crate radixbuf; extern crate radixbuf;
pub mod errors; pub mod errors;
pub mod nodemap; pub mod nodemap;
mod pybuf; mod pybuf;
#[allow(non_camel_case_types)]
pub mod pyext;

rust/indexes/src/pyext.rs

  • This file was added.
// Copyright 2017 Facebook, Inc.
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
use cpython::{PyResult, PyBytes, PyObject};
use nodemap::NodeRevMap;
use pybuf::SimplePyBuf;
use std::slice;
py_module_initializer!(indexes, initindexes, PyInit_indexes, |py, m| {
try!(m.add_class::<nodemap>(py));
Ok(())
durhamUnsubmitted
Not Done

We can't use ? here instead of try?

durham: We can't use `?` here instead of `try`?
quarkAuthorUnsubmitted
Not Done

try! was from GitHub README.md. Will change.

quark: `try!` was from GitHub README.md. Will change.
});
py_class!(class nodemap |py| {
data nodemap: NodeRevMap<SimplePyBuf<u8>, SimplePyBuf<u32>>;
def __new__(_cls, changelog: &PyObject, index: &PyObject) -> PyResult<nodemap> {
let changelog_buf = SimplePyBuf::new(py, changelog);
durhamUnsubmitted
Not Done

This isn't the actual changelog python object right? This is a byte array of the .i data? Maybe we should rename it to make that clear, since we might introduce an actual changelog concept in the future.

durham: This isn't the actual changelog python object right? This is a byte array of the .i data?
quarkAuthorUnsubmitted
Not Done

Will rename to changelogi.

quark: Will rename to `changelogi`.
let index_buf = SimplePyBuf::new(py, index);
let nm = NodeRevMap::new(changelog_buf, index_buf)?;
nodemap::create_instance(py, nm)
}
def __getitem__(&self, key: PyBytes) -> PyResult<Option<u32>> {
Ok(self.nodemap(py).node_to_rev(key.data(py))?)
}
def __contains__(&self, key: PyBytes) -> PyResult<bool> {
Ok(self.nodemap(py).node_to_rev(key.data(py))?.is_some())
}
def partialmatch(&self, hex: PyBytes) -> PyResult<Option<PyBytes>> {
Ok(self.nodemap(py).hex_prefix_to_node(hex.data(py))?.map(|b| PyBytes::new(py, b)))
}
def build(&self) -> PyResult<PyBytes> {
let buf = self.nodemap(py).build_incrementally()?;
let slice = unsafe { slice::from_raw_parts(buf.as_ptr() as *const u8, buf.len() * 4) };
Ok(PyBytes::new(py, slice))
durhamUnsubmitted
Not Done

Is the unsafe just needed to convert the u32 to a u8 quickly?

durham: Is the unsafe just needed to convert the u32 to a u8 quickly?
quarkAuthorUnsubmitted
Not Done

Yes.

quark: Yes.
}
def lag(&self) -> PyResult<u32> {
Ok(self.nodemap(py).lag())
}
@staticmethod
def emptyindexbuffer() -> PyResult<PyBytes> {
let buf = NodeRevMap::<Vec<u8>, Vec<u32>>::empty_index_buffer();
let slice = unsafe { slice::from_raw_parts(buf.as_ptr() as *const u8, buf.len() * 4) };
Ok(PyBytes::new(py, slice))
}
});