Intelligent automatic merging of source control queue items

• US 10,691,449 B2
• Filed: 04/27/2017
• Issued: 06/23/2020
• Est. Priority Date: 04/27/2017
• Status: Active Grant

• Current Assignee: Microsoft Technology Licensing LLC (Microsoft Corporation)
• Original Assignee: Microsoft Technology Licensing LLC (Microsoft Corporation)
• Inventors: Iwanir, Elad, Tamir, Gal, Rodriguez, Mario A., Lahav, Chen
• Primary Examiner(s): Lee, Adam
• Application Number:
  US15/499,702
• Publication Number:
  US 20180314517A1
• Time in Patent Office: 1,153 Days
• CPC Class Codes: G06F 11/3668 Software testing software testing in telephone exchanges H04M3/242, testing of hardware G06F11/22
• CPC Class Codes: G06F 21/563 by source code analysis
• CPC Class Codes: G06F 8/71 Version control security arrangements therefor G06F21/57; Configuration management

Abstract

Methods for intelligent automatic merging of source control queue items are performed by systems and apparatuses. Project changes are submitted in build requests to a gated check-in build queue requiring successful builds to commit changes to a code repository according to source control. Multiple pending build requests in the build queue are intelligently and automatically merged into a single, pending merged request based on risk factor values associated with the build requests. For merged requests successfully built, files in the build requests are committed and the build requests are removed from the queue. Merged requests unsuccessfully built are divided into equal subsets based on updated risk factor values using information from the unsuccessful build. Successful builds of subsets allow for committing of files and removal from the build queue, while unsuccessful builds are further divided and processed until single build requests are processed to identify root cause errors.

Claims

1. A computer-implemented method comprising:

receiving, in a build queue associated with a code repository, a first build request for a build of a first code revision and a second build request for a build of a second code revision;

determining a risk factor for at least one of the first build request or the second build request;

generating a request set comprising one or more of a copy of the first build request and a copy of the second build request based on the risk factor; and

inserting the request set into the build queue as a third build request to pend ahead of the first build request and the second build request.

2. The computer-implemented method of claim 1, wherein determining the risk factor comprises basing the risk factor on one or more sub-factors comprising at least one of:

a build request priority;

a base commit identifier for a code change;

an identity of a requestor for the first build request or the second build request;

a file type of a changed file for the first build request or the second build request;

an amount of code change in the first build request or the second build request;

or

a relationship between a changed file in the first build request and a changed file in the second build request.

3. The computer-implemented method of claim 2, further comprising:

assigning a value to each of the one or more sub-factors; and

including the copy of the first build request and the copy of the second build request in the generated request set based on a comparison of a sum of the value of each of the one or more sub-factors to a threshold value.

4. The computer-implemented method of claim 1, wherein the copy of the first build request and the copy of the second build request are included in the request set, and the first build request and the second build request remain in the build queue individually;

the method further comprising;

upon completion of the third build request, determining whether a build for the third build request completed successfully; and

removing the third build request from the build queue and subsequently performing one of;

committing the first code revision and the second code revision to the code repository based on determining the build for the third build request completed successfully;

or

processing, individually, the first build request and the second build request in the build queue based on determining the build for the third build request did not complete successfully.

5. The computer-implemented method of claim 1, wherein the request set also includes a copy of a fourth build request for a build of a third code revision that is in the build queue and has a respective risk factor, the method further comprising:

determining that a build for the third build request completed successfully;

removing the third build request from the build queue; and

committing the first code revision, the second code revision, and the third code revision to the code repository based on determining the build for the third build request completed successfully.

6. The computer-implemented method of claim 1, wherein the request set also includes a copy of a fourth build request for a build of a third code revision that is in the build queue, the method further comprising:

determining a build for the third build request was not completed successfully;

removing the third build request from the build queue;

generating a first request subset comprising less than all copies of build requests in the request set based on an updated risk factor;

generating a second request subset comprising any remaining copies of build requests in the request set that are not included in the first request subset; and

providing the first request subset and the second request subset in the build queue ahead of the first build request, the second build request, and the third build request.

7. The computer-implemented method of claim 6, wherein generating the first request subset comprises:

dividing the copies of build requests in the request set into approximately equal first and second groups, the first group comprising first copies of build requests with risk factor values that are less than risk factor values of second copies of build requests of the second group; and

assigning to the first request subset the first copies of build requests of the first group.

8. The computer-implemented method of claim 6, further comprising:

committing code revisions corresponding to the first request subset or the second request subset to the code repository based on determining a build for the first request subset or the second request subset, respectively, completed successfully;

in the first request subset or the second request subset for which a build is not successfully completed, when a number of code revisions therein is more than one, dividing each of the first request subset or the second request subset into approximately equal sub-groups based on further updated risk factors of code revisions therein; and

inserting the sub-groups at the head of the build queue.

9. A system comprising:

at least one first memory device configured to store program instructions;

at least one second memory device configured as a code repository; and

