From b6bc272dc3fc4d5975ed664ccc959fc523aef546 Mon Sep 17 00:00:00 2001 From: Alexey Palazhchenko Date: Fri, 18 Apr 2025 15:52:29 +0400 Subject: [PATCH] Use `double` for all `ok` fields --- pg_documentdb/src/commands/coll_mod.c | 2 +- pg_documentdb/src/commands/coll_stats.c | 4 ++-- pg_documentdb/src/commands/create_indexes.c | 6 +++--- .../src/commands/create_indexes_background.c | 8 ++++---- pg_documentdb/src/commands/db_stats.c | 2 +- pg_documentdb/src/commands/drop_indexes.c | 2 +- pg_documentdb/src/commands/find_and_modify.c | 2 +- pg_documentdb/src/commands/update.c | 2 +- pg_documentdb/src/commands/users.c | 14 +++++++------- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pg_documentdb/src/commands/coll_mod.c b/pg_documentdb/src/commands/coll_mod.c index ad42ec5d0..ff8656883 100644 --- a/pg_documentdb/src/commands/coll_mod.c +++ b/pg_documentdb/src/commands/coll_mod.c @@ -191,7 +191,7 @@ command_coll_mod(PG_FUNCTION_ARGS) pgbson_writer writer; PgbsonWriterInit(&writer); - PgbsonWriterAppendInt32(&writer, "ok", 2, 1); + PgbsonWriterAppendDouble(&writer, "ok", 2, 1); if (specFlags == HAS_NO_OPTIONS) { diff --git a/pg_documentdb/src/commands/coll_stats.c b/pg_documentdb/src/commands/coll_stats.c index 90ee71f2b..3bdcb9c32 100644 --- a/pg_documentdb/src/commands/coll_stats.c +++ b/pg_documentdb/src/commands/coll_stats.c @@ -914,7 +914,7 @@ BuildEmptyResponseMessage(CollStatsResult *result) PgbsonWriterAppendInt32(&writer, "totalIndexSize", 14, 0); PgbsonWriterAppendDocument(&writer, "indexSizes", 10, PgbsonInitEmpty()); PgbsonWriterAppendInt32(&writer, "scaleFactor", 11, result->scaleFactor); - PgbsonWriterAppendInt32(&writer, "ok", 2, result->ok); + PgbsonWriterAppendDouble(&writer, "ok", 2, result->ok); return PgbsonWriterGetPgbson(&writer); } @@ -931,7 +931,7 @@ BuildResponseMessage(CollStatsResult *result) PgbsonWriterAppendUtf8(&writer, "ns", 2, result->ns); WriteCoreStorageStats(result, &writer); - PgbsonWriterAppendInt32(&writer, "ok", 2, result->ok); + PgbsonWriterAppendDouble(&writer, "ok", 2, result->ok); return PgbsonWriterGetPgbson(&writer); } diff --git a/pg_documentdb/src/commands/create_indexes.c b/pg_documentdb/src/commands/create_indexes.c index c07700603..4bc1c145d 100644 --- a/pg_documentdb/src/commands/create_indexes.c +++ b/pg_documentdb/src/commands/create_indexes.c @@ -5568,7 +5568,7 @@ MakeCreateIndexesMsg(CreateIndexesResult *result) PgbsonWriterAppendUtf8(&writer, "note", strlen("note"), result->note); } - PgbsonWriterAppendInt32(&writer, "ok", strlen("ok"), result->ok); + PgbsonWriterAppendDouble(&writer, "ok", 2, result->ok); if (!result->ok) { @@ -5618,7 +5618,7 @@ MakeCreateIndexesMsg(CreateIndexesResult *result) PgbsonWriterEndDocument(&outerWriter, &indexIdWriter); } - PgbsonWriterAppendInt32(&outerWriter, "ok", strlen("ok"), result->ok); + PgbsonWriterAppendDouble(&outerWriter, "ok", 2, result->ok); return PgbsonWriterGetPgbson(&outerWriter); } @@ -5676,7 +5676,7 @@ MakeReIndexMsg(ReIndexResult *result) PgbsonWriterEndArray(&writer, &indexesWriter); } - PgbsonWriterAppendInt32(&writer, "ok", strlen("ok"), result->ok); + PgbsonWriterAppendDouble(&writer, "ok", 2, result->ok); if (!result->ok) { diff --git a/pg_documentdb/src/commands/create_indexes_background.c b/pg_documentdb/src/commands/create_indexes_background.c index f50c9cb1d..0db4896af 100644 --- a/pg_documentdb/src/commands/create_indexes_background.c +++ b/pg_documentdb/src/commands/create_indexes_background.c @@ -1338,13 +1338,13 @@ MakeBuildIndexesMsg(BuildIndexesResult *result) /* { "raw" : * { "defaultShard" : * { - * "ok" : { "$numberInt" : "0" }, + * "ok" : { "$numberDouble" : "0" }, * "errmsg" : "error", * "code" : { "$numberInt" : "1" } * } * }, * "finish" : { "$numberInt" : "1" }, - * "ok" : { "$numberInt" : "0" } + * "ok" : { "$numberDouble" : "0" } * } */ pgbson_writer outerWriter; @@ -1360,7 +1360,7 @@ MakeBuildIndexesMsg(BuildIndexesResult *result) PgbsonWriterStartDocument(&rawShardResultWriter, "defaultShard", strlen( "defaultShard"), &writer); - PgbsonWriterAppendInt32(&writer, "ok", strlen("ok"), result->ok); + PgbsonWriterAppendDouble(&writer, "ok", 2, result->ok); if (result->errcode == ERRCODE_T_R_DEADLOCK_DETECTED) { result->errmsg = "deadlock detected. createIndexes() command " @@ -1381,7 +1381,7 @@ MakeBuildIndexesMsg(BuildIndexesResult *result) PgbsonWriterEndDocument(&outerWriter, &rawShardResultWriter); } PgbsonWriterAppendInt32(&outerWriter, FinishKey, FinishKeyLength, result->finish); - PgbsonWriterAppendInt32(&outerWriter, "ok", strlen("ok"), result->ok); + PgbsonWriterAppendDouble(&outerWriter, "ok", 2, result->ok); return PgbsonWriterGetPgbson(&outerWriter); } diff --git a/pg_documentdb/src/commands/db_stats.c b/pg_documentdb/src/commands/db_stats.c index 6d6694497..121e65f8c 100644 --- a/pg_documentdb/src/commands/db_stats.c +++ b/pg_documentdb/src/commands/db_stats.c @@ -406,7 +406,7 @@ BuildResponseMessage(DbStatsResult *result) PgbsonWriterAppendDouble(&writer, "indexSize", 9, result->indexSize); PgbsonWriterAppendDouble(&writer, "totalSize", 9, result->totalSize); PgbsonWriterAppendInt32(&writer, "scaleFactor", 11, result->scaleFactor); - PgbsonWriterAppendInt32(&writer, "ok", 2, result->ok); + PgbsonWriterAppendDouble(&writer, "ok", 2, result->ok); return PgbsonWriterGetPgbson(&writer); } diff --git a/pg_documentdb/src/commands/drop_indexes.c b/pg_documentdb/src/commands/drop_indexes.c index 8ab62027d..f8869858c 100644 --- a/pg_documentdb/src/commands/drop_indexes.c +++ b/pg_documentdb/src/commands/drop_indexes.c @@ -762,7 +762,7 @@ MakeDropIndexesMsg(DropIndexesResult *result) { pgbson_writer writer; PgbsonWriterInit(&writer); - PgbsonWriterAppendBool(&writer, "ok", strlen("ok"), result->ok); + PgbsonWriterAppendDouble(&writer, "ok", 2, result->ok); if (result->ok) { diff --git a/pg_documentdb/src/commands/find_and_modify.c b/pg_documentdb/src/commands/find_and_modify.c index f45e0cb18..59bfd46aa 100644 --- a/pg_documentdb/src/commands/find_and_modify.c +++ b/pg_documentdb/src/commands/find_and_modify.c @@ -623,7 +623,7 @@ BuildResponseMessage(FindAndModifyResult *result) result->value); } - PgbsonWriterAppendDouble(&resultWriter, "ok", strlen("ok"), result->ok); + PgbsonWriterAppendDouble(&resultWriter, "ok", 2, result->ok); return PgbsonWriterGetPgbson(&resultWriter); } diff --git a/pg_documentdb/src/commands/update.c b/pg_documentdb/src/commands/update.c index 2bec8126a..481f2e368 100644 --- a/pg_documentdb/src/commands/update.c +++ b/pg_documentdb/src/commands/update.c @@ -2251,7 +2251,7 @@ SerializeBatchUpdateResult(BatchUpdateResult *result) PgbsonWriterInit(&writer); PgbsonWriterAppendDocument(&writer, "response", -1, BuildResponseMessage(result)); - PgbsonWriterAppendBool(&writer, "ok", -1, result->writeErrors == NIL); + PgbsonWriterAppendDouble(&writer, "ok", 2, result->writeErrors == NIL); return PgbsonWriterGetPgbson(&writer); } diff --git a/pg_documentdb/src/commands/users.c b/pg_documentdb/src/commands/users.c index 8c3740607..077eba62b 100644 --- a/pg_documentdb/src/commands/users.c +++ b/pg_documentdb/src/commands/users.c @@ -112,7 +112,7 @@ documentdb_extension_create_user(PG_FUNCTION_ARGS) { pgbson_writer finalWriter; PgbsonWriterInit(&finalWriter); - PgbsonWriterAppendInt32(&finalWriter, "ok", 2, 0); + PgbsonWriterAppendDouble(&finalWriter, "ok", 2, 0); PgbsonWriterAppendUtf8(&finalWriter, "errmsg", strlen("errmsg"), "External identity providers are not supported"); PgbsonWriterAppendInt32(&finalWriter, "code", strlen("code"), 115); @@ -171,7 +171,7 @@ documentdb_extension_create_user(PG_FUNCTION_ARGS) pgbson_writer finalWriter; PgbsonWriterInit(&finalWriter); - PgbsonWriterAppendInt32(&finalWriter, "ok", 2, 1); + PgbsonWriterAppendDouble(&finalWriter, "ok", 2, 1); PG_RETURN_POINTER(PgbsonWriterGetPgbson(&finalWriter)); } @@ -441,7 +441,7 @@ documentdb_extension_drop_user(PG_FUNCTION_ARGS) { pgbson_writer finalWriter; PgbsonWriterInit(&finalWriter); - PgbsonWriterAppendInt32(&finalWriter, "ok", 2, 0); + PgbsonWriterAppendDouble(&finalWriter, "ok", 2, 0); PgbsonWriterAppendUtf8(&finalWriter, "errmsg", strlen("errmsg"), "External identity providers are not supported"); PgbsonWriterAppendInt32(&finalWriter, "code", strlen("code"), 115); @@ -473,7 +473,7 @@ documentdb_extension_drop_user(PG_FUNCTION_ARGS) pgbson_writer finalWriter; PgbsonWriterInit(&finalWriter); - PgbsonWriterAppendInt32(&finalWriter, "ok", 2, 1); + PgbsonWriterAppendDouble(&finalWriter, "ok", 2, 1); PG_RETURN_POINTER(PgbsonWriterGetPgbson(&finalWriter)); } @@ -667,7 +667,7 @@ UpdateNativeUser(UpdateUserSpec *spec) pgbson_writer finalWriter; PgbsonWriterInit(&finalWriter); - PgbsonWriterAppendInt32(&finalWriter, "ok", 2, 1); + PgbsonWriterAppendDouble(&finalWriter, "ok", 2, 1); PG_RETURN_POINTER(PgbsonWriterGetPgbson(&finalWriter)); } @@ -737,7 +737,7 @@ documentdb_extension_get_users(PG_FUNCTION_ARGS) if (userInfoDatum == (Datum) 0) { - PgbsonWriterAppendInt32(&finalWriter, "ok", 2, 1); + PgbsonWriterAppendDouble(&finalWriter, "ok", 2, 1); pgbson *result = PgbsonWriterGetPgbson(&finalWriter); PG_RETURN_POINTER(result); } @@ -846,7 +846,7 @@ documentdb_extension_get_users(PG_FUNCTION_ARGS) PgbsonWriterEndArray(&finalWriter, &userArrayWriter); } - PgbsonWriterAppendInt32(&finalWriter, "ok", 2, 1); + PgbsonWriterAppendDouble(&finalWriter, "ok", 2, 1); pgbson *result = PgbsonWriterGetPgbson(&finalWriter); PG_RETURN_POINTER(result); }