resolve merge conflicts

Author: UdeshyaDhungana

course-definition.yml

@@ -81,7 +81,7 @@ extensions:
 
       Along the way you'll learn about commands like [XADD][xadd-command], [XRANGE][xrange-command] and more.
 
-      [redis-streams-data-type]: https://redis.io/docs/data-types/streams/
+      [redis-streams-data-type]: https://redis.io/docs/latest/develop/data-types/streams/
       [xadd-command]: https://redis.io/commands/xadd/
       [xrange-command]: https://redis.io/commands/xrange/
 
@@ -104,7 +104,7 @@ extensions:
 
       Along the way you'll learn about how Redis's leader-follower replication works, the [PSYNC][redis-psync-command] command and more.
 
-      [redis-replication]: https://redis.io/docs/management/replication/
+      [redis-replication]: https://redis.io/docs/latest/operate/oss_and_stack/management/replication/
       [redis-psync-command]: https://redis.io/commands/psync/
 
   - slug: "persistence-rdb"
@@ -114,7 +114,7 @@ extensions:
 
       Along the way you'll learn about Redis's [RDB file format][rdb-file-format] and more.
 
-      [redis-persistence]: https://redis.io/docs/manual/persistence/
+      [redis-persistence]: https://redis.io/docs/latest/operate/oss_and_stack/management/persistence/
       [rdb-file-format]: https://github.com/sripathikrishnan/redis-rdb-tools/blob/548b11ec3c81a603f5b321228d07a61a0b940159/docs/RDB_File_Format.textile
 
   - slug: "pub-sub"
@@ -127,6 +127,17 @@ extensions:
       [redis-pub-sub]: https://redis.io/docs/latest/develop/pubsub/
       [subscribe-command]: https://redis.io/docs/latest/commands/subscribe/
       [publish-command]: https://redis.io/docs/latest/commands/publish/
+
+  - slug: "sorted-sets"
+    name: "Sorted Sets"
+    description_markdown : |-
+      In this challenge extension you'll add support for [Sorted Sets (zsets)][redis-zset] to your Redis implementation.
+
+      Along the way, you'll learn commands like [ZADD][zadd-command], [ZRANGE][zrange-command], and more.
+
+      [redis-zset]: https://redis.io/docs/latest/develop/data-types/sorted-sets/
+      [zadd-command]: https://redis.io/docs/latest/commands/zadd/
+      [zrange-command]: https://redis.io/docs/latest/commands/zrange/
   
   - slug: "geospatial"
     name: "Geospatial Commands"
@@ -139,7 +150,6 @@ extensions:
       [geoadd-command]: https://redis.io/docs/latest/commands/geoadd/
       [geosearch-command]: https://redis.io/docs/latest/commands/geosearch/
 
-
 stages:
   - slug: "jm1"
     concept_slugs:
@@ -422,7 +432,7 @@ stages:
     name: "Create a stream"
     difficulty: medium
     marketing_md: |
-      In this stage, you'll add support for creating a [Redis stream](https://redis.io/docs/data-types/streams/) using the `XADD` command.
+      In this stage, you'll add support for creating a [Redis stream](https://redis.io/docs/latest/develop/data-types/streams/) using the `XADD` command.
 
   - slug: "hq8"
     primary_extension_slug: "streams"
@@ -690,6 +700,63 @@ stages:
     difficulty: medium
     marketing_md: In this stage, you'll add support for the `UNSUBSCRIBE command`, which is used to unsubscribe from a channel.
 
+  # Sorted Sets
+  - slug: "ct1"
+    primary_extension_slug: "sorted-sets"
+    name: "Create a sorted set"
+    difficulty: easy
+    marketing_md: |
+      In this stage, you'll add support for creating a [sorted set](https://redis.io/docs/latest/develop/data-types/sorted-sets/) using the `ZADD` command.
+
+  - slug: "hf1"
+    primary_extension_slug: "sorted-sets"
+    name: "Add members"
+    difficulty: medium
+    marketing_md: |
+      In this stage, you'll add support for adding elements to an existing sorted set.
+
+  - slug: "lg6"
+    primary_extension_slug: "sorted-sets"
+    name: "Retrieve member rank"
+    difficulty: medium
+    marketing_md: |
+      In this stage, you'll add support for retrieving the rank of a sorted set member using the `ZRANK` command.
+
+  - slug: "ic1"
+    primary_extension_slug: "sorted-sets"
+    name: "List sorted set members"
+    difficulty: easy
+    marketing_md: |
+      In this stage, you'll add support for listing the members of a sorted set using the `ZRANGE` command.
+
+  - slug: "bj4"
+    primary_extension_slug: "sorted-sets"
+    name: "ZRANGE with negative indexes"
+    difficulty: easy
+    marketing_md: |
+      In this stage, you'll add support for negative indexes for the `ZRANGE` command.
+
+  - slug: "kn4"
+    primary_extension_slug: "sorted-sets"
+    name: "Count sorted set members"
+    difficulty: easy
+    marketing_md: |
+      In this stage, you'll add support for counting the number of members in a sorted set using the `ZCARD` command.
+
+  - slug: "gd7"
+    primary_extension_slug: "sorted-sets"
+    name: "Retrieve member score"
+    difficulty: medium
+    marketing_md: |
+      In this stage, you'll add support for retrieving the score of a sorted set member using the `ZSCORE` command.
+
+  - slug: "sq7"
+    primary_extension_slug: "sorted-sets"
+    name: "Remove a member"
+    difficulty: easy
+    marketing_md: |
+      In this stage, you'll add support for removing a member of a sorted set using the `ZREM` command.
+
   # Geospatial Commands
   - slug: "zt4"
     primary_extension_slug: "geospatial"

