Merge branch 'main' into DOC-4137

Author: cmilesb

.github/workflows/main.yml

@@ -159,5 +159,14 @@ jobs:
             done
           fi
 
+          if [[ "$bucket_path" == staging/* ]]
+          then
+            versioned_builds=($(find . -type d -regex ".*[0-9-]" -maxdepth 1 | sed -E 's/^.\///'))
+            for versioned_build in "${versioned_builds[@]}"; do
+              product=$(grep -Eo '[a-zA-Z]+' <<< $versioned_build)
+              gsutil -m rsync -r -c -j html -d "${{ github.workspace }}/${versioned_build}/operate/${product}" "gs://${BUCKET}/${bucket_path}/${versioned_build}/operate/${product}"
+            done
+          fi
+
     - name: End
       run: echo "This job's status is ${{ job.status }}."

build/components/component.py

@@ -1,6 +1,8 @@
 import logging
 import glob
 import os
+import shutil
+
 import semver
 import uuid
 from typing import Tuple
@@ -514,13 +516,20 @@ def _copy_examples(self):
                 if not example_id:
                     continue
 
-                example_metadata = {'source': f}
+                example_metadata = {
+                    'source': f,
+                    'language': self.get('language').lower()
+                }
+
+                base_path = os.path.join(dst, example_id)
+                mkdir_p(base_path)
+                rsync(example_metadata['source'], base_path)
 
-                mkdir_p(f'{dst}/{example_id}')
-                rsync(example_metadata['source'], f'{dst}/{example_id}/')
+                target_path = os.path.join(base_path, f'{self.get("id")}_{os.path.basename(f)}')
+                shutil.move(os.path.join(base_path, os.path.basename(f)), target_path)
 
-                example_metadata['target'] = f'{dst}/{example_id}/{os.path.basename(f)}'
-                e = Example(self.get('language'), example_metadata['target'])
+                example_metadata['target'] = target_path
+                e = Example(self.get('language'), target_path)
                 example_metadata['highlight'] = e.highlight
                 example_metadata['hidden'] = e.hidden
                 example_metadata['named_steps'] = e.named_steps
@@ -532,7 +541,7 @@ def _copy_examples(self):
                     examples[example_id] = {}
 
                 logging.info(f'Example {example_id} processed successfully.')
-                examples[example_id][self.get('language')] = example_metadata
+                examples[example_id][self.get('label')] = example_metadata
 
     def apply(self) -> None:
         logging.info(f'Applying client {self._id}')

config.toml

@@ -45,7 +45,7 @@ tagManagerId = "GTM-TKZ6J9R"
 gitHubRepo = "https://github.com/redis/docs"
 
 # Display and sort order for client examples
-clientsExamples = ["Python", "Node.js", "Java", "Go", "C#", "RedisVL"]
+clientsExamples = ["Python", "Node.js", "Java Sync", "Java Async", "Java Reactive", "Go", "C#", "RedisVL"]
 searchService = "/convai/api/search-service"
 ratingsService = "/docusight/api/rate"
 
@@ -57,12 +57,14 @@ rdi_db_types = "cassandra|mysql|oracle|postgresql|sqlserver"
 rdi_cli_latest = "latest"
 
 [params.clientsConfig]
-"Python"={lang="python", quickstartSlug="python/redis-py"}
-"Node.js"={lang="javascript", quickstartSlug="nodejs"}
-"Java"={lang="java", quickstartSlug="java/jedis"}
-"Go"={lang="go", quickstartSlug="go"}
-"C#"={lang="C#", quickstartSlug="dotnet"}
-"RedisVL"={lang="python", quickstartSlug="python/redis-vl"}
+"Python"={quickstartSlug="redis-py"}
+"Node.js"={quickstartSlug="nodejs"}
+"Java sync"={quickstartSlug="jedis"}
+"Java async"={quickstartSlug="lettuce"}
+"Java reactive"={quickstartSlug="lettuce"}
+"Go"={quickstartSlug="go"}
+"C#"={quickstartSlug="dotnet"}
+"RedisVL"={quickstartSlug="redis-vl"}
 
 # Markup
 [markup]

content/commands/client-kill/index.md

@@ -74,6 +74,12 @@ arguments:
       optional: true
       token: SKIPME
       type: oneof
+    - display_text: maxage
+      name: maxage
+      optional: true
+      since: 7.4.0
+      token: MAXAGE
+      type: integer
     multiple: true
     name: new-format
     type: oneof
@@ -110,6 +116,8 @@ history:
   - Replaced `slave` `TYPE` with `replica`. `slave` still supported for backward compatibility.
 - - 6.2.0
   - '`LADDR` option.'
+- - 7.4.0
+  - '`MAXAGE` option.'
 linkTitle: CLIENT KILL
 since: 2.4.0
 summary: Terminates open connections.

content/commands/cluster-failover/index.md

@@ -82,7 +82,7 @@ in order to perform a data center switch, while all the masters are down
 or partitioned away.
 
 The **TAKEOVER** option implies everything **FORCE** implies, but also does
-not uses any cluster authorization in order to failover. A replica receiving
+not use any cluster authorization in order to failover. A replica receiving
 `CLUSTER FAILOVER TAKEOVER` will instead:
 
 1. Generate a new `configEpoch` unilaterally, just taking the current greatest epoch available and incrementing it if its local configuration epoch is not already the greatest.

content/commands/failover/index.md

@@ -87,7 +87,7 @@ If this value is not specified, the timeout can be considered to be "infinite".
 
 * `TO` *HOST* *PORT* -- This option allows designating a specific replica, by its host and port, to failover to. The master will wait specifically for this replica to catch up to its replication offset, and then failover to it.
 
-* `FORCE` -- If both the `TIMEOUT` and `TO` options are set, the force flag can also be used to designate that that once the timeout has elapsed, the master should failover to the target replica instead of rolling back.
+* `FORCE` -- If both the `TIMEOUT` and `TO` options are set, the force flag can also be used to designate that once the timeout has elapsed, the master should failover to the target replica instead of rolling back.
 This can be used for a best-effort attempt at a failover without data loss, but limiting write outage.
 
 NOTE: The master will always rollback if the `PSYNC FAILOVER` request is rejected by the target replica. 

content/commands/flushall/index.md

@@ -66,6 +66,7 @@ It is possible to use one of the following modifiers to dictate the flushing mod
 
 * An asynchronous `FLUSHALL` command only deletes keys that were present at the time the command was invoked. Keys created during an asynchronous flush will be unaffected.
 * This command does not delete functions.
+* Other than emptying all databases (similar to `FLUSHDB`), this command clears the RDB persistence file, aborts any snapshot that is in progress, and, if the `save` config is enabled, saves an empty RDB file.
 
 ## Behavior change history
 

content/commands/flushdb/index.md

@@ -66,6 +66,7 @@ It is possible to use one of the following modifiers to dictate the flushing mod
 
 * An asynchronous `FLUSHDB` command only deletes keys that were present at the time the command was invoked. Keys created during an asynchronous flush will be unaffected.
 * This command does not delete functions.
+* When using Redis Cluster, this command is identical to `FLUSHALL` since a Redis Cluster supports only one database with an ID of zero.
 
 ## Behavior change history
 

content/commands/ft.search/index.md

@@ -275,7 +275,7 @@ since: 1.0.0
 stack_path: docs/interact/search-and-query
 summary: Searches the index with a textual query, returning either documents or just
   ids
-syntax: "FT.SEARCH index query \n  [NOCONTENT] \n  [VERBATIM] [NOSTOPWORDS] \n  [WITHSCORES]\
+syntax: "FT.SEARCH index query \n  [NOCONTENT] \n  [VERBATIM] \n  [NOSTOPWORDS] \n  [WITHSCORES]\
   \ \n  [WITHPAYLOADS] \n  [WITHSORTKEYS] \n  [FILTER numeric_field min max [ FILTER\
   \ numeric_field min max ...]] \n  [GEOFILTER geo_field lon lat radius m | km | mi\
   \ | ft [ GEOFILTER geo_field lon lat radius m | km | mi | ft ...]] \n  [INKEYS count\
@@ -344,6 +344,13 @@ returns the document ids and not the content. This is useful if RediSearch is on
 does not try to use stemming for query expansion but searches the query terms verbatim.
 </details>
 
+<details open>
+<summary><code>NOSTOPWORDS</code></summary>
+
+ignores any defined stop words in full text searches.
+</details>
+
+
 <details open>
 <summary><code>WITHSCORES</code></summary>
 

content/commands/geodist/index.md

@@ -67,8 +67,8 @@ key_specs:
 linkTitle: GEODIST
 since: 3.2.0
 summary: Returns the distance between two members of a geospatial index.
-syntax_fmt: GEODIST key member1 member2 [m | km | ft | mi]
-syntax_str: member1 member2 [m | km | ft | mi]
+syntax_fmt: GEODIST key member1 member2 [M | KM | FT | MI]
+syntax_str: member1 member2 [M | KM | FT | MI]
 title: GEODIST
 ---
 Return the distance between two members in the geospatial index represented by the sorted set.