fluidB
/
fluidb
1
0
Fork 0
Code Pull Requests Activity

change mutability for scan operations

Browse Source
main
Ziyang Hu 2 years ago
parent 79808a4513
commit a857cb11cc
5 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File

6
cozorocks/bridge/tx.h
Unescape Escape View File

@ -57,7 +57,7 @@ struct TxBridge {
r_opts->fill_cache = val; r_opts->fill_cache = val;
} }
inline unique_ptr<IterBridge> iterator() { inline unique_ptr<IterBridge> iterator() const {
return make_unique<IterBridge>(&*tx); return make_unique<IterBridge>(&*tx);
}; };
@ -87,7 +87,7 @@ struct TxBridge {
void start(); void start();
inline unique_ptr<PinnableSlice> get(RustBytes key, bool for_update, RocksDbStatus &status) { inline unique_ptr<PinnableSlice> get(RustBytes key, bool for_update, RocksDbStatus &status) const {
Slice key_ = convert_slice(key); Slice key_ = convert_slice(key);
auto ret = make_unique<PinnableSlice>(); auto ret = make_unique<PinnableSlice>();
if (for_update) { if (for_update) {
@ -100,7 +100,7 @@ struct TxBridge {
return ret; return ret;
} }
inline void exists(RustBytes key, bool for_update, RocksDbStatus &status) { inline void exists(RustBytes key, bool for_update, RocksDbStatus &status) const {
Slice key_ = convert_slice(key); Slice key_ = convert_slice(key);
auto ret = PinnableSlice(); auto ret = PinnableSlice();
if (for_update) { if (for_update) {

11
cozorocks/src/bridge/mod.rs
Unescape Escape View File

@ -126,17 +126,12 @@ pub(crate) mod ffi {
fn set_snapshot(self: Pin<&mut TxBridge>, val: bool); fn set_snapshot(self: Pin<&mut TxBridge>, val: bool);
fn clear_snapshot(self: Pin<&mut TxBridge>); fn clear_snapshot(self: Pin<&mut TxBridge>);
fn get( fn get(
self: Pin<&mut TxBridge>, self: &TxBridge,
key: &[u8], key: &[u8],
for_update: bool, for_update: bool,
status: &mut RocksDbStatus, status: &mut RocksDbStatus,
) -> UniquePtr<PinnableSlice>; ) -> UniquePtr<PinnableSlice>;
fn exists( fn exists(self: &TxBridge, key: &[u8], for_update: bool, status: &mut RocksDbStatus);
self: Pin<&mut TxBridge>,
key: &[u8],
for_update: bool,
status: &mut RocksDbStatus,
);
fn put(self: Pin<&mut TxBridge>, key: &[u8], val: &[u8], status: &mut RocksDbStatus); fn put(self: Pin<&mut TxBridge>, key: &[u8], val: &[u8], status: &mut RocksDbStatus);
fn del(self: Pin<&mut TxBridge>, key: &[u8], status: &mut RocksDbStatus); fn del(self: Pin<&mut TxBridge>, key: &[u8], status: &mut RocksDbStatus);
fn commit(self: Pin<&mut TxBridge>, status: &mut RocksDbStatus); fn commit(self: Pin<&mut TxBridge>, status: &mut RocksDbStatus);
@ -144,7 +139,7 @@ pub(crate) mod ffi {
fn rollback_to_savepoint(self: Pin<&mut TxBridge>, status: &mut RocksDbStatus); fn rollback_to_savepoint(self: Pin<&mut TxBridge>, status: &mut RocksDbStatus);
fn pop_savepoint(self: Pin<&mut TxBridge>, status: &mut RocksDbStatus); fn pop_savepoint(self: Pin<&mut TxBridge>, status: &mut RocksDbStatus);
fn set_savepoint(self: Pin<&mut TxBridge>); fn set_savepoint(self: Pin<&mut TxBridge>);
fn iterator(self: Pin<&mut TxBridge>) -> UniquePtr<IterBridge>; fn iterator(self: &TxBridge) -> UniquePtr<IterBridge>;
type IterBridge; type IterBridge;
fn start(self: Pin<&mut IterBridge>); fn start(self: Pin<&mut IterBridge>);

20
cozorocks/src/bridge/tx.rs
Unescape Escape View File

@ -1,9 +1,11 @@
use crate::bridge::ffi::*;
use crate::bridge::iter::IterBuilder;
use cxx::*;
use std::fmt::{Debug, Formatter}; use std::fmt::{Debug, Formatter};
use std::ops::Deref; use std::ops::Deref;
use cxx::*;
use crate::bridge::ffi::*;
use crate::bridge::iter::IterBuilder;
pub struct TxBuilder { pub struct TxBuilder {
pub(crate) inner: UniquePtr<TxBridge>, pub(crate) inner: UniquePtr<TxBridge>,
} }
@ -102,9 +104,9 @@ impl Tx {
} }
} }
#[inline] #[inline]
pub fn get(&mut self, key: &[u8], for_update: bool) -> Result<Option<PinSlice>, RocksDbStatus> { pub fn get(&self, key: &[u8], for_update: bool) -> Result<Option<PinSlice>, RocksDbStatus> {
let mut status = RocksDbStatus::default(); let mut status = RocksDbStatus::default();
let ret = self.inner.pin_mut().get(key, for_update, &mut status); let ret = self.inner.get(key, for_update, &mut status);
match status.code { match status.code {
StatusCode::kOk => Ok(Some(PinSlice { inner: ret })), StatusCode::kOk => Ok(Some(PinSlice { inner: ret })),
StatusCode::kNotFound => Ok(None), StatusCode::kNotFound => Ok(None),
@ -112,9 +114,9 @@ impl Tx {
} }
} }
#[inline] #[inline]
pub fn exists(&mut self, key: &[u8], for_update: bool) -> Result<bool, RocksDbStatus> { pub fn exists(&self, key: &[u8], for_update: bool) -> Result<bool, RocksDbStatus> {
let mut status = RocksDbStatus::default(); let mut status = RocksDbStatus::default();
self.inner.pin_mut().exists(key, for_update, &mut status); self.inner.exists(key, for_update, &mut status);
match status.code { match status.code {
StatusCode::kOk => Ok(true), StatusCode::kOk => Ok(true),
StatusCode::kNotFound => Ok(false), StatusCode::kNotFound => Ok(false),
@ -166,9 +168,9 @@ impl Tx {
} }
} }
#[inline] #[inline]
pub fn iterator(&mut self) -> IterBuilder { pub fn iterator(&self) -> IterBuilder {
IterBuilder { IterBuilder {
inner: self.inner.pin_mut().iterator(), inner: self.inner.iterator(),
} }
.auto_prefix_mode(true) .auto_prefix_mode(true)
} }

2
src/transact/query.rs
Unescape Escape View File

@ -1,6 +1,5 @@
use std::collections::BTreeMap; use std::collections::BTreeMap;
use anyhow::Result;
use itertools::Itertools; use itertools::Itertools;
use crate::data::attr::Attribute; use crate::data::attr::Attribute;
@ -124,6 +123,7 @@ impl TripleRelation {
} }
fn cartesian_join<'a>(&'a self, left_iter: TupleIter<'a>) -> TupleIter<'a> { fn cartesian_join<'a>(&'a self, left_iter: TupleIter<'a>) -> TupleIter<'a> {
// [f, f] not really a join // [f, f] not really a join
left_iter.map_ok(|tuple| {});
todo!() todo!()
} }
fn ev_join<'a>( fn ev_join<'a>(

36
src/transact/triple.rs
Unescape Escape View File

@ -424,7 +424,7 @@ impl SessionTx {
) )
} }
pub(crate) fn restore_bottom_value( pub(crate) fn restore_bottom_value(
&mut self, &self,
eid: EntityId, eid: EntityId,
aid: AttrId, aid: AttrId,
vld: Validity, vld: Validity,
@ -437,7 +437,7 @@ impl SessionTx {
decode_value(&res.as_ref()[1..]) decode_value(&res.as_ref()[1..])
} }
pub(crate) fn triple_ea_scan( pub(crate) fn triple_ea_scan(
&mut self, &self,
eid: EntityId, eid: EntityId,
aid: AttrId, aid: AttrId,
) -> impl Iterator<Item = Result<(EntityId, AttrId, DataValue, Validity, StoreOp)>> { ) -> impl Iterator<Item = Result<(EntityId, AttrId, DataValue, Validity, StoreOp)>> {
@ -446,7 +446,7 @@ impl SessionTx {
TripleEntityAttrIter::new(self.tx.iterator(), lower, upper) TripleEntityAttrIter::new(self.tx.iterator(), lower, upper)
} }
pub(crate) fn triple_ea_before_scan( pub(crate) fn triple_ea_before_scan(
&mut self, &self,
eid: EntityId, eid: EntityId,
aid: AttrId, aid: AttrId,
before: Validity, before: Validity,
@ -456,7 +456,7 @@ impl SessionTx {
TripleEntityAttrBeforeIter::new(self.tx.iterator(), lower, upper, before) TripleEntityAttrBeforeIter::new(self.tx.iterator(), lower, upper, before)
} }
pub(crate) fn triple_ae_scan( pub(crate) fn triple_ae_scan(
&mut self, &self,
aid: AttrId, aid: AttrId,
eid: EntityId, eid: EntityId,
) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue, Validity, StoreOp)>> { ) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue, Validity, StoreOp)>> {
@ -465,7 +465,7 @@ impl SessionTx {
TripleAttrEntityIter::new(self.tx.iterator(), lower, upper) TripleAttrEntityIter::new(self.tx.iterator(), lower, upper)
} }
pub(crate) fn triple_ae_before_scan( pub(crate) fn triple_ae_before_scan(
&mut self, &self,
aid: AttrId, aid: AttrId,
eid: EntityId, eid: EntityId,
before: Validity, before: Validity,
@ -475,7 +475,7 @@ impl SessionTx {
TripleAttrEntityBeforeIter::new(self.tx.iterator(), lower, upper, before) TripleAttrEntityBeforeIter::new(self.tx.iterator(), lower, upper, before)
} }
pub(crate) fn triple_av_scan( pub(crate) fn triple_av_scan(
&mut self, &self,
aid: AttrId, aid: AttrId,
v: &DataValue, v: &DataValue,
) -> impl Iterator<Item = Result<(AttrId, DataValue, EntityId, Validity, StoreOp)>> { ) -> impl Iterator<Item = Result<(AttrId, DataValue, EntityId, Validity, StoreOp)>> {
@ -484,7 +484,7 @@ impl SessionTx {
TripleAttrValueIter::new(self.tx.iterator(), lower, upper) TripleAttrValueIter::new(self.tx.iterator(), lower, upper)
} }
pub(crate) fn triple_av_before_scan( pub(crate) fn triple_av_before_scan(
&mut self, &self,
aid: AttrId, aid: AttrId,
v: &DataValue, v: &DataValue,
before: Validity, before: Validity,
@ -494,7 +494,7 @@ impl SessionTx {
TripleAttrValueBeforeIter::new(self.tx.iterator(), lower, upper, before) TripleAttrValueBeforeIter::new(self.tx.iterator(), lower, upper, before)
} }
pub(crate) fn triple_av_after_scan( pub(crate) fn triple_av_after_scan(
&mut self, &self,
aid: AttrId, aid: AttrId,
v: &DataValue, v: &DataValue,
after: Validity, after: Validity,
@ -504,7 +504,7 @@ impl SessionTx {
TripleAttrValueAfterIter::new(self.tx.iterator(), lower, upper, after) TripleAttrValueAfterIter::new(self.tx.iterator(), lower, upper, after)
} }
pub(crate) fn triple_vref_a_scan( pub(crate) fn triple_vref_a_scan(
&mut self, &self,
v_eid: EntityId, v_eid: EntityId,
aid: AttrId, aid: AttrId,
) -> impl Iterator<Item = Result<(EntityId, AttrId, EntityId, Validity, StoreOp)>> { ) -> impl Iterator<Item = Result<(EntityId, AttrId, EntityId, Validity, StoreOp)>> {
@ -513,7 +513,7 @@ impl SessionTx {
TripleValueRefAttrIter::new(self.tx.iterator(), lower, upper) TripleValueRefAttrIter::new(self.tx.iterator(), lower, upper)
} }
pub(crate) fn triple_vref_a_before_scan( pub(crate) fn triple_vref_a_before_scan(
&mut self, &self,
v_eid: EntityId, v_eid: EntityId,
aid: AttrId, aid: AttrId,
before: Validity, before: Validity,
@ -523,7 +523,7 @@ impl SessionTx {
TripleValueRefAttrBeforeIter::new(self.tx.iterator(), lower, upper, before) TripleValueRefAttrBeforeIter::new(self.tx.iterator(), lower, upper, before)
} }
pub(crate) fn triple_e_scan( pub(crate) fn triple_e_scan(
&mut self, &self,
eid: EntityId, eid: EntityId,
) -> impl Iterator<Item = Result<(EntityId, AttrId, DataValue, Validity, StoreOp)>> { ) -> impl Iterator<Item = Result<(EntityId, AttrId, DataValue, Validity, StoreOp)>> {
let lower = encode_eav_key(eid, AttrId::MIN_PERM, &DataValue::Null, Validity::MAX); let lower = encode_eav_key(eid, AttrId::MIN_PERM, &DataValue::Null, Validity::MAX);
@ -531,7 +531,7 @@ impl SessionTx {
TripleEntityAttrIter::new(self.tx.iterator(), lower, upper) TripleEntityAttrIter::new(self.tx.iterator(), lower, upper)
} }
pub(crate) fn triple_e_before_scan( pub(crate) fn triple_e_before_scan(
&mut self, &self,
eid: EntityId, eid: EntityId,
before: Validity, before: Validity,
) -> impl Iterator<Item = Result<(EntityId, AttrId, DataValue)>> { ) -> impl Iterator<Item = Result<(EntityId, AttrId, DataValue)>> {
@ -540,7 +540,7 @@ impl SessionTx {
TripleEntityAttrBeforeIter::new(self.tx.iterator(), lower, upper, before) TripleEntityAttrBeforeIter::new(self.tx.iterator(), lower, upper, before)
} }
pub(crate) fn triple_a_scan( pub(crate) fn triple_a_scan(
&mut self, &self,
aid: AttrId, aid: AttrId,
) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue, Validity, StoreOp)>> { ) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue, Validity, StoreOp)>> {
let lower = encode_aev_key(aid, EntityId::MIN_PERM, &DataValue::Null, Validity::MAX); let lower = encode_aev_key(aid, EntityId::MIN_PERM, &DataValue::Null, Validity::MAX);
@ -548,7 +548,7 @@ impl SessionTx {
TripleAttrEntityIter::new(self.tx.iterator(), lower, upper) TripleAttrEntityIter::new(self.tx.iterator(), lower, upper)
} }
pub(crate) fn triple_a_before_scan( pub(crate) fn triple_a_before_scan(
&mut self, &self,
aid: AttrId, aid: AttrId,
before: Validity, before: Validity,
) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue)>> { ) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue)>> {
@ -557,7 +557,7 @@ impl SessionTx {
TripleAttrEntityBeforeIter::new(self.tx.iterator(), lower, upper, before) TripleAttrEntityBeforeIter::new(self.tx.iterator(), lower, upper, before)
} }
pub(crate) fn triple_a_scan_all( pub(crate) fn triple_a_scan_all(
&mut self, &self,
) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue, Validity, StoreOp)>> { ) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue, Validity, StoreOp)>> {
let lower = encode_aev_key( let lower = encode_aev_key(
AttrId::MIN_PERM, AttrId::MIN_PERM,
@ -574,7 +574,7 @@ impl SessionTx {
TripleAttrEntityIter::new(self.tx.iterator(), lower, upper) TripleAttrEntityIter::new(self.tx.iterator(), lower, upper)
} }
pub(crate) fn triple_a_before_scan_all( pub(crate) fn triple_a_before_scan_all(
&mut self, &self,
before: Validity, before: Validity,
) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue)>> { ) -> impl Iterator<Item = Result<(AttrId, EntityId, DataValue)>> {
let lower = encode_aev_key( let lower = encode_aev_key(
@ -592,7 +592,7 @@ impl SessionTx {
TripleAttrEntityBeforeIter::new(self.tx.iterator(), lower, upper, before) TripleAttrEntityBeforeIter::new(self.tx.iterator(), lower, upper, before)
} }
pub(crate) fn triple_vref_scan( pub(crate) fn triple_vref_scan(
&mut self, &self,
v_eid: EntityId, v_eid: EntityId,
) -> impl Iterator<Item = Result<(EntityId, AttrId, EntityId, Validity, StoreOp)>> { ) -> impl Iterator<Item = Result<(EntityId, AttrId, EntityId, Validity, StoreOp)>> {
let lower = encode_vae_key(v_eid, AttrId::MIN_PERM, EntityId::MIN_PERM, Validity::MAX); let lower = encode_vae_key(v_eid, AttrId::MIN_PERM, EntityId::MIN_PERM, Validity::MAX);
@ -600,7 +600,7 @@ impl SessionTx {
TripleValueRefAttrIter::new(self.tx.iterator(), lower, upper) TripleValueRefAttrIter::new(self.tx.iterator(), lower, upper)
} }
pub(crate) fn triple_vref_before_scan( pub(crate) fn triple_vref_before_scan(
&mut self, &self,
v_eid: EntityId, v_eid: EntityId,
before: Validity, before: Validity,
) -> impl Iterator<Item = Result<(EntityId, AttrId, EntityId)>> { ) -> impl Iterator<Item = Result<(EntityId, AttrId, EntityId)>> {

Write Preview
Loading…
Cancel
Save