Merge pull request #68730 from ClickHouse/replxx-custom-descriptors

Bump Replxx to support custom descriptors

cmake/freebsd/toolchain-x86_64.cmake

@@ -8,4 +8,7 @@ set (CMAKE_CXX_COMPILER_TARGET "x86_64-pc-freebsd11")
 set (CMAKE_ASM_COMPILER_TARGET "x86_64-pc-freebsd11")
 set (CMAKE_SYSROOT "${CMAKE_CURRENT_LIST_DIR}/../../contrib/sysroot/freebsd-x86_64")
 
+# dprintf is used in a patched version of replxx
+add_compile_definitions(_WITH_DPRINTF)
+
 set (CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)  # disable linkage check - it doesn't work in CMake

contrib/replxx

@@ -1 +1 @@
-Subproject commit 5d04501f93a4fb7f0bb8b73b8f614bc986f9e25b
+Subproject commit 711c18e7f4d951255aa8b0851e5a55d5a5fb0ddb

docs/en/sql-reference/functions/geo/geohash.md

@@ -6,7 +6,7 @@ title: "Functions for Working with Geohash"
 
 ## Geohash
 
-[Geohash](https://en.wikipedia.org/wiki/Geohash) is the geocode system, which subdivides Earth’s surface into buckets of grid shape and encodes each cell into a short string of letters and digits. It is a hierarchical data structure, so the longer is the geohash string, the more precise is the geographic location.
+[Geohash](https://en.wikipedia.org/wiki/Geohash) is the geocode system, which subdivides Earth’s surface into buckets of grid shape and encodes each cell into a short string of letters and digits. It is a hierarchical data structure, so the longer the geohash string is, the more precise the geographic location will be.
 
 If you need to manually convert geographic coordinates to geohash strings, you can use [geohash.org](http://geohash.org/).
 
@@ -14,26 +14,37 @@ If you need to manually convert geographic coordinates to geohash strings, you c
 
 Encodes latitude and longitude as a [geohash](#geohash)-string.
 
+**Syntax**
+
 ``` sql
 geohashEncode(longitude, latitude, [precision])
 ```
 
 **Input values**
 
-- longitude - longitude part of the coordinate you want to encode. Floating in range`[-180°, 180°]`
-- latitude - latitude part of the coordinate you want to encode. Floating in range `[-90°, 90°]`
-- precision - Optional, length of the resulting encoded string, defaults to `12`. Integer in range `[1, 12]`. Any value less than `1` or greater than `12` is silently converted to `12`.
+- `longitude` — Longitude part of the coordinate you want to encode. Floating in range`[-180°, 180°]`. [Float](../../data-types/float.md). 
+- `latitude` — Latitude part of the coordinate you want to encode. Floating in range `[-90°, 90°]`. [Float](../../data-types/float.md).
+- `precision` (optional) — Length of the resulting encoded string. Defaults to `12`. Integer in the range `[1, 12]`. [Int8](../../data-types/int-uint.md).
+
+:::note
+- All coordinate parameters must be of the same type: either `Float32` or `Float64`.
+- For the `precision` parameter, any value less than `1` or greater than `12` is silently converted to `12`.
+:::
 
 **Returned values**
 
-- alphanumeric `String` of encoded coordinate (modified version of the base32-encoding alphabet is used).
+- Alphanumeric string of the encoded coordinate (modified version of the base32-encoding alphabet is used). [String](../../data-types/string.md).
 
 **Example**
 
+Query:
+
 ``` sql
 SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res;
 ```
 
+Result:
+
 ``` text
 ┌─res──────────┐
 │ ezs42d000000 │
@@ -44,13 +55,19 @@ SELECT geohashEncode(-5.60302734375, 42.593994140625, 0) AS res;
 
 Decodes any [geohash](#geohash)-encoded string into longitude and latitude.
 
+**Syntax**
+
+```sql
+geohashDecode(hash_str)
+```
+
 **Input values**
 
-- encoded string - geohash-encoded string.
+- `hash_str` — Geohash-encoded string.
 
 **Returned values**
 
-- (longitude, latitude) - 2-tuple of `Float64` values of longitude and latitude.
+- Tuple `(longitude, latitude)` of `Float64` values of longitude and latitude. [Tuple](../../data-types/tuple.md)([Float64](../../data-types/float.md))
 
 **Example**
 

src/Client/ReplxxLineReader.cpp

@@ -299,13 +299,14 @@ ReplxxLineReader::ReplxxLineReader(
     Patterns delimiters_,
     const char word_break_characters_[],
     replxx::Replxx::highlighter_callback_t highlighter_,
-    [[ maybe_unused ]] std::istream & input_stream_,
-    [[ maybe_unused ]] std::ostream & output_stream_,
-    [[ maybe_unused ]] int in_fd_,
-    [[ maybe_unused ]] int out_fd_,
-    [[ maybe_unused ]] int err_fd_
+    std::istream & input_stream_,
+    std::ostream & output_stream_,
+    int in_fd_,
+    int out_fd_,
+    int err_fd_
 )
     : LineReader(history_file_path_, multiline_, std::move(extenders_), std::move(delimiters_), input_stream_, output_stream_, in_fd_)
+    , rx(input_stream_, output_stream_, in_fd_, out_fd_, err_fd_)
     , highlighter(std::move(highlighter_))
     , word_break_characters(word_break_characters_)
     , editor(getEditor())
@@ -516,7 +517,7 @@ void ReplxxLineReader::addToHistory(const String & line)
     rx.history_add(line);
 
     // flush changes to the disk
-    if (!rx.history_save(history_file_path))
+    if (history_file_fd >= 0 && !rx.history_save(history_file_path))
         rx.print("Saving history failed: %s\n", errnoToString().c_str());
 
     if (history_file_fd >= 0 && locked && 0 != flock(history_file_fd, LOCK_UN))

tests/queries/0_stateless/01395_limit_more_cases.reference

@@ -254,4 +254,3 @@
 15	13	0	0	0	0	0	0
 15	14	0	0	0	0	0	0
 15	15	0	0	0	0	0	0
-0	0	0

tests/queries/0_stateless/01395_limit_more_cases.sh

@@ -9,8 +9,11 @@ SIZE=13
 for OFFSET in {0..15}; do
     for LIMIT in {0..15}; do
         echo "SELECT
-            $OFFSET, $LIMIT,
-            count() AS c, min(number) AS first, max(number) AS last,
+            $OFFSET,
+            $LIMIT,
+            count() AS c,
+            min(number) AS first,
+            max(number) AS last,
             throwIf(first != ($OFFSET < $SIZE AND $LIMIT > 0 ? $OFFSET : 0)),
             throwIf(last != ($OFFSET < $SIZE AND $LIMIT > 0 ? least($SIZE - 1, $OFFSET + $LIMIT - 1) : 0)),
             throwIf((c != 0 OR first != 0 OR last != 0) AND (c != last - first + 1))
@@ -18,20 +21,3 @@ for OFFSET in {0..15}; do
         "
     done
 done | $CLICKHOUSE_CLIENT -n --max_block_size 5
-
-# Randomized test
-
-ITERATIONS=1000
-for _ in $(seq $ITERATIONS); do
-    SIZE=$(($RANDOM % 100))
-    OFFSET=$(($RANDOM % 111))
-    LIMIT=$(($RANDOM % 111))
-
-    echo "WITH count() AS c, min(number) AS first, max(number) AS last
-            SELECT
-                throwIf(first != ($OFFSET < $SIZE AND $LIMIT > 0 ? $OFFSET : 0)),
-                throwIf(last != ($OFFSET < $SIZE AND $LIMIT > 0 ? least($SIZE - 1, $OFFSET + $LIMIT - 1) : 0)),
-                throwIf((c != 0 OR first != 0 OR last != 0) AND (c != last - first + 1))
-            FROM (SELECT * FROM numbers($SIZE) LIMIT $OFFSET, $LIMIT);
-        "
-done | $CLICKHOUSE_CLIENT -n --max_block_size $(($RANDOM % 20 + 1)) | uniq

tests/queries/0_stateless/01395_limit_more_cases_random.reference

@@ -0,0 +1 @@
+0	0	0

tests/queries/0_stateless/01395_limit_more_cases_random.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+SIZE=13
+ITERATIONS=300
+for _ in $(seq $ITERATIONS); do
+    SIZE=$(($RANDOM % 100))
+    OFFSET=$(($RANDOM % 111))
+    LIMIT=$(($RANDOM % 111))
+
+    echo "WITH count() AS c, min(number) AS first, max(number) AS last
+            SELECT
+                throwIf(first != ($OFFSET < $SIZE AND $LIMIT > 0 ? $OFFSET : 0)),
+                throwIf(last != ($OFFSET < $SIZE AND $LIMIT > 0 ? least($SIZE - 1, $OFFSET + $LIMIT - 1) : 0)),
+                throwIf((c != 0 OR first != 0 OR last != 0) AND (c != last - first + 1))
+            FROM (SELECT * FROM numbers($SIZE) LIMIT $OFFSET, $LIMIT);
+        "
+done | $CLICKHOUSE_CLIENT -n --max_block_size $(($RANDOM % 20 + 1)) | uniq