Uploaded image for project: 'Hive'
  1. Hive
  2. HIVE-17988

Replace patch utility usage with git apply in ptest

    XMLWordPrintableJSON

    Details

    • Type: Improvement
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 3.0.0
    • Component/s: Testing Infrastructure
    • Labels:
      None

      Description

      It would be great to replace the standard diff util because git can do a 3-way merge - which in most cases successfull.

      This could reduce the ptest results which are erroring out because of build failure.

      error: patch failed: ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java:7003
      Falling back to three-way merge...
      Applied patch to 'ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java' cleanly.
      

        Attachments

        1. HIVE-17988.1.patch
          3 kB
          Daniel Voros
        2. HIVE-17988.2.patch
          3 kB
          Daniel Voros

          Activity

            People

            • Assignee:
              dvoros Daniel Voros
              Reporter:
              kgyrtkirk Zoltan Haindrich
            • Votes:
              0 Vote for this issue
              Watchers:
              5 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: