浏览代码

HUE-5291 [editor] Only autocomplete joins when possible

Johan Ahlen 9 年之前
父节点
当前提交
bb25b947e2

+ 2 - 2
desktop/core/src/desktop/static/desktop/js/sqlAutocompleter2.js

@@ -117,7 +117,7 @@ var SqlAutocompleter2 = (function () {
       colRefDeferral.resolve();
     }
 
-    if (parseResult.suggestJoins) {
+    if (parseResult.suggestJoins && HAS_OPTIMIZER) {
       var joinsDeferral = $.Deferred();
       deferrals.push(joinsDeferral);
       self.snippet.getApiHelper().fetchNavOptPopularJoins({
@@ -169,7 +169,7 @@ var SqlAutocompleter2 = (function () {
       });
     }
 
-    if (parseResult.suggestJoinConditions) {
+    if (parseResult.suggestJoinConditions && HAS_OPTIMIZER) {
       var joinConditionsDeferral = $.Deferred();
       deferrals.push(joinConditionsDeferral);
       self.snippet.getApiHelper().fetchNavOptPopularJoins({

+ 3 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -15,11 +15,12 @@
 ## limitations under the License.
 <%!
 from desktop import conf
+from desktop.conf import USE_NEW_EDITOR
 from desktop.lib.i18n import smart_unicode
 from django.utils.translation import ugettext as _
+from metadata.conf import has_optimizer
 
 home_url = url('desktop.views.home')
-from desktop.conf import USE_NEW_EDITOR
 if USE_NEW_EDITOR.get():
   home_url = url('desktop.views.home2')
 %>
@@ -104,6 +105,7 @@ if USE_NEW_EDITOR.get():
 
     var LOGGED_USERNAME = '${ user.username }';
     var IS_S3_ENABLED = '${ is_s3_enabled }' === 'True';
+    var HAS_OPTIMIZER = '${ has_optimizer() }' === 'True';
 
     // jHue plugins global configuration
     jHueFileChooserGlobals = {

+ 2 - 0
desktop/core/src/desktop/templates/responsive.mako

@@ -19,6 +19,7 @@
   from django.utils.translation import ugettext as _
   from desktop.lib.i18n import smart_unicode
   from desktop.views import login_modal
+  from metadata.conf import has_optimizer
 %>
 
 <%namespace name="assist" file="/assist.mako" />
@@ -64,6 +65,7 @@
 
     var LOGGED_USERNAME = '${ user.username }';
     var IS_S3_ENABLED = '${ is_s3_enabled }' === 'True';
+    var HAS_OPTIMIZER = '${ has_optimizer() }' === 'True';
 
     ApiHelperGlobals = {
       i18n: {