Revert "Update Rust to nightly 2/28/24, Qdrant to 1.8.4 (#24741)" (#24896)

sjudd · Convex, Inc. · commit 71cba2edc24a · 2024-04-22T19:40:26.000Z
This reverts commit 4a2e5f4f86a3ff0ee6362fc1892ba53d6e35e216.

GitOrigin-RevId: c1c0daf40e00f043023deeb486e976a3f00e1bf3
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ base64 = "0.13"
 biscuit = "0.7.0"
 bitvec = "1.0.1"
 byteorder = "1.5.0"
-bytes = "1.5.0"
+bytes = "1.1.0"
 bytesize = "1.3.0"
 cfg-if = "1.0"
 chrono = "0.4.26"
@@ -56,7 +56,7 @@ hyper = "0.14.16"
 proc-macro2 = { version = "1.0" }
 imbl = "2.0.0"
 itertools = "0.12"
-jsonschema = "0.17.1"
+jsonschema = "0.17.0"
 levenshtein_automata = "0.2.1"
 lru = "0.12.0"
 maplit = "1"
@@ -84,8 +84,7 @@ prost = "0.12"
 prost-types = "0.12"
 pyo3 = "0.19.1"
 pyo3-asyncio = { version = "0.19.0", features = [ "tokio-runtime" ] }
-qdrant_segment = { git = "https://github.com/get-convex/qdrant", rev = "8819071e5c14a602d13a048a83cde38698f5b306", package = "segment" }
-qdrant_common = { git = "https://github.com/get-convex/qdrant", rev = "8819071e5c14a602d13a048a83cde38698f5b306", package = "qdrant_common" }
+qdrant_segment = { git = "https://github.com/get-convex/qdrant", rev = "76482c6e62dd37c2bcb30a298e6538678df1bd27", package = "segment" }
 quote = "1.0"
 rand = "0.8"
 rand_chacha = "0.3.1"
diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs
@@ -10,9 +10,11 @@
 #![feature(let_chains)]
 #![feature(nonzero_ops)]
 #![feature(lazy_cell)]
+#![feature(result_option_inspect)]
 #![feature(try_blocks)]
 #![feature(type_alias_impl_trait)]
 #![feature(bound_as_ref)]
+#![feature(bound_map)]
 #![feature(iter_from_coroutine)]
 #![feature(iterator_try_collect)]
 #![feature(const_trait_impl)]
diff --git a/crates/convex/Cargo.oss.toml b/crates/convex/Cargo.oss.toml
@@ -4,7 +4,7 @@ description = "Client library for Convex (convex.dev)"
 authors = [ "Convex, Inc. <no-reply@convex.dev>" ]
 version = "0.6.0"
 edition = "2021"
-rust-version = "1.71.0"
+rust-version = "1.65.0"
 resolver = "2"
 license = "Apache-2.0"
 repository = "https://github.com/get-convex/convex-rs"
@@ -14,7 +14,7 @@ homepage = "https://www.convex.dev/"
 anyhow = { version = "1" }
 async-trait = { version = "0.1" }
 base64 = { version = "0.13" }
-bytes = { version = "1.5.0" }
+bytes = { version = "1.1.0" }
 convex_sync_types = { path = "./sync_types", version = "=0.6.0" }
 futures = { version = "0.3" }
 imbl = { version = "2.0.0" }
diff --git a/crates/convex/Cargo.toml b/crates/convex/Cargo.toml
@@ -4,7 +4,7 @@ description = "Client library for Convex (convex.dev)"
 authors = ["Convex, Inc. <no-reply@convex.dev>"]
 version = "0.6.0"
 edition = "2021"
-rust-version = "1.71.0"
+rust-version = "1.65.0"
 resolver = "2"
 license = "Apache-2.0"
 repository = "https://github.com/get-convex/convex-rs"
diff --git a/crates/convex/sync_types/Cargo.oss.toml b/crates/convex/sync_types/Cargo.oss.toml
@@ -4,7 +4,7 @@ description = "Sync types for the Convex Websocket protocol (convex.dev)"
 version = "0.6.0"
 authors = [ "Convex, Inc. <no-reply@convex.dev>" ]
 edition = "2021"
-rust-version = "1.71.0"
+rust-version = "1.65.0"
 resolver = "2"
 license = "Apache-2.0"
 repository = "https://github.com/get-convex/convex-rs"
diff --git a/crates/convex/sync_types/Cargo.toml b/crates/convex/sync_types/Cargo.toml
@@ -4,7 +4,7 @@ description = "Sync types for the Convex Websocket protocol (convex.dev)"
 version = "0.6.0"
 authors = ["Convex, Inc. <no-reply@convex.dev>"]
 edition = "2021"
-rust-version = "1.71.0"
+rust-version = "1.65.0"
 resolver = "2"
 license = "Apache-2.0"
 repository = "https://github.com/get-convex/convex-rs"
diff --git a/crates/database/src/lib.rs b/crates/database/src/lib.rs
@@ -7,14 +7,15 @@
 #![feature(lazy_cell)]
 #![feature(const_option)]
 #![feature(is_sorted)]
+#![feature(bound_map)]
 #![feature(iterator_try_collect)]
 #![feature(never_type)]
 #![feature(try_blocks)]
 #![feature(exclusive_range_pattern)]
 #![feature(async_closure)]
+#![feature(trait_upcasting)]
 #![feature(impl_trait_in_assoc_type)]
 #![feature(cow_is_borrowed)]
-#![feature(trait_upcasting)]
 
 mod bootstrap_model;
 mod committer;
diff --git a/crates/function_runner/src/lib.rs b/crates/function_runner/src/lib.rs
@@ -1,4 +1,5 @@
 #![feature(lazy_cell)]
+#![feature(arc_unwrap_or_clone)]
 #![feature(iterator_try_collect)]
 #![feature(impl_trait_in_assoc_type)]
 #![feature(try_blocks)]
diff --git a/crates/indexing/src/lib.rs b/crates/indexing/src/lib.rs
@@ -1,5 +1,6 @@
 #![feature(async_closure)]
 #![feature(bound_as_ref)]
+#![feature(bound_map)]
 #![feature(coroutines)]
 #![feature(proc_macro_hygiene)]
 #![feature(stmt_expr_attributes)]
diff --git a/crates/isolate/src/lib.rs b/crates/isolate/src/lib.rs
@@ -10,6 +10,7 @@
 #![feature(never_type)]
 #![feature(assert_matches)]
 #![feature(impl_trait_in_assoc_type)]
+#![feature(arc_unwrap_or_clone)]
 #![feature(round_char_boundary)]
 
 pub mod bundled_js;
diff --git a/crates/local_backend/src/subs/mod.rs b/crates/local_backend/src/subs/mod.rs
@@ -370,7 +370,6 @@ mod tests {
                 Message,
                 WebSocket,
             },
-            State,
             WebSocketUpgrade,
         },
         routing::get,
