mirror of https://github.com/apache/druid.git
fix npe while logging sql/query request (#9001)
* fix npe while logging sql/query request * forbid forbidden DateTime API
This commit is contained in:
parent
ca77d576c6
commit
9640f9649a
|
@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||
import com.google.common.base.Joiner;
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import org.apache.druid.java.util.common.StringUtils;
|
||||
import org.apache.druid.query.Query;
|
||||
import org.joda.time.DateTime;
|
||||
|
||||
|
@ -55,9 +56,9 @@ public class RequestLogLine
|
|||
{
|
||||
this.query = query;
|
||||
this.sql = sql;
|
||||
this.sqlQueryContext = sqlQueryContext;
|
||||
this.sqlQueryContext = sqlQueryContext != null ? sqlQueryContext : ImmutableMap.of();
|
||||
this.timestamp = Preconditions.checkNotNull(timestamp, "timestamp");
|
||||
this.remoteAddr = remoteAddr;
|
||||
this.remoteAddr = StringUtils.nullToEmptyNonDruidDataString(remoteAddr);
|
||||
this.queryStats = Preconditions.checkNotNull(queryStats, "queryStats");
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,91 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF 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 org.apache.druid.server;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import org.apache.druid.java.util.common.DateTimes;
|
||||
import org.apache.druid.query.Query;
|
||||
import org.apache.druid.query.TableDataSource;
|
||||
import org.apache.druid.query.timeboundary.TimeBoundaryQuery;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
public class RequestLogLineTest
|
||||
{
|
||||
private Query query;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception
|
||||
{
|
||||
query = new TimeBoundaryQuery(
|
||||
new TableDataSource("test"),
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
@Test(expected = NullPointerException.class)
|
||||
public void nullTimestamp() throws JsonProcessingException
|
||||
{
|
||||
RequestLogLine requestLogLine = RequestLogLine.forNative(
|
||||
query,
|
||||
null,
|
||||
"",
|
||||
new QueryStats(ImmutableMap.of())
|
||||
);
|
||||
}
|
||||
|
||||
@Test(expected = NullPointerException.class)
|
||||
public void nullQueryStats() throws JsonProcessingException
|
||||
{
|
||||
RequestLogLine requestLogLine = RequestLogLine.forNative(
|
||||
query,
|
||||
DateTimes.nowUtc(),
|
||||
"",
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void nullRemoteAddressAndNullSqlQueryContext() throws JsonProcessingException
|
||||
{
|
||||
RequestLogLine requestLogLine = RequestLogLine.forNative(
|
||||
query,
|
||||
DateTimes.nowUtc(),
|
||||
null,
|
||||
new QueryStats(ImmutableMap.of())
|
||||
);
|
||||
Assert.assertEquals("", requestLogLine.getRemoteAddr());
|
||||
requestLogLine.getNativeQueryLine(new ObjectMapper()); // call should not throw exception
|
||||
|
||||
requestLogLine = RequestLogLine.forSql(
|
||||
"", null, DateTimes.nowUtc(), null, new QueryStats(ImmutableMap.of())
|
||||
);
|
||||
Assert.assertEquals("", requestLogLine.getRemoteAddr());
|
||||
Assert.assertEquals(ImmutableMap.<String, Object>of(), requestLogLine.getSqlQueryContext());
|
||||
requestLogLine.getSqlQueryLine(new ObjectMapper()); // call should not throw exception
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue