Fixed some literal string to constants.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/285b1790 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/285b1790 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/285b1790 Branch: refs/heads/master Commit: 285b179067fcd52fa1eead1a4f4b04da3813182b Parents: 863e53e Author: Hyunsik Choi <[email protected]> Authored: Fri May 8 00:50:17 2015 -0700 Committer: Hyunsik Choi <[email protected]> Committed: Fri May 8 00:50:17 2015 -0700 ---------------------------------------------------------------------- .../tajo/catalog/store/HiveCatalogStore.java | 9 +++--- .../java/org/apache/tajo/BuiltinStorages.java | 32 ++++++++++++++++++++ 2 files changed, 37 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/285b1790/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java index 835a158..51d1044 100644 --- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java +++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java @@ -33,6 +33,7 @@ import org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe; import org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe; import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe; import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe; +import org.apache.tajo.BuiltinStorages; import org.apache.tajo.TajoConstants; import org.apache.tajo.catalog.*; import org.apache.tajo.catalog.exception.*; @@ -472,7 +473,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { table.setPartitionKeys(partitionKeys); } - if (tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.RCFILE)) { + if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.RCFILE)) { String serde = tableDesc.getMeta().getOption(StorageConstants.RCFILE_SERDE); sd.setInputFormat(org.apache.hadoop.hive.ql.io.RCFileInputFormat.class.getName()); sd.setOutputFormat(org.apache.hadoop.hive.ql.io.RCFileOutputFormat.class.getName()); @@ -487,7 +488,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { table.putToParameters(serdeConstants.SERIALIZATION_NULL_FORMAT, StringEscapeUtils.unescapeJava(tableDesc.getMeta().getOption(StorageConstants.RCFILE_NULL))); } - } else if (tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.CSV) + } else if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.CSV) || tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.TEXTFILE)) { sd.getSerdeInfo().setSerializationLib(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class.getName()); sd.setInputFormat(org.apache.hadoop.mapred.TextInputFormat.class.getName()); @@ -512,7 +513,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { StringEscapeUtils.unescapeJava(tableDesc.getMeta().getOption(StorageConstants.TEXT_NULL))); table.getParameters().remove(StorageConstants.TEXT_NULL); } - } else if (tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.SEQUENCEFILE)) { + } else if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) { String serde = tableDesc.getMeta().getOption(StorageConstants.SEQUENCEFILE_SERDE); sd.setInputFormat(org.apache.hadoop.mapred.SequenceFileInputFormat.class.getName()); sd.setOutputFormat(org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat.class.getName()); @@ -543,7 +544,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore { table.getParameters().remove(StorageConstants.SEQUENCEFILE_NULL); } } else { - if (tableDesc.getMeta().getStoreType().equals("PARQUET")) { + if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.PARQUET)) { sd.setInputFormat(parquet.hive.DeprecatedParquetInputFormat.class.getName()); sd.setOutputFormat(parquet.hive.DeprecatedParquetOutputFormat.class.getName()); sd.getSerdeInfo().setSerializationLib(parquet.hive.serde.ParquetHiveSerDe.class.getName()); http://git-wip-us.apache.org/repos/asf/tajo/blob/285b1790/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java b/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java new file mode 100644 index 0000000..318270c --- /dev/null +++ b/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java @@ -0,0 +1,32 @@ +/** + * 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 KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.tajo; + +public class BuiltinStorages { + public static final String CSV = "CSV"; + public static final String TEXT = "TEXT"; + public static final String JSON = "JSON"; + public static final String RAW = "RAW"; + public static final String RCFILE = "RCFILE"; + public static final String ROW = "ROW"; + public static final String PARQUET = "PARQUET"; + public static final String SEQUENCE_FILE = "SEQUENCEFILE"; + public static final String AVRO = "AVRO"; + public static final String HBASE = "HBASE"; +}
