preview clean up

Author: tomas-villagesql

villagesql/sdk/include/villagesql/abi/preview/keyring.h

@@ -22,14 +22,14 @@
 extern "C" {
 #endif
 
-// Preview capability: "vsql::keyring"
+// Preview capability: "vsql::preview::keyring"
 //
 // Provides access to the MySQL keyring component. Extensions that require
 // this capability can read and write secrets via the vtable functions below.
 //
 // Capability name: VEF_PREVIEW_KEYRING_NAME
 
-#define VEF_PREVIEW_KEYRING_NAME "vsql::keyring"
+#define VEF_PREVIEW_KEYRING_NAME "vsql::preview::keyring"
 
 typedef enum {
   VEF_KEYRING_OK = 0,

villagesql/sdk/include/villagesql/abi/preview/ping.h

@@ -22,15 +22,15 @@
 extern "C" {
 #endif
 
-// Preview capability: "vsql::ping"
+// Preview capability: "vsql::preview::ping"
 //
 // A trivial capability used to exercise and test the preview capability
 // registration system. The server provides a single ping() function that
 // returns a monotonically incrementing counter.
 //
 // Capability name: VEF_PREVIEW_PING_NAME
 
-#define VEF_PREVIEW_PING_NAME "vsql::ping"
+#define VEF_PREVIEW_PING_NAME "vsql::preview::ping"
 
 // Returns a monotonically incrementing counter. Used to verify that the
 // capability system is wired up correctly end-to-end.

villagesql/sdk/include/villagesql/vsql.h

@@ -82,9 +82,6 @@
 // Status variable builder: make_status_var_int(), make_status_var_double()
 #include <villagesql/vsql/status_var_builder.h>
 
-// Keyring access: vsql::keyring::read(), vsql::keyring::write()
-#include <villagesql/vsql/keyring.h>
-
 // vsql ExtensionBuilder, make_extension(), and VEF_GENERATE_ENTRY_POINTS
 #include <villagesql/vsql/extension_builder.h>
 

villagesql/sdk/include/villagesql/vsql/keyring.h

@@ -20,7 +20,8 @@
 
 namespace villagesql::services {
 
-// Returns the server-side vtable for the "vsql::keyring" preview capability.
+// Returns the server-side vtable for the "vsql::preview::keyring" preview
+// capability.
 vef_preview_keyring_t *preview_keyring_vtable();
 
 }  // namespace villagesql::services

villagesql/services/preview/keyring.h

@@ -20,7 +20,8 @@
 
 namespace villagesql::services {
 
-// Returns the server-side vtable for the "vsql::ping" preview capability.
+// Returns the server-side vtable for the "vsql::preview::ping" preview
+// capability.
 vef_preview_ping_t *preview_ping_vtable();
 
 }  // namespace villagesql::services