|
18 | 18 |
|
19 | 19 | import static com.amazon.opendistroforelasticsearch.sql.executor.ExecutionEngine.QueryResponse;
|
20 | 20 | import static com.amazon.opendistroforelasticsearch.sql.protocol.response.format.JsonResponseFormatter.Style.PRETTY;
|
21 |
| -import static org.elasticsearch.rest.RestStatus.BAD_REQUEST; |
22 | 21 | import static org.elasticsearch.rest.RestStatus.INTERNAL_SERVER_ERROR;
|
23 | 22 | import static org.elasticsearch.rest.RestStatus.OK;
|
24 |
| -import static org.elasticsearch.rest.RestStatus.SERVICE_UNAVAILABLE; |
25 | 23 |
|
26 |
| - |
27 |
| -import com.alibaba.druid.sql.parser.ParserException; |
28 | 24 | import com.amazon.opendistroforelasticsearch.sql.common.antlr.SyntaxCheckException;
|
29 | 25 | import com.amazon.opendistroforelasticsearch.sql.common.response.ResponseListener;
|
30 | 26 | import com.amazon.opendistroforelasticsearch.sql.common.setting.Settings;
|
31 | 27 | import com.amazon.opendistroforelasticsearch.sql.elasticsearch.security.SecurityAccess;
|
32 |
| -import com.amazon.opendistroforelasticsearch.sql.exception.QueryEngineException; |
33 |
| -import com.amazon.opendistroforelasticsearch.sql.exception.SemanticCheckException; |
34 | 28 | import com.amazon.opendistroforelasticsearch.sql.executor.ExecutionEngine.ExplainResponse;
|
35 |
| -import com.amazon.opendistroforelasticsearch.sql.legacy.antlr.SqlAnalysisException; |
36 |
| -import com.amazon.opendistroforelasticsearch.sql.legacy.exception.SQLFeatureDisabledException; |
37 |
| -import com.amazon.opendistroforelasticsearch.sql.legacy.exception.SqlParseException; |
38 |
| -import com.amazon.opendistroforelasticsearch.sql.legacy.executor.format.ErrorMessageFactory; |
39 | 29 | import com.amazon.opendistroforelasticsearch.sql.legacy.metrics.MetricName;
|
40 | 30 | import com.amazon.opendistroforelasticsearch.sql.legacy.metrics.Metrics;
|
41 |
| -import com.amazon.opendistroforelasticsearch.sql.legacy.rewriter.matchtoterm.VerificationException; |
42 |
| -import com.amazon.opendistroforelasticsearch.sql.legacy.utils.LogUtils; |
43 | 31 | import com.amazon.opendistroforelasticsearch.sql.planner.physical.PhysicalPlan;
|
44 | 32 | import com.amazon.opendistroforelasticsearch.sql.protocol.response.QueryResult;
|
45 |
| -import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.JdbcResponseFormatter; |
46 | 33 | import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.CsvResponseFormatter;
|
47 | 34 | import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.Format;
|
| 35 | +import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.JdbcResponseFormatter; |
48 | 36 | import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.JsonResponseFormatter;
|
49 | 37 | import com.amazon.opendistroforelasticsearch.sql.protocol.response.format.ResponseFormatter;
|
50 | 38 | import com.amazon.opendistroforelasticsearch.sql.sql.SQLService;
|
51 | 39 | import com.amazon.opendistroforelasticsearch.sql.sql.config.SQLServiceConfig;
|
52 | 40 | import com.amazon.opendistroforelasticsearch.sql.sql.domain.SQLQueryRequest;
|
53 | 41 | import java.io.IOException;
|
54 | 42 | import java.security.PrivilegedExceptionAction;
|
55 |
| -import java.sql.SQLFeatureNotSupportedException; |
56 | 43 | import java.util.List;
|
57 | 44 | import org.apache.logging.log4j.LogManager;
|
58 | 45 | import org.apache.logging.log4j.Logger;
|
59 | 46 | import org.elasticsearch.client.node.NodeClient;
|
60 | 47 | import org.elasticsearch.cluster.service.ClusterService;
|
61 |
| -import org.elasticsearch.index.IndexNotFoundException; |
62 | 48 | import org.elasticsearch.rest.BaseRestHandler;
|
63 | 49 | import org.elasticsearch.rest.BytesRestResponse;
|
64 | 50 | import org.elasticsearch.rest.RestChannel;
|
@@ -214,7 +200,7 @@ private void sendResponse(RestChannel channel, RestStatus status, String content
|
214 | 200 | }
|
215 | 201 |
|
216 | 202 | private static void logAndPublishMetrics(Exception e) {
|
217 |
| - LOG.error(LogUtils.getRequestId() + " Server side error during query execution", e); |
| 203 | + LOG.error("Server side error during query execution", e); |
218 | 204 | Metrics.getInstance().getNumericalMetric(MetricName.FAILED_REQ_COUNT_SYS).increment();
|
219 | 205 | }
|
220 | 206 | }
|
0 commit comments