Skip to content

PARQUET-318: Remove unnecessary object mapper #227

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

Closed
nezihyigitbasi wants to merge 1 commit into from
Closed

PARQUET-318: Remove unnecessary object mapper #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 10 additions & 9 deletions parquet-hadoop/src/main/java/org/apache/parquet/hadoop/metadata/ParquetMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.ObjectWriter;
import org.codehaus.jackson.map.SerializationConfig.Feature;

/**
Expand All @@ -38,19 +39,15 @@
*/
public class ParquetMetadata {

private static ObjectMapper objectMapper = new ObjectMapper();
private static ObjectMapper prettyObjectMapper = new ObjectMapper();
static {
prettyObjectMapper.configure(Feature.INDENT_OUTPUT, true);
}
private static final ObjectMapper objectMapper = new ObjectMapper();

/**
*
* @param parquetMetaData
* @return the json representation
*/
public static String toJSON(ParquetMetadata parquetMetaData) {
return toJSON(parquetMetaData, objectMapper);
return toJSON(parquetMetaData, false);
}

/**
Expand All @@ -59,13 +56,17 @@ public static String toJSON(ParquetMetadata parquetMetaData) {
* @return the pretty printed json representation
*/
public static String toPrettyJSON(ParquetMetadata parquetMetaData) {
return toJSON(parquetMetaData, prettyObjectMapper);
return toJSON(parquetMetaData, true);
}

private static String toJSON(ParquetMetadata parquetMetaData, ObjectMapper mapper) {
private static String toJSON(ParquetMetadata parquetMetaData, boolean isPrettyPrint) {
StringWriter stringWriter = new StringWriter();
try {
mapper.writeValue(stringWriter, parquetMetaData);
if (isPrettyPrint) {
objectMapper.writerWithDefaultPrettyPrinter().writeValue(stringWriter, parquetMetaData);
} else {
objectMapper.writeValue(stringWriter, parquetMetaData);
}
} catch (JsonGenerationException e) {
throw new RuntimeException(e);
} catch (JsonMappingException e) {
Expand Down
12 changes: 11 additions & 1 deletion ...adoop/src/test/java/org/apache/parquet/format/converter/TestParquetMetadataConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ public void randomTestFilterMetaData() {
}

@Test
public void testNullFieldMetadataDebugLogging() throws NoSuchFieldException, IllegalAccessException, IOException {
public void testNullFieldMetadataDebugLogging() {
MessageType schema = parseMessageType("message test { optional binary some_null_field; }");
org.apache.parquet.hadoop.metadata.FileMetaData fileMetaData = new org.apache.parquet.hadoop.metadata.FileMetaData(schema, new HashMap<String, String>(), null);
List<BlockMetaData> blockMetaDataList = new ArrayList<BlockMetaData>();
Expand All @@ -273,6 +273,16 @@ public void testNullFieldMetadataDebugLogging() throws NoSuchFieldException, Ill
ParquetMetadata.toJSON(metadata);
}

@Test
public void testMetadataToJson() {
ParquetMetadata metadata = new ParquetMetadata(null, null);
assertEquals("{\"fileMetaData\":null,\"blocks\":null}", ParquetMetadata.toJSON(metadata));
assertEquals("{\n" +
" \"fileMetaData\" : null,\n" +
" \"blocks\" : null\n" +
"}", ParquetMetadata.toPrettyJSON(metadata));
}

private ColumnChunkMetaData createColumnChunkMetaData() {
Set<Encoding> e = new HashSet<Encoding>();
PrimitiveTypeName t = PrimitiveTypeName.BINARY;
Expand Down