You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2016/05/11 08:16:55 UTC
tajo git commit: Fix compilation error
Repository: tajo
Updated Branches:
refs/heads/master 0f4bbb60c -> 01d2fe2a5
Fix compilation error
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/01d2fe2a
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/01d2fe2a
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/01d2fe2a
Branch: refs/heads/master
Commit: 01d2fe2a5afbaddb3b87b98159279a0962c3a124
Parents: 0f4bbb6
Author: Jihoon Son <ji...@apache.org>
Authored: Wed May 11 17:16:30 2016 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Wed May 11 17:16:30 2016 +0900
----------------------------------------------------------------------
.../tajo/storage/parquet/TajoRecordConverter.java | 16 ++++++++--------
.../tajo/storage/parquet/TajoWriteSupport.java | 14 +++++++-------
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/01d2fe2a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoRecordConverter.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoRecordConverter.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoRecordConverter.java
index 8a19262..c41f107 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoRecordConverter.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoRecordConverter.java
@@ -20,6 +20,12 @@ package org.apache.tajo.storage.parquet;
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.Message;
+import org.apache.parquet.io.api.Binary;
+import org.apache.parquet.io.api.Converter;
+import org.apache.parquet.io.api.GroupConverter;
+import org.apache.parquet.io.api.PrimitiveConverter;
+import org.apache.parquet.schema.GroupType;
+import org.apache.parquet.schema.Type;
import org.apache.tajo.catalog.Column;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.common.TajoDataTypes;
@@ -27,13 +33,7 @@ import org.apache.tajo.common.TajoDataTypes.DataType;
import org.apache.tajo.datum.*;
import org.apache.tajo.storage.Tuple;
import org.apache.tajo.storage.VTuple;
-import org.apache.parquet.io.api.Binary;
-import org.apache.parquet.io.api.Converter;
-import org.apache.parquet.io.api.GroupConverter;
-import org.apache.parquet.io.api.PrimitiveConverter;
-import org.apache.parquet.schema.GroupType;
-import org.apache.parquet.schema.Type;
-import org.apache.tajo.util.datetime.DateTimeUtil;
+import org.apache.tajo.util.datetime.DateTimeConstants;
import java.nio.ByteBuffer;
import java.util.Arrays;
@@ -337,7 +337,7 @@ public class TajoRecordConverter extends GroupConverter {
@Override
final public void addInt(int value) {
// Parquet DATE type is based on Unix Epoch(Jan 1, 1970).
- parent.add(DatumFactory.createDate(value + DateTimeUtil.DAYS_FROM_JULIAN_TO_EPOCH));
+ parent.add(DatumFactory.createDate(value + DateTimeConstants.UNIX_EPOCH_JDATE));
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/01d2fe2a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoWriteSupport.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoWriteSupport.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoWriteSupport.java
index 0df872c..f65b52b 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoWriteSupport.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/parquet/TajoWriteSupport.java
@@ -19,18 +19,18 @@
package org.apache.tajo.storage.parquet;
import org.apache.hadoop.conf.Configuration;
-import org.apache.tajo.catalog.Column;
-import org.apache.tajo.catalog.Schema;
-import org.apache.tajo.common.TajoDataTypes;
-import org.apache.tajo.exception.ValueTooLongForTypeCharactersException;
-import org.apache.tajo.storage.Tuple;
import org.apache.parquet.hadoop.api.WriteSupport;
import org.apache.parquet.io.api.Binary;
import org.apache.parquet.io.api.RecordConsumer;
import org.apache.parquet.schema.GroupType;
import org.apache.parquet.schema.MessageType;
import org.apache.parquet.schema.Type;
-import org.apache.tajo.util.datetime.DateTimeUtil;
+import org.apache.tajo.catalog.Column;
+import org.apache.tajo.catalog.Schema;
+import org.apache.tajo.common.TajoDataTypes;
+import org.apache.tajo.exception.ValueTooLongForTypeCharactersException;
+import org.apache.tajo.storage.Tuple;
+import org.apache.tajo.util.datetime.DateTimeConstants;
import java.util.HashMap;
import java.util.List;
@@ -143,7 +143,7 @@ public class TajoWriteSupport extends WriteSupport<Tuple> {
break;
case DATE:
// Parquet DATE type is based on Unix Epoch(Jan 1, 1970).
- recordConsumer.addInteger(tuple.getInt4(index) - DateTimeUtil.DAYS_FROM_JULIAN_TO_EPOCH);
+ recordConsumer.addInteger(tuple.getInt4(index) - DateTimeConstants.UNIX_EPOCH_JDATE);
break;
case PROTOBUF:
case BLOB: