Merge remote-tracking branch 'origin/apache-ref/branch-2.4' into 2.4.0-maint
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fa67722a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fa67722a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fa67722a Branch: refs/heads/2.4.0-maint Commit: fa67722a234d97049d17e50b7facbf7297dae2a0 Parents: 0b2f373 4a4c4f6 Author: Jenkins <[email protected]> Authored: Sun Aug 21 15:51:00 2016 +0000 Committer: Jenkins <[email protected]> Committed: Sun Aug 21 15:51:00 2016 +0000 ---------------------------------------------------------------------- .../historyqueryset/MysqlQuerySetAmbariDB.java | 20 ++- .../historyqueryset/OracleQuerySetAmbariDB.java | 19 ++- .../hive/historyqueryset/QuerySetAmbariDB.java | 68 ++++++++-- .../hive/instancedetail/QuerySetAmbariDB.java | 4 +- .../savedqueryset/MysqlQuerySetAmbariDB.java | 16 ++- .../savedqueryset/OracleQuerySetAmbariDB.java | 12 +- .../hive/savedqueryset/QuerySetAmbariDB.java | 37 ++++-- .../pig/instancedetail/QuerySetAmbariDB.java | 2 +- .../pig/jobqueryset/MysqlQuerySetAmbariDB.java | 10 +- .../pig/jobqueryset/OracleQuerySetAmbariDB.java | 10 +- .../pig/jobqueryset/QuerySetAmbariDB.java | 37 ++++-- .../MysqlQuerySetAmbariDB.java | 10 +- .../OracleQuerySetAmbariDB.java | 18 ++- .../savedscriptqueryset/QuerySetAmbariDB.java | 31 ++++- .../HiveHistoryMigrationUtility.java | 32 +++-- ...HiveHistoryQueryMigrationImplementation.java | 94 +++++++++++--- .../HiveSavedQueryMigrationImplementation.java | 82 ++++++++---- .../HiveSavedQueryMigrationUtility.java | 103 ++++++--------- .../hive/savedquery/HiveSavedQueryStartJob.java | 2 - .../pigjob/PigJobMigrationImplementation.java | 83 ++++++++---- .../pig/pigjob/PigJobMigrationUtility.java | 106 +++++++--------- .../pig/pigscript/PigSavedScriptStartJob.java | 2 - .../PigScriptMigrationImplementation.java | 125 +++++++++++++++++-- .../pigscript/PigScriptMigrationUtility.java | 32 +++-- .../scripts/models/MigrationModel.java | 18 +-- .../app/models/checkprogress.js | 2 +- .../app/models/returnjobid.js | 2 +- .../app/models/startmigration.js | 2 +- .../app/routes/home-page/hive-history.js | 11 +- .../app/routes/home-page/hive-saved-query.js | 8 +- .../app/routes/home-page/pig-job.js | 8 +- .../app/routes/home-page/pig-script.js | 8 +- .../app/routes/home-page/revert-change.js | 10 +- .../src/main/resources/view.xml | 9 +- 34 files changed, 735 insertions(+), 298 deletions(-) ----------------------------------------------------------------------
