Merge remote-tracking branch 'upstream/main' into java/integ_yuryf_it

Signed-off-by: Yury-Fridlyand <[email protected]>

.github/workflows/cd.yml

@@ -209,8 +209,8 @@ jobs:
             - name: Publish to PyPI
               uses: PyO3/maturin-action@v1
               env:
-                  MATURIN_PYPI_TOKEN: ${{ secrets.TESTPYPI_API_TOKEN }}
-                  MATURIN_REPOSITORY: testpypi
+                  MATURIN_PYPI_TOKEN: ${{ secrets.LIVEPYPI_API_TOKEN }}
+                  MATURIN_REPOSITORY: pypi
               with:
                   command: upload
                   args: --skip-existing python/wheels/*
@@ -292,4 +292,4 @@ jobs:
                   npm run build
                   npm publish
               env:
-                  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+                  NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

.github/workflows/lint-rust/action.yml

@@ -33,7 +33,7 @@ runs:
         - run: |
               cargo update
               cargo install cargo-deny
-              cargo deny check licenses --config ${GITHUB_WORKSPACE}/deny.toml
+              cargo deny check --config ${GITHUB_WORKSPACE}/deny.toml
           working-directory: ${{ inputs.cargo-toml-folder }}
           shell: bash
 

.gitignore

@@ -44,6 +44,5 @@ utils/clusters/
 utils/tls_crts/
 
 # OSS Review Toolkit (ORT) files
-**/ort/**
+**/ort*/**
 **/ort_results/**
-**/.ort.yml

README.md

@@ -7,16 +7,17 @@ GLIDE for Redis is API-compatible with open source Redis version 6 and 7.
 
 ## Current Status
 We've made GLIDE for Redis an open-source project, and are releasing it in Preview to the community to gather feedback, and actively collaborate on the project roadmap. We welcome questions and contributions from all Redis stakeholders. 
-This preview release is recommended for testing purposes only. It is available in Python and Javascript (Node.js), with Java to follow. We're tracking its production readiness and future features on the [roadmap](https://github.com/orgs/aws/projects/165/).
+This preview release is recommended for testing purposes only. It is available in Python and Javascript (Node.js), with Java to follow. We're tracking its production readiness and future features on the [roadmap](https://github.com/orgs/aws/projects/187/).
 
 
 ## Getting Started
 
 -   [Node](./node/README.md)
 -   [Python](./python/README.md)
+-   [Documenation](https://github.com/aws/glide-for-redis/wiki)
 
 ## Getting Help
-If you have any questions, feature requests, encounter issues, or need assistance with this project, please don't hesitate to open a GitHub issue. Our community and contributors are here to help you. Before creating an issue, we recommend checking the [existing issues](https://github.com/aws/glide/issues) to see if your question or problem has already been addressed. If not, feel free to create a new issue, and we'll do our best to assist you. Please provide as much detail as possible in your issue description, including: 
+If you have any questions, feature requests, encounter issues, or need assistance with this project, please don't hesitate to open a GitHub issue. Our community and contributors are here to help you. Before creating an issue, we recommend checking the [existing issues](https://github.com/aws/glide-for-redis/issues) to see if your question or problem has already been addressed. If not, feel free to create a new issue, and we'll do our best to assist you. Please provide as much detail as possible in your issue description, including: 
 
 1. A clear and concise title
 2. Detailed description of the problem or question

benchmarks/rust/Cargo.toml

@@ -14,7 +14,6 @@ logger_core = {path = "../../logger_core"}
 redis = { path = "../../submodules/redis-rs/redis", features = ["aio"] }
 futures = "0.3.28"
 rand = "0.8.5"
-stopwatch = "0.0.7"
 itoa = "1.0.6"
 futures-time = "^3.0.0"
 clap = { version = "4.3.8", features = ["derive"] }

benchmarks/rust/src/main.rs

@@ -11,9 +11,8 @@ use std::{
     collections::HashMap,
     path::Path,
     sync::{atomic::AtomicUsize, Arc},
-    time::Duration,
+    time::{Duration, Instant},
 };
-use stopwatch::Stopwatch;
 
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
@@ -102,7 +101,7 @@ async fn perform_benchmark(args: Args) {
             })
             .await;
 
