Skip to content

Commit bee0850

Browse files
mobzmobz
authored
Merge pull request #359 from andrese/Issue-328
Issue 328 (ForceMege vs Optimize)
2 parents af42e97 + 4b3d75d commit bee0850

File tree

15 files changed

+114
-2
lines changed

15 files changed

+114
-2
lines changed

‎_site/app.js‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3124,6 +3124,28 @@
31243124
}.bind(this)
31253125
}).open();
31263126
},
3127+
_forceMergeIndex_handler: function(index) {
3128+
var fields = new app.ux.FieldCollection({
3129+
fields: [
3130+
new ui.TextField({ label: i18n.text("ForceMergeForm.MaxSegments"), name: "max_num_segments", value: "1", require: true }),
3131+
new ui.CheckField({ label: i18n.text("ForceMergeForm.ExpungeDeletes"), name: "only_expunge_deletes", value: false }),
3132+
new ui.CheckField({ label: i18n.text("ForceMergeForm.FlushAfter"), name: "flush", value: true })
3133+
]
3134+
});
3135+
var dialog = new ui.DialogPanel({
3136+
title: i18n.text("ForceMergeForm.ForceMergeIndex", index.name),
3137+
body: new ui.PanelForm({ fields: fields }),
3138+
onCommit: function( panel, args ) {
3139+
if(fields.validate()) {
3140+
3141+
this.cluster.post(encodeURIComponent( index.name ) + "/_forcemerge?"+jQuery.param(fields.getData()), null, function(r) {
3142+
alert(JSON.stringify(r));
3143+
});
3144+
dialog.close();
3145+
}
3146+
}.bind(this)
3147+
}).open();
3148+
},
31273149
_testAnalyser_handler: function(index) {
31283150
this.cluster.get(encodeURIComponent( index.name ) + "/_analyze?text=" + encodeURIComponent( prompt( i18n.text("IndexCommand.TextToAnalyze") ) ), function(r) {
31293151
alert(JSON.stringify(r, true, " "));
@@ -3251,7 +3273,7 @@
32513273
{ text: i18n.text("IndexActionsMenu.NewAlias"), onclick: function() { this._newAliasAction_handler(index); }.bind(this) },
32523274
{ text: i18n.text("IndexActionsMenu.Refresh"), onclick: function() { this._postIndexAction_handler("_refresh", index, false); }.bind(this) },
32533275
{ text: i18n.text("IndexActionsMenu.Flush"), onclick: function() { this._postIndexAction_handler("_flush", index, false); }.bind(this) },
3254-
{ text: i18n.text("IndexActionsMenu.Optimize"), onclick: function () { this._optimizeIndex_handler(index); }.bind(this) },
3276+
{ 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) },
32553277
{ text: i18n.text("IndexActionsMenu.Snapshot"), disabled: closed, onclick: function() { this._postIndexAction_handler("_gateway/snapshot", index, false); }.bind(this) },
32563278
{ text: i18n.text("IndexActionsMenu.Analyser"), onclick: function() { this._testAnalyser_handler(index); }.bind(this) },
32573279
{ 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) },
@@ -3751,6 +3773,8 @@
37513773
_node_handler: function(data) {
37523774
if(data) {
37533775
this.prefs.set("app-base_uri", this.cluster.base_uri);
3776+
if(data.version && data.version.number)
3777+
this.cluster.setVersion(data.version.number);
37543778
}
37553779
},
37563780

‎_site/lang/en_strings.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "Refresh",
4242
"IndexActionsMenu.Flush": "Flush",
4343
"IndexActionsMenu.Optimize": "Optimize...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge...",
4445
"IndexActionsMenu.Snapshot": "Gateway Snapshot",
4546
"IndexActionsMenu.Analyser": "Test Analyser",
4647
"IndexActionsMenu.Open": "Open",
@@ -88,6 +89,10 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "Only Expunge Deletes",
8990
"OptimizeForm.FlushAfter": "Flush After Optimize",
9091
"OptimizeForm.WaitForMerge": "Wait For Merge",
92+
"ForceMergeForm.ForceMergeIndex": "ForceMerge {0}",
93+
"ForceMergeForm.MaxSegments": "Maximum # Of Segments",
94+
"ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes",
95+
"ForceMergeForm.FlushAfter": "Flush After ForceMerge",
9196
"Overview.PageTitle" : "Cluster Overview",
9297
"Output.JSON": "JSON",
9398
"Output.Table": "Table",

‎_site/lang/fr_strings.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "Rafraîchir",
4242
"IndexActionsMenu.Flush": "Flusher",
4343
"IndexActionsMenu.Optimize": "Optimiser...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge...",
4445
"IndexActionsMenu.Snapshot": "Dupliquer l'index (Snapshot)",
4546
"IndexActionsMenu.Analyser": "Tester un analyseur",
4647
"IndexActionsMenu.Open": "Ouvrir",
@@ -88,6 +89,10 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "Seulement purger les suppressions",
8990
"OptimizeForm.FlushAfter": "Flusher après l'optimisation",
9091
"OptimizeForm.WaitForMerge": "Attendre la fin de la fusion",
92+
"ForceMergeForm.ForceMergeIndex": "ForceMerge {0}",
93+
"ForceMergeForm.MaxSegments": "Nombre maximum de segments",
94+
"ForceMergeForm.ExpungeDeletes": "Seulement purger les suppressions",
95+
"ForceMergeForm.FlushAfter": "Flusher après ForceMerge",
9196
"Overview.PageTitle" : "Aperçu du cluster",
9297
// "Output.JSON": "JSON",
9398
"Output.Table": "Tableau",

‎_site/lang/ja_strings.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "Refresh",
4242
"IndexActionsMenu.Flush": "Flush",
4343
"IndexActionsMenu.Optimize": "Optimize...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge...",
4445
"IndexActionsMenu.Snapshot": "Gateway Snapshot",
4546
"IndexActionsMenu.Analyser": "Analyserテスト",
4647
// "IndexActionsMenu.Open": "Open",
@@ -88,6 +89,11 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "Only Expunge Deletes",
8990
"OptimizeForm.FlushAfter": "Flush After Optimize",
9091
"OptimizeForm.WaitForMerge": "Wait For Merge",
92+
"ForceMergeForm.ForceMergeIndex": "ForceMerge {0}",
93+
"ForceMergeForm.MaxSegments": "Maximum # Of Segments",
94+
"ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes",
95+
"ForceMergeForm.FlushAfter": "Flush After ForceMerge",
96+
"ForceMergeForm.WaitForMerge": "Wait For Merge",
9197
"Overview.PageTitle" : "クラスタのOverview",
9298
// "Output.JSON": "JSON",
9399
"Output.Table": "表",

‎_site/lang/pt_strings.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "Atualizar",
4242
"IndexActionsMenu.Flush": "Flush",
4343
"IndexActionsMenu.Optimize": "Otimizar...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge...",
4445
"IndexActionsMenu.Snapshot": "Snapshot do Gateway",
4546
"IndexActionsMenu.Analyser": "Analizador de teste",
4647
"IndexActionsMenu.Open": "Abrir",
@@ -88,6 +89,10 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "Apenas Expurgar Exclusões",
8990
"OptimizeForm.FlushAfter": "Flush após Otimizar",
9091
"OptimizeForm.WaitForMerge": "Esperar Por Merge",
92+
"ForceMergeForm.ForceMergeIndex": "ForceMerge {0}",
93+
"ForceMergeForm.MaxSegments": "# Máximo De Segmentos",
94+
"ForceMergeForm.ExpungeDeletes": "Apenas Expurgar Exclusões",
95+
"ForceMergeForm.FlushAfter": "Flush após ForceMerge",
9196
"Overview.PageTitle": "Visão geral do Cluster",
9297
"Output.JSON": "JSON",
9398
"Output.Table": "Tabela",

‎_site/lang/tr_strings.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "Yenile",
4242
"IndexActionsMenu.Flush": "Boşalt",
4343
"IndexActionsMenu.Optimize": "Optimize et...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge et...",
4445
"IndexActionsMenu.Snapshot": "Gateway Snapshot (Kopya Al)",
4546
"IndexActionsMenu.Analyser": "Analizi test et",
4647
"IndexActionsMenu.Open": "Aç",
@@ -88,6 +89,11 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle",
8990
"OptimizeForm.FlushAfter": "Optimize Ettikten Sonra Boşalt",
9091
"OptimizeForm.WaitForMerge": "Birleştirme İçin Bekle",
92+
"ForceMergeForm.ForceMergeIndex": "{0} ForceMerge Et",
93+
"ForceMergeForm.MaxSegments": "Maksimum Segment Sayısı",
94+
"ForceMergeForm.ExpungeDeletes": "Silme İşlemi Artıklarını Temizle",
95+
"ForceMergeForm.FlushAfter": "ForceMerge Ettikten Sonra Boşalt",
96+
"ForceMergeForm.WaitForMerge": "Birleştirme İçin Bekle",
9197
"Overview.PageTitle" : "Kümeler Genelbakış",
9298
"Output.JSON": "JSON",
9399
"Output.Table": "Tablo",

‎_site/lang/zh_strings.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "刷新",
4242
"IndexActionsMenu.Flush": "Flush刷新",
4343
"IndexActionsMenu.Optimize": "优化...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge...",
4445
"IndexActionsMenu.Snapshot": "网关快照",
4546
"IndexActionsMenu.Analyser": "测试分析器",
4647
"IndexActionsMenu.Open": "开启",
@@ -88,6 +89,10 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "只删除被标记为删除的",
8990
"OptimizeForm.FlushAfter": "优化后刷新",
9091
"OptimizeForm.WaitForMerge": "等待合并",
92+
"ForceMergeForm.ForceMergeIndex": "ForceMerge {0}",
93+
"ForceMergeForm.MaxSegments": "最大索引段数",
94+
"ForceMergeForm.ExpungeDeletes": "只删除被标记为删除的",
95+
"ForceMergeForm.FlushAfter": "ForceMerge后刷新",
9196
"Overview.PageTitle" : "集群概览",
9297
"Output.JSON": "JSON",
9398
"Output.Table": "Table",

‎src/app/lang/en_strings.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "Refresh",
4242
"IndexActionsMenu.Flush": "Flush",
4343
"IndexActionsMenu.Optimize": "Optimize...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge...",
4445
"IndexActionsMenu.Snapshot": "Gateway Snapshot",
4546
"IndexActionsMenu.Analyser": "Test Analyser",
4647
"IndexActionsMenu.Open": "Open",
@@ -88,6 +89,10 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "Only Expunge Deletes",
8990
"OptimizeForm.FlushAfter": "Flush After Optimize",
9091
"OptimizeForm.WaitForMerge": "Wait For Merge",
92+
"ForceMergeForm.ForceMergeIndex": "ForceMerge {0}",
93+
"ForceMergeForm.MaxSegments": "Maximum # Of Segments",
94+
"ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes",
95+
"ForceMergeForm.FlushAfter": "Flush After ForceMerge",
9196
"Overview.PageTitle" : "Cluster Overview",
9297
"Output.JSON": "JSON",
9398
"Output.Table": "Table",

‎src/app/lang/fr_strings.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "Rafraîchir",
4242
"IndexActionsMenu.Flush": "Flusher",
4343
"IndexActionsMenu.Optimize": "Optimiser...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge...",
4445
"IndexActionsMenu.Snapshot": "Dupliquer l'index (Snapshot)",
4546
"IndexActionsMenu.Analyser": "Tester un analyseur",
4647
"IndexActionsMenu.Open": "Ouvrir",
@@ -88,6 +89,10 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "Seulement purger les suppressions",
8990
"OptimizeForm.FlushAfter": "Flusher après l'optimisation",
9091
"OptimizeForm.WaitForMerge": "Attendre la fin de la fusion",
92+
"ForceMergeForm.ForceMergeIndex": "ForceMerge {0}",
93+
"ForceMergeForm.MaxSegments": "Nombre maximum de segments",
94+
"ForceMergeForm.ExpungeDeletes": "Seulement purger les suppressions",
95+
"ForceMergeForm.FlushAfter": "Flusher après ForceMerge",
9196
"Overview.PageTitle" : "Aperçu du cluster",
9297
// "Output.JSON": "JSON",
9398
"Output.Table": "Tableau",

‎src/app/lang/ja_strings.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ i18n.setKeys({
4141
"IndexActionsMenu.Refresh": "Refresh",
4242
"IndexActionsMenu.Flush": "Flush",
4343
"IndexActionsMenu.Optimize": "Optimize...",
44+
"IndexActionsMenu.ForceMerge": "ForceMerge...",
4445
"IndexActionsMenu.Snapshot": "Gateway Snapshot",
4546
"IndexActionsMenu.Analyser": "Analyserテスト",
4647
// "IndexActionsMenu.Open": "Open",
@@ -88,6 +89,11 @@ i18n.setKeys({
8889
"OptimizeForm.ExpungeDeletes": "Only Expunge Deletes",
8990
"OptimizeForm.FlushAfter": "Flush After Optimize",
9091
"OptimizeForm.WaitForMerge": "Wait For Merge",
92+
"ForceMergeForm.ForceMergeIndex": "ForceMerge {0}",
93+
"ForceMergeForm.MaxSegments": "Maximum # Of Segments",
94+
"ForceMergeForm.ExpungeDeletes": "Only Expunge Deletes",
95+
"ForceMergeForm.FlushAfter": "Flush After ForceMerge",
96+
"ForceMergeForm.WaitForMerge": "Wait For Merge",
9197
"Overview.PageTitle" : "クラスタのOverview",
9298
// "Output.JSON": "JSON",
9399
"Output.Table": "表",

0 commit comments

Comments
 (0)