Repository navigation
Merge the ClickHouse history recall changes into master, fix Ctrl-V blocking - #46
Merged
alexey-milovidov merged 6 commits intoOct 13, 2026
Merged
Conversation
The hint cache survives across prompts and is keyed on the line text, so a preloaded line that is byte-for-byte equal to the previously displayed one would reuse the stale cache without invoking the hint callback.
…recalled-hints-master # Conflicts: # src/replxx.cxx # src/replxx_impl.cxx # src/replxx_impl.hxx
Since `read_unicode_character` waits for input with `poll`, making the descriptor non-blocking no longer stops `read_verbatim` when there is no more input: after Ctrl-V it kept waiting for further key presses until the buffer was full. A negative delay now means "do not wait", and `read_verbatim` uses it for the characters after the first one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
alexey-milovidov
added a commit
to ClickHouse/ClickHouse
that referenced
this pull request
Oct 12, 2026
`master` of `replxx` now contains the fix of the shared terminal state. The new commit merges it with the history recall changes used by ClickHouse and fixes Ctrl-V blocking after the esc delay support from `master`. Related: ClickHouse/replxx#44 Related: ClickHouse/replxx#46 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
alexey-milovidov
added a commit
to ClickHouse/ClickHouse
that referenced
this pull request
Oct 12, 2026
`master` of `replxx` now contains the fix of Ctrl-Z in the incremental history search. The new commit merges it with the history recall changes used by ClickHouse and fixes Ctrl-V blocking after the esc delay support from `master`. Related: ClickHouse/replxx#45 Related: ClickHouse/replxx#46 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Member
|
@alexey-milovidov can you please merge all PRs that you need for replxx, update the contrib in ClickHouse, otherwise they are out of sync and it is hard to submit other fixes on top Once it will be done, I will finish mine - #47 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges the ClickHouse line of replxx into
master, so that the commit used by ClickHouse is part ofmasteragain.ClickHouse pins replxx at
4ab25d4, on theclickhouse/history-recalled-hints-fixbranch. That branch has four commits that are not inmaster:2660e50Expose accepted history recalls54e60feFix accepted history recall tracking9edc46bTrack history restore recalls4ab25d4Invalidate the hint cache when preloading a bufferClickHouse uses
Replxx::history_recalledfrom these commits, so it cannot build againstmasterwithout them.This PR has:
masterinto that line. The conflicts were only inbind_key,bind_key_internalandhistory_recalled, where the editing modes added a mode parameter.ef93b95).read_unicode_characternow waits for input withpoll, so the non-blocking descriptor no longer stopsread_verbatim: after Ctrl-V, the editor kept waiting for further key presses until its buffer was full, and the line editor appeared stuck. A negative delay now means "do not wait", andread_verbatimuses it for the characters after the first one.I checked it with ClickHouse: the build passes, Ctrl-V works again in
clickhouse local, and the interactive client tests pass (68 of 70.expecttests; the other two need a disk from the CI test configuration and do not involve the line editor).ClickHouse PRs that pin the result:
Please merge this with a merge commit (not squash or rebase), so that the commit pinned by ClickHouse stays reachable from
master.🤖 Generated with Claude Code