From 3da427db8efa0b4cbeec08ac0a0920aea7a7de86 Mon Sep 17 00:00:00 2001 From: andrese Date: Wed, 13 Sep 2017 18:55:16 +0200 Subject: [PATCH 01/26] Migrated command from "optimize" to "forcemerge" Migrated command from "optimize" to "forcemerge", changed the endpoint and parameters of the operation, and changed the text literals --- _site/app.js | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/_site/app.js b/_site/app.js index 069d12df..8048edb6 100644 --- a/_site/app.js +++ b/_site/app.js @@ -3102,28 +3102,29 @@ redraw && this.fire("redraw"); }.bind(this)); }, - _optimizeIndex_handler: function(index) { - var fields = new app.ux.FieldCollection({ - fields: [ - new ui.TextField({ label: i18n.text("OptimizeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }), - new ui.CheckField({ label: i18n.text("OptimizeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }), - new ui.CheckField({ label: i18n.text("OptimizeForm.FlushAfter"), name: "flush", value: true }), - new ui.CheckField({ label: i18n.text("OptimizeForm.WaitForMerge"), name: "wait_for_merge", value: false }) - ] - }); - var dialog = new ui.DialogPanel({ - title: i18n.text("OptimizeForm.OptimizeIndex", index.name), - body: new ui.PanelForm({ fields: fields }), - onCommit: function( panel, args ) { - if(fields.validate()) { - this.cluster.post(encodeURIComponent( index.name ) + "/_optimize", fields.getData(), function(r) { - alert(JSON.stringify(r)); - }); - dialog.close(); - } - }.bind(this) - }).open(); - }, + _forceMergeIndex_handler: function(index) { + var fields = new app.ux.FieldCollection({ + fields: [ + new ui.TextField({ label: i18n.text("ForceMergeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }), + new ui.CheckField({ label: i18n.text("ForceMergeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }), + new ui.CheckField({ label: i18n.text("ForceMergeForm.FlushAfter"), name: "flush", value: true }) + ] + }); + var dialog = new ui.DialogPanel({ + title: i18n.text("ForceMergeForm.ForceMergeIndex", index.name), + body: new ui.PanelForm({ fields: fields }), + onCommit: function( panel, args ) { + if(fields.validate()) { + + this.cluster.post(encodeURIComponent( index.name ) + "/_forcemerge?"+jQuery.param(fields.getData()), null, function(r) { + alert(JSON.stringify(r)); + }); + dialog.close(); + } + }.bind(this) + }).open(); + }, + _testAnalyser_handler: function(index) { this.cluster.get(encodeURIComponent( index.name ) + "/_analyze?text=" + encodeURIComponent( prompt( i18n.text("IndexCommand.TextToAnalyze") ) ), function(r) { alert(JSON.stringify(r, true, " ")); @@ -3251,7 +3252,7 @@ { text: i18n.text("IndexActionsMenu.NewAlias"), onclick: function() { this._newAliasAction_handler(index); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Refresh"), onclick: function() { this._postIndexAction_handler("_refresh", index, false); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Flush"), onclick: function() { this._postIndexAction_handler("_flush", index, false); }.bind(this) }, - { text: i18n.text("IndexActionsMenu.Optimize"), onclick: function () { this._optimizeIndex_handler(index); }.bind(this) }, + { text: i18n.text("IndexActionsMenu.ForceMerge"), onclick: function () { this._forceMergeIndex_handler(index); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Snapshot"), disabled: closed, onclick: function() { this._postIndexAction_handler("_gateway/snapshot", index, false); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Analyser"), onclick: function() { this._testAnalyser_handler(index); }.bind(this) }, { text: (index.state === "close") ? i18n.text("IndexActionsMenu.Open") : i18n.text("IndexActionsMenu.Close"), onclick: function() { this._postIndexAction_handler((index.state === "close") ? "_open" : "_close", index, true); }.bind(this) }, From 41fff0cc46c0c3f2cf826768a861e68f4fb4ee78 Mon Sep 17 00:00:00 2001 From: andrese Date: Wed, 13 Sep 2017 18:58:28 +0200 Subject: [PATCH 02/26] Migrated optimize to forcemerge Changed english literals for forcemerge --- _site/lang/en_strings.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/_site/lang/en_strings.js b/_site/lang/en_strings.js index 3679dfbb..e1699a53 100644 --- a/_site/lang/en_strings.js +++ b/_site/lang/en_strings.js @@ -40,7 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "New Alias...", "IndexActionsMenu.Refresh": "Refresh", "IndexActionsMenu.Flush": "Flush", - "IndexActionsMenu.Optimize": "Optimize...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Gateway Snapshot", "IndexActionsMenu.Analyser": "Test Analyser", "IndexActionsMenu.Open": "Open", @@ -83,11 +83,10 @@ i18n.setKeys({ "NodeType.Tribe": "Tribe Node", "NodeType.Worker": "Worker Node", "NodeType.Unassigned": "Unassigned", - "OptimizeForm.OptimizeIndex": "Optimize {0}", - "OptimizeForm.MaxSegments": "Maximum # Of Segments", - "OptimizeForm.ExpungeDeletes": "Only Expunge Deletes", - "OptimizeForm.FlushAfter": "Flush After Optimize", - "OptimizeForm.WaitForMerge": "Wait For Merge", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "Maximum # Of Segments", + "ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes", + "ForceMergeForm.FlushAfter": "Flush After ForceMerge", "Overview.PageTitle" : "Cluster Overview", "Output.JSON": "JSON", "Output.Table": "Table", From 17b0694e932eb35895b40f55db6493ed9ae468fb Mon Sep 17 00:00:00 2001 From: andrese Date: Wed, 13 Sep 2017 19:00:25 +0200 Subject: [PATCH 03/26] Migrated optimize to forcemerge Changed literals for forcemerge --- _site/lang/fr_strings.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/_site/lang/fr_strings.js b/_site/lang/fr_strings.js index 2cc9bbb0..0f364e79 100644 --- a/_site/lang/fr_strings.js +++ b/_site/lang/fr_strings.js @@ -40,7 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "Nouvel Alias...", "IndexActionsMenu.Refresh": "Rafraîchir", "IndexActionsMenu.Flush": "Flusher", - "IndexActionsMenu.Optimize": "Optimiser...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Dupliquer l'index (Snapshot)", "IndexActionsMenu.Analyser": "Tester un analyseur", "IndexActionsMenu.Open": "Ouvrir", @@ -83,11 +83,10 @@ i18n.setKeys({ "NodeType.Tribe": "Noeud Tribe", "NodeType.Worker": "Noeud Worker", "NodeType.Unassigned": "Non assigné", - "OptimizeForm.OptimizeIndex": "Optimiser {0}", - "OptimizeForm.MaxSegments": "Nombre maximum de segments", - "OptimizeForm.ExpungeDeletes": "Seulement purger les suppressions", - "OptimizeForm.FlushAfter": "Flusher après l'optimisation", - "OptimizeForm.WaitForMerge": "Attendre la fin de la fusion", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "Nombre maximum de segments", + "ForceMergeForm.ExpungeDeletes": "Seulement purger les suppressions", + "ForceMergeForm.FlushAfter": "Flusher après ForceMerge", "Overview.PageTitle" : "Aperçu du cluster", // "Output.JSON": "JSON", "Output.Table": "Tableau", From ea548de1a903c25b31b5064c59ac9552e68deea0 Mon Sep 17 00:00:00 2001 From: andrese Date: Wed, 13 Sep 2017 19:01:47 +0200 Subject: [PATCH 04/26] Migrated optimize to forcemerge Changed literals for forcemerge --- _site/lang/ja_strings.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_site/lang/ja_strings.js b/_site/lang/ja_strings.js index aaba72ce..85de377d 100755 --- a/_site/lang/ja_strings.js +++ b/_site/lang/ja_strings.js @@ -40,7 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "新しいエイリアス...", "IndexActionsMenu.Refresh": "Refresh", "IndexActionsMenu.Flush": "Flush", - "IndexActionsMenu.Optimize": "Optimize...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Gateway Snapshot", "IndexActionsMenu.Analyser": "Analyserテスト", // "IndexActionsMenu.Open": "Open", @@ -83,11 +83,11 @@ i18n.setKeys({ "NodeType.Tribe": "Tribe Node", "NodeType.Worker": "Worker Node", "NodeType.Unassigned": "Unassigned", - "OptimizeForm.OptimizeIndex": "Optimize {0}", - "OptimizeForm.MaxSegments": "Maximum # Of Segments", - "OptimizeForm.ExpungeDeletes": "Only Expunge Deletes", - "OptimizeForm.FlushAfter": "Flush After Optimize", - "OptimizeForm.WaitForMerge": "Wait For Merge", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "Maximum # Of Segments", + "ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes", + "ForceMergeForm.FlushAfter": "Flush After ForceMerge", + "ForceMergeForm.WaitForMerge": "Wait For Merge", "Overview.PageTitle" : "クラスタのOverview", // "Output.JSON": "JSON", "Output.Table": "表", From 6afb0a239033fe963841a2cb0fdd197ab967b89b Mon Sep 17 00:00:00 2001 From: andrese Date: Wed, 13 Sep 2017 19:03:00 +0200 Subject: [PATCH 05/26] Migrated optimize to forcemerge Changed literals for forcemerge --- _site/lang/pt_strings.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/_site/lang/pt_strings.js b/_site/lang/pt_strings.js index d4b6abff..280d1965 100644 --- a/_site/lang/pt_strings.js +++ b/_site/lang/pt_strings.js @@ -40,7 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "Novo apelido...", "IndexActionsMenu.Refresh": "Atualizar", "IndexActionsMenu.Flush": "Flush", - "IndexActionsMenu.Optimize": "Otimizar...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Snapshot do Gateway", "IndexActionsMenu.Analyser": "Analizador de teste", "IndexActionsMenu.Open": "Abrir", @@ -83,11 +83,10 @@ i18n.setKeys({ "NodeType.Tribe": "Nó tribo", "NodeType.Worker": "Nó trabalhador", "NodeType.Unassigned": "Não atribuido", - "OptimizeForm.OptimizeIndex": "Otimizar {0}", - "OptimizeForm.MaxSegments": "# Máximo De Segmentos", - "OptimizeForm.ExpungeDeletes": "Apenas Expurgar Exclusões", - "OptimizeForm.FlushAfter": "Flush após Otimizar", - "OptimizeForm.WaitForMerge": "Esperar Por Merge", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "# Máximo De Segmentos", + "ForceMergeForm.ExpungeDeletes": "Apenas Expurgar Exclusões", + "ForceMergeForm.FlushAfter": "Flush após ForceMerge", "Overview.PageTitle": "Visão geral do Cluster", "Output.JSON": "JSON", "Output.Table": "Tabela", From 876ced046a4095381c461ea74767484101b4680a Mon Sep 17 00:00:00 2001 From: andrese Date: Wed, 13 Sep 2017 19:04:07 +0200 Subject: [PATCH 06/26] Migrated optimize to forcemerge Changed literals for forcemerge --- _site/lang/tr_strings.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_site/lang/tr_strings.js b/_site/lang/tr_strings.js index f6119561..2c6cfd81 100644 --- a/_site/lang/tr_strings.js +++ b/_site/lang/tr_strings.js @@ -40,7 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "Yeni Alternatif İsim...", "IndexActionsMenu.Refresh": "Yenile", "IndexActionsMenu.Flush": "Boşalt", - "IndexActionsMenu.Optimize": "Optimize et...", + "IndexActionsMenu.ForceMerge": "ForceMerge et...", "IndexActionsMenu.Snapshot": "Gateway Snapshot (Kopya Al)", "IndexActionsMenu.Analyser": "Analizi test et", "IndexActionsMenu.Open": "Aç", @@ -83,11 +83,11 @@ i18n.setKeys({ "NodeType.Tribe": "Tribe Nod", "NodeType.Worker": "Worker Nod", "NodeType.Unassigned": "Sahipsiz", - "OptimizeForm.OptimizeIndex": "{0} Optimize Et", - "OptimizeForm.MaxSegments": "Maksimum Segment Sayısı", - "OptimizeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle", - "OptimizeForm.FlushAfter": "Optimize Ettikten Sonra Boşalt", - "OptimizeForm.WaitForMerge": "Birleştirme İçin Bekle", + "ForceMergeForm.ForceMergeIndex": "{0} ForceMerge Et", + "ForceMergeForm.MaxSegments": "Maksimum Segment Sayısı", + "ForceMergeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle", + "ForceMergeForm.FlushAfter": "ForceMerge Ettikten Sonra Boşalt", + "ForceMergeForm.WaitForMerge": "Birleştirme İçin Bekle", "Overview.PageTitle" : "Kümeler Genelbakış", "Output.JSON": "JSON", "Output.Table": "Tablo", From 6886ea253299906efb8dae0d72fa2894c1fa15f2 Mon Sep 17 00:00:00 2001 From: andrese Date: Wed, 13 Sep 2017 19:06:32 +0200 Subject: [PATCH 07/26] Migrated optimize to forcemerge Changed literals for forcemerge --- _site/lang/zh_strings.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/_site/lang/zh_strings.js b/_site/lang/zh_strings.js index 0038de17..e77e86a1 100644 --- a/_site/lang/zh_strings.js +++ b/_site/lang/zh_strings.js @@ -40,7 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "新建别名...", "IndexActionsMenu.Refresh": "刷新", "IndexActionsMenu.Flush": "Flush刷新", - "IndexActionsMenu.Optimize": "优化...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "网关快照", "IndexActionsMenu.Analyser": "测试分析器", "IndexActionsMenu.Open": "开启", @@ -83,11 +83,10 @@ i18n.setKeys({ "NodeType.Tribe": "分支结点", "NodeType.Worker": "工作节点", "NodeType.Unassigned": "未分配", - "OptimizeForm.OptimizeIndex": "优化 {0}", - "OptimizeForm.MaxSegments": "最大索引段数", - "OptimizeForm.ExpungeDeletes": "只删除被标记为删除的", - "OptimizeForm.FlushAfter": "优化后刷新", - "OptimizeForm.WaitForMerge": "等待合并", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "最大索引段数", + "ForceMergeForm.ExpungeDeletes": "只删除被标记为删除的", + "ForceMergeForm.FlushAfter": "ForceMerge后刷新", "Overview.PageTitle" : "集群概览", "Output.JSON": "JSON", "Output.Table": "Table", From 218724a9b99b57a701db8002fe00f75b2589c15c Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 11:48:51 +0200 Subject: [PATCH 08/26] Store elasticsearch version number Store elasticsearch version number during initialization --- _site/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/_site/app.js b/_site/app.js index 8048edb6..ce5437c7 100644 --- a/_site/app.js +++ b/_site/app.js @@ -3752,6 +3752,7 @@ _node_handler: function(data) { if(data) { this.prefs.set("app-base_uri", this.cluster.base_uri); + this.cluster.setVersion(data.version.number); } }, From 4a688b802a3793f7696bf3255881f4e405a0ee91 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:11:35 +0200 Subject: [PATCH 09/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- _site/lang/en_strings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_site/lang/en_strings.js b/_site/lang/en_strings.js index e1699a53..6059da7c 100644 --- a/_site/lang/en_strings.js +++ b/_site/lang/en_strings.js @@ -40,6 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "New Alias...", "IndexActionsMenu.Refresh": "Refresh", "IndexActionsMenu.Flush": "Flush", + "IndexActionsMenu.Optimize": "Optimize...", "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Gateway Snapshot", "IndexActionsMenu.Analyser": "Test Analyser", @@ -83,6 +84,11 @@ i18n.setKeys({ "NodeType.Tribe": "Tribe Node", "NodeType.Worker": "Worker Node", "NodeType.Unassigned": "Unassigned", + "OptimizeForm.OptimizeIndex": "Optimize {0}", + "OptimizeForm.MaxSegments": "Maximum # Of Segments", + "OptimizeForm.ExpungeDeletes": "Only Expunge Deletes", + "OptimizeForm.FlushAfter": "Flush After Optimize", + "OptimizeForm.WaitForMerge": "Wait For Merge", "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", "ForceMergeForm.MaxSegments": "Maximum # Of Segments", "ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes", From 8461306cbc859d8fc994b42b08b56bc14fa4205d Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:12:38 +0200 Subject: [PATCH 10/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- _site/lang/fr_strings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_site/lang/fr_strings.js b/_site/lang/fr_strings.js index 0f364e79..652bdb8a 100644 --- a/_site/lang/fr_strings.js +++ b/_site/lang/fr_strings.js @@ -40,6 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "Nouvel Alias...", "IndexActionsMenu.Refresh": "Rafraîchir", "IndexActionsMenu.Flush": "Flusher", + "IndexActionsMenu.Optimize": "Optimiser...", "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Dupliquer l'index (Snapshot)", "IndexActionsMenu.Analyser": "Tester un analyseur", @@ -83,6 +84,11 @@ i18n.setKeys({ "NodeType.Tribe": "Noeud Tribe", "NodeType.Worker": "Noeud Worker", "NodeType.Unassigned": "Non assigné", + "OptimizeForm.OptimizeIndex": "Optimiser {0}", + "OptimizeForm.MaxSegments": "Nombre maximum de segments", + "OptimizeForm.ExpungeDeletes": "Seulement purger les suppressions", + "OptimizeForm.FlushAfter": "Flusher après l'optimisation", + "OptimizeForm.WaitForMerge": "Attendre la fin de la fusion", "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", "ForceMergeForm.MaxSegments": "Nombre maximum de segments", "ForceMergeForm.ExpungeDeletes": "Seulement purger les suppressions", From 7a6ca3f81ae458dc977b7a75378b7feddf74ac5c Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:16:16 +0200 Subject: [PATCH 11/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- _site/lang/ja_strings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_site/lang/ja_strings.js b/_site/lang/ja_strings.js index 85de377d..7f0aa497 100755 --- a/_site/lang/ja_strings.js +++ b/_site/lang/ja_strings.js @@ -40,6 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "新しいエイリアス...", "IndexActionsMenu.Refresh": "Refresh", "IndexActionsMenu.Flush": "Flush", + "IndexActionsMenu.Optimize": "Optimize...", "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Gateway Snapshot", "IndexActionsMenu.Analyser": "Analyserテスト", @@ -83,6 +84,11 @@ i18n.setKeys({ "NodeType.Tribe": "Tribe Node", "NodeType.Worker": "Worker Node", "NodeType.Unassigned": "Unassigned", + "OptimizeForm.OptimizeIndex": "Optimize {0}", + "OptimizeForm.MaxSegments": "Maximum # Of Segments", + "OptimizeForm.ExpungeDeletes": "Only Expunge Deletes", + "OptimizeForm.FlushAfter": "Flush After Optimize", + "OptimizeForm.WaitForMerge": "Wait For Merge", "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", "ForceMergeForm.MaxSegments": "Maximum # Of Segments", "ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes", From 4071a3d4292f773b74fa9ad2c19ed5e7c71ff7c9 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:17:26 +0200 Subject: [PATCH 12/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- _site/lang/pt_strings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_site/lang/pt_strings.js b/_site/lang/pt_strings.js index 280d1965..2a4d85e4 100644 --- a/_site/lang/pt_strings.js +++ b/_site/lang/pt_strings.js @@ -40,6 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "Novo apelido...", "IndexActionsMenu.Refresh": "Atualizar", "IndexActionsMenu.Flush": "Flush", + "IndexActionsMenu.Optimize": "Otimizar...", "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Snapshot do Gateway", "IndexActionsMenu.Analyser": "Analizador de teste", @@ -83,6 +84,11 @@ i18n.setKeys({ "NodeType.Tribe": "Nó tribo", "NodeType.Worker": "Nó trabalhador", "NodeType.Unassigned": "Não atribuido", + "OptimizeForm.OptimizeIndex": "Otimizar {0}", + "OptimizeForm.MaxSegments": "# Máximo De Segmentos", + "OptimizeForm.ExpungeDeletes": "Apenas Expurgar Exclusões", + "OptimizeForm.FlushAfter": "Flush após Otimizar", + "OptimizeForm.WaitForMerge": "Esperar Por Merge", "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", "ForceMergeForm.MaxSegments": "# Máximo De Segmentos", "ForceMergeForm.ExpungeDeletes": "Apenas Expurgar Exclusões", From 6d9401b24d5114671e3cad1183edfa0c7edd3aa4 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:18:28 +0200 Subject: [PATCH 13/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- _site/lang/tr_strings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_site/lang/tr_strings.js b/_site/lang/tr_strings.js index 2c6cfd81..f8fc416e 100644 --- a/_site/lang/tr_strings.js +++ b/_site/lang/tr_strings.js @@ -40,6 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "Yeni Alternatif İsim...", "IndexActionsMenu.Refresh": "Yenile", "IndexActionsMenu.Flush": "Boşalt", + "IndexActionsMenu.Optimize": "Optimize et...", "IndexActionsMenu.ForceMerge": "ForceMerge et...", "IndexActionsMenu.Snapshot": "Gateway Snapshot (Kopya Al)", "IndexActionsMenu.Analyser": "Analizi test et", @@ -83,6 +84,11 @@ i18n.setKeys({ "NodeType.Tribe": "Tribe Nod", "NodeType.Worker": "Worker Nod", "NodeType.Unassigned": "Sahipsiz", + "OptimizeForm.OptimizeIndex": "{0} Optimize Et", + "OptimizeForm.MaxSegments": "Maksimum Segment Sayısı", + "OptimizeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle", + "OptimizeForm.FlushAfter": "Optimize Ettikten Sonra Boşalt", + "OptimizeForm.WaitForMerge": "Birleştirme İçin Bekle", "ForceMergeForm.ForceMergeIndex": "{0} ForceMerge Et", "ForceMergeForm.MaxSegments": "Maksimum Segment Sayısı", "ForceMergeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle", From 568523a8dd32c039ca9c3b916a392789353d6904 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:19:29 +0200 Subject: [PATCH 14/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- _site/lang/zh_strings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/_site/lang/zh_strings.js b/_site/lang/zh_strings.js index e77e86a1..bc248076 100644 --- a/_site/lang/zh_strings.js +++ b/_site/lang/zh_strings.js @@ -40,6 +40,7 @@ i18n.setKeys({ "IndexActionsMenu.NewAlias": "新建别名...", "IndexActionsMenu.Refresh": "刷新", "IndexActionsMenu.Flush": "Flush刷新", + "IndexActionsMenu.Optimize": "优化...", "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "网关快照", "IndexActionsMenu.Analyser": "测试分析器", @@ -83,6 +84,11 @@ i18n.setKeys({ "NodeType.Tribe": "分支结点", "NodeType.Worker": "工作节点", "NodeType.Unassigned": "未分配", + "OptimizeForm.OptimizeIndex": "优化 {0}", + "OptimizeForm.MaxSegments": "最大索引段数", + "OptimizeForm.ExpungeDeletes": "只删除被标记为删除的", + "OptimizeForm.FlushAfter": "优化后刷新", + "OptimizeForm.WaitForMerge": "等待合并", "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", "ForceMergeForm.MaxSegments": "最大索引段数", "ForceMergeForm.ExpungeDeletes": "只删除被标记为删除的", From dc8821f644deec7f76b81cb8d58c9af65d726143 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:23:00 +0200 Subject: [PATCH 15/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- _site/app.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/_site/app.js b/_site/app.js index ce5437c7..6ac78040 100644 --- a/_site/app.js +++ b/_site/app.js @@ -3102,6 +3102,28 @@ redraw && this.fire("redraw"); }.bind(this)); }, + _optimizeIndex_handler: function(index) { + var fields = new app.ux.FieldCollection({ + fields: [ + new ui.TextField({ label: i18n.text("OptimizeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }), + new ui.CheckField({ label: i18n.text("OptimizeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }), + new ui.CheckField({ label: i18n.text("OptimizeForm.FlushAfter"), name: "flush", value: true }), + new ui.CheckField({ label: i18n.text("OptimizeForm.WaitForMerge"), name: "wait_for_merge", value: false }) + ] + }); + var dialog = new ui.DialogPanel({ + title: i18n.text("OptimizeForm.OptimizeIndex", index.name), + body: new ui.PanelForm({ fields: fields }), + onCommit: function( panel, args ) { + if(fields.validate()) { + this.cluster.post(encodeURIComponent( index.name ) + "/_optimize", fields.getData(), function(r) { + alert(JSON.stringify(r)); + }); + dialog.close(); + } + }.bind(this) + }).open(); + }, _forceMergeIndex_handler: function(index) { var fields = new app.ux.FieldCollection({ fields: [ @@ -3252,7 +3274,7 @@ { text: i18n.text("IndexActionsMenu.NewAlias"), onclick: function() { this._newAliasAction_handler(index); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Refresh"), onclick: function() { this._postIndexAction_handler("_refresh", index, false); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Flush"), onclick: function() { this._postIndexAction_handler("_flush", index, false); }.bind(this) }, - { text: i18n.text("IndexActionsMenu.ForceMerge"), onclick: function () { this._forceMergeIndex_handler(index); }.bind(this) }, + { text: this.cluster.versionAtLeast("5.0.0.") ? i18n.text("IndexActionsMenu.ForceMerge") : i18n.text("IndexActionsMenu.Optimize"), onclick: this.cluster.versionAtLeast("5.0.0.") ? function () { this._forceMergeIndex_handler(index); }.bind(this) : function () { this._optimizeIndex_handler(index); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Snapshot"), disabled: closed, onclick: function() { this._postIndexAction_handler("_gateway/snapshot", index, false); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Analyser"), onclick: function() { this._testAnalyser_handler(index); }.bind(this) }, { text: (index.state === "close") ? i18n.text("IndexActionsMenu.Open") : i18n.text("IndexActionsMenu.Close"), onclick: function() { this._postIndexAction_handler((index.state === "close") ? "_open" : "_close", index, true); }.bind(this) }, From 4d14e8eba33a9992b557054324b8075dfd3d4c43 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:31:51 +0200 Subject: [PATCH 16/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/ui/nodesView/nodesView.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/app/ui/nodesView/nodesView.js b/src/app/ui/nodesView/nodesView.js index 08ce1d30..20c0e186 100644 --- a/src/app/ui/nodesView/nodesView.js +++ b/src/app/ui/nodesView/nodesView.js @@ -78,6 +78,28 @@ }.bind(this) }).open(); }, + _forceMergeIndex_handler: function(index) { + var fields = new app.ux.FieldCollection({ + fields: [ + new ui.TextField({ label: i18n.text("ForceMergeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }), + new ui.CheckField({ label: i18n.text("ForceMergeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }), + new ui.CheckField({ label: i18n.text("ForceMergeForm.FlushAfter"), name: "flush", value: true }) + ] + }); + var dialog = new ui.DialogPanel({ + title: i18n.text("ForceMergeForm.ForceMergeIndex", index.name), + body: new ui.PanelForm({ fields: fields }), + onCommit: function( panel, args ) { + if(fields.validate()) { + + this.cluster.post(encodeURIComponent( index.name ) + "/_forcemerge?"+jQuery.param(fields.getData()), null, function(r) { + alert(JSON.stringify(r)); + }); + dialog.close(); + } + }.bind(this) + }).open(); + }, _testAnalyser_handler: function(index) { this.cluster.get(encodeURIComponent( index.name ) + "/_analyze?text=" + encodeURIComponent( prompt( i18n.text("IndexCommand.TextToAnalyze") ) ), function(r) { alert(JSON.stringify(r, true, " ")); From 2615beefda93e3eb40198250d55b5cb6e92e4270 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:32:43 +0200 Subject: [PATCH 17/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/ui/clusterConnect/clusterConnect.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/ui/clusterConnect/clusterConnect.js b/src/app/ui/clusterConnect/clusterConnect.js index 63d09772..e9d25134 100644 --- a/src/app/ui/clusterConnect/clusterConnect.js +++ b/src/app/ui/clusterConnect/clusterConnect.js @@ -18,6 +18,7 @@ _node_handler: function(data) { if(data) { this.prefs.set("app-base_uri", this.cluster.base_uri); + this.cluster.setVersion(data.version.number); } }, From c5351b09fbfe38a4ef4c0b8775179b4c92160605 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:34:32 +0200 Subject: [PATCH 18/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/ui/nodesView/nodesView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/ui/nodesView/nodesView.js b/src/app/ui/nodesView/nodesView.js index 20c0e186..77be881c 100644 --- a/src/app/ui/nodesView/nodesView.js +++ b/src/app/ui/nodesView/nodesView.js @@ -227,7 +227,7 @@ { text: i18n.text("IndexActionsMenu.NewAlias"), onclick: function() { this._newAliasAction_handler(index); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Refresh"), onclick: function() { this._postIndexAction_handler("_refresh", index, false); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Flush"), onclick: function() { this._postIndexAction_handler("_flush", index, false); }.bind(this) }, - { text: i18n.text("IndexActionsMenu.Optimize"), onclick: function () { this._optimizeIndex_handler(index); }.bind(this) }, + { text: this.cluster.versionAtLeast("5.0.0.") ? i18n.text("IndexActionsMenu.ForceMerge") : i18n.text("IndexActionsMenu.Optimize"), onclick: this.cluster.versionAtLeast("5.0.0.") ? function () { this._forceMergeIndex_handler(index); }.bind(this) : function () { this._optimizeIndex_handler(index); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Snapshot"), disabled: closed, onclick: function() { this._postIndexAction_handler("_gateway/snapshot", index, false); }.bind(this) }, { text: i18n.text("IndexActionsMenu.Analyser"), onclick: function() { this._testAnalyser_handler(index); }.bind(this) }, { text: (index.state === "close") ? i18n.text("IndexActionsMenu.Open") : i18n.text("IndexActionsMenu.Close"), onclick: function() { this._postIndexAction_handler((index.state === "close") ? "_open" : "_close", index, true); }.bind(this) }, From 4edb878a1123911821c6a74aeacb091f2bf97067 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:36:23 +0200 Subject: [PATCH 19/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/lang/en_strings.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/lang/en_strings.js b/src/app/lang/en_strings.js index 3679dfbb..6059da7c 100644 --- a/src/app/lang/en_strings.js +++ b/src/app/lang/en_strings.js @@ -41,6 +41,7 @@ i18n.setKeys({ "IndexActionsMenu.Refresh": "Refresh", "IndexActionsMenu.Flush": "Flush", "IndexActionsMenu.Optimize": "Optimize...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Gateway Snapshot", "IndexActionsMenu.Analyser": "Test Analyser", "IndexActionsMenu.Open": "Open", @@ -88,6 +89,10 @@ i18n.setKeys({ "OptimizeForm.ExpungeDeletes": "Only Expunge Deletes", "OptimizeForm.FlushAfter": "Flush After Optimize", "OptimizeForm.WaitForMerge": "Wait For Merge", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "Maximum # Of Segments", + "ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes", + "ForceMergeForm.FlushAfter": "Flush After ForceMerge", "Overview.PageTitle" : "Cluster Overview", "Output.JSON": "JSON", "Output.Table": "Table", From c18fd67c214b0f66e445207bdc868d1b198f6dc0 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:43:58 +0200 Subject: [PATCH 20/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/lang/fr_strings.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/lang/fr_strings.js b/src/app/lang/fr_strings.js index 2cc9bbb0..652bdb8a 100644 --- a/src/app/lang/fr_strings.js +++ b/src/app/lang/fr_strings.js @@ -41,6 +41,7 @@ i18n.setKeys({ "IndexActionsMenu.Refresh": "Rafraîchir", "IndexActionsMenu.Flush": "Flusher", "IndexActionsMenu.Optimize": "Optimiser...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Dupliquer l'index (Snapshot)", "IndexActionsMenu.Analyser": "Tester un analyseur", "IndexActionsMenu.Open": "Ouvrir", @@ -88,6 +89,10 @@ i18n.setKeys({ "OptimizeForm.ExpungeDeletes": "Seulement purger les suppressions", "OptimizeForm.FlushAfter": "Flusher après l'optimisation", "OptimizeForm.WaitForMerge": "Attendre la fin de la fusion", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "Nombre maximum de segments", + "ForceMergeForm.ExpungeDeletes": "Seulement purger les suppressions", + "ForceMergeForm.FlushAfter": "Flusher après ForceMerge", "Overview.PageTitle" : "Aperçu du cluster", // "Output.JSON": "JSON", "Output.Table": "Tableau", From 6f825cf2fd1b1175a0a8c132cf2e49746ef21f62 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:44:43 +0200 Subject: [PATCH 21/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/lang/ja_strings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/lang/ja_strings.js b/src/app/lang/ja_strings.js index aaba72ce..7f0aa497 100755 --- a/src/app/lang/ja_strings.js +++ b/src/app/lang/ja_strings.js @@ -41,6 +41,7 @@ i18n.setKeys({ "IndexActionsMenu.Refresh": "Refresh", "IndexActionsMenu.Flush": "Flush", "IndexActionsMenu.Optimize": "Optimize...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Gateway Snapshot", "IndexActionsMenu.Analyser": "Analyserテスト", // "IndexActionsMenu.Open": "Open", @@ -88,6 +89,11 @@ i18n.setKeys({ "OptimizeForm.ExpungeDeletes": "Only Expunge Deletes", "OptimizeForm.FlushAfter": "Flush After Optimize", "OptimizeForm.WaitForMerge": "Wait For Merge", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "Maximum # Of Segments", + "ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes", + "ForceMergeForm.FlushAfter": "Flush After ForceMerge", + "ForceMergeForm.WaitForMerge": "Wait For Merge", "Overview.PageTitle" : "クラスタのOverview", // "Output.JSON": "JSON", "Output.Table": "表", From 8e65b8d77698631bb0b403875d196ac9420b14b2 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:45:21 +0200 Subject: [PATCH 22/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/lang/pt_strings.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/lang/pt_strings.js b/src/app/lang/pt_strings.js index d4b6abff..2a4d85e4 100644 --- a/src/app/lang/pt_strings.js +++ b/src/app/lang/pt_strings.js @@ -41,6 +41,7 @@ i18n.setKeys({ "IndexActionsMenu.Refresh": "Atualizar", "IndexActionsMenu.Flush": "Flush", "IndexActionsMenu.Optimize": "Otimizar...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "Snapshot do Gateway", "IndexActionsMenu.Analyser": "Analizador de teste", "IndexActionsMenu.Open": "Abrir", @@ -88,6 +89,10 @@ i18n.setKeys({ "OptimizeForm.ExpungeDeletes": "Apenas Expurgar Exclusões", "OptimizeForm.FlushAfter": "Flush após Otimizar", "OptimizeForm.WaitForMerge": "Esperar Por Merge", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "# Máximo De Segmentos", + "ForceMergeForm.ExpungeDeletes": "Apenas Expurgar Exclusões", + "ForceMergeForm.FlushAfter": "Flush após ForceMerge", "Overview.PageTitle": "Visão geral do Cluster", "Output.JSON": "JSON", "Output.Table": "Tabela", From bb638f74979049a3c310c0d7d98557dba21ad356 Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:45:52 +0200 Subject: [PATCH 23/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/lang/tr_strings.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/app/lang/tr_strings.js b/src/app/lang/tr_strings.js index f6119561..f8fc416e 100644 --- a/src/app/lang/tr_strings.js +++ b/src/app/lang/tr_strings.js @@ -41,6 +41,7 @@ i18n.setKeys({ "IndexActionsMenu.Refresh": "Yenile", "IndexActionsMenu.Flush": "Boşalt", "IndexActionsMenu.Optimize": "Optimize et...", + "IndexActionsMenu.ForceMerge": "ForceMerge et...", "IndexActionsMenu.Snapshot": "Gateway Snapshot (Kopya Al)", "IndexActionsMenu.Analyser": "Analizi test et", "IndexActionsMenu.Open": "Aç", @@ -88,6 +89,11 @@ i18n.setKeys({ "OptimizeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle", "OptimizeForm.FlushAfter": "Optimize Ettikten Sonra Boşalt", "OptimizeForm.WaitForMerge": "Birleştirme İçin Bekle", + "ForceMergeForm.ForceMergeIndex": "{0} ForceMerge Et", + "ForceMergeForm.MaxSegments": "Maksimum Segment Sayısı", + "ForceMergeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle", + "ForceMergeForm.FlushAfter": "ForceMerge Ettikten Sonra Boşalt", + "ForceMergeForm.WaitForMerge": "Birleştirme İçin Bekle", "Overview.PageTitle" : "Kümeler Genelbakış", "Output.JSON": "JSON", "Output.Table": "Tablo", From 1b4f790515973fec77f5f8bab76acb3f94268f6e Mon Sep 17 00:00:00 2001 From: andrese Date: Thu, 14 Sep 2017 12:46:30 +0200 Subject: [PATCH 24/26] Support optimize AND forcemerge Support optimize AND forcemerge, depending of ES version --- src/app/lang/zh_strings.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/lang/zh_strings.js b/src/app/lang/zh_strings.js index 0038de17..bc248076 100644 --- a/src/app/lang/zh_strings.js +++ b/src/app/lang/zh_strings.js @@ -41,6 +41,7 @@ i18n.setKeys({ "IndexActionsMenu.Refresh": "刷新", "IndexActionsMenu.Flush": "Flush刷新", "IndexActionsMenu.Optimize": "优化...", + "IndexActionsMenu.ForceMerge": "ForceMerge...", "IndexActionsMenu.Snapshot": "网关快照", "IndexActionsMenu.Analyser": "测试分析器", "IndexActionsMenu.Open": "开启", @@ -88,6 +89,10 @@ i18n.setKeys({ "OptimizeForm.ExpungeDeletes": "只删除被标记为删除的", "OptimizeForm.FlushAfter": "优化后刷新", "OptimizeForm.WaitForMerge": "等待合并", + "ForceMergeForm.ForceMergeIndex": "ForceMerge {0}", + "ForceMergeForm.MaxSegments": "最大索引段数", + "ForceMergeForm.ExpungeDeletes": "只删除被标记为删除的", + "ForceMergeForm.FlushAfter": "ForceMerge后刷新", "Overview.PageTitle" : "集群概览", "Output.JSON": "JSON", "Output.Table": "Table", From 7e3b43178ced5d44e953f6a1518c4889ff0b81da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Ederra?= Date: Thu, 14 Sep 2017 18:44:46 +0200 Subject: [PATCH 25/26] Fixed test pass --- src/app/ui/clusterConnect/clusterConnect.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/ui/clusterConnect/clusterConnect.js b/src/app/ui/clusterConnect/clusterConnect.js index e9d25134..f1e2b350 100644 --- a/src/app/ui/clusterConnect/clusterConnect.js +++ b/src/app/ui/clusterConnect/clusterConnect.js @@ -18,7 +18,8 @@ _node_handler: function(data) { if(data) { this.prefs.set("app-base_uri", this.cluster.base_uri); - this.cluster.setVersion(data.version.number); + if(data.version && data.version.number) + this.cluster.setVersion(data.version.number); } }, From 4b3d75d697853a8e2b91f6b842c497a68fbffc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Ederra?= Date: Thu, 14 Sep 2017 18:48:35 +0200 Subject: [PATCH 26/26] Fixed test pass --- _site/app.js | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/_site/app.js b/_site/app.js index 6ac78040..434b8a9d 100644 --- a/_site/app.js +++ b/_site/app.js @@ -3103,28 +3103,28 @@ }.bind(this)); }, _optimizeIndex_handler: function(index) { - var fields = new app.ux.FieldCollection({ - fields: [ - new ui.TextField({ label: i18n.text("OptimizeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }), - new ui.CheckField({ label: i18n.text("OptimizeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }), - new ui.CheckField({ label: i18n.text("OptimizeForm.FlushAfter"), name: "flush", value: true }), - new ui.CheckField({ label: i18n.text("OptimizeForm.WaitForMerge"), name: "wait_for_merge", value: false }) - ] - }); - var dialog = new ui.DialogPanel({ - title: i18n.text("OptimizeForm.OptimizeIndex", index.name), - body: new ui.PanelForm({ fields: fields }), - onCommit: function( panel, args ) { - if(fields.validate()) { - this.cluster.post(encodeURIComponent( index.name ) + "/_optimize", fields.getData(), function(r) { - alert(JSON.stringify(r)); - }); - dialog.close(); - } - }.bind(this) - }).open(); - }, - _forceMergeIndex_handler: function(index) { + var fields = new app.ux.FieldCollection({ + fields: [ + new ui.TextField({ label: i18n.text("OptimizeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }), + new ui.CheckField({ label: i18n.text("OptimizeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }), + new ui.CheckField({ label: i18n.text("OptimizeForm.FlushAfter"), name: "flush", value: true }), + new ui.CheckField({ label: i18n.text("OptimizeForm.WaitForMerge"), name: "wait_for_merge", value: false }) + ] + }); + var dialog = new ui.DialogPanel({ + title: i18n.text("OptimizeForm.OptimizeIndex", index.name), + body: new ui.PanelForm({ fields: fields }), + onCommit: function( panel, args ) { + if(fields.validate()) { + this.cluster.post(encodeURIComponent( index.name ) + "/_optimize", fields.getData(), function(r) { + alert(JSON.stringify(r)); + }); + dialog.close(); + } + }.bind(this) + }).open(); + }, + _forceMergeIndex_handler: function(index) { var fields = new app.ux.FieldCollection({ fields: [ new ui.TextField({ label: i18n.text("ForceMergeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }), @@ -3145,8 +3145,7 @@ } }.bind(this) }).open(); - }, - + }, _testAnalyser_handler: function(index) { this.cluster.get(encodeURIComponent( index.name ) + "/_analyze?text=" + encodeURIComponent( prompt( i18n.text("IndexCommand.TextToAnalyze") ) ), function(r) { alert(JSON.stringify(r, true, " ")); @@ -3774,7 +3773,8 @@ _node_handler: function(data) { if(data) { this.prefs.set("app-base_uri", this.cluster.base_uri); - this.cluster.setVersion(data.version.number); + if(data.version && data.version.number) + this.cluster.setVersion(data.version.number); } },