shaofengshi closed pull request #241: KYLIN-3546 Add column which belongs to
root fact table in join relation but lost
URL: https://github.com/apache/kylin/pull/241
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaInputBase.java
b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaInputBase.java
index a624f8fbb8..cb2e14ce5c 100644
---
a/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaInputBase.java
+++
b/source-kafka/src/main/java/org/apache/kylin/source/kafka/KafkaInputBase.java
@@ -18,8 +18,11 @@
package org.apache.kylin.source.kafka;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Set;
+import com.google.common.collect.Sets;
import org.apache.kylin.cube.CubeSegment;
import org.apache.kylin.cube.model.CubeDesc;
import org.apache.kylin.engine.mr.JobBuilderSupport;
@@ -32,7 +35,10 @@
import org.apache.kylin.metadata.model.DataModelDesc;
import org.apache.kylin.metadata.model.IJoinedFlatTableDesc;
import org.apache.kylin.metadata.model.ISegment;
+import org.apache.kylin.metadata.model.JoinDesc;
+import org.apache.kylin.metadata.model.JoinTableDesc;
import org.apache.kylin.metadata.model.SegmentRange;
+import org.apache.kylin.metadata.model.TableRef;
import org.apache.kylin.metadata.model.TblColRef;
import org.apache.kylin.source.hive.CreateFlatHiveTableStep;
import org.apache.kylin.source.hive.GarbageCollectionStep;
@@ -89,7 +95,23 @@ public DataModelDesc getDataModel() {
@Override
public List<TblColRef> getAllColumns() {
- return flatDesc.getFactColumns();
+ final Set<TblColRef> factTableColumnSet = Sets.newHashSet();
+ TableRef rootFactTable = getDataModel().getRootFactTable();
+ for (TblColRef colRef : flatDesc.getAllColumns()) {
+ if (colRef.getTableRef().equals(rootFactTable)) {
+ factTableColumnSet.add(colRef);
+ }
+ }
+ // Add column which belongs to root fact table in join
relation but lost
+ for (JoinTableDesc joinTableDesc :
getDataModel().getJoinTables()) {
+ JoinDesc join = joinTableDesc.getJoin();
+ for (TblColRef colRef : join.getForeignKeyColumns()) {
+ if (colRef.getTableRef().equals(rootFactTable)) {
+ factTableColumnSet.add(colRef);
+ }
+ }
+ }
+ return new LinkedList<>(factTableColumnSet);
}
@Override
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
