Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into local-index

This commit is contained in:
fjy 2013-10-01 13:21:43 -07:00
parent 30df53671e 62eda5020c
commit 59f2d0711d
5 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indexing-service/src/main/java/io/druid/indexing/common/task/IndexGeneratorTask.java
View File

@ -210,19 +210,11 @@ public class IndexGeneratorTask extends AbstractTask
*/
private boolean shouldIndex(InputRow inputRow)
{
if (!getImplicitLockInterval().get().contains(inputRow.getTimestampFromEpoch())) {
if (getImplicitLockInterval().get().contains(inputRow.getTimestampFromEpoch())) {
return schema.getShardSpec().isInChunk(inputRow);
} else {
return false;
}
final Map<String, String> eventDimensions = Maps.newHashMapWithExpectedSize(inputRow.getDimensions().size());
for (final String dim : inputRow.getDimensions()) {
final List<String> dimValues = inputRow.getDimension(dim);
if (dimValues.size() == 1) {
eventDimensions.put(dim, Iterables.getOnlyElement(dimValues));
}
}
return schema.getShardSpec().isInChunk(eventDimensions);
}
@JsonProperty("firehose")

5
server/src/main/java/io/druid/timeline/partition/LinearShardSpec.java
View File

@ -49,11 +49,6 @@ public class LinearShardSpec implements ShardSpec
return new LinearPartitionChunk<T>(partitionNum, obj);
}
@Override
public boolean isInChunk(Map<String, String> dimensions) {
return true;
}
@Override
public boolean isInChunk(InputRow inputRow) {
return true;

6
server/src/main/java/io/druid/timeline/partition/NumberedShardSpec.java
View File

@ -66,12 +66,6 @@ public class NumberedShardSpec implements ShardSpec
return NumberedPartitionChunk.make(partitionNum, partitions, obj);
}
@Override
public boolean isInChunk(Map<String, String> dimensions)
{
return true;
}
@Override
public boolean isInChunk(InputRow inputRow)
{

6
server/src/main/java/io/druid/timeline/partition/SingleDimensionShardSpec.java
View File

@ -105,12 +105,6 @@ public class SingleDimensionShardSpec implements ShardSpec
return new StringPartitionChunk<T>(start, end, partitionNum, obj);
}
@Override
public boolean isInChunk(Map<String, String> dimensions)
{
return checkValue(dimensions.get(dimension));
}
@Override
public boolean isInChunk(InputRow inputRow)
{

1
server/src/test/java/io/druid/server/shard/SingleDimensionShardSpecTest.java
View File

@ -111,7 +111,6 @@ public class SingleDimensionShardSpecTest
}
)
);
Assert.assertEquals(String.format("spec[%s], map[%s]", spec, pair.rhs), pair.lhs, spec.isInChunk(pair.rhs));
Assert.assertEquals(String.format("spec[%s], row[%s]", spec, inputRow), pair.lhs, spec.isInChunk(inputRow));
}
}