From c61b689d1b1a671a32f8f5dbb3493e784fceba18 Mon Sep 17 00:00:00 2001
From: linonetwo <linonetwo012@gmail.com>
Date: Thu, 9 Feb 2023 10:55:28 +0800
Subject: [PATCH] chore: upgrade octobase to latest master

---
 client-app/src-OctoBase         |  2 +-
 client-app/src-tauri/Cargo.lock | 65 +++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/client-app/src-OctoBase b/client-app/src-OctoBase
index e1ad8be532..515061eb0f 160000
--- a/client-app/src-OctoBase
+++ b/client-app/src-OctoBase
@@ -1 +1 @@
-Subproject commit e1ad8be532917e4b4a7537f3bc84c74775bfbda9
+Subproject commit 515061eb0f7f21134b711298cc13971a225177e7
diff --git a/client-app/src-tauri/Cargo.lock b/client-app/src-tauri/Cargo.lock
index 890b67a243..70a3368c02 100644
--- a/client-app/src-tauri/Cargo.lock
+++ b/client-app/src-tauri/Cargo.lock
@@ -983,6 +983,19 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dashmap"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "907076dfda823b0b36d2a1bb5f90c96660a5bbcd7729e10727f07858f22c4edc"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.12.3",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.5",
+]
+
 [[package]]
 name = "dbus"
 version = "0.9.6"
@@ -1753,6 +1766,12 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
 
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
 [[package]]
 name = "iana-time-zone"
 version = "0.1.53"
@@ -1985,6 +2004,7 @@ dependencies = [
  "bytes",
  "cang-jie",
  "chrono",
+ "dashmap",
  "futures",
  "lib0",
  "log",
@@ -2035,6 +2055,7 @@ dependencies = [
  "base64 0.21.0",
  "bytes",
  "chrono",
+ "dashmap",
  "futures",
  "jwst",
  "jwst-blob-migration",
@@ -2045,7 +2066,9 @@ dependencies = [
  "sea-orm-migration",
  "sha2",
  "tokio",
+ "tokio-tungstenite",
  "tokio-util",
+ "url",
  "yrs",
 ]
 
@@ -3931,6 +3954,17 @@ dependencies = [
  "stable_deref_trait",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.6"
@@ -4799,6 +4833,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-tungstenite"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd"
+dependencies = [
+ "futures-util",
+ "log",
+ "tokio",
+ "tungstenite",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.4"
@@ -4927,6 +4973,25 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1ee9bd9239c339d714d657fac840c6d2a4f9c45f4f9ec7b0975113458be78db"
 
+[[package]]
+name = "tungstenite"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788"
+dependencies = [
+ "base64 0.13.1",
+ "byteorder",
+ "bytes",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "sha1",
+ "thiserror",
+ "url",
+ "utf-8",
+]
+
 [[package]]
 name = "type-map"
 version = "0.5.0"