Skip to content

Commit 00da79b

Browse files
author
Hendrik Muhs
committed
rename internal index and search on old name pattern
1 parent 73587b3 commit 00da79b

File tree

5 files changed

+40
-16
lines changed

5 files changed

+40
-16
lines changed

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/transform/transforms/persistence/TransformInternalIndexConstants.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,14 @@ public final class TransformInternalIndexConstants {
2222
*/
2323

2424
// internal index
25-
public static final String INDEX_VERSION = "2";
26-
public static final String INDEX_PATTERN = ".data-frame-internal-";
25+
26+
// version is not a rollover pattern, however padded because sort is string based
27+
public static final String INDEX_VERSION = "003";
28+
public static final String INDEX_PATTERN = ".transform-internal-";
2729
public static final String LATEST_INDEX_VERSIONED_NAME = INDEX_PATTERN + INDEX_VERSION;
2830
public static final String LATEST_INDEX_NAME = LATEST_INDEX_VERSIONED_NAME;
2931
public static final String INDEX_NAME_PATTERN = INDEX_PATTERN + "*";
32+
public static final String INDEX_NAME_PATTERN_DEPRECATED = ".data-frame-internal-*";
3033

3134
// audit index
3235
public static final String AUDIT_TEMPLATE_VERSION = "000001";

‎x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformInfoTransportAction.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,10 @@ static void getStatisticSummations(Client client, ActionListener<TransformIndexe
110110
.filter(QueryBuilders.termQuery(TransformField.INDEX_DOC_TYPE.getPreferredName(),
111111
TransformStoredDoc.NAME)));
112112

113-
SearchRequestBuilder requestBuilder = client.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
113+
SearchRequestBuilder requestBuilder = client
114+
.prepareSearch(
115+
TransformInternalIndexConstants.INDEX_NAME_PATTERN,
116+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
114117
.setSize(0)
115118
.setQuery(queryBuilder);
116119

‎x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/TransformUsageTransportAction.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@
3232
import org.elasticsearch.xpack.core.action.XPackUsageFeatureTransportAction;
3333
import org.elasticsearch.xpack.core.transform.TransformFeatureSetUsage;
3434
import org.elasticsearch.xpack.core.transform.TransformField;
35-
import org.elasticsearch.xpack.core.transform.transforms.TransformIndexerStats;
36-
import org.elasticsearch.xpack.core.transform.transforms.TransformTaskParams;
3735
import org.elasticsearch.xpack.core.transform.transforms.TransformConfig;
36+
import org.elasticsearch.xpack.core.transform.transforms.TransformIndexerStats;
3837
import org.elasticsearch.xpack.core.transform.transforms.TransformState;
38+
import org.elasticsearch.xpack.core.transform.transforms.TransformTaskParams;
3939
import org.elasticsearch.xpack.core.transform.transforms.TransformTaskState;
4040
import org.elasticsearch.xpack.core.transform.transforms.persistence.TransformInternalIndexConstants;
4141

@@ -118,7 +118,9 @@ protected void masterOperation(Task task, XPackUsageRequest request, ClusterStat
118118
}
119119
);
120120

121-
SearchRequest totalTransformCount = client.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
121+
SearchRequest totalTransformCount = client
122+
.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN,
123+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
122124
.setTrackTotalHits(true)
123125
.setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.boolQuery()
124126
.filter(QueryBuilders.termQuery(TransformField.INDEX_DOC_TYPE.getPreferredName(), TransformConfig.NAME))))

