Skip to content

fix(pipeline): decode persisted LSP arrays linearly #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ngallodev merged 1 commit into from
Sep 30, 2026
Merged

fix(pipeline): decode persisted LSP arrays linearly #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/pipeline/lsp_surface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,13 @@ static const char **arena_str_array(CBMArena *arena, yyjson_val *arr, bool null_
if (!items) {
return NULL;
}
for (int i = 0; i < count; i++) {
const char *s = yyjson_get_str(yyjson_arr_get(arr, (size_t)i));
items[i] = s ? cbm_arena_strdup(arena, s) : "?";
/* Indexed access rescans non-flat arrays; iterate once to keep this O(n). */
yyjson_arr_iter iter = yyjson_arr_iter_with(arr);
int i = 0;
yyjson_val *item;
while ((item = yyjson_arr_iter_next(&iter))) {
const char *s = yyjson_get_str(item);
items[i++] = s ? cbm_arena_strdup(arena, s) : "?";
}
if (null_terminated) {
items[count] = NULL;
Expand Down Expand Up @@ -236,9 +240,12 @@ int cbm_lsp_surface_defs_from_json(CBMArena *arena, const char *defs_json, CBMLS
return -1;
}
memset(defs, 0, (size_t)count * sizeof(CBMLSPDef));
for (int i = 0; i < count; i++) {
yyjson_val *o = yyjson_arr_get(lsp, (size_t)i);
CBMLSPDef *d = &defs[i];
/* `lsp` contains objects, so yyjson_arr_get(i) makes this decode O(n^2). */
yyjson_arr_iter iter = yyjson_arr_iter_with(lsp);
int i = 0;
yyjson_val *o;
while ((o = yyjson_arr_iter_next(&iter))) {
CBMLSPDef *d = &defs[i++];
d->qualified_name = arena_str_or_null(arena, yyjson_obj_get(o, "qn"));
d->short_name = arena_str_or_null(arena, yyjson_obj_get(o, "sn"));
d->label = arena_str_or_null(arena, yyjson_obj_get(o, "lb"));
Expand Down
28 changes: 28 additions & 0 deletions tests/test_pipeline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
#include "test_framework.h"
#include "test_helpers.h"
#include "foundation/mem.h" // cbm_mem_init/budget (back-pressure futile-nap test)
#include "foundation/arena.h"
#include "pipeline/pipeline.h"
#include "pipeline/lsp_surface.h"
#include "pipeline/pipeline_internal.h"
#include "pipeline/artifact.h"
#include "store/store.h"
Expand Down Expand Up @@ -13008,6 +13010,31 @@ TEST(pipeline_lsp_surface_persisted_and_body_edit_invariant) {
PASS();
}

TEST(pipeline_lsp_surface_decode_preserves_array_order_and_nulls) {
const char *json =
"{\"v\":1,\"lsp\":["
"{\"qn\":\"first\",\"sn\":\"one\",\"lb\":\"Function\",\"rt\":null,\"spt\":[\"A\",null,\"C\"]},"
"{\"qn\":\"second\",\"sn\":\"two\",\"lb\":\"Method\",\"rt\":\"Receiver\",\"spt\":[\"D\"]},"
"{\"qn\":\"third\",\"sn\":\"three\",\"lb\":\"Class\",\"rt\":null,\"spt\":[]}]}";
CBMArena arena;
cbm_arena_init(&arena);
CBMLSPDef *defs = NULL;
ASSERT_EQ(cbm_lsp_surface_defs_from_json(&arena, json, &defs), 3);
ASSERT_NOT_NULL(defs);
ASSERT_STR_EQ(defs[0].qualified_name, "first");
ASSERT_STR_EQ(defs[1].qualified_name, "second");
ASSERT_STR_EQ(defs[2].qualified_name, "third");
ASSERT_TRUE(defs[0].receiver_type == NULL);
ASSERT_STR_EQ(defs[1].receiver_type, "Receiver");
ASSERT_EQ(defs[0].signature_param_count, 3);
ASSERT_STR_EQ(defs[0].signature_param_types[0], "A");
ASSERT_STR_EQ(defs[0].signature_param_types[1], "?");
ASSERT_STR_EQ(defs[0].signature_param_types[2], "C");
ASSERT_EQ(defs[2].signature_param_count, 0);
cbm_arena_destroy(&arena);
PASS();
}

TEST(pipeline_ensemble_routing_edges) {
char tmpdir[256];
snprintf(tmpdir, sizeof(tmpdir), "/tmp/cbm_ens_XXXXXX");
Expand Down Expand Up @@ -13662,6 +13689,7 @@ TEST(pipeline_objectscript_export_range_join_keeps_one_trailing_marker) {
#endif

SUITE(pipeline) {
RUN_TEST(pipeline_lsp_surface_decode_preserves_array_order_and_nulls);
RUN_TEST(pipeline_lsp_surface_persisted_and_body_edit_invariant);
/* Index lock */
RUN_TEST(pipeline_lock_try_acquire);
Expand Down
Loading