Repository: ambari Updated Branches: refs/heads/trunk e8bd12b19 -> 27f6b17ca
AMBARI-17727. Getting error while executing query for adding udf jar. (dipayanb) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27f6b17c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27f6b17c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27f6b17c Branch: refs/heads/trunk Commit: 27f6b17ca64645e7a922c56bdbad48cf77d964cc Parents: e8bd12b Author: Dipayan Bhowmick <[email protected]> Authored: Fri Jul 15 12:49:28 2016 +0530 Committer: Dipayan Bhowmick <[email protected]> Committed: Sat Jul 16 01:10:09 2016 +0530 ---------------------------------------------------------------------- .../ui/hive-web/app/controllers/index.js | 21 +++++++++++++++++++- .../ui/hive-web/app/controllers/index.js | 21 +++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/27f6b17c/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index.js b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index.js index 5b7544d..d68d82e 100644 --- a/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index.js +++ b/contrib/views/hive-next/src/main/resources/ui/hive-web/app/controllers/index.js @@ -199,7 +199,7 @@ export default Ember.Controller.extend({ finalQuery = query; finalQuery = this.bindQueryParams(finalQuery); finalQuery = this.prependGlobalSettings(finalQuery, job); - + finalQuery = this.rearrangeComponents(finalQuery); job.set('forcedContent', finalQuery); if (shouldGetVisualExplain) { @@ -209,6 +209,25 @@ export default Ember.Controller.extend({ return this.createJob(job, originalModel); }, + /** + * Rearranges the files and udfs statements to the starting of the query. + */ + rearrangeComponents: function(query) { + var extractedComponents = this.extractComponents(query); + var modifiedFinalQuery = ''; + if (extractedComponents.files.length) { + modifiedFinalQuery += extractedComponents.files.join("\n") + "\n\n"; + } + + if (extractedComponents.udfs.length) { + modifiedFinalQuery += extractedComponents.udfs.join("\n") + "\n\n"; + } + var newQueries = extractedComponents.queryString.split(";"); + newQueries = newQueries.filter(Boolean); + modifiedFinalQuery += newQueries.join(";") + ";"; + return modifiedFinalQuery; + }, + getVisualExplainJson: function (job, originalModel) { var self = this; var defer = Ember.RSVP.defer(); http://git-wip-us.apache.org/repos/asf/ambari/blob/27f6b17c/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js ---------------------------------------------------------------------- diff --git a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js index 4d35ae7..72f717d 100644 --- a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js +++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/index.js @@ -200,7 +200,7 @@ export default Ember.Controller.extend({ finalQuery = query; finalQuery = this.bindQueryParams(finalQuery); finalQuery = this.prependGlobalSettings(finalQuery, job); - + finalQuery = this.rearrangeComponents(finalQuery); job.set('forcedContent', finalQuery); if (shouldGetVisualExplain) { @@ -210,6 +210,25 @@ export default Ember.Controller.extend({ return this.createJob(job, originalModel); }, + /** + * Rearranges the files and udfs statements to the starting of the query. + */ + rearrangeComponents: function(query) { + var extractedComponents = this.extractComponents(query); + var modifiedFinalQuery = ''; + if (extractedComponents.files.length) { + modifiedFinalQuery += extractedComponents.files.join("\n") + "\n\n"; + } + + if (extractedComponents.udfs.length) { + modifiedFinalQuery += extractedComponents.udfs.join("\n") + "\n\n"; + } + var newQueries = extractedComponents.queryString.split(";"); + newQueries = newQueries.filter(Boolean); + modifiedFinalQuery += newQueries.join(";") + ";"; + return modifiedFinalQuery; + }, + getVisualExplainJson: function (job, originalModel) { var self = this; var defer = Ember.RSVP.defer();
