emergency save.
This commit is contained in:
parent
555cf209ba
commit
3955048157
10
Cargo.lock
generated
10
Cargo.lock
generated
@ -614,6 +614,7 @@ dependencies = [
|
|||||||
"clap",
|
"clap",
|
||||||
"rand",
|
"rand",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"uuid",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -1069,6 +1070,15 @@ version = "0.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "uuid"
|
||||||
|
version = "1.8.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
|
||||||
|
dependencies = [
|
||||||
|
"getrandom",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "version_check"
|
name = "version_check"
|
||||||
version = "0.9.4"
|
version = "0.9.4"
|
||||||
|
@ -11,3 +11,4 @@ axum-extra = { version = "0.9.2", features = ["cookie-signed"] }
|
|||||||
clap = { version = "4.5.1", features = ["derive"] }
|
clap = { version = "4.5.1", features = ["derive"] }
|
||||||
rand = "0.8.5"
|
rand = "0.8.5"
|
||||||
tokio = { version = "1.36.0", features = ["full"] }
|
tokio = { version = "1.36.0", features = ["full"] }
|
||||||
|
uuid = { version = "1.8.0", features = ["v4"] }
|
||||||
|
46
src/counter.rs
Normal file
46
src/counter.rs
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
use std::iter::Iterator;
|
||||||
|
use uuid::Uuid;
|
||||||
|
|
||||||
|
struct Counter {
|
||||||
|
id: Uuid,
|
||||||
|
counter: u128,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Counter {
|
||||||
|
fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
id: Uuid::new_v4(),
|
||||||
|
counter: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Iterator for Counter {
|
||||||
|
type Item: Counter;
|
||||||
|
|
||||||
|
fn next(&mut self) -> Option<Self::Item> {
|
||||||
|
Counter::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod counters {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn create_counter() {
|
||||||
|
let count1 = Counter::new();
|
||||||
|
let count2 = Counter::new();
|
||||||
|
assert_ne!(count1.id, count2.id);
|
||||||
|
assert_eq!(count1.counter, 0);
|
||||||
|
assert_eq!(count2.counter, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn iterate_counter() {
|
||||||
|
let count = Counter::new();
|
||||||
|
let first = count.next().unwrap();
|
||||||
|
let second = count.next().unwrap();
|
||||||
|
let third = count.next().unwrap();
|
||||||
|
}
|
||||||
|
}
|
90
src/lib.rs
90
src/lib.rs
@ -1,5 +1,9 @@
|
|||||||
|
mod counter;
|
||||||
|
|
||||||
use rand::distributions::{Alphanumeric, DistString};
|
use rand::distributions::{Alphanumeric, DistString};
|
||||||
use std::{
|
use std::{
|
||||||
|
collections::HashMap,
|
||||||
|
fmt,
|
||||||
sync::mpsc::{channel, Receiver, Sender},
|
sync::mpsc::{channel, Receiver, Sender},
|
||||||
thread::spawn,
|
thread::spawn,
|
||||||
};
|
};
|
||||||
@ -25,7 +29,7 @@ enum SendMsg {
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct Cache {
|
struct Cache {
|
||||||
data: Vec<String>,
|
data: HashMap<String, DataType>,
|
||||||
rx: Receiver<SendMsg>,
|
rx: Receiver<SendMsg>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -33,7 +37,7 @@ impl Cache {
|
|||||||
fn new(recv: Receiver<SendMsg>) -> Self {
|
fn new(recv: Receiver<SendMsg>) -> Self {
|
||||||
Self {
|
Self {
|
||||||
rx: recv,
|
rx: recv,
|
||||||
data: Vec::new(),
|
data: HashMap::new(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,11 +57,11 @@ impl Cache {
|
|||||||
|
|
||||||
fn validate_session(&mut self, sess: Option<String>) -> Session {
|
fn validate_session(&mut self, sess: Option<String>) -> Session {
|
||||||
let session: Session;
|
let session: Session;
|
||||||
if sess.is_some_and(|sess| self.data.contains(&sess)) {
|
if sess.is_some_and(|sess| true) {// self.data.contains(&sess)) {
|
||||||
session = Session::Ok;
|
session = Session::Ok;
|
||||||
} else {
|
} else {
|
||||||
let id = self.gen_id();
|
let id = self.gen_id();
|
||||||
self.data.push(id.clone());
|
// `self.data.push(id.clone());
|
||||||
session = Session::New(id);
|
session = Session::New(id);
|
||||||
}
|
}
|
||||||
session
|
session
|
||||||
@ -133,3 +137,81 @@ mod client {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum Field {
|
||||||
|
StaticString(String),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for Field {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self {
|
||||||
|
Field::StaticString(data) => write!(f, "{}", data),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Record {
|
||||||
|
data: HashMap<String, Field>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Record {
|
||||||
|
fn new(data: HashMap<String, Field>) -> Self {
|
||||||
|
Self {
|
||||||
|
data: data,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get(&self, fieldname: &str) -> &Field {
|
||||||
|
match self.data.get(fieldname) {
|
||||||
|
Some(field) => field,
|
||||||
|
None => unreachable!(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod records {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn create_record() {
|
||||||
|
let input = HashMap::from([
|
||||||
|
("one".to_string(), Field::StaticString("1".to_string())),
|
||||||
|
("two".to_string(), Field::StaticString("2".to_string())),
|
||||||
|
("three".to_string(), Field::StaticString("3".to_string())),
|
||||||
|
]);
|
||||||
|
let rec = Record::new(input);
|
||||||
|
assert_eq!(rec.get("one").to_string(), "1");
|
||||||
|
assert_eq!(rec.get("two").to_string(), "2");
|
||||||
|
assert_eq!(rec.get("three").to_string(), "3");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
struct Column;
|
||||||
|
|
||||||
|
struct Table {
|
||||||
|
columns: HashMap<String, Column>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Table {
|
||||||
|
fn new() -> Self {
|
||||||
|
Self {
|
||||||
|
columns: HashMap::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tables {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn create_table() {
|
||||||
|
let tbl = Table::new();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enum DataType {
|
||||||
|
Table(Table),
|
||||||
|
Record(Record),
|
||||||
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
"""Base for MoreThanTest test cases."""
|
"""Base for MoreThanTest test cases."""
|
||||||
|
|
||||||
from asyncio import create_subprocess_exec, sleep
|
from asyncio import create_subprocess_exec, gather, sleep
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from socket import socket
|
from socket import socket
|
||||||
from unittest import IsolatedAsyncioTestCase
|
from unittest import IsolatedAsyncioTestCase
|
||||||
@ -87,6 +87,19 @@ class MTTClusterTC(IsolatedAsyncioTestCase):
|
|||||||
port = await self.get_port()
|
port = await self.get_port()
|
||||||
await self.create_server_with_flags("-p", str(port))
|
await self.create_server_with_flags("-p", str(port))
|
||||||
|
|
||||||
|
async def create_cluster(self, num=2):
|
||||||
|
"""Create a cluster of servers."""
|
||||||
|
ports = []
|
||||||
|
while len(ports) < num:
|
||||||
|
port = await self.get_port()
|
||||||
|
if port not in ports:
|
||||||
|
ports.append(port)
|
||||||
|
servers = []
|
||||||
|
for port in ports:
|
||||||
|
servers.append(self.create_server_with_flags("-p", str(port)))
|
||||||
|
cluster = gather(*servers)
|
||||||
|
await cluster
|
||||||
|
|
||||||
async def run_tests(self, uri, func):
|
async def run_tests(self, uri, func):
|
||||||
"""Run the tests on each server."""
|
"""Run the tests on each server."""
|
||||||
for server in self.servers:
|
for server in self.servers:
|
||||||
|
@ -85,3 +85,15 @@ class BootUpTC(MTTClusterTC):
|
|||||||
) as response:
|
) as response:
|
||||||
self.assertIn(SESSION_KEY, response.cookies)
|
self.assertIn(SESSION_KEY, response.cookies)
|
||||||
self.assertNotEqual(response.cookies[SESSION_KEY].value, value)
|
self.assertNotEqual(response.cookies[SESSION_KEY].value, value)
|
||||||
|
|
||||||
|
async def test_sessions_are_shared_between_servers(self):
|
||||||
|
"""Does the session apply to the cluster."""
|
||||||
|
await self.create_cluster()
|
||||||
|
ids = []
|
||||||
|
|
||||||
|
def tests(response):
|
||||||
|
if SESSION_KEY in response.cookies:
|
||||||
|
ids.append(response.cookies[SESSION_KEY].value)
|
||||||
|
|
||||||
|
await self.run_tests("/", tests)
|
||||||
|
self.assertEqual(len(ids), 1, "Session info should be shared to the cluster.")
|
||||||
|
Loading…
Reference in New Issue
Block a user