Identifying differences between source codes of different versions of a software when each source code is organized using incorporated files

• US 9,043,757 B2
• Filed: 12/13/2012
• Issued: 05/26/2015
• Est. Priority Date: 12/13/2012
• Status: Active Grant

• Current Assignee: Oracle International Corporation (Oracle Corporation)
• Original Assignee: Oracle International Corporation (Oracle Corporation)
• Inventors: Tiwari, Praneet
• Primary Examiner(s): Chen, Xi D
• Application Number:
  US13/712,974
• Publication Number:
  US 20140173559A1
• Time in Patent Office: 894 Days
• Field of Search: None
• US Class Current: 717/122
• CPC Class Codes: G06F 8/31 Programming languages or programming paradigms
• CPC Class Codes: G06F 8/71 Version control security arrangements therefor G06F21/57; Configuration management

Abstract

An aspect of the present invention identifies differences between source codes (e.g. of different versions of a software), when each source code is organized using incorporated files. In one embodiment, in response to receiving identifiers of a first and second source codes (each source code being organized as a corresponding set of code files), listings of the instructions in the first and second source codes are constructed. Each listing is constructed, for example, by replacing each incorporate statement in the source code with instructions stored in a corresponding one of code files. The differences between the first and second source codes are then found by comparing the constructed listings of instructions.

Claims

1. A method of identifying differences between source codes when each source code is organized using incorporated files, said method comprising:

receiving identifiers of a first source code and a second source code, said first source code being organized as a first plurality of code files and said second source code being organized as a second plurality of code files,

wherein said first source code contains a first conditional incorporate statement having a first condition, said first conditional incorporate statement indicating that a first code file of said first plurality of code files is to be incorporated when said first condition is true and a second code file of said first plurality of code files is to be incorporated when said first condition is false,

wherein said second source code contains a second conditional incorporate statement also having said first condition, said second conditional incorporate statement indicating that a third code file of said second plurality of code files is to be incorporated when said first condition is true and a fourth code file of said second plurality of code files is to be incorporated when said first condition is false;

constructing a first listing of instructions for said first source code and a second listing of instructions for said second source code, wherein said constructing said first listing comprises including, for each incorporate statement in said first plurality of code files, the instructions stored in a corresponding one of said first plurality of code files as specified by the corresponding incorporate statement,

wherein said constructing, in response to said first conditional incorporate statement, includes the instructions stored in both of said first code file and said second code file respectively as a first code portion and a second code portion in said first listing of instructions without evaluation of said first condition,

wherein said constructing said second listing comprises including, for each incorporate statement in said second plurality of code files, the instructions stored in a corresponding one of said second plurality of code files as specified by the corresponding incorporate statement,

wherein said constructing, in response to said second conditional incorporate statement, includes the instructions stored in both of said third code file and said fourth code file respectively as a third code portion and a fourth code portion in said second listing of instructions without evaluation of said first condition; and

finding the differences between said first source code and said second source code by comparing said first listing of instructions and said second listing of instructions,

wherein said comparing compares the instructions in said first code portion with instructions in said third code portion in view of both of said first code portion and said third code portion being present in said first listing and said second listing corresponding to said first condition being true, and compares the instructions in said second code portion with instructions in said fourth code portion in view of both of said second code portion and said fourth code portion being present in said first listing and said second listing corresponding to said first condition being false.

2. The method of claim 1, wherein said first source code is of a first version of a software and said second source code is of a second version of said software.

3. The method of claim 2, wherein said software comprises an operating system, wherein the identified differences are used to determine the modifications necessary for applications to be migrated from said first version of said operating system to said second version of said operating system.

4. The method of claim 2, further comprising retrieving said first plurality of code files and said second plurality of code files from a code repository in response to said receiving of said identifiers, wherein said constructing is performed after said retrieving.

5. The method of claim 4, wherein said first listing comprises all the instructions in said first source code and said second listing comprises all the instructions in said second source code.

6. The method of claim 5, wherein said including comprises replacing each incorporate statement with the instructions stores in the code file specified by the corresponding incorporate statement.

7. The method of claim 1, wherein said finding comprises determining a first set of functional constructs in said first listing and a second set of functional constructs in said second listing,

wherein said comparing compares said first set of functional constructs with said second set of functional constructs to determine the differences between said first source code and said second source code.

8. The method of claim 7, further comprising:

building, in response to said determining, a first hierarchy of nodes and a second hierarchy of nodes, wherein each node in said first hierarchy of nodes and said second hierarchy of nodes respectively indicates the functional constructs determined in a corresponding code portion of said first listing and said second listing,

wherein said comparing compares the functional constructs in each node of said first hierarchy of nodes with a corresponding node of said second hierarchy of nodes to determine the differences.

9. The method of claim 1, wherein a result of evaluation of said first condition is not capable of being determined during said constructing.

10. A non-transitory machine readable medium storing one or more sequences of instructions for causing a system to identify differences between source codes when each source code is organized using incorporated files, wherein execution of said one or more instructions by one or more processors contained in said system causes said system to perform the actions of:

receiving identifiers of a first source code and a second source code, said first source code being organized as a first plurality of code files and said second source code being organized as a second plurality of code files,

wherein said first source code contains a first conditional incorporate statement having a first condition, said first conditional incorporate statement indicating that a first code file of said first plurality of code files is to be incorporated when said first condition is true and a second code file of said first plurality of code files is to be incorporated when said first condition is false,

