CN105988849B - Application software upgrading method and device - Google Patents
Application software upgrading method and device Download PDFInfo
- Publication number
- CN105988849B CN105988849B CN201510100641.9A CN201510100641A CN105988849B CN 105988849 B CN105988849 B CN 105988849B CN 201510100641 A CN201510100641 A CN 201510100641A CN 105988849 B CN105988849 B CN 105988849B
- Authority
- CN
- China
- Prior art keywords
- application software
- function
- version
- forward version
- upgrading
- Prior art date
- Legal status (The legal status is an assumption and is not a legal conclusion. Google has not performed a legal analysis and makes no representation as to the accuracy of the status listed.)
- Active
Links
Images
Classifications
-
- G—PHYSICS
- G06—COMPUTING; CALCULATING OR COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F9/00—Arrangements for program control, e.g. control units
- G06F9/06—Arrangements for program control, e.g. control units using stored programs, i.e. using an internal store of processing equipment to receive or retain programs
- G06F9/44—Arrangements for executing specific programs
- G06F9/445—Program loading or initiating
-
- G—PHYSICS
- G06—COMPUTING; CALCULATING OR COUNTING
- G06F—ELECTRIC DIGITAL DATA PROCESSING
- G06F8/00—Arrangements for software engineering
- G06F8/60—Software deployment
- G06F8/65—Updates
Landscapes
- Engineering & Computer Science (AREA)
- Software Systems (AREA)
- Theoretical Computer Science (AREA)
- General Engineering & Computer Science (AREA)
- Physics & Mathematics (AREA)
- General Physics & Mathematics (AREA)
- Computer Security & Cryptography (AREA)
- Stored Programmes (AREA)
Abstract
The invention discloses an application software upgrading method, wherein the method comprises the following steps: under the condition that the forward version of the first application software comprises a first function, upgrading the first application software into second application software according to the forward version of the first application software; wherein the first application software does not include a first function. The invention also discloses an application software upgrading device.
Description
Technical Field
The invention relates to the field of intelligent terminal safe storage, in particular to an application software upgrading method and device.
Background
The application software upgrade generally refers to the update of the application software from a low version to a high version, and after the application software upgrade, the performance of the application software is generally better than that of the original version. However, the upgraded application software may show differences between different versions in different levels from the application software before upgrading.
Taking network node software as an example, the non-newly added function point of the upgraded network node software can show different service capabilities from those before upgrading in a plurality of service modules such as a control plane, a media plane, policy control, charging and the like, and the different service capabilities belong to version differences. The version difference problem is very likely to trigger serious faults in the current complex network service environment, thereby greatly improving the network operation risk of an operator, and being a problem that a network node software provider needs to pay attention and eliminate.
Fig. 1 is a general scenario of application software upgrade, B1 is an original version of application software, and all versions after B1 inherit all functions of B1, and other functions may be added. The three versions of B1a, B1B, and B1c are located on the patch branch of B1, which is the patch version of B1 version, and B3a is located on the patch branch of B3, which is the patch version of B3, and there is no precedence order requirement between the time point of the planned release of the patch version and the time point of the planned release of the versions of B1, B2, B3, B4, B5, etc. on the trunk branch, that is, when the trunk branch evolves to B2 version, the patch version has evolved to B1c version; it is also possible that patch versions evolve to B1a, and trunk branches have evolved to B4 versions. In addition, the version with the later release time does not necessarily have more functions than the version with the earlier release time, for example, taking fig. 1 as an example, if the release time of B1B is earlier than that of B3, but B1B has two more functions than that of B3, because when the software version on the backbone branches evolves to B3, B2 directly inherits the functions of B1 (only the provided functions are optimized), and B3 directly inherits the functions of B2; however, from the aspect of patch branch, the B1a version is added with a function on the basis of B1, and the B1B version is added with B function on the basis of B1 a; thus, version B1B has two more functions, the A function and the B function, than version B3.
It should be noted that, the version planning release time point and the function of a single patch branch or trunk branch are required in order, taking fig. 1 as an example, B1B must be created on the basis of B1a, and the created B1B will inherit the a function planned by B1a in addition to the B function of the version planning. B5 must be created on the basis of B4, and the created B5 has the B, C function planned by the version B4 and also inherits the a function planned by the version B4.
However, taking the version B5 as an example, the version has B, C two functions, and after the version B4 is upgraded to the version B5, in the version B4, B, C has no configuration data for the two functions, and at this time, according to the implementation manner in the prior art, the two functions are often upgraded in the manner of a new function. However, it can be seen that B functions are planned and distributed in forward versions, e.g., B1B, B1c, and B3a, in which case version differences between B4 and B1B, or B1c, or B3a will result.
Disclosure of Invention
In order to solve the existing technical problem, embodiments of the present invention are expected to provide an application software upgrading method and apparatus.
The embodiment of the invention provides an application software upgrading method, which comprises the following steps:
the invention provides an application software upgrading method, which comprises the following steps:
under the condition that the forward version of the first application software comprises a first function, upgrading the first application software into second application software according to the forward version of the first application software; wherein the first application software does not include a first function.
Preferably, the first function is determined to be included in the forward version of the first application software by:
judging whether a version containing a function label indicating a first function exists in the forward version of the first application software; when determining that the version containing the function label indicating the first function exists in the forward version of the first application software, determining that the first function is contained in the forward version of the first application software.
Preferably, before determining that the first function is included in the forward version of the first application software, the method further comprises:
marking a function label indicating a first function on a forward version of the first application software by:
adding a record identifier indicating a first function in a database file of a forward version of first application software by using a Structured Query Language (SQL) script; alternatively, the first and second electrodes may be,
an identification field indicating a first function is added to a configuration file of a forward version of the first application software.
Preferably, the upgrading the first application software to a second application software according to the forward version of the first application software comprises:
and configuring the configuration parameters of the first function in the second application software according to the configuration parameter value of the first function in the forward version of the first application software.
Preferably, after the first application software is upgraded to the second application software, the method further comprises:
a function label indicating the first function is marked on the second application software.
The invention also provides an application software upgrading device, which comprises: the system comprises a judgment module and an upgrading module; wherein the content of the first and second substances,
the judging module is used for judging whether the forward version of the first application software contains a first function or not, and the first application software does not contain the first function; the upgrading module is also used for triggering the upgrading module under the condition that the forward version of the first application software is determined to contain the first function;
the upgrading module is used for upgrading the first application software into second application software according to the forward version of the first application software when the judging module determines that the forward version of the first application software contains the first function.
Preferably, the determining module is configured to determine whether the forward version of the first application software includes the first function by:
and judging whether a version containing a function label indicating a first function exists in the forward version of the first application software.
Preferably, the apparatus further comprises a marking module for marking a function tag indicating the first function on the forward version of the first application software by:
adding a record identifier indicating a first function in a database file of a forward version of first application software by using a Structured Query Language (SQL) script; alternatively, an identification field indicating the first function is added to the configuration file of the forward version of the first application software.
Preferably, the upgrade module is configured to upgrade the first application software into a second application software by:
and configuring the configuration parameters of the first function in the second application software according to the configuration parameter value of the first function in the forward version of the first application software.
Preferably, the marking module is further configured to mark a function label indicating the first function on the second application software after the first application software is upgraded to the second application software.
In the method and the device for upgrading the application software, provided by the embodiment of the invention, under the condition that the forward version of the first application software comprises a first function, the first application software is upgraded into second application software according to the forward version of the first application software; wherein the first application software does not include a first function. Therefore, the problem of software version difference in the upgrading process of the application software can be avoided, and a plurality of faults and problems caused by the version difference problem are avoided.
Drawings
FIG. 1 is a general scenario diagram of application software upgrade in the prior art;
FIG. 2 is a basic flowchart of an application software upgrading method according to an embodiment of the present invention;
fig. 3 is a basic structure diagram of an application software upgrading apparatus according to an embodiment of the present invention.
Detailed Description
In the embodiment of the invention, under the condition that the forward version of the first application software comprises a first function, upgrading the first application software into second application software according to the forward version of the first application software; wherein the first application software does not include a first function.
The invention is further described in detail below with reference to the figures and the specific embodiments.
Example one
An embodiment of the present invention provides an application software upgrading method, as shown in fig. 2, the method includes the following steps:
step 201: when first application software is upgraded to second application software containing a first function, judging whether a forward version of the first application software contains the first function;
specifically, the first function may be one function or a plurality of functions, and the first function is a function not included in the first application software; that is, the second application software cannot be upgraded directly from the first application software to the application software containing the first function.
Specifically, when the first application software is a trunk version, the second application software may be a trunk version or a patch version; and when the first application software is a patch version, the second application software is also the patch version.
The forward version of the first application software comprises: all backbone version and/or patch version software released before the date of release of the first application software.
The determining whether the forward version of the first application software includes the first function includes:
and judging whether a version containing a function label indicating a first function exists in the forward version of the first application software.
Prior to this step, if the first function is included in any one or more of the forward versions of the first application software, a function label indicating the first function is marked on the third application software when the version software (hereinafter, this version software is referred to as the third application software for distinction from the first application software and the second application software) is manufactured; in this way, for the backward version of the third application software, when the first function is planned, the third application software which already contains the first function can be quickly found through the function tag, and therefore, the first application software can be directly upgraded based on the third application software; on the contrary, if the third application software is not processed as in the prior art, when the first application software is upgraded and the first function is added, because it is unclear whether the application software including the first function exists in the forward version, the first application software is often upgraded according to the newly added function, that is, the configuration parameter of the first function in the upgraded second application software is set to null (null), so that the version difference between the second application software and the third application software is caused.
Specifically, in practical implementation, a function tag indicating a first function may be marked on the first application software in the following manner: adding a record identifier indicating a first function in a database file of third application software by using a Structured Query Language (SQL) script; alternatively, an identification field indicating the first function is added to the configuration file of the third application software.
Correspondingly, according to the different marking modes of the function labels, the mode of judging whether the forward version of the first application software has the version containing the function label indicating the first function is also different; for example, when a function tag of a first function is marked by adding a record identifier in a database file of application software by using an SQL script, it may be detected whether the database files of all forward versions of the first application software include a corresponding record identifier, and if the corresponding record identifier is detected, it is determined that the forward version application software includes the function tag indicating the first function; when the function tag of the first function is marked by adding an identification field in the relevant configuration file of the application software, whether the configuration file of all forward versions of the first application software contains the corresponding identification field or not can be detected, and if the corresponding identification field is detected, the forward version application software is determined to contain the function tag indicating the first function.
Step 202: when the forward version of the first application software is determined to contain the first function, upgrading the first application software into second application software according to the forward version of the first application software;
when the forward version of the first application software is determined to comprise the first function, upgrading the first application software into second application software according to the forward version of the first application software;
specifically, upgrading the first application software to a second application software according to the forward version of the first application software includes:
configuring configuration parameters of the first function in second application software according to the configuration parameter value of the first function in the forward version of the first application software; that is to say, in the process of upgrading the first application software to the second application software, the second application software directly inherits all relevant configurations of the first function in the forward version of the first application software when the first function is added.
Further, after the first application software is upgraded to the second application software, the method further comprises: a function label indicating the first function is marked on the second application software.
Example two
An embodiment of the present invention provides an application software upgrading apparatus, as shown in fig. 3, where the apparatus includes: a judging module 31 and an upgrading module 32; wherein the content of the first and second substances,
the determining module 31 is configured to determine whether a forward version of a first application software includes a first function, where the first application software does not include the first function; also for triggering the upgrade module 32 if it is determined that the first functionality is included in the forward version of the first application software;
the upgrading module 32 is configured to upgrade the first application software to a second application software according to the forward version of the first application software when the determining module 31 determines that the forward version of the first application software includes the first function.
Specifically, the first function may be one function or may be multiple functions.
Specifically, when the first application software is a trunk version, the second application software may be a trunk version or a patch version; and when the first application software is a patch version, the second application software is also the patch version.
Specifically, the forward version of the first application software includes: all backbone version and/or patch version software released before the date of release of the first application software.
Specifically, the determining module 31 is configured to determine whether the forward version of the first application software includes the first function by:
and judging whether a version containing a function label indicating a first function exists in the forward version of the first application software.
Further, the apparatus further comprises a marking module 33 for marking a function label indicating the first function on the forward version of the first application software by:
adding a record identifier indicating a first function in a database file of a forward version of first application software by using a Structured Query Language (SQL) script; alternatively, an identification field indicating the first function is added to the configuration file of the forward version of the first application software.
Further, the marking module 33 is further configured to mark a function label indicating the first function on the second application software after the first application software is upgraded to the second application software.
Specifically, the upgrade module 32 is configured to upgrade the first application software into a second application software by:
and configuring the configuration parameters of the first function in the second application software according to the configuration parameter value of the first function in the forward version of the first application software.
The method according to the embodiments of the present invention is described in detail below by two specific examples.
Example 1
Taking fig. 1 as an example, when the application software is upgraded from the B4 version to the B5 version, new functions B are planned in the B5 version relative to the B4 version; at this time, whether the forward version of B4 includes function B is first detected, and if the versions published before the release of B4 version include B1, B2, B3, B1a, B1B, and B3a, it is found through detection that the forward version of B4 includes function B and the forward versions including function B include B1B and B3a, and at this time, B4 to B5 are upgraded according to B1B or B3a according to a preset rule; specifically, the preset rule may be set as required, for example, B4 may be upgraded according to the version with the earlier release time among B1B and B3a, or B4 may be upgraded according to the version with the later release time among B1B and B3 a.
It should be noted that if only one forward version including function B is detected, B4 may be upgraded according to the version.
Example two
Still taking fig. 1 as an example, when the application software is upgraded from the B4 version to the B5 version, the new function B relative to the B4 version is planned in the B5 version; at this time, first, whether the forward version of B4 includes the function B is detected, specifically, detection is performed sequentially according to the sequence of the release time of all the forward versions, for example, detection is performed according to the sequence of the release time from front to back, or according to the sequence of the release time from back to front, to see whether the forward version of B4 includes the function B; in the detection process according to the scheme, when the forward version containing the function B is detected, the detection is stopped;
for example, in the forward version of B4, the result of sorting all versions in the order of release time from front to back is: b1, B1a, B2, B3, B3a, B1B; sequentially detecting whether the corresponding versions contain the function B according to the sequence, and determining that the function B is contained in the B3a when the B3a version is detected; at this point, the test is stopped and B4 is upgraded to B5 directly from B3 a.
In a specific implementation process, the judging module 31, the upgrading module 32 and the marking module 33 may be implemented by any Central Processing Unit (CPU), Micro Processing Unit (MPU), Digital Signal Processor (DSP), or Programmable logic Array (FPGA) in a computer, a server, or other devices with data Processing functions.
As will be appreciated by one skilled in the art, embodiments of the present invention may be provided as a method, system, or computer program product. Accordingly, the present invention may take the form of a hardware embodiment, a software embodiment, or an embodiment combining software and hardware aspects. Furthermore, the present invention may take the form of a computer program product embodied on one or more computer-usable storage media (including, but not limited to, disk storage, optical storage, and the like) having computer-usable program code embodied therein.
The present invention is described with reference to flowchart illustrations and/or block diagrams of methods, apparatus (systems), and computer program products according to embodiments of the invention. It will be understood that each flow and/or block of the flow diagrams and/or block diagrams, and combinations of flows and/or blocks in the flow diagrams and/or block diagrams, can be implemented by computer program instructions. These computer program instructions may be provided to a processor of a general purpose computer, special purpose computer, embedded processor, or other programmable data processing apparatus to produce a machine, such that the instructions, which execute via the processor of the computer or other programmable data processing apparatus, create means for implementing the functions specified in the flowchart flow or flows and/or block diagram block or blocks.
These computer program instructions may also be stored in a computer-readable memory that can direct a computer or other programmable data processing apparatus to function in a particular manner, such that the instructions stored in the computer-readable memory produce an article of manufacture including instruction means which implement the function specified in the flowchart flow or flows and/or block diagram block or blocks.
These computer program instructions may also be loaded onto a computer or other programmable data processing apparatus to cause a series of operational steps to be performed on the computer or other programmable apparatus to produce a computer implemented process such that the instructions which execute on the computer or other programmable apparatus provide steps for implementing the functions specified in the flowchart flow or flows and/or block diagram block or blocks.
The above description is only a preferred embodiment of the present invention, and is not intended to limit the scope of the present invention.
Claims (8)
1. A method for upgrading application software, the method comprising:
under the condition that the forward version of the first application software comprises a first function, upgrading the first application software into second application software according to the forward version of the first application software; wherein the first application software does not include a first function;
the determining that the forward version of the first application software includes the first function further comprises:
judging whether a version containing a function label indicating a first function exists in the forward version of the first application software; when determining that the version containing the function label indicating the first function exists in the forward version of the first application software, determining that the first function is contained in the forward version of the first application software.
2. The method of claim 1, wherein prior to determining that the first function is included in the forward version of the first application software, the method further comprises:
marking a function label indicating a first function on a forward version of the first application software by:
adding a record identifier indicating a first function in a database file of a forward version of first application software by using a Structured Query Language (SQL) script; alternatively, the first and second electrodes may be,
an identification field indicating a first function is added to a configuration file of a forward version of the first application software.
3. The method of claim 1, wherein upgrading the first application software to a second application software according to the forward version of the first application software comprises:
and configuring the configuration parameters of the first function in the second application software according to the configuration parameter value of the first function in the forward version of the first application software.
4. The method of claim 3, wherein after upgrading the first application software to the second application software, the method further comprises:
a function label indicating the first function is marked on the second application software.
5. An apparatus for upgrading application software, the apparatus comprising: the system comprises a judgment module and an upgrading module; wherein the content of the first and second substances,
the judging module is used for judging whether the forward version of the first application software contains a first function or not, and the first application software does not contain the first function; the upgrading module is also used for triggering the upgrading module under the condition that the forward version of the first application software is determined to contain the first function;
the upgrading module is used for upgrading the first application software into second application software according to the forward version of the first application software when the judging module determines that the forward version of the first application software contains the first function;
the judging module judges whether the forward version of the first application software contains the first function further comprises:
and judging whether a version containing a function label indicating a first function exists in the forward version of the first application software.
6. The apparatus of claim 5, further comprising a marking module for marking a function label indicating the first function on the forward version of the first application software by:
adding a record identifier indicating a first function in a database file of a forward version of first application software by using a Structured Query Language (SQL) script; alternatively, an identification field indicating the first function is added to the configuration file of the forward version of the first application software.
7. The apparatus of claim 6, wherein the upgrade module is configured to upgrade the first application software to a second application software by:
and configuring the configuration parameters of the first function in the second application software according to the configuration parameter value of the first function in the forward version of the first application software.
8. The apparatus of claim 7, the tagging module further configured to tag a function tag indicating the first function on the second application software after the first application software is upgraded to the second application software.
Priority Applications (2)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CN201510100641.9A CN105988849B (en) | 2015-03-06 | 2015-03-06 | Application software upgrading method and device |
| PCT/CN2015/088529 WO2016141688A1 (en) | 2015-03-06 | 2015-08-31 | Application software upgrade method and apparatus, and computer storage medium |
Applications Claiming Priority (1)
| Application Number | Priority Date | Filing Date | Title |
|---|---|---|---|
| CN201510100641.9A CN105988849B (en) | 2015-03-06 | 2015-03-06 | Application software upgrading method and device |
Publications (2)
| Publication Number | Publication Date |
|---|---|
| CN105988849A CN105988849A (en) | 2016-10-05 |
| CN105988849B true CN105988849B (en) | 2020-10-02 |
Family
ID=56879846
Family Applications (1)
| Application Number | Title | Priority Date | Filing Date |
|---|---|---|---|
| CN201510100641.9A Active CN105988849B (en) | 2015-03-06 | 2015-03-06 | Application software upgrading method and device |
Country Status (2)
| Country | Link |
|---|---|
| CN (1) | CN105988849B (en) |
| WO (1) | WO2016141688A1 (en) |
Citations (4)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN101593121A (en) * | 2009-06-23 | 2009-12-02 | 中兴通讯股份有限公司 | The method of on-line software updating, Apparatus and system |
| CN102955699A (en) * | 2011-08-17 | 2013-03-06 | 施耐德电器工业公司 | Software upgrade package creating method and software upgrading method |
| CN102999349A (en) * | 2011-09-19 | 2013-03-27 | 施耐德电器工业公司 | Software upgrading method |
| CN103019789A (en) * | 2012-12-17 | 2013-04-03 | 深圳市九洲电器有限公司 | Signature software upgrading method, device and mobile terminal |
Family Cites Families (2)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| US20090210852A1 (en) * | 2008-02-19 | 2009-08-20 | International Business Machines Corporation | Automated merging in a software development environment |
| US8495564B2 (en) * | 2008-02-19 | 2013-07-23 | International Business Machines Corporation | Automated merging in a software development environment |
-
2015
- 2015-03-06 CN CN201510100641.9A patent/CN105988849B/en active Active
- 2015-08-31 WO PCT/CN2015/088529 patent/WO2016141688A1/en active Application Filing
Patent Citations (4)
| Publication number | Priority date | Publication date | Assignee | Title |
|---|---|---|---|---|
| CN101593121A (en) * | 2009-06-23 | 2009-12-02 | 中兴通讯股份有限公司 | The method of on-line software updating, Apparatus and system |
| CN102955699A (en) * | 2011-08-17 | 2013-03-06 | 施耐德电器工业公司 | Software upgrade package creating method and software upgrading method |
| CN102999349A (en) * | 2011-09-19 | 2013-03-27 | 施耐德电器工业公司 | Software upgrading method |
| CN103019789A (en) * | 2012-12-17 | 2013-04-03 | 深圳市九洲电器有限公司 | Signature software upgrading method, device and mobile terminal |
Also Published As
| Publication number | Publication date |
|---|---|
| CN105988849A (en) | 2016-10-05 |
| WO2016141688A1 (en) | 2016-09-15 |
Similar Documents
| Publication | Publication Date | Title |
|---|---|---|
| US10489591B2 (en) | Detection system and method thereof | |
| US20160188318A1 (en) | Data processing for upgrading medical equipment | |
| CN109918285B (en) | Security identification method and device for open source software | |
| US9569339B1 (en) | Debugging in an actor-based system | |
| CN106484453B (en) | Method and device for realizing system upgrading | |
| US20170147469A1 (en) | Correlation of source code with system dump information | |
| US20150193296A1 (en) | Run-time error repairing method, device and system | |
| CN111381858B (en) | Application program upgrading method, server and terminal equipment | |
| CN111144839B (en) | Project construction method, continuous integration system and terminal equipment | |
| CN103473076A (en) | Issuing method and issuing system for code version | |
| CN111258913A (en) | Automatic algorithm testing method and device, computer system and readable storage medium | |
| CN103150253B (en) | A kind of method and system for duration performance test | |
| CN104123496A (en) | Rogue software interception method, device and terminal | |
| CN113032245A (en) | Error positioning identification test method and device, computer equipment and storage medium | |
| CN105446873B (en) | APK Software Automatic Testing Methods and system based on Android platform | |
| CN102945155A (en) | Linux operation system software package and dependency deficiency detecting method thereof | |
| CN105955798A (en) | Method, device and system for detecting abnormal state of virtual machine in cloud platform | |
| CN105389172A (en) | Application upgrading method and apparatus | |
| CN105988849B (en) | Application software upgrading method and device | |
| CN111385613B (en) | Television system repairing method, storage medium and application server | |
| CN109408104B (en) | Method and device for acquiring game integration information | |
| CN115437663A (en) | Upgrade strategy updating method and device, electronic equipment, storage medium and vehicle | |
| US10031739B1 (en) | System and method for updating a java management extensions collector | |
| CN109408571B (en) | Object enumeration method, device and computer storage medium | |
| CN109240906B (en) | Database configuration information adaptation method and device, computer equipment and storage medium |
Legal Events
| Date | Code | Title | Description |
|---|---|---|---|
| C06 | Publication | ||
| PB01 | Publication | ||
| SE01 | Entry into force of request for substantive examination | ||
| SE01 | Entry into force of request for substantive examination | ||
| TA01 | Transfer of patent application right | ||
| TA01 | Transfer of patent application right |
Effective date of registration: 20200901 Address after: 210012 Nanjing, Yuhuatai District, South Street, Bauhinia Road, No. 68 Applicant after: Nanjing Zhongxing Software Co.,Ltd. Address before: 518057 Nanshan District Guangdong high tech Industrial Park, South Road, science and technology, ZTE building, Ministry of Justice Applicant before: ZTE Corp. |
|
| GR01 | Patent grant | ||
| GR01 | Patent grant |