Skip to content

Commit

Permalink
New Json Architecture
Browse files Browse the repository at this point in the history
  • Loading branch information
amigin committed Feb 4, 2024
1 parent 4820c33 commit 24b8f6c
Show file tree
Hide file tree
Showing 83 changed files with 162 additions and 126 deletions.
12 changes: 3 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion src/app/app_ctx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/app/events_sync.rs
Original file line number Diff line number Diff line change
@@ -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,
};
Expand Down
2 changes: 1 addition & 1 deletion src/background/backup_timer.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/background/gc_db_rows.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion src/background/gc_http_sessions.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/background/gc_multipart.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/background/metrics_updater.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/background/persist.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/background/sync.rs
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/data_readers/data_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/data_readers/data_readers_data.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion src/data_readers/data_readers_list.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 3 additions & 1 deletion src/data_readers/http_connection/connection_delivery_info.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 3 additions & 1 deletion src/data_readers/http_connection/http_connection_info.rs
Original file line number Diff line number Diff line change
@@ -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::{
Expand Down
2 changes: 1 addition & 1 deletion src/data_readers/http_connection/into_http_payload.rs
Original file line number Diff line number Diff line change
@@ -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},
Expand Down
2 changes: 1 addition & 1 deletion src/data_readers/tcp_connection/tcp_payload_to_send.rs
Original file line number Diff line number Diff line change
@@ -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<MyNoSqlTcpContract> {
match sync_event {
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/gc/keep_max_partitions_amount.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/gc/keep_partition_max_records.rs
Original file line number Diff line number Diff line change
@@ -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};

Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/multipart/multipart.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/multipart/multipart_list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/db_operations/read/get_highest_row_and_below.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/db_operations/read/read_filter.rs
Original file line number Diff line number Diff line change
@@ -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<Item = &'s Arc<DbRow>>,
Expand Down
4 changes: 2 additions & 2 deletions src/db_operations/read/rows/get_all.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/read/rows/get_all_by_partition_key.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/db_operations/read/rows/get_all_by_row_key.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/read/rows/get_single.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/transactions/commit.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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<Item = &'s str>>(
table: &DbTableWrapper,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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<Item = &'s str>>(
db_table: &Arc<DbTableWrapper>,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/update_statistics/update_statistics.rs
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/write/bulk_delete.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/write/bulk_insert_or_update.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/write/clean_partition_and_bulk_insert.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/write/clean_table.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/write/clean_table_and_bulk_insert.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/write/delete_partitions.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/db_operations/write/delete_row.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
Loading

0 comments on commit 24b8f6c

Please sign in to comment.