Repository: metamodel Updated Branches: refs/heads/master 864dae1e0 -> 9611e5edf
METAMODEL-1197: Fixed Kafka module's Column-to-Table references Closes #188 Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/9611e5ed Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/9611e5ed Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/9611e5ed Branch: refs/heads/master Commit: 9611e5edf0adab7c4a1ed75efd8c21ea431e2e00 Parents: 864dae1 Author: David Krause <[email protected]> Authored: Thu Sep 13 19:32:33 2018 -0700 Committer: Kasper Sørensen <[email protected]> Committed: Thu Sep 13 19:32:56 2018 -0700 ---------------------------------------------------------------------- CHANGES.md | 1 + .../java/org/apache/metamodel/schema/MutableColumn.java | 6 ++++++ .../java/org/apache/metamodel/kafka/KafkaDataContext.java | 10 +++++----- 3 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/9611e5ed/CHANGES.md ---------------------------------------------------------------------- diff --git a/CHANGES.md b/CHANGES.md index f9b79ef..d37939c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ * [METAMODEL-1194] - Improved rewriting of CREATE TABLE for Apache Hive when user specifies primary key(s). * [METAMODEL-1192] - Add support for Oracle "TIMESTAMP WITH (LOCAL_)TIME_ZONE" column type. * [METAMODEL-1193] - Updated release process to produce SHA-512 signature files. + * [METAMODEL-1197] - Fixed references in Kafka module's Columns to Tables. ### Apache MetaModel 5.1.0 http://git-wip-us.apache.org/repos/asf/metamodel/blob/9611e5ed/core/src/main/java/org/apache/metamodel/schema/MutableColumn.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/metamodel/schema/MutableColumn.java b/core/src/main/java/org/apache/metamodel/schema/MutableColumn.java index 050de15..b1b6346 100644 --- a/core/src/main/java/org/apache/metamodel/schema/MutableColumn.java +++ b/core/src/main/java/org/apache/metamodel/schema/MutableColumn.java @@ -56,6 +56,12 @@ public class MutableColumn extends AbstractColumn implements Serializable { setType(type); } + public MutableColumn(String name, ColumnType type, Table table) { + this(name); + setType(type); + setTable(table); + } + public MutableColumn(String name, ColumnType type, Table table, int columnNumber, Boolean nullable) { this(name, type); setColumnNumber(columnNumber); http://git-wip-us.apache.org/repos/asf/metamodel/blob/9611e5ed/kafka/src/main/java/org/apache/metamodel/kafka/KafkaDataContext.java ---------------------------------------------------------------------- diff --git a/kafka/src/main/java/org/apache/metamodel/kafka/KafkaDataContext.java b/kafka/src/main/java/org/apache/metamodel/kafka/KafkaDataContext.java index a4dea28..7c9790b 100644 --- a/kafka/src/main/java/org/apache/metamodel/kafka/KafkaDataContext.java +++ b/kafka/src/main/java/org/apache/metamodel/kafka/KafkaDataContext.java @@ -94,11 +94,11 @@ public class KafkaDataContext<K, V> extends QueryPostprocessDataContext implemen for (String topic : topics) { final MutableTable table = new MutableTable(topic, schema); - table.addColumn(new MutableColumn(COLUMN_PARTITION, ColumnType.INTEGER)); - table.addColumn(new MutableColumn(COLUMN_OFFSET, ColumnType.BIGINT)); - table.addColumn(new MutableColumn(COLUMN_TIMESTAMP, ColumnType.TIMESTAMP)); - table.addColumn(new MutableColumn(COLUMN_KEY, ColumnTypeImpl.convertColumnType(keyClass))); - table.addColumn(new MutableColumn(COLUMN_VALUE, ColumnTypeImpl.convertColumnType(valueClass))); + table.addColumn(new MutableColumn(COLUMN_PARTITION, ColumnType.INTEGER, table).setPrimaryKey(true)); + table.addColumn(new MutableColumn(COLUMN_OFFSET, ColumnType.BIGINT, table).setPrimaryKey(true)); + table.addColumn(new MutableColumn(COLUMN_TIMESTAMP, ColumnType.TIMESTAMP, table)); + table.addColumn(new MutableColumn(COLUMN_KEY, ColumnTypeImpl.convertColumnType(keyClass), table)); + table.addColumn(new MutableColumn(COLUMN_VALUE, ColumnTypeImpl.convertColumnType(valueClass), table)); schema.addTable(table); } return schema;
