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.
apache#3574 Fix invalid conversion to semi-join filter with duplicate…
…d values
- Loading branch information
Showing
8 changed files
with
132 additions
and
106 deletions.
There are no files selected for viewing
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
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
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
79 changes: 79 additions & 0 deletions
79
processing/src/main/java/io/druid/query/filter/SemiJoinFactory.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,79 @@ | ||
| /* | ||
| * Licensed to SK Telecom Co., LTD. (SK Telecom) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. SK Telecom 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.query.filter; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.common.collect.Lists; | ||
| import com.google.common.collect.Sets; | ||
| import io.druid.common.guava.Sequence; | ||
| import io.druid.common.utils.Sequences; | ||
| import io.druid.java.util.common.parsers.CloseableIterator; | ||
| import io.druid.segment.StringArray; | ||
| import org.apache.commons.io.IOUtils; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
|
|
||
| public class SemiJoinFactory | ||
| { | ||
| public static DimFilter from(List<String> fieldNames, Sequence<Object[]> fieldValues, boolean allowDuplication) | ||
| { | ||
| if (fieldNames.size() == 1) { | ||
| final Set<String> set = Sets.newTreeSet(); | ||
| final CloseableIterator<Object[]> iterator = Sequences.toIterator(fieldValues); | ||
| try { | ||
| while (iterator.hasNext()) { | ||
| if (!set.add(Objects.toString(iterator.next()[0], "")) && !allowDuplication) { | ||
| return null; | ||
| } | ||
| } | ||
| } | ||
| finally { | ||
| IOUtils.closeQuietly(iterator); | ||
| } | ||
| return new InDimFilter(fieldNames.get(0), null, ImmutableList.copyOf(set)); | ||
| } else { | ||
| final Set<StringArray> set = Sets.newTreeSet(); | ||
| final CloseableIterator<Object[]> iterator = Sequences.toIterator(fieldValues); | ||
| try { | ||
| while (iterator.hasNext()) { | ||
| if (!set.add(StringArray.of(iterator.next(), "")) && !allowDuplication) { | ||
| return null; | ||
| } | ||
| } | ||
| } | ||
| finally { | ||
| IOUtils.closeQuietly(iterator); | ||
| } | ||
| List<List<String>> valuesList = Lists.newArrayList(); | ||
| for (int i = 0; i < fieldNames.size(); i++) { | ||
| valuesList.add(Lists.newArrayList()); | ||
| } | ||
| for (StringArray array : set) { | ||
| for (int i = 0; i < fieldNames.size(); i++) { | ||
| valuesList.get(i).add(array.get(i)); | ||
| } | ||
| } | ||
| return new InDimsFilter(fieldNames, valuesList); | ||
| } | ||
| } | ||
| } | ||
|
|
76 changes: 0 additions & 76 deletions
76
processing/src/main/java/io/druid/query/filter/ValuesFilter.java
This file was deleted.
Oops, something went wrong.
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