Selaa lähdekoodia

HPCC-18293 Remove the no longer needed ESPuses HIDL feature

The ESPuses feature hasn't been needed for years, and it can cause
problems with interface versioning.

Signed-off-by: Anthony Fishbeck <anthony.fishbeck@lexisnexis.com>
Anthony Fishbeck 7 vuotta sitten
vanhempi
commit
265333a416

+ 0 - 5
esp/scm/WsDeploy.ecm

@@ -570,11 +570,6 @@ ESPresponse [exceptions_inline, encode(0)] GetSummaryResponse
 
 
 ESPservice [auth_feature("NONE"), exceptions_inline("xslt/exceptions.xslt")] WsDeploy
 ESPservice [auth_feature("NONE"), exceptions_inline("xslt/exceptions.xslt")] WsDeploy
 {
 {
-    ESPuses ESPstruct Task;
-    ESPuses ESPstruct Component;
-    ESPuses ESPstruct DeployOptions;
-    ESPuses ESPstruct DeployInfo;
-
     ESPmethod[description("Handle an event from the navigation tree menu"), help("")] 
     ESPmethod[description("Handle an event from the navigation tree menu"), help("")] 
         NavMenuEvent(NavMenuEventRequest, NavMenuEventResponse);    
         NavMenuEvent(NavMenuEventRequest, NavMenuEventResponse);    
     ESPmethod[description("Dependency graph"), help(""), resp_xsl_default("xslt/graph_display.xsl")] 
     ESPmethod[description("Dependency graph"), help(""), resp_xsl_default("xslt/graph_display.xsl")] 

+ 0 - 6
esp/scm/ws_dfu.ecm

@@ -749,12 +749,6 @@ ESPservice [
     noforms,
     noforms,
     exceptions_inline("./smc_xslt/exceptions.xslt")] WsDfu
     exceptions_inline("./smc_xslt/exceptions.xslt")] WsDfu
 {
 {
-    ESPuses ESPStruct DFULogicalFile;
-    ESPuses ESPStruct DFUPart;
-    ESPuses ESPStruct DFUFileStat;
-    ESPuses ESPStruct DFUFileDetail;
-    ESPuses ESPStruct DFUDataColumn;
-
     ESPmethod [resp_xsl_default("/esp/xslt/dfu_fileview.xslt")] DFUFileView(DFUFileViewRequest, DFUFileViewResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfu_fileview.xslt")] DFUFileView(DFUFileViewRequest, DFUFileViewResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfu_search.xslt")] DFUSearch(DFUSearchRequest, DFUSearchResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfu_search.xslt")] DFUSearch(DFUSearchRequest, DFUSearchResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfu.xslt")] DFUQuery(DFUQueryRequest, DFUQueryResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfu.xslt")] DFUQuery(DFUQueryRequest, DFUQueryResponse);

+ 0 - 1
esp/scm/ws_fileio.ecm

@@ -74,7 +74,6 @@ ReadFileDataResponse
 
 
 ESPservice [auth_feature("DEFERRED"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsFileIO
 ESPservice [auth_feature("DEFERRED"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsFileIO
 {
 {
-    //ESPuses ESPstruct DFUException;
     ESPmethod CreateFile(CreateFileRequest, CreateFileResponse);
     ESPmethod CreateFile(CreateFileRequest, CreateFileResponse);
     ESPmethod WriteFileData(WriteFileDataRequest, WriteFileDataResponse);
     ESPmethod WriteFileData(WriteFileDataRequest, WriteFileDataResponse);
     ESPmethod ReadFileData(ReadFileDataRequest, ReadFileDataResponse);
     ESPmethod ReadFileData(ReadFileDataRequest, ReadFileDataResponse);

+ 0 - 2
esp/scm/ws_fs.ecm

@@ -682,8 +682,6 @@ ESPservice [
     version("1.15"),
     version("1.15"),
     exceptions_inline("./smc_xslt/exceptions.xslt")] FileSpray
     exceptions_inline("./smc_xslt/exceptions.xslt")] FileSpray
 {
 {
-    ESPuses ESPstruct DFUWorkunit;
-    ESPuses ESPstruct DFUException;
     ESPmethod EchoDateTime(EchoDateTime, EchoDateTimeResponse);
     ESPmethod EchoDateTime(EchoDateTime, EchoDateTimeResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/showresult.xslt")] ShowResult(ShowResultRequest, ShowResultResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/showresult.xslt")] ShowResult(ShowResultRequest, ShowResultResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfuwu_search.xslt")] DFUWUSearch(DFUWUSearchRequest, DFUWUSearchResponse);
     ESPmethod [resp_xsl_default("/esp/xslt/dfuwu_search.xslt")] DFUWUSearch(DFUWUSearchRequest, DFUWUSearchResponse);

+ 0 - 8
esp/scm/ws_machine.ecm

@@ -370,14 +370,6 @@ ESPresponse [encode(0), nil_remove, exceptions_inline] UpdateComponentStatusResp
 //-------- service ---------
 //-------- service ---------
 ESPservice [auth_feature("DEFERRED"), version("1.13")] ws_machine
 ESPservice [auth_feature("DEFERRED"), version("1.13")] ws_machine
 {
 {
-    ESPuses ESPstruct RequestInfoStruct;
-    ESPuses ESPstruct MachineInfoEx;
-    ESPuses ESPstruct ProcessorInfo;
-    ESPuses ESPstruct StorageInfo;
-    ESPuses ESPstruct SWRunInfo;
-    ESPuses ESPstruct RemoteExecResult;
-    ESPuses ESPStruct ComponentInfo;
-
     ESPmethod [resp_xsl_default("./smc_xslt/clusterprocesses.xslt"), exceptions_inline("./smc_xslt/exceptions.xslt")]
     ESPmethod [resp_xsl_default("./smc_xslt/clusterprocesses.xslt"), exceptions_inline("./smc_xslt/exceptions.xslt")]
        GetTargetClusterInfo(GetTargetClusterInfoRequest, GetTargetClusterInfoResponse);
        GetTargetClusterInfo(GetTargetClusterInfoRequest, GetTargetClusterInfoResponse);
 
 

+ 0 - 20
esp/scm/ws_topology.ecm

@@ -613,26 +613,6 @@ ESPresponse [nil_remove, exceptions_inline] TpDropZoneQueryResponse
 
 
 ESPservice [auth_feature("DEFERRED"), noforms, version("1.26"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsTopology
 ESPservice [auth_feature("DEFERRED"), noforms, version("1.26"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsTopology
 {
 {
-    ESPuses ESPStruct TpBinding;
-    ESPuses ESPstruct TpCluster;
-    ESPuses ESPstruct TpDali;
-    ESPuses ESPstruct TpDfuServer;
-    ESPuses ESPstruct TpDropZone;
-    ESPuses ESPstruct TpEclAgent;
-    ESPuses ESPstruct TpEclServer;
-    ESPuses ESPstruct TpEspServer;
-    ESPuses ESPstruct TpFTSlave;
-    ESPuses ESPstruct TpDkcSlave;
-    ESPuses ESPstruct TpGroup;
-    ESPuses ESPstruct TpLdapServer;
-    ESPuses ESPStruct TpLogicalCluster;
-    ESPuses ESPstruct TpMachine;
-    ESPuses ESPstruct TpMySqlServer;
-    ESPuses ESPStruct TpQueryType;
-    ESPuses ESPStruct TpSashaServer;
-    ESPuses ESPstruct TpServices;
-    ESPuses ESPstruct TpTargetCluster;
-
     ESPmethod [cache_seconds(180), cache_global(1), resp_xsl_default("/esp/xslt/targetclusters.xslt")] TpTargetClusterQuery(TpTargetClusterQueryRequest, TpTargetClusterQueryResponse);
     ESPmethod [cache_seconds(180), cache_global(1), resp_xsl_default("/esp/xslt/targetclusters.xslt")] TpTargetClusterQuery(TpTargetClusterQueryRequest, TpTargetClusterQueryResponse);
     ESPmethod [cache_seconds(180), cache_global(1), resp_xsl_default("/esp/xslt/topology.xslt")] TpClusterQuery(TpClusterQueryRequest, TpClusterQueryResponse);
     ESPmethod [cache_seconds(180), cache_global(1), resp_xsl_default("/esp/xslt/topology.xslt")] TpClusterQuery(TpClusterQueryRequest, TpClusterQueryResponse);
     ESPmethod [cache_seconds(180), cache_global(1)] TpLogicalClusterQuery(TpLogicalClusterQueryRequest, TpLogicalClusterQueryResponse);
     ESPmethod [cache_seconds(180), cache_global(1)] TpLogicalClusterQuery(TpLogicalClusterQueryRequest, TpLogicalClusterQueryResponse);

+ 0 - 7
tools/hidl/hidlcomp.cpp

@@ -5801,13 +5801,6 @@ void EspServInfo::write_esp_binding()
     }
     }
     outs("\tDBGLOG(\"Client version: %g\", context.getClientVersion());\n");
     outs("\tDBGLOG(\"Client version: %g\", context.getClientVersion());\n");
 
 
-    // kept for backward compatible
-    EspStructInfo *sti=NULL;
-    for (sti=structs;sti!=NULL;sti=sti->next)
-    {
-        outf("\tC%s::getXsdDefinition(context, request, content, added);\n", sti->getName());
-    }
-    
     indentReset(1);
     indentReset(1);
     outf(1, "bool fullservice = (!Utils::strcasecmp(service, \"%s\"));\n", name_);
     outf(1, "bool fullservice = (!Utils::strcasecmp(service, \"%s\"));\n", name_);
     indentOuts("bool allMethods = (method==NULL || *method==0);\n");
     indentOuts("bool allMethods = (method==NULL || *method==0);\n");

+ 0 - 3
tools/hidl/hidlcomp.h

@@ -1149,7 +1149,6 @@ public:
         methods=NULL;
         methods=NULL;
         mounts=NULL;
         mounts=NULL;
         tags=NULL;
         tags=NULL;
-        structs=NULL;
         next=NULL;
         next=NULL;
         needsXslt = false;
         needsXslt = false;
     }
     }
@@ -1161,7 +1160,6 @@ public:
         if (base_)
         if (base_)
             free(base_);
             free(base_);
         
         
-        delete structs;
         delete methods;
         delete methods;
         delete mounts;
         delete mounts;
         delete tags;
         delete tags;
@@ -1216,7 +1214,6 @@ public:
     void write_catch_blocks(EspMethodInfo* mthi, catch_type ct, int indents);
     void write_catch_blocks(EspMethodInfo* mthi, catch_type ct, int indents);
     void write_clarion_include_interface();
     void write_clarion_include_interface();
 
 
-    EspStructInfo  *structs;
     EspMethodInfo   *methods;
     EspMethodInfo   *methods;
     EspMountInfo    *mounts;
     EspMountInfo    *mounts;
     MetaTagInfo     *tags;
     MetaTagInfo     *tags;

+ 0 - 14
tools/hidl/hidlgram.y

@@ -97,7 +97,6 @@ int  nCommentStartLine = -1;
   ESPVERSIONDEF
   ESPVERSIONDEF
   ESPTEMPLATE
   ESPTEMPLATE
   ESPMOUNT
   ESPMOUNT
-  ESPUSES
   ESPDEFEXPORT
   ESPDEFEXPORT
   XSDTYPE
   XSDTYPE
   _CONST
   _CONST
@@ -209,7 +208,6 @@ EspServiceEntryList
 EspServiceEntry
 EspServiceEntry
  : EspServiceMethod
  : EspServiceMethod
  | EspServiceMount
  | EspServiceMount
- | EspServiceUses
  ;
  ;
 
 
 EspServiceMethod
 EspServiceMethod
@@ -261,18 +259,6 @@ EspServiceMount
  }
  }
  ;
  ;
 
 
-EspServiceUses
- : ESPUSES EspMetaData EspType ID ';'
- {
-    EspStructInfo *esp_struct=new EspStructInfo($4.getName());
-    
-    esp_struct->tags = getClearCurMetaTags();
-
-    esp_struct->next=CurService->structs;
-    CurService->structs=esp_struct;
- }
- ;
-
 EspStruct
 EspStruct
  : EspStructStart OptionalExtends EspMessageBody ';'
  : EspStructStart OptionalExtends EspMessageBody ';'
  {
  {

+ 0 - 1
tools/hidl/hidllex.l

@@ -53,7 +53,6 @@ ESPservice  { if (check_return( ESPSERVICE )) return ESPSERVICE; }
 ESPmethod   { if (check_return( ESPMETHOD )) return ESPMETHODREF; else return ESPMETHOD; }
 ESPmethod   { if (check_return( ESPMETHOD )) return ESPMETHODREF; else return ESPMETHOD; }
 ESPmount    { if (check_return( ESPMOUNT )) return ESPMOUNT; }
 ESPmount    { if (check_return( ESPMOUNT )) return ESPMOUNT; }
 ESParray    { yylval.setName((const char *) yytext); if (check_return( ESPTEMPLATE )) return ESPTEMPLATE; }
 ESParray    { yylval.setName((const char *) yytext); if (check_return( ESPTEMPLATE )) return ESPTEMPLATE; }
-ESPuses     { if (check_return( ESPUSES )) return ESPUSES; }
 EspInclude  { if (check_return( ESPINCLUDE )) return ESPINCLUDE; } //Kevin
 EspInclude  { if (check_return( ESPINCLUDE )) return ESPINCLUDE; } //Kevin
 ESPVersionDef   { if (check_return( ESPVERSIONDEF )) return ESPVERSIONDEF; }
 ESPVersionDef   { if (check_return( ESPVERSIONDEF )) return ESPVERSIONDEF; }
 const       { if (check_return( _CONST )) return _CONST; }
 const       { if (check_return( _CONST )) return _CONST; }