Skip to content

Commit 0006bdc

Browse files
dbentley-vsqldbentley-vsql
committed
review responses/rebase
1 parent 9ff61f8 commit 0006bdc

4 files changed

Lines changed: 13 additions & 5 deletions

File tree

‎mysql-test/suite/villagesql/information_schema/r/extension_registration.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Created foo.veb
77
INSTALL EXTENSION foo;
88
SELECT * FROM INFORMATION_SCHEMA.EXTENSION_REGISTRATION ORDER BY EXTENSION_NAME;
99
EXTENSION_NAME NEGOTIATED_PROTOCOL REGISTRATION_JSON
10-
foo 2 {"extension_name":"foo","extension_version":"EXT_VERSION","sdk_version":"SDK_VERSION","requested_protocol":2,"funcs":[],"types":[],"sys_vars":[]}
11-
vsql_complex 2 {"extension_name":"vsql_complex","extension_version":"EXT_VERSION","sdk_version":"SDK_VERSION","requested_protocol":2,"funcs":[{"name":"COMPLEX::from_string","return_type":"COMPLEX","params":["STRING"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX::to_string","return_type":"STRING","params":["COMPLEX"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX::compare","return_type":"INT","params":["COMPLEX","COMPLEX"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX2::from_string","return_type":"COMPLEX2","params":["STRING"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX2::to_string","return_type":"STRING","params":["COMPLEX2"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX2::compare","return_type":"INT","params":["COMPLEX2","COMPLEX2"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX2::hash","return_type":"INT","params":["COMPLEX2"],"deterministic":false,"is_aggregate":false},{"name":"complex_add","return_type":"COMPLEX","params":["COMPLEX","COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_subtract","return_type":"COMPLEX","params":["COMPLEX","COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_multiply","return_type":"COMPLEX","params":["COMPLEX","COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_divide","return_type":"COMPLEX","params":["COMPLEX","COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_real","return_type":"REAL","params":["COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_imag","return_type":"REAL","params":["COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_abs","return_type":"REAL","params":["COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_conjugate","return_type":"COMPLEX","params":["COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_sum","return_type":"COMPLEX","params":["COMPLEX"],"deterministic":false,"is_aggregate":true}],"types":[{"name":"COMPLEX","persisted_length":16,"max_decode_buffer_length":64,"encode_vdf":"COMPLEX::from_string","decode_vdf":"COMPLEX::to_string","compare_vdf":"COMPLEX::compare","intrinsic_default_str":"(0,0)"},{"name":"COMPLEX2","persisted_length":16,"max_decode_buffer_length":64,"encode_vdf":"COMPLEX2::from_string","decode_vdf":"COMPLEX2::to_string","compare_vdf":"COMPLEX2::compare","hash_vdf":"COMPLEX2::hash","intrinsic_default_str":"(0,0)"}],"sys_vars":[]}
10+
foo 2 {"extension_name":"","extension_version":"EXT_VERSION","sdk_version":"SDK_VERSION","requested_protocol":2,"funcs":[],"types":[],"sys_vars":[]}
11+
vsql_complex 2 {"extension_name":"","extension_version":"EXT_VERSION","sdk_version":"SDK_VERSION","requested_protocol":2,"funcs":[{"name":"COMPLEX::from_string","return_type":"COMPLEX","params":["STRING"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX::to_string","return_type":"STRING","params":["COMPLEX"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX::compare","return_type":"INT","params":["COMPLEX","COMPLEX"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX2::from_string","return_type":"COMPLEX2","params":["STRING"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX2::to_string","return_type":"STRING","params":["COMPLEX2"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX2::compare","return_type":"INT","params":["COMPLEX2","COMPLEX2"],"deterministic":false,"is_aggregate":false},{"name":"COMPLEX2::hash","return_type":"INT","params":["COMPLEX2"],"deterministic":false,"is_aggregate":false},{"name":"complex_add","return_type":"COMPLEX","params":["COMPLEX","COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_subtract","return_type":"COMPLEX","params":["COMPLEX","COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_multiply","return_type":"COMPLEX","params":["COMPLEX","COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_divide","return_type":"COMPLEX","params":["COMPLEX","COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_real","return_type":"REAL","params":["COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_imag","return_type":"REAL","params":["COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_abs","return_type":"REAL","params":["COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_conjugate","return_type":"COMPLEX","params":["COMPLEX"],"deterministic":true,"is_aggregate":false},{"name":"complex_sum","return_type":"COMPLEX","params":["COMPLEX"],"deterministic":false,"is_aggregate":true}],"types":[{"name":"COMPLEX","persisted_length":16,"max_decode_buffer_length":64,"encode_vdf":"COMPLEX::from_string","decode_vdf":"COMPLEX::to_string","compare_vdf":"COMPLEX::compare","intrinsic_default_str":"(0,0)"},{"name":"COMPLEX2","persisted_length":16,"max_decode_buffer_length":64,"encode_vdf":"COMPLEX2::from_string","decode_vdf":"COMPLEX2::to_string","compare_vdf":"COMPLEX2::compare","hash_vdf":"COMPLEX2::hash","intrinsic_default_str":"(0,0)"}],"sys_vars":[]}
1212
# Verify requested and negotiated protocols match the server's VEF protocol version
1313
SELECT EXTENSION_NAME,
1414
JSON_EXTRACT(REGISTRATION_JSON, '$.requested_protocol') = @@villagesql_vef_server_protocol AS requested_matches_server,

‎villagesql/examples/vsql-keyring-reader/src/extension.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void keyring_store(StringArg data_id, StringArg auth_id, StringArg value,
8383
out.set(kr == VEF_KEYRING_OK ? 0 : 1);
8484
}
8585

86-
VEF_GENERATE_ENTRY_POINTS(make_extension("vsql_keyring_reader", "0.0.1")
86+
VEF_GENERATE_ENTRY_POINTS(make_extension()
8787
.func(make_func<&keyring_read>("keyring_read")
8888
.returns(STRING)
8989
.param(STRING)

‎villagesql/sdk/include/villagesql/extension_builder.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,13 @@ constexpr auto make_extension() {
160160
{}, {}, {}, VEF_PROTOCOL_1};
161161
}
162162

163+
// Deprecated: name and version are now read from the VEB manifest file.
164+
[[deprecated("use make_extension() — name/version are now in the VEB manifest")]]
165+
constexpr auto make_extension(std::string_view /*name*/,
166+
std::string_view /*version*/) {
167+
return make_extension();
168+
}
169+
163170
} // namespace extension_builder
164171

165172
namespace detail {

‎villagesql/system_views/extension_registration.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,11 @@ static std::string registration_to_json(const vef_registration_t *r) {
7474
w.StartObject();
7575

7676
w.Key("extension_name");
77-
w.String(r->extension_name ? r->extension_name : "");
77+
w.String(r->deprecated_extension_name ? r->deprecated_extension_name : "");
7878

7979
w.Key("extension_version");
80-
w.String(r->extension_version ? r->extension_version : "");
80+
w.String(r->deprecated_extension_version ? r->deprecated_extension_version
81+
: "");
8182

8283
std::string sdk_ver = std::to_string(r->sdk_version.major) + "." +
8384
std::to_string(r->sdk_version.minor) + "." +

0 commit comments

Comments
 (0)