mirrors/loro
1
0
Fork 0
mirror of https://github.com/loro-dev/loro.git synced 2025-02-06 04:19:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

feat: use columnar iterable

Browse source
This commit is contained in:
leeeon233 2023-09-08 08:21:46 +08:00
parent 5b0f3e3f50
commit a1c3eea4f1
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/loro-internal/src/encoding/encode_changes.rs
View file

@ -3,7 +3,7 @@ use std::{collections::VecDeque, ops::Range, sync::Arc};
use fxhash::FxHashMap;
use itertools::Itertools;
use rle::{HasLength, RleVec};
use serde_columnar::{columnar, from_bytes, iterable::*, to_vec};
use serde_columnar::{columnar, iter_from_bytes, iterable::*, to_vec};
use crate::{
change::{Change, Lamport, Timestamp},
@ -232,10 +232,10 @@ pub(super) fn decode_changes_to_inner_format_oplog(
input: &[u8],
store: &OpLog,
) -> Result<RemoteClientChanges<'static>, LoroError> {
let encoded: DocEncoding =
from_bytes(input).map_err(|e| LoroError::DecodeError(e.to_string().into()))?;
let encoded = iter_from_bytes::<DocEncoding>(input)
.map_err(|e| LoroError::DecodeError(e.to_string().into()))?;
let DocEncoding {
let TableIterDocEncoding {
changes: change_encodings,
ops,
deps,
@ -245,13 +245,11 @@ pub(super) fn decode_changes_to_inner_format_oplog(
start_counter,
} = encoded;
let mut op_iter = ops.into_iter();
let mut op_iter = ops;
let mut changes = FxHashMap::default();
let mut deps_iter = deps.into_iter();
let mut deps_iter = deps;
for (client_idx, this_change_encodings) in
&change_encodings.into_iter().group_by(|c| c.client_idx)
{
for (client_idx, this_change_encodings) in &change_encodings.group_by(|c| c.client_idx) {
let mut counter = start_counter[client_idx as usize];
for change_encoding in this_change_encodings {
let ChangeEncoding {

15
crates/loro-internal/src/encoding/encode_enhanced.rs
View file

@ -1,7 +1,7 @@
use fxhash::{FxHashMap, FxHashSet};
use loro_common::{HasCounterSpan, HasLamportSpan};
use rle::{HasLength, RleVec};
use serde_columnar::{columnar, from_bytes, iterable::*, to_vec};
use serde_columnar::{columnar, iter_from_bytes, iterable::*, to_vec};
use std::{borrow::Cow, cmp::Ordering, ops::Deref, sync::Arc};
use zerovec::{vecs::Index32, VarZeroVec};
@ -100,15 +100,14 @@ impl DepsEncoding {
#[columnar(ser, de)]
struct DocEncoding<'a> {
#[columnar(class = "vec")]
#[columnar(class = "vec", iter = "ChangeEncoding")]
changes: Vec<ChangeEncoding>,
#[columnar(class = "vec")]
#[columnar(class = "vec", iter = "OpEncoding")]
ops: Vec<OpEncoding>,
#[columnar(class = "vec")]
#[columnar(class = "vec", iter = "DepsEncoding")]
deps: Vec<DepsEncoding>,
#[columnar(class = "vec")]
normal_containers: Vec<NormalContainer>,
#[columnar(borrow)]
str: Cow<'a, str>,
// #[columnar(borrow)]
@ -345,10 +344,10 @@ fn extract_containers(
}
pub fn decode_oplog_v2(oplog: &mut OpLog, input: &[u8]) -> Result<(), LoroError> {
let encoded: DocEncoding =
from_bytes(input).map_err(|e| LoroError::DecodeError(e.to_string().into()))?;
let encoded = iter_from_bytes::<DocEncoding>(input)
.map_err(|e| LoroError::DecodeError(e.to_string().into()))?;
let DocEncoding {
let TableIterDocEncoding {
changes: change_encodings,
ops,
deps,