Skip to content

PARQUET-1253: Support for new logical type representation #463

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.

Sign up for GitHub

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

Merged
gszadovszky merged 12 commits into from
May 24, 2018
Merged

PARQUET-1253: Support for new logical type representation #463

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
244bb6a
PARQUET-1253: Support for new logical type representation
nkollar Mar 28, 2018
0a66346
refactor: move conversion logic to logical type classes
nkollar Mar 29, 2018
f8e2236
better (hopefully) name for new type
nkollar Mar 29, 2018
6b4ff74
Address code review comments
nkollar Apr 4, 2018
f801605
Deprecate old constructors, address comment related to builder
nkollar Apr 18, 2018
db30adb
Address latest comments
nkollar Apr 19, 2018
047feb9
Introduce type visitors for logical types, and address code review co…
nkollar Apr 24, 2018
d11a09c
Move factory methods to the interface for each logical type subclass
nkollar Apr 24, 2018
eb432f7
Incorporate new logical type parameters into schema language
nkollar May 8, 2018
3c426d9
Address latest code review comments
nkollar May 11, 2018
77f1d52
Make LogicalTypeToken enum and getType method package private
nkollar May 14, 2018
6e1ea5d
Make typeParametersAsString package private
nkollar May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions parquet-cascading3/src/test/java/org/apache/parquet/cascading/TestParquetTBaseScheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,22 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.BytesWritable;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapreduce.TaskAttemptContext;
import org.apache.hadoop.mapreduce.TaskAttemptID;
import org.apache.thrift.protocol.TCompactProtocol;
import org.apache.thrift.protocol.TProtocol;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.transport.TIOStreamTransport;
import org.junit.Test;
import static org.junit.Assert.*;

import org.apache.parquet.hadoop.thrift.ThriftToParquetFileWriter;
import org.apache.parquet.hadoop.util.ContextUtil;
import org.apache.parquet.thrift.test.Name;

import java.io.File;
import java.io.ByteArrayOutputStream;
import java.util.HashMap;
import java.util.Map;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

public class TestParquetTBaseScheme {
final String txtInputPath = "target/test-classes/names.txt";
Expand Down
18 changes: 14 additions & 4 deletions parquet-column/src/main/java/org/apache/parquet/schema/GroupType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/*
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF 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
Expand Down Expand Up @@ -47,7 +47,7 @@ public class GroupType extends Type {
* @param fields the contained fields
*/
public GroupType(Repetition repetition, String name, List<Type> fields) {
this(repetition, name, null, fields, null);
this(repetition, name, (LogicalTypeAnnotation) null, fields, null);
}

/**
Expand Down Expand Up @@ -88,6 +88,7 @@ public GroupType(Repetition repetition, String name, OriginalType originalType,
* @param fields the contained fields
* @param id the id of the field
*/
@Deprecated
Copy link
Contributor

@gszadovszky gszadovszky Apr 18, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think, it is enough to deprecate public API. If a method is not public we can freely modify/remove it.

GroupType(Repetition repetition, String name, OriginalType originalType, List<Type> fields, ID id) {
super(name, repetition, originalType, id);
this.fields = fields;
Expand All @@ -97,6 +98,15 @@ public GroupType(Repetition repetition, String name, OriginalType originalType,
}
}

GroupType(Repetition repetition, String name, LogicalTypeAnnotation logicalTypeAnnotation, List<Type> fields, ID id) {
super(name, repetition, logicalTypeAnnotation, id);
this.fields = fields;
this.indexByName = new HashMap<String, Integer>();
for (int i = 0; i < fields.size(); i++) {
indexByName.put(fields.get(i).getName(), i);
}
}

/**
* @param id the field id
* @return a new GroupType with the same fields and a new id
Expand Down
Loading