wherein said second source code contains a second conditional incorporate statement also having said first condition, said second conditional incorporate statement indicating that a third code file of said second plurality of code files is to be incorporated when said first condition is true and a fourth code file of said second plurality of code files is to be incorporated when said first condition is false;

constructing a first listing of instructions for said first source code and a second listing of instructions for said second source code, wherein said constructing said first listing comprises including, for each incorporate statement in said first plurality of code files, the instructions stored in a corresponding one of said first plurality of code files as specified by the corresponding incorporate statement,

wherein said constructing, in response to said first conditional incorporate statement, includes the instructions stored in both of said first code file and said second code file respectively as a first code portion and a second code portion in said first listing of instructions without evaluation of said first condition,

wherein said constructing said second listing comprises including, for each incorporate statement in said second plurality of code files, the instructions stored in a corresponding one of said second plurality of code files as specified by the corresponding incorporate statement,

wherein said constructing, in response to said second conditional incorporate statement, includes the instructions stored in both of said third code file and said fourth code file respectively as a third code portion and a fourth code portion in said second listing of instructions without evaluation of said first condition; and

finding the differences between said first source code and said second source code by comparing said first listing of instructions and said second listing of instructions,

wherein said comparing compares the instructions in said first code portion with instructions in said third code portion in view of both of said first code portion and said third code portion being present in said first listing and said second listing corresponding to said first condition being true, and compares the instructions in said second code portion with instructions in said fourth code portion in view of both of said second code portion and said fourth code portion being present in said first listing and said second listing corresponding to said first condition being false.

11. The machine readable medium of claim 10, further comprising one or more instructions for retrieving said first plurality of code files and said second plurality of code files from a code repository in response to said receiving of said identifiers, wherein said constructing is performed after said retrieving.

12. The machine readable medium of claim 10, wherein said finding comprises one or more instructions for determining a first set of functional constructs in said first listing and a second set of functional constructs in said second listing,

wherein said comparing compares said first set of functional constructs with said second set of functional constructs to determine the differences between said first source code and said second source code.

13. The machine readable medium of claim 12, further comprising one or more instructions for:

building, in response to said determining, a first hierarchy of nodes and a second hierarchy of nodes, wherein each node in said first hierarchy of nodes and said second hierarchy of nodes respectively indicates the functional constructs determined in a corresponding code portion of said first listing and said second listing,

wherein said comparing compares the functional constructs in each node of said first hierarchy of nodes with a corresponding node of said second hierarchy of nodes to determine the differences.

14. The machine readable medium of claim 10, wherein a result of evaluation of said first condition is not capable of being determined during said constructing.

15. A digital processing system comprising:

a processor;

a random access memory (RAM);

a machine readable medium to store one or more instructions, which when retrieved into said RAM and executed by said processor causes said digital processing system to identify differences between source codes when each source code is organized using incorporated files, said digital processing system performing the actions of;

receiving identifiers of a first source code and a second source code, said first source code being organized as a first plurality of code files and said second source code being organized as a second plurality of code files,

wherein said first source code contains a first conditional incorporate statement having a first condition, said first conditional incorporate statement indicating that a first code file of said first plurality of code files is to be incorporated when said first condition is true and a second code file of said first plurality of code files is to be incorporated when said first condition is false,

wherein said second source code contains a second conditional incorporate statement also having said first condition, said second conditional incorporate statement indicating that a third code file of said second plurality of code files is to be incorporated when said first condition is true and a fourth code file of said second plurality of code files is to be incorporated when said first condition is false;

constructing a first listing of instructions for said first source code and a second listing of instructions for said second source code, wherein said constructing said first listing comprises including, for each incorporate statement in said first plurality of code files, the instructions stored in a corresponding one of said first plurality of code files as specified by the corresponding incorporate statement,

wherein said constructing, in response to said first conditional incorporate statement, includes the instructions stored in both of said first code file and said second code file respectively as a first code portion and a second code portion in said first listing of instructions without evaluation of said first condition,

wherein said constructing said second listing comprises including, for each incorporate statement in said second plurality of code files, the instructions stored in a corresponding one of said second plurality of code files as specified by the corresponding incorporate statement,

wherein said constructing, in response to said second conditional incorporate statement, includes the instructions stored in both of said third code file and said fourth code file respectively as a third code portion and a fourth code portion in said second listing of instructions without evaluation of said first condition; and

finding the differences between said first source code and said second source code by comparing said first listing of instructions and said second listing of instructions,

wherein said comparing compares the instructions in said first code portion with instructions in said third code portion in view of both of said first code portion and said third code portion being present in said first listing and said second listing corresponding to said first condition being true, and compares the instructions in said second code portion with instructions in said fourth code portion in view of both of said second code portion and said fourth code portion being present in said first listing and said second listing corresponding to said first condition being false.

16. The digital processing system of claim 15, for said finding, performing the actions of:

determining a first set of functional constructs in said first listing and a second set of functional constructs in said second listing; and

building, in response to said determining, a first hierarchy of nodes and a second hierarchy of nodes, wherein each node in said first hierarchy of nodes and said second hierarchy of nodes respectively indicates the functional constructs determined in a corresponding code portion of said first listing and said second listing,

wherein said comparing compares the functional constructs in each node of said first hierarchy of nodes with a corresponding node of said second hierarchy of nodes to determine the differences between said first source code and said second source code.