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?

rust/indexes/src/pyext.rs
13	`try!` was from GitHub README.md. Will change.
20	Will rename to `changelogi`.
41	Yes.

			Path	Packages
M			rust/indexes/src/lib.rs (3 lines)
A	M		rust/indexes/src/pyext.rs (47 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	3701		Nov 20 2017, 7:11 PM	★	★
Diff 2	3790		Nov 22 2017, 8:45 PM	★	★
Diff 3	3794		Nov 22 2017, 9:31 PM	★	★
Diff 4	3797		Nov 22 2017, 9:42 PM	★	★
Diff 5	3800		Nov 22 2017, 10:40 PM	★	★
Diff 6	4453		Dec 14 2017, 9:21 PM	★	★
Diff 7	4511	rFBHGXb62a54a440241dc0b7c81764a7500c4c9bb837db	Dec 15 2017, 2:29 PM	★	★

Status	Author	Revision
Abandoned	quark	D1517 radixbuf: make key reader function more flexible
Closed	quark	D1472 clindex: integrate Rust nodemap
Closed	quark	D1471 setup: make rust nodemap buildable
Closed	quark	D1470 nodemap: implement Python interface
Closed	quark	D1493 pybuf: add a simple abstraction around Py_buffer interface
Closed	quark	D1469 nodemap: implement nodemap in rust
Closed	quark	D1291 radixbuf: implement the main radix tree
Closed	quark	D1432 radixbuf: add read and write functions for keys
Closed	quark	D1290 radixbuf: add a base16 iterator
Closed	quark	D1289 radixbuf: initial boilerplate

Diff 3797

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())
				}
				});

This is an archive of the discontinued Mercurial Phabricator instance.

nodemap: implement Python interface
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 3797

rust/indexes/src/lib.rs

rust/indexes/src/pyext.rs

This is an archive of the discontinued Mercurial Phabricator instance.

nodemap: implement Python interfaceClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 3797

rust/indexes/src/lib.rs

rust/indexes/src/pyext.rs

nodemap: implement Python interface
ClosedPublic

Revision Contents
Changeset List