Skip to content

Commit ebc2045

Browse files
committed
Fix flaky string format in test
Signed-off-by: Lantao Jin <ltjin@amazon.com>
1 parent 21fd14c commit ebc2045

306 files changed

Lines changed: 3610 additions & 1103 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

async-query-core/src/main/java/org/opensearch/sql/spark/asyncquery/AsyncQueryExecutorServiceImpl.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.amazonaws.services.emrserverless.model.JobRunState;
1212
import java.util.ArrayList;
1313
import java.util.List;
14+
import java.util.Locale;
1415
import java.util.Optional;
1516
import lombok.AllArgsConstructor;
1617
import org.json.JSONObject;
@@ -109,7 +110,8 @@ public AsyncQueryExecutionResponse getAsyncQueryResults(
109110
sessionId);
110111
}
111112
}
112-
throw new AsyncQueryNotFoundException(String.format("QueryId: %s not found", queryId));
113+
throw new AsyncQueryNotFoundException(
114+
String.format(Locale.ROOT, "QueryId: %s not found", queryId));
113115
}
114116

115117
@Override
@@ -123,6 +125,7 @@ public String cancelQuery(String queryId, AsyncQueryRequestContext asyncQueryReq
123125
asyncQueryJobMetadata.get(), QueryState.CANCELLED, asyncQueryRequestContext);
124126
return result;
125127
}
126-
throw new AsyncQueryNotFoundException(String.format("QueryId: %s not found", queryId));
128+
throw new AsyncQueryNotFoundException(
129+
String.format(Locale.ROOT, "QueryId: %s not found", queryId));
127130
}
128131
}

async-query-core/src/main/java/org/opensearch/sql/spark/client/EMRServerlessClientFactoryImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.amazonaws.services.emrserverless.AWSEMRServerlessClientBuilder;
1313
import java.security.AccessController;
1414
import java.security.PrivilegedAction;
15+
import java.util.Locale;
1516
import lombok.RequiredArgsConstructor;
1617
import org.opensearch.sql.spark.asyncquery.model.NullAsyncQueryRequestContext;
1718
import org.opensearch.sql.spark.config.SparkExecutionEngineConfig;
@@ -48,6 +49,7 @@ private void validateSparkExecutionEngineConfig(
4849
if (sparkExecutionEngineConfig == null || sparkExecutionEngineConfig.getRegion() == null) {
4950
throw new IllegalArgumentException(
5051
String.format(
52+
Locale.ROOT,
5153
"Async Query APIs are disabled. Please configure %s in cluster settings to enable"
5254
+ " them.",
5355
SPARK_EXECUTION_ENGINE_CONFIG.getKeyValue()));

async-query-core/src/main/java/org/opensearch/sql/spark/client/EmrServerlessClientImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.amazonaws.services.emrserverless.model.ValidationException;
2424
import java.security.AccessController;
2525
import java.security.PrivilegedAction;
26+
import java.util.Locale;
2627
import lombok.RequiredArgsConstructor;
2728
import org.apache.commons.lang3.StringUtils;
2829
import org.apache.logging.log4j.LogManager;
@@ -128,7 +129,7 @@ public CancelJobRunResult cancelJobRun(
128129
throw new RuntimeException(GENERIC_INTERNAL_SERVER_ERROR_MESSAGE);
129130
}
130131
});
131-
logger.info(String.format("Job : %s cancelled", cancelJobRunResult.getJobRunId()));
132+
logger.info(String.format(Locale.ROOT, "Job : %s cancelled", cancelJobRunResult.getJobRunId()));
132133
return cancelJobRunResult;
133134
}
134135
}

async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/IndexDMLHandler.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static org.opensearch.sql.spark.data.constants.SparkConstants.STATUS_FIELD;
1010

1111
import com.amazonaws.services.emrserverless.model.JobRunState;
12+
import java.util.Locale;
1213
import java.util.Map;
1314
import lombok.RequiredArgsConstructor;
1415
import org.apache.commons.lang3.StringUtils;
@@ -145,6 +146,7 @@ private FlintIndexOp getIndexOp(
145146
default:
146147
throw new IllegalStateException(
147148
String.format(
149+
Locale.ROOT,
148150
"IndexQueryActionType: %s is not supported in IndexDMLHandler.",
149151
indexQueryDetails.getIndexQueryActionType()));
150152
}
@@ -158,7 +160,9 @@ private FlintIndexMetadata getFlintIndexMetadata(
158160
if (!indexMetadataMap.containsKey(indexDetails.openSearchIndexName())) {
159161
throw new IllegalStateException(
160162
String.format(
161-
"Couldn't fetch flint index: %s details", indexDetails.openSearchIndexName()));
163+
Locale.ROOT,
164+
"Couldn't fetch flint index: %s details",
165+
indexDetails.openSearchIndexName()));
162166
}
163167
return indexMetadataMap.get(indexDetails.openSearchIndexName());
164168
}