at least one processor configured to execute the program instructions, the program instructions including;

build queue instructions configured to;

maintain a build queue to queue received build requests and request sets, the build queue being a gated check-in build queue for access to the code repository;

order the request sets in the build queue ahead of pending build requests in the build queue that are also represented in the request sets; and

commit code revisions of the build requests and the request sets for which a build successfully completes;

risk factor instructions configured to;

determine risk factors of the build requests that are received by the system;

subset instructions configured to;

generate request sets, each comprising respective copies of one or more build requests pending in the build queue that are included to form the request sets, based on the risk factors; and

queue optimizer instructions configured to;

insert the request sets into the build queue.

10. The system of claim 9, wherein the risk factor instructions are configured to determine the risk factors based on values of one or more sub-factors comprising at least one of:

a build request priority;

a base commit identifier for a code change;

an identity of a code developer requestor for the first build request or the second build request;

a file type of a changed file for the first build request or the second build request;

an amount of code change in the first build request or the second build request;

or

a relationship between a changed file in the first build request and a changed file in the second build request.

11. The system of claim 10, wherein the risk factor instructions are configured to select sub-factors of the one or more sub-factors to determine the risk factors based on a number of build requests to be included in a request set.

12. The system of claim 9, wherein the risk factor instructions are configured to be updated based on a machine learning algorithm analysis of one or more of a plurality of code bases and a plurality of code developer requestors to determine the risk factors.

13. The system of claim 9, the system further comprising error handling instructions configured to:

determine at least one possible point of failure for a build of the request set based on a received completion indication of the build of the request set;

wherein the risk factor instructions are further configured to;

determine an updated risk factor for a build request associated with the determined at least one possible point of failure;

wherein the subset instructions are further configured to;

divide a request set into two request subsets with an approximately equal number of copies of build requests responsive to a build of the request set not successfully completing;

wherein the queue optimizer instructions are further configured to;

insert the request subsets to the build queue; and

wherein the build queue instructions are further configured to;

remove the request set from the build queue; and

order the request subsets in the build queue ahead of build requests represented in the request subsets that are also pending in the build queue.

14. The system of claim 13, wherein the subset instructions are further configured to:

divide a request subset into two additional request subsets, with an approximately equal number of copies of build requests and based on risk factors of the build requests represented in the request subset, responsive to a build of the request subset not successfully completing;

wherein the queue optimizer instructions are further configured to;

insert the two additional request subsets to the build queue; and

wherein the build queue instructions are further configured to;

commit code revisions of the request subsets for which a build successfully completed;

remove the request subsets from the build queue subsequent to builds of the request subsets completing; and

order the two additional request subsets in the build queue ahead of pending build requests represented in the two additional request subsets.

15. The system of claim 9, the program instructions further comprising:

user interface (UI) instructions configured to provide a UI for the build queue to one or more client devices of code developer requestors, the UI providing at least one of;

a queue status of the build requests and the request sets in the build queue;

a completion indication of builds of the build requests and the request sets;

access to the one or more client devices of the code developer requestors for submitting respective build requests to the build queue;

or

an option selectable by a developer requestor to prevent a build request of the developer requestor from being included with other build requests.

16. A computer-readable storage medium having program instructions recorded thereon that, when executed by one or more processors, cause the one or more processors to perform a method in a client device, the method comprising:

receiving a first build request for a first code revision and a second build request for a second code revision in a build queue;

determining a risk factor for at least one of the first build request or the second build request;

generating a request set comprising one or more of a copy of the first build request and a copy of the second build request based on the risk factor for the at least one of the first build request or the second build request; and

inserting the request set into the build queue as a third build request to pend ahead of the first build request and the second build request.

17. The computer-readable storage medium of claim 16, wherein determining the risk factor comprises basing the risk factor on one or more sub-factors comprising at least one of:

a build request priority;

a base commit identifier for a code change;

an identity of a requestor for the first build request or the second build request;

a file type of a changed file for the first build request or the second build request;

an amount of code change in the first build request or the second build request;

or

a relationship between a changed file in the first build request and a changed file in the second build request.

18. The computer-readable storage medium of claim 16, wherein the copy of the first build request and the copy of the second build request are included in the request set, and the first build request and the second build request remain in the build queue individually;

the method further comprising;

upon completion of the third build request, determining whether a build for the third build request completed successfully; and

removing the third build request from the build queue and subsequently performing one of;

committing the first code revision and the second code revision to the code repository based on determining the build for the third build request completed successfully;

or

processing, individually, the first build request and the second build request in the build queue based on determining the build for the third build request did not complete successfully.

19. The computer-readable storage medium of claim 16, the method further comprising:

determining that the request set excludes the copy of the second build request based on the risk factor assoeiated for the second build request.

20. The computer-readable storage medium of claim 19, wherein the risk factor for the second build request includes a relationship between a changed file in the first build request and a changed file in the second build request each of which includes code changes to a common code component.