This is an automated email from the ASF dual-hosted git repository.
nishant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 0aabeb4 Enable Spotbugs: MS_OOI_PKGPROTECT (#8022)
0aabeb4 is described below
commit 0aabeb4b1ad9e24eb02f2f6175154e7cf58c3af4
Author: Fokko Driesprong <[email protected]>
AuthorDate: Mon Jul 8 09:47:56 2019 +0200
Enable Spotbugs: MS_OOI_PKGPROTECT (#8022)
---
codestyle/spotbugs-exclude.xml | 1 -
.../apache/druid/query/metadata/metadata/AllColumnIncluderator.java | 2 ++
.../org/apache/druid/query/metadata/metadata/ColumnIncluderator.java | 4 ----
.../apache/druid/query/metadata/metadata/ListColumnIncluderator.java | 4 +++-
.../apache/druid/query/metadata/metadata/NoneColumnIncluderator.java | 2 ++
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/codestyle/spotbugs-exclude.xml b/codestyle/spotbugs-exclude.xml
index 4fafbc4..e1fdbf7 100644
--- a/codestyle/spotbugs-exclude.xml
+++ b/codestyle/spotbugs-exclude.xml
@@ -55,7 +55,6 @@
<Bug pattern="JLM_JSR166_UTILCONCURRENT_MONITORENTER"/>
<Bug pattern="JLM_JSR166_UTILCONCURRENT_MONITORENTER"/>
<Bug pattern="MS_FINAL_PKGPROTECT"/>
- <Bug pattern="MS_OOI_PKGPROTECT"/>
<Bug pattern="MS_PKGPROTECT"/>
<Bug pattern="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT"/>
<Bug pattern="NP_GUARANTEED_DEREF"/>
diff --git
a/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java
b/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java
index 4ab4099..39ab2c8 100644
---
a/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java
+++
b/processing/src/main/java/org/apache/druid/query/metadata/metadata/AllColumnIncluderator.java
@@ -23,6 +23,8 @@ package org.apache.druid.query.metadata.metadata;
*/
public class AllColumnIncluderator implements ColumnIncluderator
{
+ private static final byte[] ALL_CACHE_PREFIX = new byte[]{0x1};
+
@Override
public boolean include(String columnName)
{
diff --git
a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java
b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java
index 7f55474..600b277 100644
---
a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java
+++
b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ColumnIncluderator.java
@@ -32,10 +32,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
})
public interface ColumnIncluderator
{
- byte[] NONE_CACHE_PREFIX = new byte[]{0x0};
- byte[] ALL_CACHE_PREFIX = new byte[]{0x1};
- byte[] LIST_CACHE_PREFIX = new byte[]{0x2};
-
boolean include(String columnName);
byte[] getCacheKey();
}
diff --git
a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java
b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java
index b1a336c..22fefe3 100644
---
a/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java
+++
b/processing/src/main/java/org/apache/druid/query/metadata/metadata/ListColumnIncluderator.java
@@ -34,6 +34,8 @@ import java.util.TreeSet;
*/
public class ListColumnIncluderator implements ColumnIncluderator
{
+ private static final byte[] LIST_CACHE_PREFIX = new byte[]{0x2};
+
private final Set<String> columns;
@JsonCreator
@@ -61,7 +63,7 @@ public class ListColumnIncluderator implements
ColumnIncluderator
public byte[] getCacheKey()
{
int size = 1;
- List<byte[]> columns =
Lists.newArrayListWithExpectedSize(this.columns.size());
+ final List<byte[]> columns =
Lists.newArrayListWithExpectedSize(this.columns.size());
for (String column : this.columns) {
final byte[] bytes = StringUtils.toUtf8(column);
diff --git
a/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java
b/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java
index b72f024..69512a6 100644
---
a/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java
+++
b/processing/src/main/java/org/apache/druid/query/metadata/metadata/NoneColumnIncluderator.java
@@ -23,6 +23,8 @@ package org.apache.druid.query.metadata.metadata;
*/
public class NoneColumnIncluderator implements ColumnIncluderator
{
+ private static final byte[] NONE_CACHE_PREFIX = new byte[]{0x0};
+
@Override
public boolean include(String columnName)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