async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/RefreshQueryHandler.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.opensearch.sql.spark.dispatcher;
77

8+
import java.util.Locale;
89
import java.util.Map;
910
import org.opensearch.sql.datasource.model.DataSourceMetadata;
1011
import org.opensearch.sql.spark.asyncquery.model.AsyncQueryJobMetadata;
@@ -63,7 +64,9 @@ public String cancelJob(
6364
if (!indexMetadataMap.containsKey(asyncQueryJobMetadata.getIndexName())) {
6465
throw new IllegalStateException(
6566
String.format(
66-
"Couldn't fetch flint index: %s details", asyncQueryJobMetadata.getIndexName()));
67+
Locale.ROOT,
68+
"Couldn't fetch flint index: %s details",
69+
asyncQueryJobMetadata.getIndexName()));
6770
}
6871
FlintIndexMetadata indexMetadata = indexMetadataMap.get(asyncQueryJobMetadata.getIndexName());
6972
FlintIndexOp jobCancelOp = flintIndexOpFactory.getCancel(datasourceName);

async-query-core/src/main/java/org/opensearch/sql/spark/dispatcher/model/IndexQueryDetails.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static org.apache.commons.lang3.StringUtils.strip;
99

10+
import java.util.Locale;
1011
import java.util.Set;
1112
import lombok.EqualsAndHashCode;
1213
import lombok.Getter;
@@ -134,7 +135,7 @@ private String percentEncode(String indexName) {
134135
StringBuilder builder = new StringBuilder(indexName.length());
135136
for (char ch : indexName.toCharArray()) {
136137
if (INVALID_INDEX_NAME_CHARS.contains(ch)) {
137-
builder.append(String.format("%%%02X", (int) ch));
138+
builder.append(String.format(Locale.ROOT, "%%%02X", (int) ch));
138139
} else {
139140
builder.append(ch);
140141
}

async-query-core/src/main/java/org/opensearch/sql/spark/execution/session/InteractiveSession.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static org.opensearch.sql.spark.execution.session.SessionState.FAIL;
1212
import static org.opensearch.sql.spark.execution.statement.StatementId.newStatementId;
1313

14+
import java.util.Locale;
1415
import java.util.Optional;
1516
import lombok.Builder;
1617
import lombok.Getter;
@@ -111,6 +112,7 @@ public StatementId submit(
111112
} else {
112113
String errMsg =
113114
String.format(
115+
Locale.ROOT,
114116
"can't submit statement, session should not be in end state, "
115117
+ "current session state is: %s",
116118
sessionModel.getSessionState().getSessionState());

async-query-core/src/main/java/org/opensearch/sql/spark/execution/statement/Statement.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static org.opensearch.sql.spark.execution.statement.StatementModel.submitStatement;
99

10+
import java.util.Locale;
1011
import lombok.Builder;
1112
import lombok.Getter;
1213
import lombok.Setter;
@@ -64,8 +65,10 @@ public void cancel() {
6465
|| statementState.equals(StatementState.CANCELLED)) {
6566
String errorMsg =
6667
String.format(
68+
Locale.ROOT,
6769
"can't cancel statement in %s state. statement: %s.",
68-
statementState.getState(), statementId);
70+
statementState.getState(),
71+
statementId);
6972
LOG.error(errorMsg);
7073
throw new IllegalStateException(errorMsg);
7174
}

async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/OpenSearchStateStoreUtil.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ public class OpenSearchStateStoreUtil {
1515

1616
public static String getIndexName(String datasourceName) {
1717
return String.format(
18-
"%s_%s", SPARK_REQUEST_BUFFER_INDEX_NAME, datasourceName.toLowerCase(Locale.ROOT));
18+
Locale.ROOT,
19+
"%s_%s",
20+
SPARK_REQUEST_BUFFER_INDEX_NAME,
21+
datasourceName.toLowerCase(Locale.ROOT));
1922
}
2023
}

async-query-core/src/main/java/org/opensearch/sql/spark/execution/statestore/StateModel.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package org.opensearch.sql.spark.execution.statestore;
77

88
import com.google.common.collect.ImmutableMap;
9+
import java.util.Locale;
910
import java.util.Optional;
1011
import lombok.Builder.Default;
1112
import lombok.EqualsAndHashCode;
@@ -27,8 +28,11 @@ public <T> Optional<T> getMetadataItem(String name, Class<T> type) {
2728
} else {
2829
throw new RuntimeException(
2930
String.format(
31+
Locale.ROOT,
3032
"The metadata field %s is an instance of %s instead of %s",
31-
name, value.getClass(), type));
33+
name,
34+
value.getClass(),
35+
type));
3236
}
3337
} else {
3438
return Optional.empty();

0 commit comments

Comments
 (0)