LA-Toth commented on PR #3069: URL: https://github.com/apache/hive/pull/3069#issuecomment-2136869368
Rebase itself seems to be relatively easy, the tests are still broken, at least: ``` [ERROR] Tests run: 9, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 4.667 s <<< FAILURE! - in org.apache.hadoop.hive.cli.TestCliDriverMethods [ERROR] org.apache.hadoop.hive.cli.TestCliDriverMethods.testRun Time elapsed: 0.829 s <<< ERROR! java.lang.NullPointerException ``` The first conflict during the rebase: `src/java/org/apache/hadoop/hive/cli/CliDriver.java`' - the apache/master branch's changes are fine, but the code requries one more import: `import com.google.common.base.Splitter;` After two years I don't remember too much, it was just a regular change for me. And I haven't used Java for a while. So, anyone who works on Hive daily can fix this faster than me. Please feel free to improve my changes. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org For additional commands, e-mail: gitbox-h...@hive.apache.org