-        let mut stopwatch = stopwatch::Stopwatch::start_new();
+        let start = Instant::now();
         let results = join_all((0..*concurrent_tasks_count).map(|_| async {
             single_benchmark_task(
                 &connections,
@@ -114,7 +113,7 @@ async fn perform_benchmark(args: Args) {
             .await
         }))
         .await;
-        stopwatch.stop();
+        let elapsed = start.elapsed();
         let combined_results = results.into_iter().fold(HashMap::new(), |mut acc, map| {
             if acc.is_empty() {
                 return map;
@@ -139,7 +138,7 @@ async fn perform_benchmark(args: Args) {
         );
         results_json.insert(
             "tps".to_string(),
-            Value::Number((number_of_operations as i64 * 1000 / stopwatch.elapsed_ms()).into()),
+            Value::Number((number_of_operations as i64 * 1000 / elapsed.as_millis() as i64).into()),
         );
         results_json.insert(
             "client_count".to_string(),
@@ -236,7 +235,6 @@ async fn single_benchmark_task(
     data_size: usize,
 ) -> HashMap<ChosenAction, Vec<Duration>> {
     let mut buffer = itoa::Buffer::new();
-    let mut stopwatch = Stopwatch::new();
     let mut results = HashMap::new();
     results.insert(
         ChosenAction::GetNonExisting,
@@ -257,10 +255,10 @@ async fn single_benchmark_task(
         }
         let index = current_op % connections.len();
         let mut connection = connections[index].clone();
-        stopwatch.restart();
+        let start = Instant::now();
         let action = perform_operation(&mut connection, &mut buffer, data_size).await;
-        stopwatch.stop();
-        results.get_mut(&action).unwrap().push(stopwatch.elapsed());
+        let elapsed = start.elapsed();
+        results.get_mut(&action).unwrap().push(elapsed);
     }
 }
 

deny.toml

@@ -38,13 +38,14 @@ db-urls = ["https://github.com/rustsec/advisory-db"]
 # The lint level for security vulnerabilities
 vulnerability = "deny"
 # The lint level for unmaintained crates
-unmaintained = "warn"
+unmaintained = "deny"
 # The lint level for crates that have been yanked from their source registry
-yanked = "warn"
+yanked = "deny"
 # The lint level for crates with security notices. Note that as of
 # 2019-12-17 there are no security notice advisories in
 # https://github.com/rustsec/advisory-db
-notice = "warn"
+notice = "deny"
+unsound = "deny"
 # A list of advisory IDs to ignore. Note that ignored advisories will still
 # output a note when they are encountered.
 ignore = [
@@ -92,7 +93,7 @@ deny = [
     #"Nokia",
 ]
 # Lint level for licenses considered copyleft
-copyleft = "warn"
+copyleft = "deny"
 # Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
 # * both - The license will be approved if it is both OSI-approved *AND* FSF
 # * either - The license will be approved if it is either OSI-approved *OR* FSF
@@ -156,7 +157,7 @@ registries = [
 # https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
 [bans]
 # Lint level for when multiple versions of the same crate are detected
-multiple-versions = "warn"
+multiple-versions = "allow"
 # Lint level for when a crate version requirement is `*`
 wildcards = "allow"
 # The graph highlighting used when creating dotgraphs for crates
@@ -197,20 +198,12 @@ skip-tree = [
 [sources]
 # Lint level for what to happen when a crate from a crate registry that is not
 # in the allow list is encountered
-unknown-registry = "warn"
+unknown-registry = "deny"
 # Lint level for what to happen when a crate from a git repository that is not
 # in the allow list is encountered
-unknown-git = "warn"
+unknown-git = "deny"
 # List of URLs for allowed crate registries. Defaults to the crates.io index
 # if not specified. If it is specified but empty, no registries are allowed.
 allow-registry = ["https://github.com/rust-lang/crates.io-index"]
 # List of URLs for allowed Git repositories
 allow-git = []
-
-[sources.allow-org]
-# 1 or more github.com organizations to allow git sources for
-github = [""]
-# 1 or more gitlab.com organizations to allow git sources for
-gitlab = [""]
-# 1 or more bitbucket.org organizations to allow git sources for
-bitbucket = [""]

glide-core/.ort.yml

@@ -0,0 +1,11 @@
+excludes:
+    scopes:
+        - pattern: "devDependencies"
+          reason: "DEV_DEPENDENCY_OF"
+          comment: "Packages for development only."
+        - pattern: "build-dependencies"
+          reason: "BUILD_DEPENDENCY_OF"
+          comment: "Packages for building the code only."
+        - pattern: "dev-dependencies"
+          reason: "DEV_DEPENDENCY_OF"
+          comment: "Packages for development only."

glide-core/Cargo.toml

@@ -25,7 +25,7 @@ integer-encoding = "4.0.0"
 thiserror = "1"
 rand = "0.8.5"
 futures-intrusive = "0.5.0"
-directories = "5.0"
+directories = "4.0"
 once_cell = "1.18.0"
 arcstr = "1.1.5"
 sha1_smol = "1.0.0"