@@ -390,14 +389,10 @@ mod tests {
     /// backend in `is_connection_closed_error` to work around axum sloppiness.
     #[tokio::test]
     async fn test_ws_tungstenite_version_match() -> anyhow::Result<()> {
-        let (ws_shutdown_tx, mut ws_shutdown_rx) = futures::channel::mpsc::channel(1);
+        let (mut ws_shutdown_tx, mut ws_shutdown_rx) = futures::channel::mpsc::channel(1);
 
-        async fn ws_handler(
-            ws: WebSocketUpgrade,
-            st: State<futures::channel::mpsc::Sender<bool>>,
-        ) -> axum::response::Response {
+        let ws_handler = async move |ws: WebSocketUpgrade| {
             ws.on_upgrade(move |mut ws: WebSocket| async move {
-                let mut ws_shutdown_tx = st.0;
                 assert_eq!(ws.recv().await.unwrap().unwrap(), Message::Close(None));
                 let e = ws
                     .send(Message::Text("Hello".to_string()))
@@ -415,13 +410,9 @@ mod tests {
                     TungsteniteError::ConnectionClosed
                 );
             })
-        }
+        };
 
-        let app = ConvexHttpService::new_for_test(
-            Router::new()
-                .route("/test", get(ws_handler))
-                .with_state(ws_shutdown_tx),
-        );
+        let app = ConvexHttpService::new_for_test(Router::new().route("/test", get(ws_handler)));
         let port = portpicker::pick_unused_port().expect("No ports free");
         let addr = format!("127.0.0.1:{port}").parse()?;
         let (shutdown_tx, shutdown_rx) = futures::channel::oneshot::channel();
diff --git a/crates/model/src/lib.rs b/crates/model/src/lib.rs
@@ -25,11 +25,13 @@
 #![feature(lazy_cell)]
 #![feature(const_option)]
 #![feature(is_sorted)]
+#![feature(bound_map)]
 #![feature(iterator_try_collect)]
 #![feature(never_type)]
 #![feature(try_blocks)]
 #![feature(exclusive_range_pattern)]
 #![feature(async_closure)]
+#![feature(trait_upcasting)]
 #![feature(impl_trait_in_assoc_type)]
 
 use std::{
diff --git a/crates/search/src/lib.rs b/crates/search/src/lib.rs
@@ -1,6 +1,7 @@
 #![feature(iter_from_coroutine, coroutines)]
 #![feature(let_chains)]
 #![feature(lazy_cell)]
+#![feature(slice_group_by)]
 #![feature(try_blocks)]
 #![feature(is_sorted)]
 #![feature(ptr_metadata)]
diff --git a/crates/search/src/searcher/searcher.rs b/crates/search/src/searcher/searcher.rs
@@ -224,19 +224,20 @@ impl<RT: Runtime> SearcherImpl<RT> {
             let start = Instant::now();
             let result = schema.search(
                 &segment,
-                query,
+                &query,
                 overfetch_delta,
                 slow_query_threshold,
                 require_exact,
             );
             let query_duration = Instant::now().duration_since(start);
             if query_duration > Duration::from_millis(slow_query_threshold) {
                 tracing::warn!(
-                    "Slow vector query, duration: {}ms, results: {:?} schema: {:?}, \
+                    "Slow vector query, duration: {}ms, results: {:?} schema: {:?}, query: {:?}, \
                      overfetch_delta: {overfetch_delta}",
                     query_duration.as_millis(),
                     result.as_ref().map(|value| value.len()),
                     schema,
+                    query,
                 )
             }
             timer.finish();
diff --git a/crates/storage/src/lib.rs b/crates/storage/src/lib.rs
@@ -625,7 +625,6 @@ impl StorageExt for Arc<dyn Storage> {
 
 const STORAGE_GET_RETRIES: usize = 5;
 
-#[allow(clippy::blocks_in_conditions)]
 #[try_stream(ok = Bytes, error = futures::io::Error)]
 async fn stream_object_with_retries(
     mut stream: BoxStream<'static, futures::io::Result<Bytes>>,
diff --git a/crates/vector/Cargo.toml b/crates/vector/Cargo.toml
@@ -25,10 +25,9 @@ parking_lot = { workspace = true }
 pb = { path = "../pb" }
 proptest = { workspace = true, optional = true }
 proptest-derive = { workspace = true, optional = true }
-qdrant_common = { workspace = true }
 qdrant_segment = { workspace = true }
 rand = { workspace = true }
-rocksdb = { version = "0.22.0", default-features = false, features = [ "snappy" ] }
+rocksdb = { version = "0.21.0", default-features = false, features = [ "snappy" ] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 storage = { path = "../storage" }
diff --git a/crates/vector/src/id_tracker.rs b/crates/vector/src/id_tracker.rs
@@ -22,19 +22,17 @@ use byteorder::{
     WriteBytesExt,
 };
 use csf::ls::Map as CsfMap;
-use qdrant_common::types::PointOffsetType;
 use qdrant_segment::{
-    common::{
-        operation_error::{
-            OperationError,
-            OperationResult,
-        },
-        Flusher,
+    common::Flusher,
+    entry::entry_point::{
+        OperationError,
+        OperationResult,
     },
     id_tracker::IdTracker,
     types::{
         ExtendedPointId,
         PointIdType,
+        PointOffsetType,
         SeqNumberType,
     },
 };
diff --git a/crates/vector/src/lib.rs b/crates/vector/src/lib.rs
@@ -15,10 +15,7 @@ use common::{
     types::IndexName,
 };
 use errors::ErrorMetadata;
-use qdrant_segment::data_types::vectors::{
-    QueryVector,
-    Vector,
-};
+use qdrant_segment::data_types::vectors::QueryVector;
 use value::FieldPath;
 
 pub mod id_tracker;
@@ -67,19 +64,15 @@ pub const DEFAULT_VECTOR_LIMIT: u32 = 10;
 pub const MAX_FILTER_LENGTH: usize = 64;
 
 #[derive(Clone, Debug)]
-pub struct IndexedVector(Vec<f32>);
-
-impl From<IndexedVector> for QueryVector {
-    fn from(value: IndexedVector) -> Self {
-        QueryVector::Nearest(Vector::Dense(value.0))
-    }
-}
+pub struct IndexedVector(QueryVector);
 
 impl Deref for IndexedVector {
     type Target = [f32];
 
     fn deref(&self) -> &Self::Target {
-        &self.0
+        match self.0 {
+            QueryVector::Nearest(ref vec) => &vec[..],
+        }
     }
 }
 
@@ -91,13 +84,15 @@ impl TryFrom<Vec<f32>> for IndexedVector {
             value.len() <= MAX_VECTOR_DIMENSIONS as usize,
             vector_dimensions_mismatch_error(value.len() as u32, MAX_VECTOR_DIMENSIONS)
         );
-        Ok(IndexedVector(value))
+        Ok(IndexedVector(QueryVector::Nearest(value)))
     }
 }
 
 impl From<IndexedVector> for Vec<f32> {
     fn from(value: IndexedVector) -> Self {
-        value.0
+        match value.0 {
+            QueryVector::Nearest(vec) => vec,
+        }
     }
 }
 
diff --git a/crates/vector/src/qdrant_index.rs b/crates/vector/src/qdrant_index.rs
diff --git a/crates/vector/src/qdrant_segments.rs b/crates/vector/src/qdrant_segments.rs
diff --git a/rust-toolchain b/rust-toolchain

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#![feature(lazy_cell)]`
	`2`	`+#![feature(arc_unwrap_or_clone)]`
`2`	`3`	`#![feature(iterator_try_collect)]`
`3`	`4`	`#![feature(impl_trait_in_assoc_type)]`
`4`	`5`	`#![feature(try_blocks)]`