-
Notifications
You must be signed in to change notification settings - Fork 3.1k
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.
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
Separate file metastore column serialization from internals #18309
Closed
findepi
wants to merge
1
commit into
trinodb:master
from
findepi:findepi/separate-file-metastore-column-serialization-from-internals-9142a9
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
125 changes: 125 additions & 0 deletions
125
plugin/trino-hive/src/main/java/io/trino/plugin/hive/metastore/file/Column.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,125 @@ | ||
| /* | ||
| * Licensed 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.trino.plugin.hive.metastore.file; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import com.google.errorprone.annotations.Immutable; | ||
| import io.trino.plugin.hive.HiveType; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
|
|
||
| import static com.google.common.base.MoreObjects.toStringHelper; | ||
| import static com.google.common.collect.ImmutableList.toImmutableList; | ||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| @Immutable | ||
| public class Column | ||
| { | ||
| private final String name; | ||
| private final HiveType type; | ||
| private final Optional<String> comment; | ||
|
|
||
| @JsonCreator | ||
| public Column( | ||
| @JsonProperty("name") String name, | ||
| @JsonProperty("type") HiveType type, | ||
| @JsonProperty("comment") Optional<String> comment) | ||
| { | ||
| this.name = requireNonNull(name, "name is null"); | ||
| this.type = requireNonNull(type, "type is null"); | ||
| this.comment = requireNonNull(comment, "comment is null"); | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public String getName() | ||
| { | ||
| return name; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public HiveType getType() | ||
| { | ||
| return type; | ||
| } | ||
|
|
||
| @JsonProperty | ||
| public Optional<String> getComment() | ||
| { | ||
| return comment; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() | ||
| { | ||
| return toStringHelper(this) | ||
| .add("name", name) | ||
| .add("type", type) | ||
| .toString(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) | ||
| { | ||
| if (this == o) { | ||
| return true; | ||
| } | ||
| if (o == null || getClass() != o.getClass()) { | ||
| return false; | ||
| } | ||
|
|
||
| Column column = (Column) o; | ||
| return Objects.equals(name, column.name) && | ||
| Objects.equals(type, column.type) && | ||
| Objects.equals(comment, column.comment); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() | ||
| { | ||
| return Objects.hash(name, type, comment); | ||
| } | ||
|
|
||
| public static List<Column> fromMetastoreModel(List<io.trino.plugin.hive.metastore.Column> metastoreColumns) | ||
| { | ||
| return metastoreColumns.stream() | ||
| .map(Column::fromMetastoreModel) | ||
| .collect(toImmutableList()); | ||
| } | ||
|
|
||
| public static Column fromMetastoreModel(io.trino.plugin.hive.metastore.Column metastoreColumn) | ||
| { | ||
| return new Column( | ||
| metastoreColumn.getName(), | ||
| metastoreColumn.getType(), | ||
| metastoreColumn.getComment()); | ||
| } | ||
|
|
||
| public static List<io.trino.plugin.hive.metastore.Column> toMetastoreModel(List<Column> fileMetastoreColumns) | ||
| { | ||
| return fileMetastoreColumns.stream() | ||
| .map(Column::toMetastoreModel) | ||
| .collect(toImmutableList()); | ||
| } | ||
|
|
||
| public static io.trino.plugin.hive.metastore.Column toMetastoreModel(Column fileMetastoreColumn) | ||
| { | ||
| return new io.trino.plugin.hive.metastore.Column( | ||
| fileMetastoreColumn.getName(), | ||
| fileMetastoreColumn.getType(), | ||
| fileMetastoreColumn.getComment()); | ||
| } | ||
| } | ||
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should be able to make this a record. Also, we don’t need to use explicit names for JSON serialization in new code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would rather not refactor this class, since we have no tests for the file metastore. I don't want to change serialization state inadvertently. From my perspective, this isn't new code.