Skip to content

Commit 1d5bf05

Browse files
authored
refactor: extract utils to a separate crate (#1276)
1 parent aa338b0 commit 1d5bf05

33 files changed

+282
-181
lines changed

Cargo.lock

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = ["rust/cocoindex"]
2+
members = ["rust/cocoindex", "rust/utils"]
33
resolver = "2"
44

55
[workspace.package]

rust/cocoindex/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ default = ["legacy-states-v0"]
1414
legacy-states-v0 = []
1515

1616
[dependencies]
17+
cocoindex-utils = { path = "../utils" }
18+
1719
pyo3 = { workspace = true }
1820
pythonize = { workspace = true }
1921
pyo3-async-runtimes = { workspace = true }

rust/cocoindex/src/base/json_schema.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use crate::prelude::*;
22

3-
use crate::utils::immutable::RefList;
43
use schemars::schema::{
54
ArrayValidation, InstanceType, ObjectValidation, Schema, SchemaObject, SingleOrVec,
65
SubschemaValidation,
76
};
87
use std::fmt::Write;
8+
use utils::immutable::RefList;
99

1010
pub struct ToJsonSchemaOptions {
1111
/// If true, mark all fields as required.

rust/cocoindex/src/builder/analyzer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ use crate::prelude::*;
66

77
use super::plan::*;
88
use crate::lib_context::get_auth_registry;
9-
use crate::utils::fingerprint::Fingerprinter;
109
use crate::{
1110
base::{schema::*, spec::*},
1211
ops::interface::*,
1312
};
1413
use futures::future::{BoxFuture, try_join3};
1514
use futures::{FutureExt, future::try_join_all};
15+
use utils::fingerprint::Fingerprinter;
1616

1717
#[derive(Debug)]
1818
pub(super) enum ValueTypeBuilder {

rust/cocoindex/src/builder/plan.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::base::spec::FieldName;
33
use crate::prelude::*;
44

55
use crate::ops::interface::*;
6-
use crate::utils::fingerprint::{Fingerprint, Fingerprinter};
6+
use utils::fingerprint::{Fingerprint, Fingerprinter};
77

88
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
99
pub struct AnalyzedLocalFieldReference {

rust/cocoindex/src/execution/db_tracking.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
use crate::prelude::*;
22

33
use super::{db_tracking_setup::TrackingTableSetupState, memoization::StoredMemoizationInfo};
4-
use crate::utils::{db::WriteAction, fingerprint::Fingerprint};
54
use futures::Stream;
65
use serde::de::{self, Deserializer, SeqAccess, Visitor};
76
use serde::ser::SerializeSeq;
87
use sqlx::PgPool;
98
use std::fmt;
9+
use utils::{db::WriteAction, fingerprint::Fingerprint};
1010

1111
////////////////////////////////////////////////////////////
1212
// Access for the row tracking table

rust/cocoindex/src/execution/dumper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use super::row_indexer;
1313
use crate::base::{schema, value};
1414
use crate::builder::plan::{AnalyzedImportOp, ExecutionPlan};
1515
use crate::ops::interface::SourceExecutorReadOptions;
16-
use crate::utils::yaml_ser::YamlSerializer;
16+
use utils::yaml_ser::YamlSerializer;
1717

1818
#[derive(Debug, Clone, Deserialize)]
1919
pub struct EvaluateAndDumpOptions {

rust/cocoindex/src/execution/evaluator.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ use anyhow::{Context, Ok};
44
use futures::future::try_join_all;
55

66
use crate::base::value::EstimatedByteSize;
7+
use crate::base::{schema, value};
78
use crate::builder::{AnalyzedTransientFlow, plan::*};
89
use crate::py::AnyhowIntoPyResult;
9-
use crate::{
10-
base::{schema, value},
11-
utils::immutable::RefList,
12-
};
10+
use utils::immutable::RefList;
1311

1412
use super::memoization::{EvaluationMemory, EvaluationMemoryOptions, evaluate_with_cell};
1513

rust/cocoindex/src/execution/memoization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ use std::{
1010
use crate::{
1111
base::{schema, value},
1212
service::error::{SharedError, SharedResultExtRef},
13-
utils::fingerprint::{Fingerprint, Fingerprinter},
1413
};
14+
use cocoindex_utils::fingerprint::{Fingerprint, Fingerprinter};
1515

1616
#[derive(Debug, Clone, Serialize, Deserialize)]
1717
pub struct StoredCacheEntry {

0 commit comments

Comments
 (0)