‎x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportGetTransformAction.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ protected ParseField getResultsField() {
6363

6464
@Override
6565
protected String[] getIndices() {
66-
return new String[]{TransformInternalIndexConstants.INDEX_NAME_PATTERN};
66+
return new String[] { TransformInternalIndexConstants.INDEX_NAME_PATTERN,
67+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED };
6768
}
6869

6970
@Override

‎x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/persistence/TransformConfigManager.java‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,9 @@ public void updateTransformConfiguration(TransformConfig transformConfig,
168168
* @param listener listener to alert on completion
169169
*/
170170
public void deleteOldTransformConfigurations(String transformId, ActionListener<Boolean> listener) {
171-
DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
171+
DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(
172+
TransformInternalIndexConstants.INDEX_NAME_PATTERN,
173+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
172174
.setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.boolQuery()
173175
.mustNot(QueryBuilders.termQuery("_index", TransformInternalIndexConstants.LATEST_INDEX_NAME))
174176
.filter(QueryBuilders.termQuery("_id", TransformConfig.documentId(transformId)))))
@@ -195,7 +197,8 @@ public void deleteOldTransformConfigurations(String transformId, ActionListener<
195197
* @param listener listener to alert on completion
196198
*/
197199
public void deleteOldTransformStoredDocuments(String transformId, ActionListener<Boolean> listener) {
198-
DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
200+
DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest(
201+
TransformInternalIndexConstants.INDEX_NAME_PATTERN, TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
199202
.setQuery(QueryBuilders.constantScoreQuery(QueryBuilders.boolQuery()
200203
.mustNot(QueryBuilders.termQuery("_index", TransformInternalIndexConstants.LATEST_INDEX_NAME))
201204
.filter(QueryBuilders.termQuery("_id", TransformStoredDoc.documentId(transformId)))))
@@ -261,7 +264,9 @@ private void putTransformConfiguration(TransformConfig transformConfig,
261264
*/
262265
public void getTransformCheckpoint(String transformId, long checkpoint, ActionListener<TransformCheckpoint> resultListener) {
263266
QueryBuilder queryBuilder = QueryBuilders.termQuery("_id", TransformCheckpoint.documentId(transformId, checkpoint));
264-
SearchRequest searchRequest = client.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
267+
SearchRequest searchRequest = client
268+
.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN,
269+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
265270
.setQuery(queryBuilder)
266271
// use sort to get the last
267272
.addSort("_index", SortOrder.DESC)
@@ -290,7 +295,9 @@ public void getTransformCheckpoint(String transformId, long checkpoint, ActionLi
290295
*/
291296
public void getTransformConfiguration(String transformId, ActionListener<TransformConfig> resultListener) {
292297
QueryBuilder queryBuilder = QueryBuilders.termQuery("_id", TransformConfig.documentId(transformId));
293-
SearchRequest searchRequest = client.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
298+
SearchRequest searchRequest = client
299+
.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN,
300+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
294301
.setQuery(queryBuilder)
295302
// use sort to get the last
296303
.addSort("_index", SortOrder.DESC)
@@ -321,7 +328,9 @@ public void getTransformConfigurationForUpdate(String transformId,
321328
ActionListener<Tuple<TransformConfig,
322329
SeqNoPrimaryTermAndIndex>> configAndVersionListener) {
323330
QueryBuilder queryBuilder = QueryBuilders.termQuery("_id", TransformConfig.documentId(transformId));
324-
SearchRequest searchRequest = client.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
331+
SearchRequest searchRequest = client
332+
.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN,
333+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
325334
.setQuery(queryBuilder)
326335
// use sort to get the last
327336
.addSort("_index", SortOrder.DESC)
@@ -362,7 +371,9 @@ public void expandTransformIds(String transformIdsExpression,
362371
String[] idTokens = ExpandedIdsMatcher.tokenizeExpression(transformIdsExpression);
363372
QueryBuilder queryBuilder = buildQueryFromTokenizedIds(idTokens, TransformConfig.NAME);
364373

365-
SearchRequest request = client.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
374+
SearchRequest request = client
375+
.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN,
376+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
366377
.addSort(TransformField.ID.getPreferredName(), SortOrder.ASC)
367378
.setFrom(pageParams.getFrom())
368379
.setTrackTotalHits(true)
@@ -413,7 +424,7 @@ public void deleteTransform(String transformId, ActionListener<Boolean> listener
413424
DeleteByQueryRequest request = new DeleteByQueryRequest()
414425
.setAbortOnVersionConflict(false); //since these documents are not updated, a conflict just means it was deleted previously
415426

416-
request.indices(TransformInternalIndexConstants.INDEX_NAME_PATTERN);
427+
request.indices(TransformInternalIndexConstants.INDEX_NAME_PATTERN, TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED);
417428
QueryBuilder query = QueryBuilders.termQuery(TransformField.ID.getPreferredName(), transformId);
418429
request.setQuery(query);
419430
request.setRefresh(true);
@@ -472,7 +483,9 @@ public void putOrUpdateTransformStoredDoc(TransformStoredDoc stats,
472483
public void getTransformStoredDoc(String transformId,
473484
ActionListener<Tuple<TransformStoredDoc, SeqNoPrimaryTermAndIndex>> resultListener) {
474485
QueryBuilder queryBuilder = QueryBuilders.termQuery("_id", TransformStoredDoc.documentId(transformId));
475-
SearchRequest searchRequest = client.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
486+
SearchRequest searchRequest = client
487+
.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN,
488+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
476489
.setQuery(queryBuilder)
477490
// use sort to get the last
478491
.addSort("_index", SortOrder.DESC)
@@ -508,7 +521,9 @@ public void getTransformStoredDoc(Collection<String> transformIds, ActionListene
508521
.filter(QueryBuilders.termsQuery(TransformField.ID.getPreferredName(), transformIds))
509522
.filter(QueryBuilders.termQuery(TransformField.INDEX_DOC_TYPE.getPreferredName(), TransformStoredDoc.NAME)));
510523

511-
SearchRequest searchRequest = client.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN)
524+
SearchRequest searchRequest = client
525+
.prepareSearch(TransformInternalIndexConstants.INDEX_NAME_PATTERN,
526+
TransformInternalIndexConstants.INDEX_NAME_PATTERN_DEPRECATED)
512527
.addSort(TransformField.ID.getPreferredName(), SortOrder.ASC)
513528
.addSort("_index", SortOrder.DESC)
514529
.setQuery(builder)

0 commit comments

Comments
 (0)