dockerfiles/ocaml-5.3.Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.7-labs
-FROM ocaml/opam:alpine-3.21-ocaml-5.3
+FROM ocaml/opam:debian-11-ocaml-5.3
 
 # The image uses opam as the user, so let's set OPAMROOT to re-use whatever is already built
 ENV OPAMROOT /home/opam/.opam
@@ -24,6 +24,3 @@ COPY --exclude=.git --exclude=README.md . /app
 
 # Cache dependencies
 RUN opam install . --yes
-
-# This runs dune build
-RUN .codecrafters/compile.sh

stage_descriptions/base-02-rg2.md

@@ -5,7 +5,7 @@ Commands and responses are both encoded using the [Redis protocol](https://redis
 
 [PING](https://redis.io/commands/ping/) is one of the simplest Redis commands. It's used to check whether a Redis server is healthy.
 
-The response for the `PING` command is `+PONG\r\n`. This is the string "PONG" encoded using the [Redis protocol](https://redis.io/docs/reference/protocol-spec/).
+The response for the `PING` command is `+PONG\r\n`. This is the string "PONG" encoded using the [Redis protocol](https://redis.io/docs/latest/develop/reference/protocol-spec).
 
 In this stage, we'll cut corners by ignoring client input and hardcoding `+PONG\r\n` as a response. We'll learn to parse client input in later stages.
 
@@ -23,7 +23,7 @@ It'll then send a `PING` command to your server and expect a `+PONG\r\n` respons
 $ redis-cli PING
 ```
 
-Your server should respond with `+PONG\r\n`, which is "PONG" encoded as a [RESP simple string](https://redis.io/docs/reference/protocol-spec/#resp-simple-strings).
+Your server should respond with `+PONG\r\n`, which is "PONG" encoded as a [RESP simple string](https://redis.io/docs/latest/develop/reference/protocol-spec/#simple-strings).
 
 ### Notes
 

stage_descriptions/base-05-qq0.md

@@ -24,13 +24,13 @@ It'll then send an `ECHO` command with an argument to your server:
 $ redis-cli ECHO hey
 ```
 
-The tester will expect to receive `$3\r\nhey\r\n` as a response (that's the string `hey` encoded as a [RESP bulk string](https://redis.io/docs/reference/protocol-spec/#bulk-strings).
+The tester will expect to receive `$3\r\nhey\r\n` as a response (that's the string `hey` encoded as a [RESP bulk string](https://redis.io/docs/latest/develop/reference/protocol-spec/#bulk-strings).
 
 ### Notes
 
 - We suggest that you implement a proper Redis protocol parser in this stage. It'll come in handy in later stages.
 - Redis command names are case-insensitive, so `ECHO`, `echo` and `EcHo` are all valid commands.
 - The tester will send a random string as an argument to the `ECHO` command, so you won't be able to hardcode the response to pass this stage.
 - The exact bytes your program will receive won't be just `ECHO hey`, you'll receive something like this: `*2\r\n$4\r\nECHO\r\n$3\r\nhey\r\n`. That's
-  `["ECHO", "hey"]` encoded using the [Redis protocol](https://redis.io/docs/reference/protocol-spec/).
-- You can read more about how "commands" are handled in the Redis protocol [here](https://redis.io/docs/reference/protocol-spec/#sending-commands-to-a-redis-server).
+  `["ECHO", "hey"]` encoded using the [Redis protocol](https://redis.io/docs/latest/develop/reference/protocol-spec/).
+- You can read more about how "commands" are handled in the Redis protocol [here](https://redis.io/docs/latest/develop/reference/protocol-spec/#sending-commands-to-a-redis-server).

stage_descriptions/base-06-la7.md

@@ -27,15 +27,15 @@ It'll then send a `SET` command to your server:
 $ redis-cli SET foo bar
 ```
 
-The tester will expect to receive `+OK\r\n` as a response (that's the string `OK` encoded as a [RESP simple string](https://redis.io/docs/reference/protocol-spec/#resp-simple-strings)).
+The tester will expect to receive `+OK\r\n` as a response (that's the string `OK` encoded as a [RESP simple string](https://redis.io/docs/latest/develop/reference/protocol-spec/#simple-strings)).
 
 This command will be followed by a `GET` command:
 
 ```bash
 $ redis-cli GET foo
 ```
 
-The tester will expect to receive `$3\r\nbar\r\n` as a response (that's the string `bar` encoded as a [RESP bulk string](https://redis.io/docs/reference/protocol-spec/#bulk-strings).
+The tester will expect to receive `$3\r\nbar\r\n` as a response (that's the string `bar` encoded as a [RESP bulk string](https://redis.io/docs/latest/develop/reference/protocol-spec/#bulk-strings).
 
 ### Notes
 

stage_descriptions/lists-04-sf6.md

@@ -27,7 +27,7 @@ Here are some additional notes on how the LRANGE command behaves with different
 
 - If the list does not exist, an empty array is returned
 - If the start index is greater than or equal to the list's length, an empty array is returned.
-- If the stop index is greater than the list's length, the stop index is treated as the last element.
+- If the stop index is greater than or equal to the list's length, the stop index is treated as the last element.
 - If the start index is greater than the stop index, the result is an empty array.
 
 ### Tests

stage_descriptions/lists-07-fv6.md

@@ -33,16 +33,16 @@ The tester will then send a `LLEN` command specifying the list that was just cre
 
 ```bash
 > LLEN list_key
-# Expect: list_length (RESP Encoded Integer) 
+# Expect: list_length (RESP Encoded Integer)
 ```
 
 It will expect the response to be length of the list encoded as a RESP integer.
 
 It will also verify the response of `LLEN` command for a non-existent list.
 
 ```bash
-> LLEN non_existent_list_key
+> LLEN missing_list_key
 # Expect:  (integer) 0
 ```
 
-The tester expects 0, which is RESP Encoded as `:0\r\n `. 
+The tester expects 0, which is RESP Encoded as `:0\r\n `.

stage_descriptions/lists-11-xj7.md

@@ -12,7 +12,7 @@ It will then send a BLPOP command with a non-zero timeout:
 
 ```bash
 $ redis-cli BLPOP list_key 0.1
-# (Blocks)
+# (Blocks for 0.1 seconds)
 ```
 
 After the timeout expires, the tester will expect to receive a null bulk string (`$-1\r\n`) as the response.

stage_descriptions/persistence-rdb-01-zg5.md

@@ -1,4 +1,4 @@
-Welcome to the RDB Persistence Extension! In this extension, you'll add support for reading [RDB files](https://redis.io/docs/management/persistence/) (Redis Database files).
+Welcome to the RDB Persistence Extension! In this extension, you'll add support for reading [RDB files](https://redis.io/docs/latest/operate/oss_and_stack/management/persistence/) (Redis Database files).
 
 In this stage, you'll add support for two configuration parameters related to RDB persistence, as well as the [CONFIG GET](https://redis.io/docs/latest/commands/config-get/) command.
 

stage_descriptions/persistence-rdb-02-jz6.md

@@ -103,33 +103,33 @@ FF                       /* Indicates that the file is ending,
 89 3b b7 4e f8 0f 77 19  // An 8-byte CRC64 checksum of the entire file.
 ```
 
-#### Size encoding
+#### Length encoding
 
-Size-encoded values specify the size of something. Here are some examples:
-- The database indexes and hash table sizes are size encoded.
-- String encoding begins with a size-encoded value that specifies the number of characters in the string.
-- List encoding begins with a size-encoded value that specifies the number of elements in the list.
+Length-encoded values specify the length or size of something. Here are some examples:
+- The database indexes and hash table sizes are length encoded.
+- String encoding begins with a length-encoded value that specifies the number of characters in the string.
+- List encoding begins with a length-encoded value that specifies the number of elements in the list.
 
-The first (most significant) two bits of a size-encoded value indicate how the value should be parsed. Here's a guide (bits are shown in both hexadecimal and binary):
+The first (most significant) two bits of a length-encoded value indicate how the value should be parsed. Here's a guide (bits are shown in both hexadecimal and binary):
 ```
 /* If the first two bits are 0b00:
-   The size is the remaining 6 bits of the byte.
-   In this example, the size is 10: */
+   The length is the remaining 6 bits of the byte.
+   In this example, the length is 10: */
 0A
 00001010
 
 /* If the first two bits are 0b01:
-   The size is the next 14 bits
+   The length is the next 14 bits
    (remaining 6 bits in the first byte, combined with the next byte),
    in big-endian (read left-to-right).
-   In this example, the size is 700: */
+   In this example, the length is 700: */
 42 BC
 01000010 10111100
 
 /* If the first two bits are 0b10:
    Ignore the remaining 6 bits of the first byte.
-   The size is the next 4 bytes, in big-endian (read left-to-right).
-   In this example, the size is 17000: */
+   The length is the next 4 bytes, in big-endian (read left-to-right).
+   In this example, the length is 17000: */
 80 00 00 42 68
 10000000 00000000 00000000 01000010 01101000