forked from apache/druid
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request apache#1576 from metamx/queryTimeLookup_announce
[QTL] Query time lookup cluster wide config
- Loading branch information
Showing
37 changed files
with
6,001 additions
and
62 deletions.
There are no files selected for viewing
44 changes: 44 additions & 0 deletions
44
common/src/main/java/io/druid/common/utils/ServletResourceUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| /* | ||
| * Licensed to Metamarkets Group Inc. (Metamarkets) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Metamarkets licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package io.druid.common.utils; | ||
|
|
||
| import com.google.common.collect.ImmutableMap; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import javax.validation.constraints.NotNull; | ||
| import java.util.Map; | ||
|
|
||
| public class ServletResourceUtils | ||
| { | ||
| /** | ||
| * Sanitize the exception as a map of "error" to information about the exception. | ||
| * | ||
| * This method explicitly suppresses the stack trace and any other logging. Any logging should be handled by the caller. | ||
| * @param t The exception to sanitize | ||
| * @return An immutable Map with a single entry which maps "error" to information about the error suitable for passing as an entity in a servlet error response. | ||
| */ | ||
| public static Map<String, String> sanitizeException(@Nullable Throwable t) | ||
| { | ||
| return ImmutableMap.of( | ||
| "error", | ||
| t == null ? "null" : (t.getMessage() == null ? t.toString() : t.getMessage()) | ||
| ); | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
common/src/test/java/io/druid/common/utils/ServletResourceUtilsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Licensed to Metamarkets Group Inc. (Metamarkets) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. Metamarkets licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| package io.druid.common.utils; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| public class ServletResourceUtilsTest | ||
| { | ||
|
|
||
| @Test | ||
| public void testSanitizeException() throws Exception | ||
| { | ||
| final String message = "some message"; | ||
| Assert.assertEquals(message, ServletResourceUtils.sanitizeException(new Throwable(message)).get("error")); | ||
| Assert.assertEquals("null", ServletResourceUtils.sanitizeException(null).get("error")); | ||
| Assert.assertEquals(message, ServletResourceUtils.sanitizeException(new Throwable() | ||
| { | ||
| @Override | ||
| public String toString() | ||
| { | ||
| return message; | ||
| } | ||
| }).get("error")); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.