Skip to content

Commit 13fe3fd

Browse files
authored
Merge branch 'unstable' into fix/stream-destroy-group-subkey-prefix
2 parents 1ecf84f + c7d91ed commit 13fe3fd

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

.github/workflows/kvrocks.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,8 @@ jobs:
678678
if: ${{ needs.precondition.outputs.docs_only != 'true' }}
679679
run: |
680680
if [[ ! ( \
681-
"${{ needs.build-and-test.result }}" == "success" \
681+
"${{ needs.check-and-lint.result }}" == "success" \
682+
&& "${{ needs.build-and-test.result }}" == "success" \
682683
&& "${{ needs.build-and-test-in-container.result }}" == "success" \
683684
&& "${{ needs.check-docker.result }}" == "success" \
684685
) ]]; then

src/config/config.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,8 @@ Config::Config() {
239239
{"resp3-enabled", false, new YesNoField(&resp3_enabled, true)},
240240
{"repl-namespace-enabled", false, new YesNoField(&repl_namespace_enabled, false)},
241241
{"proto-max-bulk-len", false,
242-
new IntWithUnitField<uint64_t>(&proto_max_bulk_len, std::to_string(512 * MiB), 1 * MiB, UINT64_MAX)},
242+
new IntWithUnitField<uint64_t>(&proto_max_bulk_len, std::to_string(512 * MiB), 1 * MiB,
243+
4ULL * 1024 * 1024 * 1024)},
243244
{"json-max-nesting-depth", false, new IntField(&json_max_nesting_depth, 1024, 0, INT_MAX)},
244245
{"json-storage-format", false,
245246
new EnumField<JsonStorageFormat>(&json_storage_format, json_storage_formats, JsonStorageFormat::JSON)},

0 commit comments

Comments
 (0)