Skip to content

Fix merge for TrueDimFilter #5916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jon-wei merged 2 commits into from
Jun 28, 2018
Merged

Fix merge for TrueDimFilter #5916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57e06b2
Fix merge for TrueDimFilter
jon-wei Jun 28, 2018
f79c0b6
remove unused cache ID
jon-wei Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ce/src/test/java/io/druid/indexing/firehose/IngestSegmentFirehoseFactoryTimelineTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
import io.druid.java.util.common.Intervals;
import io.druid.java.util.common.JodaUtils;
import io.druid.query.aggregation.LongSumAggregatorFactory;
import io.druid.query.filter.NoopDimFilter;
import io.druid.query.filter.TrueDimFilter;
import io.druid.segment.IndexIO;
import io.druid.segment.IndexMergerV9;
import io.druid.segment.IndexSpec;
Expand Down Expand Up @@ -350,7 +350,7 @@ public TaskActionClient create(Task task)
final IngestSegmentFirehoseFactory factory = new IngestSegmentFirehoseFactory(
DATA_SOURCE,
testCase.interval,
new NoopDimFilter(),
new TrueDimFilter(),
Arrays.asList(DIMENSIONS),
Arrays.asList(METRICS),
INDEX_IO
Expand Down
1 change: 0 additions & 1 deletion processing/src/main/java/io/druid/query/filter/DimFilterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
*/
public class DimFilterUtils
{
static final byte NOOP_CACHE_ID = -0x4;
static final byte SELECTOR_CACHE_ID = 0x0;
static final byte AND_CACHE_ID = 0x1;
static final byte OR_CACHE_ID = 0x2;
Expand Down
60 changes: 0 additions & 60 deletions processing/src/main/java/io/druid/query/filter/NoopDimFilter.java
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions processing/src/main/java/io/druid/query/filter/TrueDimFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,14 @@
import io.druid.segment.filter.TrueFilter;

import java.nio.ByteBuffer;
import java.util.HashSet;

/**
*/
public class TrueDimFilter implements DimFilter
{
private static HashSet<String> REQUIRED_COLUMNS = new HashSet<>();

@Override
public byte[] getCacheKey()
{
Expand All @@ -51,4 +54,10 @@ public RangeSet<String> getDimensionRangeSet(String dimension)
{
return null;
}

@Override
public HashSet<String> getRequiredColumns()
{
return REQUIRED_COLUMNS;
}
}