From 27695b7eeaf78c16eebc95d7b2a5538a237e4389 Mon Sep 17 00:00:00 2001 From: Martin Vahlensieck Date: Fri, 19 Apr 2024 16:10:42 +0200 Subject: [PATCH] Sync protofiles --- .../polypheny/jdbc/PrismInterfaceClient.java | 32 ------------------- .../java/org/polypheny/jdbc/RpcService.java | 17 ---------- src/main/proto/polyprism/meta_requests.proto | 22 ------------- src/main/proto/polyprism/meta_responses.proto | 16 ---------- .../polyprism/namespace_meta_requests.proto | 8 ----- src/main/proto/polyprism/protointerface.proto | 7 ---- 6 files changed, 102 deletions(-) diff --git a/src/main/java/org/polypheny/jdbc/PrismInterfaceClient.java b/src/main/java/org/polypheny/jdbc/PrismInterfaceClient.java index c5d55af4..b7135c37 100644 --- a/src/main/java/org/polypheny/jdbc/PrismInterfaceClient.java +++ b/src/main/java/org/polypheny/jdbc/PrismInterfaceClient.java @@ -24,8 +24,6 @@ import java.util.stream.Collectors; import org.polypheny.db.protointerface.proto.ClientInfoProperties; import org.polypheny.db.protointerface.proto.ClientInfoPropertiesRequest; -import org.polypheny.db.protointerface.proto.ClientInfoPropertyMeta; -import org.polypheny.db.protointerface.proto.ClientInfoPropertyMetaRequest; import org.polypheny.db.protointerface.proto.CloseResultRequest; import org.polypheny.db.protointerface.proto.CloseStatementRequest; import org.polypheny.db.protointerface.proto.CommitRequest; @@ -49,9 +47,7 @@ import org.polypheny.db.protointerface.proto.Function; import org.polypheny.db.protointerface.proto.FunctionsRequest; import org.polypheny.db.protointerface.proto.IndexedParameters; -import org.polypheny.db.protointerface.proto.LanguageRequest; import org.polypheny.db.protointerface.proto.Namespace; -import org.polypheny.db.protointerface.proto.NamespaceRequest; import org.polypheny.db.protointerface.proto.NamespacesRequest; import org.polypheny.db.protointerface.proto.PrepareStatementRequest; import org.polypheny.db.protointerface.proto.PreparedStatementSignature; @@ -70,8 +66,6 @@ import org.polypheny.db.protointerface.proto.TableTypesRequest; import org.polypheny.db.protointerface.proto.Type; import org.polypheny.db.protointerface.proto.TypesRequest; -import org.polypheny.db.protointerface.proto.UserDefinedType; -import org.polypheny.db.protointerface.proto.UserDefinedTypesRequest; import org.polypheny.jdbc.properties.PolyphenyConnectionProperties; import org.polypheny.jdbc.transport.PlainTransport; import org.polypheny.jdbc.transport.Transport; @@ -114,12 +108,6 @@ public boolean checkConnection( int timeout ) { } - public List requestSupportedLanguages( int timeout ) { - LanguageRequest languageRequest = LanguageRequest.newBuilder().build(); - throw new RuntimeException( "Not yet implemented" ); - } - - public ConnectionResponse register( PolyphenyConnectionProperties connectionProperties, int timeout ) throws PrismInterfaceServiceException { ConnectionRequest.Builder requestBuilder = ConnectionRequest.newBuilder(); Optional.ofNullable( connectionProperties.getUsername() ).ifPresent( requestBuilder::setUsername ); @@ -286,11 +274,6 @@ public String getDefaultNamespace( int timeout ) throws PrismInterfaceServiceExc } - public List getClientInfoPropertyMetas( int timeout ) throws PrismInterfaceServiceException { - return rpc.getClientInfoPropertiesMetas( ClientInfoPropertyMetaRequest.newBuilder().build(), timeout ).getClientInfoPropertyMetasList(); - } - - public List getTypes( int timeout ) throws PrismInterfaceServiceException { return rpc.getTypes( TypesRequest.newBuilder().build(), timeout ).getTypesList(); } @@ -365,21 +348,6 @@ public List getTablesTypes( int timeout ) throws PrismInterfaceServic } - public Namespace getNamespace( String namespaceName, int timeout ) throws PrismInterfaceServiceException { - NamespaceRequest.Builder requestBuilder = NamespaceRequest.newBuilder(); - requestBuilder.setNamespaceName( namespaceName ); - - throw new RuntimeException( "Not yet implemented" ); - } - - - public List getUserDefinedTypes( int timeout ) throws PrismInterfaceServiceException { - UserDefinedTypesRequest.Builder requestBuilder = UserDefinedTypesRequest.newBuilder(); - - return rpc.getUserDefinedTypes( requestBuilder.build(), timeout ).getUserDefinedTypesList(); - } - - public void setClientInfoProperties( Properties properties, int timeout ) throws PrismInterfaceServiceException { ClientInfoProperties.Builder requestBuilder = ClientInfoProperties.newBuilder(); properties.stringPropertyNames() diff --git a/src/main/java/org/polypheny/jdbc/RpcService.java b/src/main/java/org/polypheny/jdbc/RpcService.java index b31f3e4d..b585637f 100644 --- a/src/main/java/org/polypheny/jdbc/RpcService.java +++ b/src/main/java/org/polypheny/jdbc/RpcService.java @@ -30,7 +30,6 @@ import org.polypheny.db.protointerface.proto.ClientInfoProperties; import org.polypheny.db.protointerface.proto.ClientInfoPropertiesRequest; import org.polypheny.db.protointerface.proto.ClientInfoPropertiesResponse; -import org.polypheny.db.protointerface.proto.ClientInfoPropertyMetaRequest; import org.polypheny.db.protointerface.proto.ClientInfoPropertyMetaResponse; import org.polypheny.db.protointerface.proto.CloseResultRequest; import org.polypheny.db.protointerface.proto.CloseResultResponse; @@ -84,8 +83,6 @@ import org.polypheny.db.protointerface.proto.TableTypesResponse; import org.polypheny.db.protointerface.proto.TypesRequest; import org.polypheny.db.protointerface.proto.TypesResponse; -import org.polypheny.db.protointerface.proto.UserDefinedTypesRequest; -import org.polypheny.db.protointerface.proto.UserDefinedTypesResponse; import org.polypheny.jdbc.transport.Transport; import org.polypheny.jdbc.utils.CallbackQueue; @@ -272,13 +269,6 @@ DefaultNamespaceResponse defaultNamespaceRequest( DefaultNamespaceRequest msg, i } - ClientInfoPropertyMetaResponse getClientInfoPropertiesMetas( ClientInfoPropertyMetaRequest msg, int timeout ) throws PrismInterfaceServiceException { - Request.Builder req = newMessage(); - req.setClientInfoPropertyMetaRequest( msg ); - return completeSynchronously( req, timeout ).getClientInfoPropertyMetaResponse(); - } - - TableTypesResponse getTableTypes( TableTypesRequest msg, int timeout ) throws PrismInterfaceServiceException { Request.Builder req = newMessage(); req.setTableTypesRequest( msg ); @@ -286,13 +276,6 @@ TableTypesResponse getTableTypes( TableTypesRequest msg, int timeout ) throws Pr } - UserDefinedTypesResponse getUserDefinedTypes( UserDefinedTypesRequest msg, int timeout ) throws PrismInterfaceServiceException { - Request.Builder req = newMessage(); - req.setUserDefinedTypesRequest( msg ); - return completeSynchronously( req, timeout ).getUserDefinedTypesResponse(); - } - - TypesResponse getTypes( TypesRequest msg, int timeout ) throws PrismInterfaceServiceException { Request.Builder req = newMessage(); req.setTypesRequest( msg ); diff --git a/src/main/proto/polyprism/meta_requests.proto b/src/main/proto/polyprism/meta_requests.proto index aadef92f..1ec451cf 100644 --- a/src/main/proto/polyprism/meta_requests.proto +++ b/src/main/proto/polyprism/meta_requests.proto @@ -18,13 +18,6 @@ This message does not contain any fields. It simply acts as an indicator to prom message DbmsVersionRequest { } -/* -The LanguageRequest message facilitates the retrieval of supported query languages that can be used for constructing statements. -This message does not contain any fields. It acts as a request for the server to return the list of supported query languages in a LanguageResponse. -*/ -message LanguageRequest { -} - /* Request the default namespace */ message DefaultNamespaceRequest { } @@ -44,14 +37,6 @@ This message does not contain any fields. It simply prompts the server to return message TypesRequest { } -/* -The UserDefinedTypesRequest message facilitates the retrieval of user-defined data types present in the database. -These custom data types can be crafted to meet specific needs not met by standard types. -This message is devoid of fields. It acts as a signal for the server to provide details of user-defined data types in a UserDefinedTypesResponse. -*/ -message UserDefinedTypesRequest { -} - /* The SqlStringFunctionsRequest message is used to solicit information about the string functions supported by the SQL implementation of the DBMS. This message is field less and prompts the server to return details of the available string functions in an SqlStringFunctionsResponse. @@ -111,13 +96,6 @@ It acts as a directive for the server to provide the associated client informati message ClientInfoPropertiesRequest { } -/* -The ClientInfoPropertyMetaRequest message aids in extracting metadata about the client information properties present in the database. -This fieldless message prompts the server to detail metadata concerning client information properties in a ClientInfoPropertyMetaResponse. -*/ -message ClientInfoPropertyMetaRequest { -} - /* The FunctionsRequest message is wielded to obtain a list of functions from the database based on the specified query language and function category. */ diff --git a/src/main/proto/polyprism/meta_responses.proto b/src/main/proto/polyprism/meta_responses.proto index b37f5780..84bee999 100644 --- a/src/main/proto/polyprism/meta_responses.proto +++ b/src/main/proto/polyprism/meta_responses.proto @@ -24,14 +24,6 @@ message DbmsVersionResponse { int32 minor_version = 4; } -/* -The LanguageResponse message offers a list of query languages supported by the system. -*/ -message LanguageResponse { - // A list containing the names of all supported query languages. - repeated string language_names = 1; -} - /* The default namespace */ message DefaultNamespaceResponse { string default_namespace = 1; @@ -87,14 +79,6 @@ message Type { int32 radix = 10; } -/* -The UserDefinedTypesResponse message offers a list of user-defined data types present in the system. -*/ -message UserDefinedTypesResponse { - // A list of UserDefinedType objects detailing each user-defined data type in the system. - repeated UserDefinedType user_defined_types = 1; -} - /* The UserDefinedType message encapsulates details about a specific user-defined data type. */ diff --git a/src/main/proto/polyprism/namespace_meta_requests.proto b/src/main/proto/polyprism/namespace_meta_requests.proto index da18f105..536fced5 100644 --- a/src/main/proto/polyprism/namespace_meta_requests.proto +++ b/src/main/proto/polyprism/namespace_meta_requests.proto @@ -10,14 +10,6 @@ option java_outer_classname = "NamespaceMeta"; package polypheny.protointerface; -/* -The NamespaceRequest message is designed for querying specific details about a specific namespace. -*/ -message NamespaceRequest { - // The name of the namespace for which details are being requested. - string namespace_name = 1; -} - /* The NamespacesRequest message allows querying for namespaces based on specific patterns in their names as well as their types. */ diff --git a/src/main/proto/polyprism/protointerface.proto b/src/main/proto/polyprism/protointerface.proto index 73e1047f..81cb70b4 100644 --- a/src/main/proto/polyprism/protointerface.proto +++ b/src/main/proto/polyprism/protointerface.proto @@ -32,16 +32,12 @@ message Request { uint64 id = 1; oneof type { DbmsVersionRequest dbms_version_request = 2; - LanguageRequest language_request = 3; DefaultNamespaceRequest default_namespace_request = 4; TableTypesRequest table_types_request = 5; TypesRequest types_request = 6; - UserDefinedTypesRequest user_defined_types_request = 7; - ClientInfoPropertyMetaRequest client_info_property_meta_request = 8; ProceduresRequest procedures_request = 9; FunctionsRequest functions_request = 10; NamespacesRequest namespaces_request = 11; - NamespaceRequest namespace_request = 12; EntitiesRequest entities_request = 13; SqlStringFunctionsRequest sql_string_functions_request = 14; SqlSystemFunctionsRequest sql_system_functions_request = 15; @@ -88,12 +84,9 @@ message Response { oneof type { ErrorResponse error_response = 256; DbmsVersionResponse dbms_version_response = 3; - LanguageResponse language_response = 4; DefaultNamespaceResponse default_namespace_response = 24; TableTypesResponse table_types_response = 5; TypesResponse types_response = 26; - UserDefinedTypesResponse user_defined_types_response = 6; - ClientInfoPropertyMetaResponse client_info_property_meta_response = 27; ProceduresResponse procedures_response = 7; FunctionsResponse functions_response = 29; NamespacesResponse namespaces_response = 8;