diff --git a/Cargo.toml b/Cargo.toml index 9fed463..2eb740f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,27 +13,21 @@ my-http-server = { tag = "0.7.0", git = "https://github.com/MyJetTools/my-http-s "static-files", ] } -my-no-sql-sdk = { branch = "main", git = "https://github.com/MyJetTools/my-no-sql-sdk.git", features = [ +my-no-sql-sdk = { tag = "0.3.1", git = "https://github.com/MyJetTools/my-no-sql-sdk.git", features = [ "master-node", "tcp-contracts", ] } -my-no-sql-server-core = { branch = "main", git = "https://github.com/MyJetTools/my-no-sql-server-core.git", features = [ +my-no-sql-server-core = { tag = "0.3.2", git = "https://github.com/MyJetTools/my-no-sql-server-core.git", features = [ "master-node", ] } my-azure-storage-sdk = { tag = "0.5.0", git = "https://github.com/MyJetTools/my-azure-storage.git" } flurl = { tag = "0.5.0", git = "https://github.com/MyJetTools/fl-url" } -rust-extensions = { tag = "0.1.4", git = "https://github.com/MyJetTools/rust-extensions.git", features = [ - "with-tokio", - "base64", -] } - my-logger = { tag = "1.1.0", git = "https://github.com/MyJetTools/my-logger.git" } -my-json = { tag = "0.2.2", git = "https://github.com/MyJetTools/my-json.git" } -my-tcp-sockets = { branch = "main", git = "https://github.com/MyJetTools/my-tcp-sockets.git" } +my-tcp-sockets = { tag = "0.1.9", git = "https://github.com/MyJetTools/my-tcp-sockets.git" } hyper-tls = "*" tonic = { version = "*", features = ["tls", "tls-roots", "prost"] } diff --git a/src/app/app_ctx.rs b/src/app/app_ctx.rs index 8df2c5c..c1b6ddf 100644 --- a/src/app/app_ctx.rs +++ b/src/app/app_ctx.rs @@ -3,8 +3,8 @@ use std::{ time::Duration, }; +use my_no_sql_sdk::core::rust_extensions::{date_time::DateTimeAsMicroseconds, AppStates}; use my_no_sql_server_core::DbInstance; -use rust_extensions::{date_time::DateTimeAsMicroseconds, AppStates}; use crate::{ data_readers::DataReadersList, diff --git a/src/app/events_sync.rs b/src/app/events_sync.rs index f1d9a90..703c4ce 100644 --- a/src/app/events_sync.rs +++ b/src/app/events_sync.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use rust_extensions::{ +use my_no_sql_sdk::core::rust_extensions::{ events_loop::{EventsLoop, EventsLoopPublisher, EventsLoopTick}, ApplicationStates, }; diff --git a/src/background/backup_timer.rs b/src/background/backup_timer.rs index 26cc7ba..0d916d6 100644 --- a/src/background/backup_timer.rs +++ b/src/background/backup_timer.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use rust_extensions::MyTimerTick; +use my_no_sql_sdk::core::rust_extensions::MyTimerTick; use crate::app::AppContext; diff --git a/src/background/gc_db_rows.rs b/src/background/gc_db_rows.rs index dbd9464..fad41ae 100644 --- a/src/background/gc_db_rows.rs +++ b/src/background/gc_db_rows.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, sync::Arc}; use my_logger::LogEventCtx; -use rust_extensions::{date_time::DateTimeAsMicroseconds, MyTimerTick}; +use my_no_sql_sdk::core::rust_extensions::{date_time::DateTimeAsMicroseconds, MyTimerTick}; use crate::{app::AppContext, db_sync::EventSource}; diff --git a/src/background/gc_http_sessions.rs b/src/background/gc_http_sessions.rs index 8d3a911..eb93c50 100644 --- a/src/background/gc_http_sessions.rs +++ b/src/background/gc_http_sessions.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use rust_extensions::{date_time::DateTimeAsMicroseconds, MyTimerTick}; +use my_no_sql_sdk::core::rust_extensions::{date_time::DateTimeAsMicroseconds, MyTimerTick}; use crate::app::AppContext; diff --git a/src/background/gc_multipart.rs b/src/background/gc_multipart.rs index f73b7aa..c30be07 100644 --- a/src/background/gc_multipart.rs +++ b/src/background/gc_multipart.rs @@ -1,6 +1,6 @@ use std::{sync::Arc, time::Duration}; -use rust_extensions::{date_time::DateTimeAsMicroseconds, MyTimerTick}; +use my_no_sql_sdk::core::rust_extensions::{date_time::DateTimeAsMicroseconds, MyTimerTick}; use crate::app::AppContext; diff --git a/src/background/metrics_updater.rs b/src/background/metrics_updater.rs index 4695059..58a1396 100644 --- a/src/background/metrics_updater.rs +++ b/src/background/metrics_updater.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_http_server::HttpConnectionsCounter; +use my_no_sql_sdk::core::rust_extensions::MyTimerTick; use my_tcp_sockets::ThreadsStatistics; -use rust_extensions::MyTimerTick; use crate::app::AppContext; diff --git a/src/background/persist.rs b/src/background/persist.rs index 7a61070..bda1b2a 100644 --- a/src/background/persist.rs +++ b/src/background/persist.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use rust_extensions::MyTimerTick; +use my_no_sql_sdk::core::rust_extensions::MyTimerTick; use crate::app::AppContext; diff --git a/src/background/sync.rs b/src/background/sync.rs index e07cd18..e39dd12 100644 --- a/src/background/sync.rs +++ b/src/background/sync.rs @@ -1,5 +1,5 @@ use crate::{app::AppContext, db_sync::SyncEvent}; -use rust_extensions::events_loop::EventsLoopTick; +use my_no_sql_sdk::core::rust_extensions::events_loop::EventsLoopTick; use std::sync::Arc; pub struct SyncEventLoop { diff --git a/src/data_readers/data_reader.rs b/src/data_readers/data_reader.rs index fa1420c..82b64bd 100644 --- a/src/data_readers/data_reader.rs +++ b/src/data_readers/data_reader.rs @@ -3,8 +3,8 @@ use std::sync::{ Arc, }; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use tokio::sync::RwLock; use super::{DataReaderConnection, DataReaderUpdatableData}; diff --git a/src/data_readers/data_readers_data.rs b/src/data_readers/data_readers_data.rs index 21d6006..b8fc6ac 100644 --- a/src/data_readers/data_readers_data.rs +++ b/src/data_readers/data_readers_data.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, sync::Arc, time::Duration}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use super::{DataReader, DataReaderConnection}; diff --git a/src/data_readers/data_readers_list.rs b/src/data_readers/data_readers_list.rs index deaf223..55cea84 100644 --- a/src/data_readers/data_readers_list.rs +++ b/src/data_readers/data_readers_list.rs @@ -1,6 +1,6 @@ use std::{sync::Arc, time::Duration}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use tokio::sync::RwLock; use crate::tcp::MyNoSqlTcpConnection; diff --git a/src/data_readers/http_connection/connection_delivery_info.rs b/src/data_readers/http_connection/connection_delivery_info.rs index fdf950a..2f26825 100644 --- a/src/data_readers/http_connection/connection_delivery_info.rs +++ b/src/data_readers/http_connection/connection_delivery_info.rs @@ -1,7 +1,9 @@ use std::{collections::VecDeque, time::Duration}; use my_http_server::HttpFailResult; -use rust_extensions::{date_time::DateTimeAsMicroseconds, TaskCompletion, TaskCompletionAwaiter}; +use my_no_sql_sdk::core::rust_extensions::{ + date_time::DateTimeAsMicroseconds, TaskCompletion, TaskCompletionAwaiter, +}; pub enum HttpPayload { Ping, diff --git a/src/data_readers/http_connection/http_connection_info.rs b/src/data_readers/http_connection/http_connection_info.rs index 8e9850a..19c8169 100644 --- a/src/data_readers/http_connection/http_connection_info.rs +++ b/src/data_readers/http_connection/http_connection_info.rs @@ -1,7 +1,9 @@ use std::sync::atomic::AtomicUsize; use my_http_server::HttpFailResult; -use rust_extensions::date_time::{AtomicDateTimeAsMicroseconds, DateTimeAsMicroseconds}; +use my_no_sql_sdk::core::rust_extensions::date_time::{ + AtomicDateTimeAsMicroseconds, DateTimeAsMicroseconds, +}; use tokio::sync::Mutex; use crate::{ diff --git a/src/data_readers/http_connection/into_http_payload.rs b/src/data_readers/http_connection/into_http_payload.rs index abb8552..1582e0c 100644 --- a/src/data_readers/http_connection/into_http_payload.rs +++ b/src/data_readers/http_connection/into_http_payload.rs @@ -1,4 +1,4 @@ -use my_json::json_writer::{JsonArrayWriter, JsonObjectWriter}; +use my_no_sql_sdk::core::my_json::json_writer::{JsonArrayWriter, JsonObjectWriter}; use crate::db_sync::{ states::{DeleteRowsEventSyncData, InitPartitionsSyncEventData, UpdateRowsSyncData}, diff --git a/src/data_readers/tcp_connection/tcp_payload_to_send.rs b/src/data_readers/tcp_connection/tcp_payload_to_send.rs index c3eb092..23fbea0 100644 --- a/src/data_readers/tcp_connection/tcp_payload_to_send.rs +++ b/src/data_readers/tcp_connection/tcp_payload_to_send.rs @@ -1,7 +1,7 @@ use my_no_sql_sdk::tcp_contracts::{DeleteRowTcpContract, MyNoSqlTcpContract}; use crate::db_sync::SyncEvent; -use my_json::json_reader::consts::EMPTY_ARRAY; +use my_no_sql_sdk::core::my_json::json_reader::consts::EMPTY_ARRAY; pub async fn serialize(sync_event: &SyncEvent, compress: bool) -> Vec { match sync_event { diff --git a/src/db_operations/gc/keep_max_partitions_amount.rs b/src/db_operations/gc/keep_max_partitions_amount.rs index 9be17ac..61d7783 100644 --- a/src/db_operations/gc/keep_max_partitions_amount.rs +++ b/src/db_operations/gc/keep_max_partitions_amount.rs @@ -1,7 +1,7 @@ use std::sync::Arc; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{app::AppContext, db_operations::DbOperationError, db_sync::EventSource}; diff --git a/src/db_operations/gc/keep_partition_max_records.rs b/src/db_operations/gc/keep_partition_max_records.rs index dd7747f..2da1e90 100644 --- a/src/db_operations/gc/keep_partition_max_records.rs +++ b/src/db_operations/gc/keep_partition_max_records.rs @@ -1,6 +1,6 @@ use my_no_sql_sdk::core::db::PartitionKeyParameter; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{app::AppContext, db_operations::DbOperationError, db_sync::EventSource}; diff --git a/src/db_operations/multipart/multipart.rs b/src/db_operations/multipart/multipart.rs index 5fb4873..a9bc1ab 100644 --- a/src/db_operations/multipart/multipart.rs +++ b/src/db_operations/multipart/multipart.rs @@ -1,7 +1,7 @@ use std::{collections::VecDeque, sync::Arc}; use my_no_sql_sdk::core::db::DbRow; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; pub struct Multipart { pub created: DateTimeAsMicroseconds, diff --git a/src/db_operations/multipart/multipart_list.rs b/src/db_operations/multipart/multipart_list.rs index 2c5405e..0c8b096 100644 --- a/src/db_operations/multipart/multipart_list.rs +++ b/src/db_operations/multipart/multipart_list.rs @@ -5,8 +5,8 @@ use std::{ }; use my_no_sql_sdk::core::db::DbRow; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::db_snapshots::DbRowsSnapshot; -use rust_extensions::date_time::DateTimeAsMicroseconds; use tokio::sync::Mutex; use super::Multipart; diff --git a/src/db_operations/read/get_highest_row_and_below.rs b/src/db_operations/read/get_highest_row_and_below.rs index ffa1e9c..973cdb0 100644 --- a/src/db_operations/read/get_highest_row_and_below.rs +++ b/src/db_operations/read/get_highest_row_and_below.rs @@ -1,8 +1,8 @@ use std::sync::Arc; -use my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/read/read_filter.rs b/src/db_operations/read/read_filter.rs index be0fcd7..c193f19 100644 --- a/src/db_operations/read/read_filter.rs +++ b/src/db_operations/read/read_filter.rs @@ -1,8 +1,8 @@ use std::sync::Arc; -use my_json::json_writer::JsonArrayWriter; use my_no_sql_sdk::core::db::DbRow; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; pub fn filter_and_compile_json<'s>( iterator: impl Iterator>, diff --git a/src/db_operations/read/rows/get_all.rs b/src/db_operations/read/rows/get_all.rs index 942a438..bbcfaf5 100644 --- a/src/db_operations/read/rows/get_all.rs +++ b/src/db_operations/read/rows/get_all.rs @@ -1,8 +1,8 @@ use std::sync::Arc; -use my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/read/rows/get_all_by_partition_key.rs b/src/db_operations/read/rows/get_all_by_partition_key.rs index e8200be..7566ea9 100644 --- a/src/db_operations/read/rows/get_all_by_partition_key.rs +++ b/src/db_operations/read/rows/get_all_by_partition_key.rs @@ -1,7 +1,7 @@ use std::sync::Arc; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/read/rows/get_all_by_row_key.rs b/src/db_operations/read/rows/get_all_by_row_key.rs index 9cfb685..ecd65b6 100644 --- a/src/db_operations/read/rows/get_all_by_row_key.rs +++ b/src/db_operations/read/rows/get_all_by_row_key.rs @@ -1,8 +1,8 @@ use std::sync::Arc; -use my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/read/rows/get_single.rs b/src/db_operations/read/rows/get_single.rs index 9b4ec47..5dd2ef6 100644 --- a/src/db_operations/read/rows/get_single.rs +++ b/src/db_operations/read/rows/get_single.rs @@ -1,7 +1,7 @@ use std::sync::Arc; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/read/rows/get_single_partition_multiple_rows.rs b/src/db_operations/read/rows/get_single_partition_multiple_rows.rs index ece66b9..79f0715 100644 --- a/src/db_operations/read/rows/get_single_partition_multiple_rows.rs +++ b/src/db_operations/read/rows/get_single_partition_multiple_rows.rs @@ -1,8 +1,8 @@ use std::sync::Arc; -use my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::my_json::json_writer::JsonArrayWriter; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/transactions/commit.rs b/src/db_operations/transactions/commit.rs index 867457a..19ab74e 100644 --- a/src/db_operations/transactions/commit.rs +++ b/src/db_operations/transactions/commit.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, db_sync::EventSource, db_transactions::steps::TransactionalOperationStep, diff --git a/src/db_operations/update_statistics/update_partition_expiration_time.rs b/src/db_operations/update_statistics/update_partition_expiration_time.rs index 1f46d65..863909a 100644 --- a/src/db_operations/update_statistics/update_partition_expiration_time.rs +++ b/src/db_operations/update_statistics/update_partition_expiration_time.rs @@ -1,7 +1,7 @@ use std::sync::Arc; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::app::AppContext; diff --git a/src/db_operations/update_statistics/update_partitions_last_read_time.rs b/src/db_operations/update_statistics/update_partitions_last_read_time.rs index 6cc1d6b..4913a26 100644 --- a/src/db_operations/update_statistics/update_partitions_last_read_time.rs +++ b/src/db_operations/update_statistics/update_partitions_last_read_time.rs @@ -1,5 +1,5 @@ +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; pub async fn update_partitions_last_read_time<'s, TPartitions: Iterator>( table: &DbTableWrapper, diff --git a/src/db_operations/update_statistics/update_rows_expiration_time.rs b/src/db_operations/update_statistics/update_rows_expiration_time.rs index 47a9cc6..05fbe9c 100644 --- a/src/db_operations/update_statistics/update_rows_expiration_time.rs +++ b/src/db_operations/update_statistics/update_rows_expiration_time.rs @@ -1,7 +1,7 @@ use std::sync::Arc; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::app::AppContext; diff --git a/src/db_operations/update_statistics/update_rows_last_read_time.rs b/src/db_operations/update_statistics/update_rows_last_read_time.rs index ddab527..d707351 100644 --- a/src/db_operations/update_statistics/update_rows_last_read_time.rs +++ b/src/db_operations/update_statistics/update_rows_last_read_time.rs @@ -1,7 +1,7 @@ use std::sync::Arc; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; pub async fn update_row_keys_last_read_access_time<'s, TRowKeys: Iterator>( db_table: &Arc, diff --git a/src/db_operations/update_statistics/update_statistics.rs b/src/db_operations/update_statistics/update_statistics.rs index d967874..52af3a0 100644 --- a/src/db_operations/update_statistics/update_statistics.rs +++ b/src/db_operations/update_statistics/update_statistics.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use my_no_sql_sdk::core::db::{DbPartition, DbRow}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; #[derive(Clone, Debug)] pub struct UpdateStatistics { diff --git a/src/db_operations/write/bulk_delete.rs b/src/db_operations/write/bulk_delete.rs index 250b426..52a9e8a 100644 --- a/src/db_operations/write/bulk_delete.rs +++ b/src/db_operations/write/bulk_delete.rs @@ -1,6 +1,6 @@ use my_no_sql_sdk::core::db::{PartitionKeyParameter, RowKeyParameter}; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/bulk_insert_or_update.rs b/src/db_operations/write/bulk_insert_or_update.rs index 1371cd1..1c121e9 100644 --- a/src/db_operations/write/bulk_insert_or_update.rs +++ b/src/db_operations/write/bulk_insert_or_update.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_no_sql_sdk::core::db::{DbRow, PartitionKeyParameter}; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/clean_partition_and_bulk_insert.rs b/src/db_operations/write/clean_partition_and_bulk_insert.rs index 19c0c0e..a61fbea 100644 --- a/src/db_operations/write/clean_partition_and_bulk_insert.rs +++ b/src/db_operations/write/clean_partition_and_bulk_insert.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_no_sql_sdk::core::db::DbRow; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/clean_table.rs b/src/db_operations/write/clean_table.rs index 5e26ff3..69c1167 100644 --- a/src/db_operations/write/clean_table.rs +++ b/src/db_operations/write/clean_table.rs @@ -1,7 +1,7 @@ use std::sync::Arc; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/clean_table_and_bulk_insert.rs b/src/db_operations/write/clean_table_and_bulk_insert.rs index d8ad2c9..b0c86ce 100644 --- a/src/db_operations/write/clean_table_and_bulk_insert.rs +++ b/src/db_operations/write/clean_table_and_bulk_insert.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_no_sql_sdk::core::db::DbRow; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/delete_partitions.rs b/src/db_operations/write/delete_partitions.rs index a4bdfb7..d77e760 100644 --- a/src/db_operations/write/delete_partitions.rs +++ b/src/db_operations/write/delete_partitions.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_no_sql_sdk::core::db::PartitionKeyParameter; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/delete_row.rs b/src/db_operations/write/delete_row.rs index ab3170b..41903c5 100644 --- a/src/db_operations/write/delete_row.rs +++ b/src/db_operations/write/delete_row.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_no_sql_sdk::core::db::{PartitionKeyParameter, RowKeyParameter}; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/insert.rs b/src/db_operations/write/insert.rs index 5201aaa..46b6480 100644 --- a/src/db_operations/write/insert.rs +++ b/src/db_operations/write/insert.rs @@ -1,8 +1,8 @@ use std::sync::Arc; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_sdk::core::{db::DbRow, db_json_entity::DbJsonEntityWithContent}; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/insert_or_replace.rs b/src/db_operations/write/insert_or_replace.rs index 4c6c2fd..2182151 100644 --- a/src/db_operations/write/insert_or_replace.rs +++ b/src/db_operations/write/insert_or_replace.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_no_sql_sdk::core::db::DbRow; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/db_operations/write/replace.rs b/src/db_operations/write/replace.rs index c22af39..277a617 100644 --- a/src/db_operations/write/replace.rs +++ b/src/db_operations/write/replace.rs @@ -6,12 +6,12 @@ use crate::{ db_sync::{states::UpdateRowsSyncData, EventSource, SyncEvent}, }; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_sdk::core::{ db::DbRow, db_json_entity::{DbJsonEntityWithContent, JsonTimeStamp}, }; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use serde::{Deserialize, Serialize}; use super::WriteOperationResult; diff --git a/src/db_operations/write/table.rs b/src/db_operations/write/table.rs index c793b53..dee8ad6 100644 --- a/src/db_operations/write/table.rs +++ b/src/db_operations/write/table.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_no_sql_sdk::core::db::{DbTable, DbTableAttributes}; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::db_operations::validation; use crate::{ diff --git a/src/db_sync/states/delete_rows_event_sync_data.rs b/src/db_sync/states/delete_rows_event_sync_data.rs index 8c6b660..e1d75b7 100644 --- a/src/db_sync/states/delete_rows_event_sync_data.rs +++ b/src/db_sync/states/delete_rows_event_sync_data.rs @@ -1,8 +1,8 @@ use std::sync::Arc; -use my_json::json_writer::{JsonArrayWriter, JsonNullValue, JsonObjectWriter}; use my_no_sql_sdk::core::db::{DbRow, DbTable, PartitionKey, PartitionKeyParameter}; -use rust_extensions::sorted_vec::{EntityWithStrKey, SortedVecWithStrKey}; +use my_no_sql_sdk::core::my_json::json_writer::{JsonArrayWriter, JsonNullValue, JsonObjectWriter}; +use my_no_sql_sdk::core::rust_extensions::sorted_vec::{EntityWithStrKey, SortedVecWithStrKey}; use crate::db_sync::EventSource; @@ -64,15 +64,17 @@ impl DeleteRowsEventSyncData { let deleted_rows = self.check_that_we_are_in_partition_mode(partition_key); match deleted_rows.insert_or_update(partition_key.as_str()) { - rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert( + entry, + ) => { entry.insert(DeletedRowData { partition_key: partition_key.to_partition_key(), db_rows: vec![deleted_row], }); } - rust_extensions::sorted_vec::InsertOrUpdateEntry::Update(entry) => { - entry.item.db_rows.push(deleted_row) - } + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Update( + entry, + ) => entry.item.db_rows.push(deleted_row), } } @@ -84,15 +86,17 @@ impl DeleteRowsEventSyncData { let deleted_rows = self.check_that_we_are_in_partition_mode(partition_key); match deleted_rows.insert_or_update(partition_key.as_str()) { - rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert( + entry, + ) => { entry.insert(DeletedRowData { partition_key: partition_key.to_partition_key(), db_rows: deleted_rows_to_add.to_vec(), }); } - rust_extensions::sorted_vec::InsertOrUpdateEntry::Update(entry) => { - entry.item.db_rows.extend_from_slice(deleted_rows_to_add) - } + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Update( + entry, + ) => entry.item.db_rows.extend_from_slice(deleted_rows_to_add), } } diff --git a/src/db_sync/states/init_partitions_sync_data.rs b/src/db_sync/states/init_partitions_sync_data.rs index edac9b6..5b5fba1 100644 --- a/src/db_sync/states/init_partitions_sync_data.rs +++ b/src/db_sync/states/init_partitions_sync_data.rs @@ -1,7 +1,7 @@ -use my_json::json_writer::{EmptyJsonArray, JsonObjectWriter}; use my_no_sql_sdk::core::db::{DbTable, PartitionKey}; +use my_no_sql_sdk::core::my_json::json_writer::{EmptyJsonArray, JsonObjectWriter}; +use my_no_sql_sdk::core::rust_extensions::sorted_vec::{EntityWithStrKey, SortedVecWithStrKey}; use my_no_sql_server_core::db_snapshots::DbPartitionSnapshot; -use rust_extensions::sorted_vec::{EntityWithStrKey, SortedVecWithStrKey}; use crate::db_sync::EventSource; diff --git a/src/db_sync/sync_attributes.rs b/src/db_sync/sync_attributes.rs index bd1c68a..1024d19 100644 --- a/src/db_sync/sync_attributes.rs +++ b/src/db_sync/sync_attributes.rs @@ -1,7 +1,7 @@ use my_http_server::macros::*; use std::collections::HashMap; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use crate::app::AppContext; diff --git a/src/db_transactions/json_parser/models.rs b/src/db_transactions/json_parser/models.rs index e1d55d5..ede346c 100644 --- a/src/db_transactions/json_parser/models.rs +++ b/src/db_transactions/json_parser/models.rs @@ -82,7 +82,7 @@ impl InsertOrUpdateTransactionJsonModel { let now = JsonTimeStamp::now(); for entity in self.entities { - let db_row = DbJsonEntity::parse_into_db_row(&entity, &now)?; + let db_row = DbJsonEntity::parse_into_db_row(entity.as_slice().into(), &now)?; let db_row = Arc::new(db_row); let partition_key = db_row.get_partition_key(); diff --git a/src/db_transactions/json_parser/parser.rs b/src/db_transactions/json_parser/parser.rs index fd6be2d..1fa2bb2 100644 --- a/src/db_transactions/json_parser/parser.rs +++ b/src/db_transactions/json_parser/parser.rs @@ -1,4 +1,5 @@ -use my_json::json_reader::array_parser::ArrayToJsonObjectsSplitter; +use my_no_sql_sdk::core::my_json::json_reader::array_iterator::JsonArrayIterator; +use my_no_sql_server_core::rust_extensions::array_of_bytes_iterator::SliceIterator; use crate::{ db_operations::transactions::TransactionOperationError, @@ -19,31 +20,39 @@ const JSON_TRANSACTION_INSERT_OR_UPDATE: &str = "InsertOrUpdate"; pub fn parse_transactions( payload: &[u8], ) -> Result, TransactionOperationError> { + let mut json_array_iterator: JsonArrayIterator = payload.into(); + let mut result = Vec::new(); - for json_object in payload.split_array_json_to_objects() { + + while let Some(json_object) = json_array_iterator.get_next() { let json_object = json_object.unwrap(); - let type_model: JsonBaseTransaction = serde_json::from_slice(json_object)?; + let type_model: JsonBaseTransaction = + serde_json::from_slice(json_object.as_bytes().unwrap())?; if type_model.transaction_type == JSON_TRANSACTION_CLEAN_TABLE { - let model: CleanTableTransactionJsonModel = serde_json::from_slice(json_object)?; + let model: CleanTableTransactionJsonModel = + serde_json::from_slice(json_object.as_bytes().unwrap())?; result.push(model.into()) } if type_model.transaction_type == JSON_TRANSACTION_DELETE_PARTITIONS { - let model: DeletePartitionsTransactionJsonModel = serde_json::from_slice(json_object)?; + let model: DeletePartitionsTransactionJsonModel = + serde_json::from_slice(json_object.as_bytes().unwrap())?; result.push(model.into()) } if type_model.transaction_type == JSON_TRANSACTION_DELETE_ROWS { - let model: DeleteRowsTransactionJsonModel = serde_json::from_slice(json_object)?; + let model: DeleteRowsTransactionJsonModel = + serde_json::from_slice(json_object.as_bytes().unwrap())?; result.push(model.into()) } if type_model.transaction_type == JSON_TRANSACTION_INSERT_OR_UPDATE { - let model: InsertOrUpdateTransactionJsonModel = serde_json::from_slice(json_object)?; + let model: InsertOrUpdateTransactionJsonModel = + serde_json::from_slice(json_object.as_bytes().unwrap())?; result.push(model.into()?) } diff --git a/src/http/controllers/api/api_controller.rs b/src/http/controllers/api/api_controller.rs index a1306db..f53529b 100644 --- a/src/http/controllers/api/api_controller.rs +++ b/src/http/controllers/api/api_controller.rs @@ -1,5 +1,5 @@ use my_http_server::{macros::http_route, HttpContext, HttpFailResult, HttpOkResult, HttpOutput}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use super::models::IsAliveResponse; diff --git a/src/http/controllers/backup_controller/download_action.rs b/src/http/controllers/backup_controller/download_action.rs index 4b4195b..ec9982c 100644 --- a/src/http/controllers/backup_controller/download_action.rs +++ b/src/http/controllers/backup_controller/download_action.rs @@ -1,6 +1,6 @@ use my_http_server::macros::*; use my_http_server::{HttpContext, HttpFailResult, HttpOkResult, HttpOutput}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use std::sync::Arc; use crate::app::AppContext; diff --git a/src/http/controllers/bulk/bulk_delete_action.rs b/src/http/controllers/bulk/bulk_delete_action.rs index d25917d..f885881 100644 --- a/src/http/controllers/bulk/bulk_delete_action.rs +++ b/src/http/controllers/bulk/bulk_delete_action.rs @@ -1,6 +1,6 @@ use my_http_server::macros::*; use my_http_server::{HttpContext, HttpFailResult, HttpOkResult, HttpOutput}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use std::collections::BTreeMap; use std::sync::Arc; diff --git a/src/http/controllers/mappers.rs b/src/http/controllers/mappers.rs index 33510b6..777d54b 100644 --- a/src/http/controllers/mappers.rs +++ b/src/http/controllers/mappers.rs @@ -1,4 +1,4 @@ -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; pub trait ToSetExpirationTime { fn to_set_expiration_time(&self) -> Option>; diff --git a/src/http/controllers/row_controller/delete_row_action.rs b/src/http/controllers/row_controller/delete_row_action.rs index b512c90..b4ea7fd 100644 --- a/src/http/controllers/row_controller/delete_row_action.rs +++ b/src/http/controllers/row_controller/delete_row_action.rs @@ -1,6 +1,6 @@ use my_http_server::macros::*; use my_http_server::{HttpContext, HttpFailResult, HttpOkResult}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use std::sync::Arc; use crate::db_operations; diff --git a/src/http/controllers/row_controller/get_rows_action.rs b/src/http/controllers/row_controller/get_rows_action.rs index 7d37fac..56a5d9e 100644 --- a/src/http/controllers/row_controller/get_rows_action.rs +++ b/src/http/controllers/row_controller/get_rows_action.rs @@ -1,6 +1,6 @@ use my_http_server::macros::*; use my_http_server::{HttpContext, HttpFailResult, HttpOkResult}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use std::sync::Arc; use super::models::*; diff --git a/src/http/controllers/rows_controller/delete_partitions_action.rs b/src/http/controllers/rows_controller/delete_partitions_action.rs index 7e391a7..386b0e6 100644 --- a/src/http/controllers/rows_controller/delete_partitions_action.rs +++ b/src/http/controllers/rows_controller/delete_partitions_action.rs @@ -1,6 +1,6 @@ use my_http_server::macros::*; use my_http_server::{HttpContext, HttpFailResult, HttpOkResult, HttpOutput}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use std::sync::Arc; use crate::{app::AppContext, db_sync::EventSource}; diff --git a/src/http/controllers/rows_controller/get_highest_row_and_below.rs b/src/http/controllers/rows_controller/get_highest_row_and_below.rs index c21d9d1..60ff4c1 100644 --- a/src/http/controllers/rows_controller/get_highest_row_and_below.rs +++ b/src/http/controllers/rows_controller/get_highest_row_and_below.rs @@ -1,6 +1,6 @@ use my_http_server::macros::*; use my_http_server::{HttpContext, HttpFailResult, HttpOkResult}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use std::sync::Arc; use crate::{app::AppContext, http::controllers::row_controller::models::BaseDbRowContract}; diff --git a/src/http/controllers/rows_controller/get_single_partition_multiple_rows.rs b/src/http/controllers/rows_controller/get_single_partition_multiple_rows.rs index d41fba5..793be99 100644 --- a/src/http/controllers/rows_controller/get_single_partition_multiple_rows.rs +++ b/src/http/controllers/rows_controller/get_single_partition_multiple_rows.rs @@ -1,6 +1,6 @@ use my_http_server::macros::*; use my_http_server::{HttpContext, HttpFailResult, HttpOkResult}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use std::sync::Arc; use crate::{app::AppContext, http::controllers::row_controller::models::BaseDbRowContract}; diff --git a/src/http/controllers/status_controller/models.rs b/src/http/controllers/status_controller/models.rs index a5f08b9..8b5864a 100644 --- a/src/http/controllers/status_controller/models.rs +++ b/src/http/controllers/status_controller/models.rs @@ -1,6 +1,6 @@ use crate::app::AppContext; use my_http_server::macros::*; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use serde::{Deserialize, Serialize}; use super::{non_initialized::NonInitializedModel, status_bar_model::StatusBarModel}; diff --git a/src/http/controllers/status_controller/non_initialized/model.rs b/src/http/controllers/status_controller/non_initialized/model.rs index ae04b2d..87a689a 100644 --- a/src/http/controllers/status_controller/non_initialized/model.rs +++ b/src/http/controllers/status_controller/non_initialized/model.rs @@ -1,6 +1,6 @@ use crate::app::AppContext; use my_http_server::macros::*; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug, MyHttpObjectStructure)] diff --git a/src/http/controllers/transactions/commit.rs b/src/http/controllers/transactions/commit.rs index 59f0ced..4687c43 100644 --- a/src/http/controllers/transactions/commit.rs +++ b/src/http/controllers/transactions/commit.rs @@ -1,7 +1,7 @@ use crate::{app::AppContext, db_sync::EventSource}; use my_http_server::macros::*; use my_http_server::{HttpContext, HttpFailResult, HttpOkResult, HttpOutput}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use std::sync::Arc; use super::models::ProcessTransactionInputModel; diff --git a/src/http/http_sessions.rs b/src/http/http_sessions.rs index d3385d3..c0b42d1 100644 --- a/src/http/http_sessions.rs +++ b/src/http/http_sessions.rs @@ -2,7 +2,7 @@ use std::sync::Arc; use my_http_server::{HttpFailResult, WebContentType}; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/http/mappers/db_operation_error.rs b/src/http/mappers/db_operation_error.rs index 741acbb..17f0fd3 100644 --- a/src/http/mappers/db_operation_error.rs +++ b/src/http/mappers/db_operation_error.rs @@ -1,8 +1,8 @@ use crate::db_operations::DbOperationError; use my_http_server::{HttpFailResult, WebContentType}; -use my_json::json_reader::JsonParseError; use my_no_sql_sdk::core::db_json_entity::DbEntityParseFail; +use my_no_sql_sdk::core::my_json::json_reader::JsonParseError; use super::{OperationFailHttpContract, OperationFailReason}; diff --git a/src/http/mappers/read_result.rs b/src/http/mappers/read_result.rs index 44ae083..697bc68 100644 --- a/src/http/mappers/read_result.rs +++ b/src/http/mappers/read_result.rs @@ -31,8 +31,8 @@ impl Into for ReadOperationResult { } ReadOperationResult::EmptyArray => { let empty_array = vec![ - my_json::json_reader::consts::OPEN_ARRAY, - my_json::json_reader::consts::CLOSE_ARRAY, + my_no_sql_sdk::core::my_json::json_reader::consts::OPEN_ARRAY, + my_no_sql_sdk::core::my_json::json_reader::consts::CLOSE_ARRAY, ]; let output = HttpOutput::Content { diff --git a/src/main.rs b/src/main.rs index 5df0a9a..ccaf357 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,9 +4,9 @@ use background::{ metrics_updater::MetricsUpdater, persist::PersistTimer, sync::SyncEventLoop, BackupTimer, }; +use my_no_sql_sdk::core::rust_extensions::MyTimer; use my_no_sql_sdk::tcp_contracts::MyNoSqlTcpSerializerFactory; use my_tcp_sockets::TcpServer; -use rust_extensions::MyTimer; use std::{net::SocketAddr, sync::Arc, time::Duration}; use tcp::TcpServerEvents; mod zip; diff --git a/src/operations/backup/gc_backups.rs b/src/operations/backup/gc_backups.rs index ab71d52..16e5e77 100644 --- a/src/operations/backup/gc_backups.rs +++ b/src/operations/backup/gc_backups.rs @@ -1,4 +1,4 @@ -use rust_extensions::ShortString; +use my_no_sql_sdk::core::rust_extensions::ShortString; use crate::app::AppContext; diff --git a/src/operations/backup/save_backup.rs b/src/operations/backup/save_backup.rs index be6f501..2a74ac6 100644 --- a/src/operations/backup/save_backup.rs +++ b/src/operations/backup/save_backup.rs @@ -1,4 +1,4 @@ -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use crate::app::AppContext; diff --git a/src/operations/data_readers.rs b/src/operations/data_readers.rs index 2fe7675..5acf22f 100644 --- a/src/operations/data_readers.rs +++ b/src/operations/data_readers.rs @@ -1,6 +1,6 @@ use std::sync::Arc; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use crate::{ app::AppContext, diff --git a/src/operations/get_metrics.rs b/src/operations/get_metrics.rs index 9c553a2..95c8670 100644 --- a/src/operations/get_metrics.rs +++ b/src/operations/get_metrics.rs @@ -1,5 +1,5 @@ +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::date_time::DateTimeAsMicroseconds; use crate::app::AppContext; diff --git a/src/operations/parse_db_json_entity.rs b/src/operations/parse_db_json_entity.rs index d93c420..9d7d547 100644 --- a/src/operations/parse_db_json_entity.rs +++ b/src/operations/parse_db_json_entity.rs @@ -6,7 +6,7 @@ use my_no_sql_sdk::core::{ use crate::db_operations::DbOperationError; pub fn parse_db_json_entity(src: &[u8], now: &JsonTimeStamp) -> Result { - match DbJsonEntity::parse_into_db_row(src, now) { + match DbJsonEntity::parse_into_db_row(src.into(), now) { Ok(result) => Ok(result), Err(err) => { let result = DbOperationError::DbEntityParseFail(err); diff --git a/src/operations/persist.rs b/src/operations/persist.rs index bb4bb05..994bfea 100644 --- a/src/operations/persist.rs +++ b/src/operations/persist.rs @@ -1,8 +1,8 @@ use std::sync::Arc; use my_logger::LogEventCtx; +use my_no_sql_sdk::core::rust_extensions::{date_time::DateTimeAsMicroseconds, StopWatch}; use my_no_sql_server_core::DbTableWrapper; -use rust_extensions::{date_time::DateTimeAsMicroseconds, StopWatch}; use crate::{app::AppContext, persist::partition_persist_marker::PersistResult}; diff --git a/src/persist/partition_persist_marker.rs b/src/persist/partition_persist_marker.rs index 40653ac..deec8c6 100644 --- a/src/persist/partition_persist_marker.rs +++ b/src/persist/partition_persist_marker.rs @@ -1,5 +1,5 @@ use my_no_sql_sdk::core::db::{PartitionKey, PartitionKeyParameter}; -use rust_extensions::{ +use my_no_sql_sdk::core::rust_extensions::{ date_time::DateTimeAsMicroseconds, sorted_vec::{EntityWithStrKey, SortedVecWithStrKey}, }; @@ -77,7 +77,9 @@ impl PartitionPersistMarker { persist_moment: DateTimeAsMicroseconds, ) { match self.partitions.insert_or_update(partition_key.as_str()) { - rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert( + entry, + ) => { let entity = PartitionPersistMoment { partition_key: partition_key.to_partition_key(), persist_moment, @@ -85,7 +87,9 @@ impl PartitionPersistMarker { entry.insert(entity); } - rust_extensions::sorted_vec::InsertOrUpdateEntry::Update(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Update( + entry, + ) => { if persist_moment.unix_microseconds > entry.item.persist_moment.unix_microseconds { entry.item.persist_moment = persist_moment; } diff --git a/src/persist/persist_markers.rs b/src/persist/persist_markers.rs index 539821d..aae9369 100644 --- a/src/persist/persist_markers.rs +++ b/src/persist/persist_markers.rs @@ -1,6 +1,6 @@ use std::time::Duration; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use super::partition_persist_marker::PartitionPersistMarker; const DURATION_MONITORING_DATA_SIZE: usize = 120; diff --git a/src/persist/persist_markers_by_table.rs b/src/persist/persist_markers_by_table.rs index 92ebd10..a136550 100644 --- a/src/persist/persist_markers_by_table.rs +++ b/src/persist/persist_markers_by_table.rs @@ -1,7 +1,7 @@ use std::time::Duration; use my_no_sql_sdk::core::db::{DbTable, PartitionKeyParameter}; -use rust_extensions::{ +use my_no_sql_sdk::core::rust_extensions::{ date_time::DateTimeAsMicroseconds, sorted_vec::{EntityWithStrKey, SortedVecWithStrKey}, }; @@ -51,7 +51,9 @@ impl PersistMarkersByTable { let mut write_access = self.by_table.lock().await; match write_access.insert_or_update(db_table.name.as_str()) { - rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert( + entry, + ) => { let mut item = PersistByTableItem { table_name: db_table.name.clone(), data: TablePersistData::new(), @@ -63,7 +65,9 @@ impl PersistMarkersByTable { entry.insert(item); } - rust_extensions::sorted_vec::InsertOrUpdateEntry::Update(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Update( + entry, + ) => { entry .item .data @@ -81,7 +85,9 @@ impl PersistMarkersByTable { let mut write_access = self.by_table.lock().await; match write_access.insert_or_update(&db_table.name) { - rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert( + entry, + ) => { let mut item = PersistByTableItem { table_name: db_table.name.to_string(), data: TablePersistData::new(), @@ -91,7 +97,9 @@ impl PersistMarkersByTable { entry.insert(item); } - rust_extensions::sorted_vec::InsertOrUpdateEntry::Update(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Update( + entry, + ) => { entry .item .data @@ -109,7 +117,9 @@ impl PersistMarkersByTable { let mut write_access = self.by_table.lock().await; match write_access.insert_or_update(&db_table.name) { - rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert( + entry, + ) => { let mut item = PersistByTableItem { table_name: db_table.name.to_string(), data: TablePersistData::new(), @@ -119,7 +129,9 @@ impl PersistMarkersByTable { entry.insert(item); } - rust_extensions::sorted_vec::InsertOrUpdateEntry::Update(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Update( + entry, + ) => { entry.item.data.data_to_persist.mark_persist_attrs(); } } diff --git a/src/persist_io/table_file.rs b/src/persist_io/table_file.rs index a4d1c09..1aed4a1 100644 --- a/src/persist_io/table_file.rs +++ b/src/persist_io/table_file.rs @@ -1,5 +1,5 @@ use my_no_sql_sdk::core::db::PartitionKey; -use rust_extensions::base64::FromBase64; +use my_no_sql_sdk::core::rust_extensions::base64::FromBase64; use crate::persist_io::TABLE_METADATA_FILE_NAME; diff --git a/src/persist_operations/blob_content_cache/blob_content_cache.rs b/src/persist_operations/blob_content_cache/blob_content_cache.rs index 1f59485..bfe5704 100644 --- a/src/persist_operations/blob_content_cache/blob_content_cache.rs +++ b/src/persist_operations/blob_content_cache/blob_content_cache.rs @@ -1,8 +1,10 @@ use my_no_sql_sdk::core::db::{ db_table_master_node::PartitionLastWriteMoment, DbTable, DbTableAttributes, }; +use my_no_sql_sdk::core::rust_extensions::{ + date_time::DateTimeAsMicroseconds, sorted_vec::SortedVecWithStrKey, +}; use my_no_sql_server_core::db_snapshots::DbPartitionSnapshot; -use rust_extensions::{date_time::DateTimeAsMicroseconds, sorted_vec::SortedVecWithStrKey}; use tokio::sync::RwLock; use super::PersistedTableData; @@ -45,11 +47,15 @@ impl BlobContentCache { let mut write_access = self.data_by_table.write().await; match write_access.insert_or_update(table_name) { - rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Insert( + entry, + ) => { let table_data = PersistedTableData::new(table_name.to_string(), attr); entry.insert(table_data); } - rust_extensions::sorted_vec::InsertOrUpdateEntry::Update(entry) => { + my_no_sql_sdk::core::rust_extensions::sorted_vec::InsertOrUpdateEntry::Update( + entry, + ) => { entry.item.attr = attr; } } diff --git a/src/persist_operations/blob_content_cache/persisted_table_data.rs b/src/persist_operations/blob_content_cache/persisted_table_data.rs index 0335156..d3c90c8 100644 --- a/src/persist_operations/blob_content_cache/persisted_table_data.rs +++ b/src/persist_operations/blob_content_cache/persisted_table_data.rs @@ -1,7 +1,7 @@ use my_no_sql_sdk::core::db::{ db_table_master_node::PartitionLastWriteMoment, DbTable, DbTableAttributes, }; -use rust_extensions::sorted_vec::{EntityWithStrKey, SortedVecWithStrKey}; +use my_no_sql_sdk::core::rust_extensions::sorted_vec::{EntityWithStrKey, SortedVecWithStrKey}; pub struct PersistedTableData { pub table_name: String, diff --git a/src/persist_operations/data_initializer/load_tables.rs b/src/persist_operations/data_initializer/load_tables.rs index 193928e..64d894d 100644 --- a/src/persist_operations/data_initializer/load_tables.rs +++ b/src/persist_operations/data_initializer/load_tables.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use my_logger::LogEventCtx; -use rust_extensions::StopWatch; +use my_no_sql_sdk::core::rust_extensions::StopWatch; use crate::app::AppContext; diff --git a/src/persist_operations/serializers/db_partition.rs b/src/persist_operations/serializers/db_partition.rs index ec75048..1b4c09d 100644 --- a/src/persist_operations/serializers/db_partition.rs +++ b/src/persist_operations/serializers/db_partition.rs @@ -1,19 +1,22 @@ use std::sync::Arc; -use my_json::json_reader::array_parser::ArrayToJsonObjectsSplitter; +use my_no_sql_sdk::core::my_json::json_reader::array_iterator::JsonArrayIterator; use my_no_sql_sdk::core::{db::DbPartition, db_json_entity::DbJsonEntity}; +use my_no_sql_server_core::rust_extensions::array_of_bytes_iterator::SliceIterator; pub fn deserialize(partition_key: &str, raw: &[u8]) -> Result { let mut db_partition = DbPartition::new(partition_key.to_string()); - for db_entity_json_result in raw.split_array_json_to_objects() { + let mut json_array_iterator: JsonArrayIterator = raw.into(); + + while let Some(db_entity_json_result) = json_array_iterator.get_next() { if let Err(err) = db_entity_json_result { return Err(format!("Can not split to array of json objects: {:?}", err)); } let db_entity_json = db_entity_json_result.unwrap(); - match DbJsonEntity::restore_into_db_row(db_entity_json) { + match DbJsonEntity::restore_into_db_row(db_entity_json.unwrap_as_object().unwrap()) { Ok(db_row) => { db_partition.insert_row(Arc::new(db_row)); } diff --git a/src/persist_operations/serializers/table_attrs.rs b/src/persist_operations/serializers/table_attrs.rs index edbe2ce..b477823 100644 --- a/src/persist_operations/serializers/table_attrs.rs +++ b/src/persist_operations/serializers/table_attrs.rs @@ -1,5 +1,5 @@ use my_no_sql_sdk::core::db::DbTableAttributes; -use rust_extensions::date_time::DateTimeAsMicroseconds; +use my_no_sql_sdk::core::rust_extensions::date_time::DateTimeAsMicroseconds; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug)] diff --git a/src/persist_operations/sync/save_table.rs b/src/persist_operations/sync/save_table.rs index 92e9ebd..fc5ace6 100644 --- a/src/persist_operations/sync/save_table.rs +++ b/src/persist_operations/sync/save_table.rs @@ -1,6 +1,6 @@ use my_no_sql_sdk::core::db::db_table_master_node::PartitionLastWriteMoment; +use my_no_sql_sdk::core::rust_extensions::sorted_vec::SortedVecWithStrKey; use my_no_sql_server_core::{db_snapshots::DbTableSnapshot, DbTableWrapper}; -use rust_extensions::sorted_vec::SortedVecWithStrKey; use crate::app::AppContext; diff --git a/src/settings_reader.rs b/src/settings_reader.rs index 4f64699..8e6389d 100644 --- a/src/settings_reader.rs +++ b/src/settings_reader.rs @@ -1,5 +1,5 @@ use my_azure_storage_sdk::AzureStorageConnection; -use rust_extensions::StrOrString; +use my_no_sql_sdk::core::rust_extensions::StrOrString; use serde::{Deserialize, Serialize}; use std::{env, sync::Arc}; use tokio::{fs::File, io::AsyncReadExt}; @@ -49,7 +49,7 @@ impl SettingsModel { } pub fn get_backup_folder<'s>(&'s self) -> StrOrString<'s> { - rust_extensions::file_utils::format_path(self.backup_folder.as_str()) + my_no_sql_sdk::core::rust_extensions::file_utils::format_path(self.backup_folder.as_str()) } }