You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2015/09/28 23:41:37 UTC
[1/2] tajo git commit: TAJO-1663: Change the variable name storeType
to dataFormat.
Repository: tajo
Updated Branches:
refs/heads/master 72dd1c025 -> 67c4541ee
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java
index 74edc48..ece1616 100644
--- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java
+++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Stage.java
@@ -775,14 +775,14 @@ public class Stage implements EventHandler<StageEvent> {
DataChannel channel = masterPlan.getOutgoingChannels(getId()).get(0);
// if store plan (i.e., CREATE or INSERT OVERWRITE)
- String storeType = PlannerUtil.getStoreType(masterPlan.getLogicalPlan());
- if (storeType == null) {
+ String dataFormat = PlannerUtil.getDataFormat(masterPlan.getLogicalPlan());
+ if (dataFormat == null) {
// get final output store type (i.e., SELECT)
- storeType = channel.getStoreType();
+ dataFormat = channel.getDataFormat();
}
schema = channel.getSchema();
- meta = CatalogUtil.newTableMeta(storeType, new KeyValueSet());
+ meta = CatalogUtil.newTableMeta(dataFormat, new KeyValueSet());
inputStatistics = statsArray[0];
resultStatistics = statsArray[1];
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/querymaster/Task.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Task.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Task.java
index 7a9c8b1..8e0675a 100644
--- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Task.java
+++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Task.java
@@ -276,7 +276,7 @@ public class Task implements EventHandler<TaskEvent> {
fragmentList.add(fragment.toString());
} catch (Exception e) {
LOG.error(e.getMessage(), e);
- fragmentList.add("ERROR: " + eachFragment.getStoreType() + "," + eachFragment.getId() + ": " + e.getMessage());
+ fragmentList.add("ERROR: " + eachFragment.getDataFormat() + "," + eachFragment.getId() + ": " + e.getMessage());
}
}
taskHistory.setFragments(fragmentList.toArray(new String[]{}));
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/resources/webapps/admin/catalogview.jsp
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/resources/webapps/admin/catalogview.jsp b/tajo-core/src/main/resources/webapps/admin/catalogview.jsp
index 6771912..2388f71 100644
--- a/tajo-core/src/main/resources/webapps/admin/catalogview.jsp
+++ b/tajo-core/src/main/resources/webapps/admin/catalogview.jsp
@@ -186,7 +186,7 @@
<div style=''>Detail</div>
<table border="1" class='border_table'>
<tr><td width='100'>Table path</td><td width='410'><%=tableDesc.getUri()%></td></tr>
- <tr><td>Store type</td><td><%=tableDesc.getMeta().getStoreType()%></td></tr>
+ <tr><td>Store type</td><td><%=tableDesc.getMeta().getDataFormat()%></td></tr>
<tr><td># rows</td><td><%=(tableDesc.hasStats() ? ("" + tableDesc.getStats().getNumRows()) : "-")%></td></tr>
<tr><td>Volume</td><td><%=(tableDesc.hasStats() ? FileUtil.humanReadableByteCount(tableDesc.getStats().getNumBytes(),true) : "-")%></td></tr>
<tr><td>Options</td><td><%=optionStr%></td></tr>
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
index 7593a9b..a140bd2 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
@@ -24,9 +24,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.fs.ContentSummary;
-import org.apache.hadoop.fs.FileStatus;
-import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.tajo.BuiltinStorages;
import org.apache.tajo.OverridableConf;
@@ -1401,7 +1398,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
private void updatePhysicalInfo(TableDesc desc) {
// FAKEFILE is used for test
- if (!desc.getMeta().getStoreType().equals("SYSTEM") && !desc.getMeta().getStoreType().equals("FAKEFILE")) {
+ if (!desc.getMeta().getDataFormat().equals("SYSTEM") && !desc.getMeta().getDataFormat().equals("FAKEFILE")) {
try {
if (desc.getStats() != null) {
desc.getStats().setNumBytes(storage.getTableVolumn(desc.getUri()));
@@ -1844,7 +1841,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
insertNode.setUri(targetUri);
if (expr.hasStorageType()) {
- insertNode.setStorageType(CatalogUtil.getBackwardCompitablityStoreType(expr.getStorageType()));
+ insertNode.setDataFormat(CatalogUtil.getBackwardCompitableDataFormat(expr.getDataFormat()));
}
if (expr.hasParams()) {
KeyValueSet options = new KeyValueSet();
@@ -1891,7 +1888,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
createTableNode.setTableSchema(baseTable.getSchema());
createTableNode.setPartitionMethod(partitionDesc);
- createTableNode.setStorageType(CatalogUtil.getBackwardCompitablityStoreType(baseTable.getMeta().getStoreType()));
+ createTableNode.setDataFormat(CatalogUtil.getBackwardCompitableDataFormat(baseTable.getMeta().getDataFormat()));
createTableNode.setOptions(baseTable.getMeta().getOptions());
createTableNode.setExternal(baseTable.isExternal());
@@ -1927,9 +1924,9 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
createTableNode.setUri(getCreatedTableURI(context, expr));
if (expr.hasStorageType()) { // If storage type (using clause) is specified
- createTableNode.setStorageType(CatalogUtil.getBackwardCompitablityStoreType(expr.getStorageType()));
+ createTableNode.setDataFormat(CatalogUtil.getBackwardCompitableDataFormat(expr.getStorageType()));
} else { // otherwise, default type
- createTableNode.setStorageType(BuiltinStorages.TEXT);
+ createTableNode.setDataFormat(BuiltinStorages.TEXT);
}
// Set default storage properties to table
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/java/org/apache/tajo/plan/TablePropertyUtil.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/TablePropertyUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/TablePropertyUtil.java
index 62fa706..4bf2734 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/TablePropertyUtil.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/TablePropertyUtil.java
@@ -38,10 +38,10 @@ public class TablePropertyUtil {
* @param node CreateTableNode
*/
public static void setTableProperty(OverridableConf context, CreateTableNode node) {
- String storeType = node.getStorageType();
+ String dataFormat = node.getStorageType();
KeyValueSet property = node.getOptions();
- if (storeType.equalsIgnoreCase("TEXT") || storeType.equalsIgnoreCase("TEXT")) {
+ if (dataFormat.equalsIgnoreCase("TEXT") || dataFormat.equalsIgnoreCase("TEXT")) {
setSessionToProperty(context, SessionVars.NULL_CHAR, property, StorageConstants.TEXT_NULL);
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/java/org/apache/tajo/plan/logical/CreateTableNode.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/CreateTableNode.java b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/CreateTableNode.java
index 9a169dd..bf29a2d 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/CreateTableNode.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/CreateTableNode.java
@@ -124,7 +124,7 @@ public class CreateTableNode extends StoreTableNode implements Cloneable {
}
public String toString() {
- return "CreateTable (table=" + tableName + ", external=" + external + ", storeType=" + storageType +
+ return "CreateTable (table=" + tableName + ", external=" + external + ", dataFormat=" + storageType +
", ifNotExists=" + ifNotExists +")";
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/java/org/apache/tajo/plan/logical/InsertNode.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/InsertNode.java b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/InsertNode.java
index cb3dcee..4030b69 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/InsertNode.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/InsertNode.java
@@ -48,7 +48,7 @@ public class InsertNode extends StoreTableNode implements Cloneable {
setUri(desc.getUri());
}
setOptions(desc.getMeta().getOptions());
- setStorageType(desc.getMeta().getStoreType());
+ setDataFormat(desc.getMeta().getDataFormat());
if (desc.hasPartition()) {
this.setPartitionMethod(desc.getPartitionMethod());
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/java/org/apache/tajo/plan/logical/PersistentStoreNode.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/PersistentStoreNode.java b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/PersistentStoreNode.java
index a28f01f..30e3260 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/PersistentStoreNode.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/PersistentStoreNode.java
@@ -39,7 +39,7 @@ public abstract class PersistentStoreNode extends UnaryNode implements Cloneable
super(pid, nodeType);
}
- public void setStorageType(String storageType) {
+ public void setDataFormat(String storageType) {
this.storageType = storageType;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java
index c75c3fd..2051dfb 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/serder/LogicalNodeDeserializer.java
@@ -502,7 +502,7 @@ public class LogicalNodeDeserializer {
createTable.setOutSchema(convertSchema(protoNode.getOutSchema()));
}
createTable.setChild(nodeMap.get(persistentStoreProto.getChildSeq()));
- createTable.setStorageType(persistentStoreProto.getStorageType());
+ createTable.setDataFormat(persistentStoreProto.getStorageType());
createTable.setOptions(new KeyValueSet(persistentStoreProto.getTableProperties()));
createTable.setTableName(storeTableNodeSpec.getTableName());
@@ -540,7 +540,7 @@ public class LogicalNodeDeserializer {
insertNode.setOutSchema(convertSchema(protoNode.getOutSchema()));
}
insertNode.setChild(nodeMap.get(persistentStoreProto.getChildSeq()));
- insertNode.setStorageType(persistentStoreProto.getStorageType());
+ insertNode.setDataFormat(persistentStoreProto.getStorageType());
insertNode.setOptions(new KeyValueSet(persistentStoreProto.getTableProperties()));
if (storeTableNodeSpec.hasTableName()) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java
index 74cf546..e91375a 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java
@@ -159,7 +159,7 @@ public class PlannerUtil {
for (LogicalNode node: scanNodes) {
scanNode = (ScanNode) node;
- isVirtualTable &= (scanNode.getTableDesc().getMeta().getStoreType().equalsIgnoreCase("SYSTEM"));
+ isVirtualTable &= (scanNode.getTableDesc().getMeta().getDataFormat().equalsIgnoreCase("SYSTEM"));
}
return !checkIfDDLPlan(rootNode) && hasScanNode && isVirtualTable;
@@ -818,7 +818,7 @@ public class PlannerUtil {
}
}
- public static String getStoreType(LogicalPlan plan) {
+ public static String getDataFormat(LogicalPlan plan) {
LogicalRootNode rootNode = plan.getRootBlock().getRoot();
NodeType nodeType = rootNode.getChild().getType();
if (nodeType == NodeType.CREATE_TABLE) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PreLogicalPlanVerifier.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PreLogicalPlanVerifier.java b/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PreLogicalPlanVerifier.java
index 2c7feac..c16736d 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PreLogicalPlanVerifier.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PreLogicalPlanVerifier.java
@@ -190,7 +190,7 @@ public class PreLogicalPlanVerifier extends BaseAlgebraVisitor<PreLogicalPlanVer
return true;
}
- private boolean assertSupportedStoreType(VerificationState state, String name) {
+ private boolean assertSupportedDataFormat(VerificationState state, String name) {
Preconditions.checkNotNull(name);
if (name.equalsIgnoreCase("RAW")) {
@@ -271,7 +271,7 @@ public class PreLogicalPlanVerifier extends BaseAlgebraVisitor<PreLogicalPlanVer
}
if (expr.hasStorageType()) {
- assertSupportedStoreType(context.state, expr.getStorageType());
+ assertSupportedDataFormat(context.state, expr.getStorageType());
}
return expr;
@@ -298,7 +298,7 @@ public class PreLogicalPlanVerifier extends BaseAlgebraVisitor<PreLogicalPlanVer
}
if (expr.hasStorageType()) {
- assertSupportedStoreType(context.state, expr.getStorageType());
+ assertSupportedDataFormat(context.state, expr.getDataFormat());
}
if (child != null && child.getType() == OpType.Projection) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/main/proto/Plan.proto
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/proto/Plan.proto b/tajo-plan/src/main/proto/Plan.proto
index fa1deeb..0cd0c32 100644
--- a/tajo-plan/src/main/proto/Plan.proto
+++ b/tajo-plan/src/main/proto/Plan.proto
@@ -566,7 +566,7 @@ message DataChannelProto {
repeated ColumnProto shuffleKeys = 7;
optional int32 numOutputs = 9 [default = 1];
- optional string storeType = 10;
+ optional string dataFormat = 10;
}
message EnforcerProto {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-plan/src/test/java/org/apache/tajo/plan/TestLogicalNode.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/test/java/org/apache/tajo/plan/TestLogicalNode.java b/tajo-plan/src/test/java/org/apache/tajo/plan/TestLogicalNode.java
index 92cb399..56edccc 100644
--- a/tajo-plan/src/test/java/org/apache/tajo/plan/TestLogicalNode.java
+++ b/tajo-plan/src/test/java/org/apache/tajo/plan/TestLogicalNode.java
@@ -22,11 +22,9 @@ import org.apache.hadoop.fs.Path;
import org.apache.tajo.catalog.CatalogUtil;
import org.apache.tajo.catalog.Column;
import org.apache.tajo.catalog.Schema;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.plan.logical.GroupbyNode;
import org.apache.tajo.plan.logical.JoinNode;
-import org.apache.tajo.plan.logical.LogicalNode;
import org.apache.tajo.plan.logical.ScanNode;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/OldStorageManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/OldStorageManager.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/OldStorageManager.java
index 9716744..14db7c0 100644
--- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/OldStorageManager.java
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/OldStorageManager.java
@@ -103,39 +103,39 @@ public class OldStorageManager {
}
/**
- * Returns the proper Tablespace instance according to the storeType.
+ * Returns the proper Tablespace instance according to the dataFormat.
*
* @param tajoConf Tajo system property.
- * @param storeType Storage type
+ * @param dataFormat Storage type
* @return
* @throws IOException
*/
- public static Tablespace getStorageManager(TajoConf tajoConf, String storeType) throws IOException {
+ public static Tablespace getStorageManager(TajoConf tajoConf, String dataFormat) throws IOException {
FileSystem fileSystem = TajoConf.getWarehouseDir(tajoConf).getFileSystem(tajoConf);
if (fileSystem != null) {
- return getStorageManager(tajoConf, fileSystem.getUri(), storeType);
+ return getStorageManager(tajoConf, fileSystem.getUri(), dataFormat);
} else {
- return getStorageManager(tajoConf, null, storeType);
+ return getStorageManager(tajoConf, null, dataFormat);
}
}
/**
- * Returns the proper Tablespace instance according to the storeType
+ * Returns the proper Tablespace instance according to the dataFormat
*
* @param tajoConf Tajo system property.
* @param uri Key that can identify each storage manager(may be a path)
- * @param storeType Storage type
+ * @param dataFormat Storage type
* @return
* @throws IOException
*/
public static synchronized Tablespace getStorageManager(
- TajoConf tajoConf, URI uri, String storeType) throws IOException {
+ TajoConf tajoConf, URI uri, String dataFormat) throws IOException {
Preconditions.checkNotNull(tajoConf);
Preconditions.checkNotNull(uri);
- Preconditions.checkNotNull(storeType);
+ Preconditions.checkNotNull(dataFormat);
String typeName;
- if (storeType.equalsIgnoreCase("HBASE")) {
+ if (dataFormat.equalsIgnoreCase("HBASE")) {
typeName = "hbase";
} else {
typeName = "hdfs";
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java
index 1c6f433..81fbbc0 100644
--- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Tablespace.java
@@ -209,7 +209,7 @@ public abstract class Tablespace {
Scanner scanner;
- Class<? extends Scanner> scannerClass = getScannerClass(meta.getStoreType());
+ Class<? extends Scanner> scannerClass = getScannerClass(meta.getDataFormat());
scanner = OldStorageManager.newScannerInstance(scannerClass, conf, schema, meta, fragment);
scanner.setTarget(target.toArray());
@@ -256,7 +256,7 @@ public abstract class Tablespace {
Class<? extends Appender> appenderClass;
- String handlerName = meta.getStoreType().toLowerCase();
+ String handlerName = meta.getDataFormat().toLowerCase();
appenderClass = OldStorageManager.APPENDER_HANDLER_CACHE.get(handlerName);
if (appenderClass == null) {
appenderClass = conf.getClass(
@@ -265,7 +265,7 @@ public abstract class Tablespace {
}
if (appenderClass == null) {
- throw new IOException("Unknown Storage Type: " + meta.getStoreType());
+ throw new IOException("Unknown Storage Type: " + meta.getDataFormat());
}
appender = OldStorageManager.newAppenderInstance(appenderClass, conf, taskAttemptId, meta, schema, workDir);
@@ -274,14 +274,14 @@ public abstract class Tablespace {
}
/**
- * Return the Scanner class for the StoreType that is defined in storage-default.xml.
+ * Return the Scanner class for the DataFormat that is defined in storage-default.xml.
*
- * @param storeType store type
+ * @param dataFormat store type
* @return The Scanner class
* @throws java.io.IOException
*/
- public Class<? extends Scanner> getScannerClass(String storeType) throws IOException {
- String handlerName = storeType.toLowerCase();
+ public Class<? extends Scanner> getScannerClass(String dataFormat) throws IOException {
+ String handlerName = dataFormat.toLowerCase();
Class<? extends Scanner> scannerClass = OldStorageManager.SCANNER_HANDLER_CACHE.get(handlerName);
if (scannerClass == null) {
scannerClass = conf.getClass(
@@ -290,7 +290,7 @@ public abstract class Tablespace {
}
if (scannerClass == null) {
- throw new IOException("Unknown Storage Type: " + storeType);
+ throw new IOException("Unknown Storage Type: " + dataFormat);
}
return scannerClass;
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java
index bd46551..d9405e2 100644
--- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/fragment/FragmentConvertor.java
@@ -47,17 +47,17 @@ public class FragmentConvertor {
*/
private static final Class<?>[] DEFAULT_FRAGMENT_PARAMS = { ByteString.class };
- public static Class<? extends Fragment> getFragmentClass(Configuration conf, String storeType)
+ public static Class<? extends Fragment> getFragmentClass(Configuration conf, String dataFormat)
throws IOException {
- Class<? extends Fragment> fragmentClass = CACHED_FRAGMENT_CLASSES.get(storeType.toLowerCase());
+ Class<? extends Fragment> fragmentClass = CACHED_FRAGMENT_CLASSES.get(dataFormat.toLowerCase());
if (fragmentClass == null) {
fragmentClass = conf.getClass(
- String.format("tajo.storage.fragment.%s.class", storeType.toLowerCase()), null, Fragment.class);
- CACHED_FRAGMENT_CLASSES.put(storeType.toLowerCase(), fragmentClass);
+ String.format("tajo.storage.fragment.%s.class", dataFormat.toLowerCase()), null, Fragment.class);
+ CACHED_FRAGMENT_CLASSES.put(dataFormat.toLowerCase(), fragmentClass);
}
if (fragmentClass == null) {
- throw new IOException("No such a fragment for " + storeType.toLowerCase());
+ throw new IOException("No such a fragment for " + dataFormat.toLowerCase());
}
return fragmentClass;
@@ -82,9 +82,9 @@ public class FragmentConvertor {
public static <T extends Fragment> T convert(Configuration conf, FragmentProto fragment)
throws IOException {
- Class<T> fragmentClass = (Class<T>) getFragmentClass(conf, fragment.getStoreType().toLowerCase());
+ Class<T> fragmentClass = (Class<T>) getFragmentClass(conf, fragment.getDataFormat().toLowerCase());
if (fragmentClass == null) {
- throw new IOException("No such a fragment class for " + fragment.getStoreType());
+ throw new IOException("No such a fragment class for " + fragment.getDataFormat());
}
return convert(fragmentClass, fragment);
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseFragment.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseFragment.java b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseFragment.java
index 2d3f2c3..18aa515 100644
--- a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseFragment.java
+++ b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseFragment.java
@@ -172,7 +172,7 @@ public class HBaseFragment implements Fragment, Comparable<HBaseFragment>, Clone
FragmentProto.Builder fragmentBuilder = FragmentProto.newBuilder();
fragmentBuilder.setId(this.tableName);
fragmentBuilder.setContents(builder.buildPartial().toByteString());
- fragmentBuilder.setStoreType(BuiltinStorages.HBASE);
+ fragmentBuilder.setDataFormat(BuiltinStorages.HBASE);
return fragmentBuilder.build();
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java
index 6ac5fc3..79b2080 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/fragment/FileFragment.java
@@ -230,7 +230,7 @@ public class FileFragment implements Fragment, Comparable<FileFragment>, Cloneab
FragmentProto.Builder fragmentBuilder = FragmentProto.newBuilder();
fragmentBuilder.setId(this.tableName);
- fragmentBuilder.setStoreType(BuiltinStorages.TEXT);
+ fragmentBuilder.setDataFormat(BuiltinStorages.TEXT);
fragmentBuilder.setContents(builder.buildPartial().toByteString());
return fragmentBuilder.build();
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/TextLineSerDe.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/TextLineSerDe.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/TextLineSerDe.java
index 4cdf7df..3143ec2 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/TextLineSerDe.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/text/TextLineSerDe.java
@@ -43,7 +43,7 @@ public abstract class TextLineSerDe {
public static ByteBuf getNullChars(TableMeta meta) {
byte[] nullCharByteArray;
- if (meta.getStoreType().equals("SEQUENCEFILE")) {
+ if (meta.getDataFormat().equals("SEQUENCEFILE")) {
nullCharByteArray = getNullCharsAsBytes(meta, StorageConstants.SEQUENCEFILE_NULL, "\\");
} else {
nullCharByteArray = getNullCharsAsBytes(meta);
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java
index 67d0646..cc69119 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestCompressionStorages.java
@@ -53,12 +53,12 @@ public class TestCompressionStorages {
private TajoConf conf;
private static String TEST_PATH = "target/test-data/TestCompressionStorages";
- private String storeType;
+ private String dataFormat;
private Path testDir;
private FileSystem fs;
public TestCompressionStorages(String type) throws IOException {
- this.storeType = type;
+ this.dataFormat = type;
conf = new TajoConf();
testDir = CommonTestingUtil.getTestDir(TEST_PATH);
@@ -76,44 +76,44 @@ public class TestCompressionStorages {
@Test
public void testDeflateCodecCompressionData() throws IOException {
- storageCompressionTest(storeType, DeflateCodec.class);
+ storageCompressionTest(dataFormat, DeflateCodec.class);
}
@Test
public void testGzipCodecCompressionData() throws IOException {
- if (storeType.equalsIgnoreCase("RCFILE")) {
+ if (dataFormat.equalsIgnoreCase("RCFILE")) {
if( ZlibFactory.isNativeZlibLoaded(conf)) {
- storageCompressionTest(storeType, GzipCodec.class);
+ storageCompressionTest(dataFormat, GzipCodec.class);
}
- } else if (storeType.equalsIgnoreCase("SEQUENCEFILE")) {
+ } else if (dataFormat.equalsIgnoreCase("SEQUENCEFILE")) {
if( ZlibFactory.isNativeZlibLoaded(conf)) {
- storageCompressionTest(storeType, GzipCodec.class);
+ storageCompressionTest(dataFormat, GzipCodec.class);
}
} else {
- storageCompressionTest(storeType, GzipCodec.class);
+ storageCompressionTest(dataFormat, GzipCodec.class);
}
}
@Test
public void testSnappyCodecCompressionData() throws IOException {
if (SnappyCodec.isNativeCodeLoaded()) {
- storageCompressionTest(storeType, SnappyCodec.class);
+ storageCompressionTest(dataFormat, SnappyCodec.class);
}
}
@Test
public void testLz4CodecCompressionData() throws IOException {
if(NativeCodeLoader.isNativeCodeLoaded() && Lz4Codec.isNativeCodeLoaded())
- storageCompressionTest(storeType, Lz4Codec.class);
+ storageCompressionTest(dataFormat, Lz4Codec.class);
}
- private void storageCompressionTest(String storeType, Class<? extends CompressionCodec> codec) throws IOException {
+ private void storageCompressionTest(String dataFormat, Class<? extends CompressionCodec> codec) throws IOException {
Schema schema = new Schema();
schema.addColumn("id", Type.INT4);
schema.addColumn("age", Type.FLOAT4);
schema.addColumn("name", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(storeType);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat);
meta.putOption("compression.codec", codec.getCanonicalName());
meta.putOption("compression.type", SequenceFile.CompressionType.BLOCK.name());
meta.putOption("rcfile.serde", TextSerializerDeserializer.class.getName());
@@ -154,7 +154,7 @@ public class TestCompressionStorages {
Scanner scanner = TablespaceManager.getLocalFs().getScanner(meta, schema, tablets[0], schema);
scanner.init();
- if (storeType.equalsIgnoreCase("SEQUENCEFILE")) {
+ if (dataFormat.equalsIgnoreCase("SEQUENCEFILE")) {
assertTrue(scanner instanceof SequenceFileScanner);
Writable key = ((SequenceFileScanner) scanner).getKey();
assertEquals(key.getClass().getCanonicalName(), LongWritable.class.getCanonicalName());
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java
index 4faf8b9..78fbd6b 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java
@@ -66,11 +66,11 @@ public class TestMergeScanner {
"}\n";
private Path testDir;
- private String storeType;
+ private String dataFormat;
private FileSystem fs;
- public TestMergeScanner(String storeType) {
- this.storeType = storeType;
+ public TestMergeScanner(String dataFormat) {
+ this.dataFormat = dataFormat;
}
@Parameters
@@ -83,7 +83,7 @@ public class TestMergeScanner {
{"SEQUENCEFILE"},
{"AVRO"},
// RowFile requires Byte-buffer read support, so we omitted RowFile.
- //{StoreType.ROWFILE},
+ //{DataFormat.ROWFILE},
});
}
@@ -106,13 +106,13 @@ public class TestMergeScanner {
schema.addColumn("age", Type.INT8);
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
- meta.setOptions(CatalogUtil.newDefaultProperty(storeType));
- if (storeType.equalsIgnoreCase("AVRO")) {
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
+ meta.setOptions(CatalogUtil.newDefaultProperty(dataFormat));
+ if (dataFormat.equalsIgnoreCase("AVRO")) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL, TEST_MULTIPLE_FILES_AVRO_SCHEMA);
}
- Path table1Path = new Path(testDir, storeType + "_1.data");
+ Path table1Path = new Path(testDir, dataFormat + "_1.data");
Appender appender1 = TablespaceManager.getLocalFs().getAppender(null, null, meta, schema, table1Path);
appender1.enableStats();
appender1.init();
@@ -134,7 +134,7 @@ public class TestMergeScanner {
assertEquals(tupleNum, stat1.getNumRows().longValue());
}
- Path table2Path = new Path(testDir, storeType + "_2.data");
+ Path table2Path = new Path(testDir, dataFormat + "_2.data");
Appender appender2 = TablespaceManager.getLocalFs().getAppender(null, null, meta, schema, table2Path);
appender2.enableStats();
appender2.init();
@@ -166,7 +166,7 @@ public class TestMergeScanner {
targetSchema.addColumn(schema.getColumn(2));
Scanner scanner = new MergeScanner(conf, schema, meta, TUtil.newList(fragment), targetSchema);
- assertEquals(isProjectableStorage(meta.getStoreType()), scanner.isProjectable());
+ assertEquals(isProjectableStorage(meta.getDataFormat()), scanner.isProjectable());
scanner.init();
int totalCounts = 0;
@@ -174,7 +174,7 @@ public class TestMergeScanner {
while ((tuple = scanner.next()) != null) {
totalCounts++;
- if (storeType.equalsIgnoreCase("RAW")) {
+ if (dataFormat.equalsIgnoreCase("RAW")) {
assertEquals(4, tuple.size());
assertFalse(tuple.isBlankOrNull(0));
assertFalse(tuple.isBlankOrNull(1));
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java
index 26e16ea..278de45 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java
@@ -109,7 +109,7 @@ public class TestStorages {
" ]\n" +
"}\n";
- private String storeType;
+ private String dataFormat;
private boolean splitable;
private boolean statsable;
private boolean seekable;
@@ -121,14 +121,14 @@ public class TestStorages {
throws IOException {
final String TEST_PATH = "target/test-data/TestStorages";
- this.storeType = type;
+ this.dataFormat = type;
this.splitable = splitable;
this.statsable = statsable;
this.seekable = seekable;
this.internalType = internalType;
conf = new TajoConf();
- if (storeType.equalsIgnoreCase(BuiltinStorages.RCFILE)) {
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.RCFILE)) {
conf.setInt(RCFile.RECORD_INTERVAL_CONF_STR, 100);
}
@@ -159,7 +159,7 @@ public class TestStorages {
schema.addColumn("id", Type.INT4);
schema.addColumn("age", Type.INT8);
- TableMeta meta = CatalogUtil.newTableMeta(storeType);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat);
Path tablePath = new Path(testDir, "Splitable.data");
FileTablespace sm = TablespaceManager.getLocalFs();
Appender appender = sm.getAppender(meta, schema, tablePath);
@@ -214,9 +214,9 @@ public class TestStorages {
schema.addColumn("age", Type.INT8);
schema.addColumn("score", Type.FLOAT4);
- TableMeta meta = CatalogUtil.newTableMeta(storeType);
- meta.setOptions(CatalogUtil.newDefaultProperty(storeType));
- if (storeType.equalsIgnoreCase(BuiltinStorages.AVRO)) {
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat);
+ meta.setOptions(CatalogUtil.newDefaultProperty(dataFormat));
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.AVRO)) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL,
TEST_PROJECTION_AVRO_SCHEMA);
}
@@ -231,7 +231,7 @@ public class TestStorages {
TableStats stat = appender.getStats();
assertEquals(0, stat.getNumRows().longValue());
- if(internalType || BuiltinStorages.TEXT.equals(storeType)) {
+ if(internalType || BuiltinStorages.TEXT.equals(dataFormat)) {
FileStatus fileStatus = fs.getFileStatus(tablePath);
assertEquals(0, fileStatus.getLen());
}
@@ -252,12 +252,12 @@ public class TestStorages {
@Test
public void testRCFileSplitable() throws IOException {
- if (storeType.equalsIgnoreCase(BuiltinStorages.RCFILE)) {
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.RCFILE)) {
Schema schema = new Schema();
schema.addColumn("id", Type.INT4);
schema.addColumn("age", Type.INT8);
- TableMeta meta = CatalogUtil.newTableMeta(storeType);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat);
Path tablePath = new Path(testDir, "Splitable.data");
FileTablespace sm = TablespaceManager.getLocalFs();
Appender appender = sm.getAppender(meta, schema, tablePath);
@@ -312,9 +312,9 @@ public class TestStorages {
schema.addColumn("age", Type.INT8);
schema.addColumn("score", Type.FLOAT4);
- TableMeta meta = CatalogUtil.newTableMeta(storeType);
- meta.setOptions(CatalogUtil.newDefaultProperty(storeType));
- if (storeType.equalsIgnoreCase(BuiltinStorages.AVRO)) {
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat);
+ meta.setOptions(CatalogUtil.newDefaultProperty(dataFormat));
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.AVRO)) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL,
TEST_PROJECTION_AVRO_SCHEMA);
}
@@ -370,7 +370,7 @@ public class TestStorages {
@Test
public void testVariousTypes() throws IOException {
- boolean handleProtobuf = !storeType.equalsIgnoreCase(BuiltinStorages.JSON);
+ boolean handleProtobuf = !dataFormat.equalsIgnoreCase(BuiltinStorages.JSON);
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -389,9 +389,9 @@ public class TestStorages {
}
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
- meta.setOptions(CatalogUtil.newDefaultProperty(storeType));
- if (storeType.equalsIgnoreCase(BuiltinStorages.AVRO)) {
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
+ meta.setOptions(CatalogUtil.newDefaultProperty(dataFormat));
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.AVRO)) {
String path = JavaResourceUtil.getResourceURL("dataset/testVariousTypes.avsc").toString();
meta.putOption(StorageConstants.AVRO_SCHEMA_URL, path);
}
@@ -443,7 +443,7 @@ public class TestStorages {
@Test
public void testNullHandlingTypes() throws IOException {
- boolean handleProtobuf = !storeType.equalsIgnoreCase(BuiltinStorages.JSON);
+ boolean handleProtobuf = !dataFormat.equalsIgnoreCase(BuiltinStorages.JSON);
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -463,13 +463,13 @@ public class TestStorages {
}
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
- meta.setOptions(CatalogUtil.newDefaultProperty(storeType));
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
+ meta.setOptions(CatalogUtil.newDefaultProperty(dataFormat));
meta.putOption(StorageConstants.TEXT_NULL, "\\\\N");
meta.putOption(StorageConstants.RCFILE_NULL, "\\\\N");
meta.putOption(StorageConstants.RCFILE_SERDE, TextSerializerDeserializer.class.getName());
meta.putOption(StorageConstants.SEQUENCEFILE_NULL, "\\");
- if (storeType.equalsIgnoreCase("AVRO")) {
+ if (dataFormat.equalsIgnoreCase("AVRO")) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL, TEST_NULL_HANDLING_TYPES_AVRO_SCHEMA);
}
@@ -540,7 +540,7 @@ public class TestStorages {
@Test
public void testRCFileTextSerializeDeserialize() throws IOException {
- if(!storeType.equalsIgnoreCase(BuiltinStorages.RCFILE)) return;
+ if(!dataFormat.equalsIgnoreCase(BuiltinStorages.RCFILE)) return;
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -558,7 +558,7 @@ public class TestStorages {
schema.addColumn("col13", CatalogUtil.newDataType(Type.PROTOBUF, TajoIdProtos.QueryIdProto.class.getName()));
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
meta.putOption(StorageConstants.CSVFILE_SERDE, TextSerializerDeserializer.class.getName());
Path tablePath = new Path(testDir, "testVariousTypes.data");
@@ -609,7 +609,7 @@ public class TestStorages {
@Test
public void testRCFileBinarySerializeDeserialize() throws IOException {
- if(!storeType.equalsIgnoreCase(BuiltinStorages.RCFILE)) return;
+ if(!dataFormat.equalsIgnoreCase(BuiltinStorages.RCFILE)) return;
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -627,7 +627,7 @@ public class TestStorages {
schema.addColumn("col13", CatalogUtil.newDataType(Type.PROTOBUF, TajoIdProtos.QueryIdProto.class.getName()));
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
meta.putOption(StorageConstants.RCFILE_SERDE, BinarySerializerDeserializer.class.getName());
Path tablePath = new Path(testDir, "testVariousTypes.data");
@@ -678,7 +678,7 @@ public class TestStorages {
@Test
public void testSequenceFileTextSerializeDeserialize() throws IOException {
- if(!storeType.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) return;
+ if(!dataFormat.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) return;
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -696,7 +696,7 @@ public class TestStorages {
schema.addColumn("col13", CatalogUtil.newDataType(Type.PROTOBUF, TajoIdProtos.QueryIdProto.class.getName()));
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
meta.putOption(StorageConstants.SEQUENCEFILE_SERDE, TextSerializerDeserializer.class.getName());
Path tablePath = new Path(testDir, "testVariousTypes.data");
@@ -751,7 +751,7 @@ public class TestStorages {
@Test
public void testSequenceFileBinarySerializeDeserialize() throws IOException {
- if(!storeType.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) return;
+ if(!dataFormat.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) return;
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -769,7 +769,7 @@ public class TestStorages {
schema.addColumn("col13", CatalogUtil.newDataType(Type.PROTOBUF, TajoIdProtos.QueryIdProto.class.getName()));
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
meta.putOption(StorageConstants.SEQUENCEFILE_SERDE, BinarySerializerDeserializer.class.getName());
Path tablePath = new Path(testDir, "testVariousTypes.data");
@@ -825,14 +825,14 @@ public class TestStorages {
@Test
public void testTime() throws IOException {
- if (storeType.equalsIgnoreCase(BuiltinStorages.TEXT) || internalType) {
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.TEXT) || internalType) {
Schema schema = new Schema();
schema.addColumn("col1", Type.DATE);
schema.addColumn("col2", Type.TIME);
schema.addColumn("col3", Type.TIMESTAMP);
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
Path tablePath = new Path(testDir, "testTime.data");
FileTablespace sm = TablespaceManager.getLocalFs();
@@ -874,7 +874,7 @@ public class TestStorages {
schema.addColumn("age", Type.INT8);
schema.addColumn("comment", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(storeType);
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat);
Path tablePath = new Path(testDir, "Seekable.data");
FileTablespace sm = TablespaceManager.getLocalFs();
FileAppender appender = (FileAppender) sm.getAppender(meta, schema, tablePath);
@@ -952,12 +952,12 @@ public class TestStorages {
schema.addColumn("col5", Type.INT8);
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
- if (storeType.equalsIgnoreCase(BuiltinStorages.AVRO)) {
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.AVRO)) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL, TEST_MAX_VALUE_AVRO_SCHEMA);
}
- if (storeType.equalsIgnoreCase(BuiltinStorages.RAW)) {
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.RAW)) {
OldStorageManager.clearCache();
/* TAJO-1250 reproduce BufferOverflow of RAWFile */
int headerSize = 4 + 2 + 1; //Integer record length + Short null-flag length + 1 byte null flags
@@ -1006,9 +1006,9 @@ public class TestStorages {
@Test
public void testLessThanSchemaSize() throws IOException {
/* Internal storage must be same with schema size */
- if (internalType || storeType.equalsIgnoreCase(BuiltinStorages.AVRO)
- || storeType.equalsIgnoreCase(BuiltinStorages.PARQUET)
- || storeType.equalsIgnoreCase(BuiltinStorages.ORC)) {
+ if (internalType || dataFormat.equalsIgnoreCase(BuiltinStorages.AVRO)
+ || dataFormat.equalsIgnoreCase(BuiltinStorages.PARQUET)
+ || dataFormat.equalsIgnoreCase(BuiltinStorages.ORC)) {
return;
}
@@ -1018,8 +1018,8 @@ public class TestStorages {
dataSchema.addColumn("col3", Type.INT2);
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
- meta.setOptions(CatalogUtil.newDefaultProperty(storeType));
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
+ meta.setOptions(CatalogUtil.newDefaultProperty(dataFormat));
Path tablePath = new Path(testDir, "testLessThanSchemaSize.data");
FileTablespace sm = TablespaceManager.getLocalFs();
@@ -1071,10 +1071,10 @@ public class TestStorages {
@Test
public final void testInsertFixedCharTypeWithOverSize() throws Exception {
- if (!storeType.equalsIgnoreCase(BuiltinStorages.TEXT) &&
- !storeType.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE) &&
- !storeType.equalsIgnoreCase(BuiltinStorages.RCFILE) &&
- !storeType.equalsIgnoreCase(BuiltinStorages.PARQUET)) {
+ if (!dataFormat.equalsIgnoreCase(BuiltinStorages.TEXT) &&
+ !dataFormat.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE) &&
+ !dataFormat.equalsIgnoreCase(BuiltinStorages.RCFILE) &&
+ !dataFormat.equalsIgnoreCase(BuiltinStorages.PARQUET)) {
return;
}
@@ -1082,10 +1082,10 @@ public class TestStorages {
dataSchema.addColumn("col1", Type.CHAR);
KeyValueSet options = new KeyValueSet();
- TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
- meta.setOptions(CatalogUtil.newDefaultProperty(storeType));
+ TableMeta meta = CatalogUtil.newTableMeta(dataFormat, options);
+ meta.setOptions(CatalogUtil.newDefaultProperty(dataFormat));
- Path tablePath = new Path(testDir, "test_storetype_oversize.data");
+ Path tablePath = new Path(testDir, "test_dataformat_oversize.data");
FileTablespace sm = TablespaceManager.getLocalFs();
Appender appender = sm.getAppender(meta, dataSchema, tablePath);
appender.init();
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java
index 5437b0d..30cea60 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestBSTIndex.java
@@ -54,10 +54,10 @@ public class TestBSTIndex {
private static final String TEST_PATH = "target/test-data/TestIndex";
private Path testDir;
private FileSystem fs;
- private String storeType;
+ private String dataFormat;
public TestBSTIndex(String type) {
- this.storeType = type;
+ this.dataFormat = type;
conf = new TajoConf();
conf.setVar(TajoConf.ConfVars.ROOT_DIR, TEST_PATH);
schema = new Schema();
@@ -85,9 +85,9 @@ public class TestBSTIndex {
@Test
public void testFindValue() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testFindValue_" + storeType);
+ Path tablePath = new Path(testDir, "testFindValue_" + dataFormat);
Appender appender = ((FileTablespace) TablespaceManager.getLocalFs())
.getAppender(meta, schema, tablePath);
appender.init();
@@ -118,13 +118,13 @@ public class TestBSTIndex {
BaseTupleComparator comp = new BaseTupleComparator(keySchema, sortKeys);
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindValue_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindValue_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX,
keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -146,9 +146,9 @@ public class TestBSTIndex {
scanner.close();
tuple = new VTuple(keySchema.size());
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindValue_" + storeType + ".idx"), keySchema, comp);
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindValue_" + dataFormat + ".idx"), keySchema, comp);
reader.open();
- scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -176,9 +176,9 @@ public class TestBSTIndex {
@Test
public void testBuildIndexWithAppender() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testBuildIndexWithAppender_" + storeType);
+ Path tablePath = new Path(testDir, "testBuildIndexWithAppender_" + dataFormat);
FileAppender appender = (FileAppender) ((FileTablespace) TablespaceManager.getLocalFs())
.getAppender(meta, schema, tablePath);
appender.init();
@@ -194,7 +194,7 @@ public class TestBSTIndex {
BaseTupleComparator comp = new BaseTupleComparator(keySchema, sortKeys);
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testBuildIndexWithAppender_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testBuildIndexWithAppender_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
@@ -225,10 +225,10 @@ public class TestBSTIndex {
FileFragment tablet = new FileFragment("table1_1", status.getPath(), 0, fileLen);
tuple = new VTuple(keySchema.size());
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testBuildIndexWithAppender_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testBuildIndexWithAppender_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -256,9 +256,9 @@ public class TestBSTIndex {
@Test
public void testFindOmittedValue() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = StorageUtil.concatPath(testDir, "testFindOmittedValue_" + storeType);
+ Path tablePath = StorageUtil.concatPath(testDir, "testFindOmittedValue_" + dataFormat);
Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(meta, schema, tablePath);
appender.init();
Tuple tuple;
@@ -287,12 +287,12 @@ public class TestBSTIndex {
BaseTupleComparator comp = new BaseTupleComparator(keySchema, sortKeys);
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindOmittedValue_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindOmittedValue_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -313,7 +313,7 @@ public class TestBSTIndex {
creater.close();
scanner.close();
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindOmittedValue_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindOmittedValue_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
for (int i = 1; i < TUPLE_NUM - 1; i += 2) {
@@ -327,9 +327,9 @@ public class TestBSTIndex {
@Test
public void testFindNextKeyValue() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testFindNextKeyValue_" + storeType);
+ Path tablePath = new Path(testDir, "testFindNextKeyValue_" + dataFormat);
Appender appender = ((FileTablespace) TablespaceManager.getLocalFs())
.getAppender(meta, schema, tablePath);
appender.init();
@@ -360,12 +360,12 @@ public class TestBSTIndex {
BaseTupleComparator comp = new BaseTupleComparator(keySchema, sortKeys);
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindNextKeyValue_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindNextKeyValue_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -386,10 +386,10 @@ public class TestBSTIndex {
creater.close();
scanner.close();
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyValue_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyValue_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
- scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -420,9 +420,9 @@ public class TestBSTIndex {
@Test
public void testFindNextKeyOmittedValue() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testFindNextKeyOmittedValue_" + storeType);
+ Path tablePath = new Path(testDir, "testFindNextKeyOmittedValue_" + dataFormat);
Appender appender = (((FileTablespace) TablespaceManager.getLocalFs()))
.getAppender(meta, schema, tablePath);
appender.init();
@@ -453,12 +453,12 @@ public class TestBSTIndex {
BaseTupleComparator comp = new BaseTupleComparator(keySchema, sortKeys);
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindNextKeyOmittedValue_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindNextKeyOmittedValue_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -479,10 +479,10 @@ public class TestBSTIndex {
creater.close();
scanner.close();
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyOmittedValue_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyOmittedValue_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
- scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -502,9 +502,9 @@ public class TestBSTIndex {
@Test
public void testFindMinValue() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testFindMinValue" + storeType);
+ Path tablePath = new Path(testDir, "testFindMinValue" + dataFormat);
Appender appender = ((FileTablespace) TablespaceManager.getLocalFs())
.getAppender(meta, schema, tablePath);
appender.init();
@@ -535,12 +535,12 @@ public class TestBSTIndex {
BaseTupleComparator comp = new BaseTupleComparator(keySchema, sortKeys);
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindMinValue_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindMinValue_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -563,10 +563,10 @@ public class TestBSTIndex {
tuple = new VTuple(keySchema.size());
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindMinValue_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindMinValue_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
- scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -588,9 +588,9 @@ public class TestBSTIndex {
@Test
public void testMinMax() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testMinMax_" + storeType);
+ Path tablePath = new Path(testDir, "testMinMax_" + dataFormat);
Appender appender = ((FileTablespace) TablespaceManager.getLocalFs())
.getAppender(meta, schema, tablePath);
appender.init();
@@ -621,12 +621,12 @@ public class TestBSTIndex {
BaseTupleComparator comp = new BaseTupleComparator(keySchema, sortKeys);
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testMinMax_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testMinMax_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -647,7 +647,7 @@ public class TestBSTIndex {
creater.close();
scanner.close();
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testMinMax_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testMinMax_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
@@ -694,9 +694,9 @@ public class TestBSTIndex {
@Test
public void testConcurrentAccess() throws IOException, InterruptedException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testConcurrentAccess_" + storeType);
+ Path tablePath = new Path(testDir, "testConcurrentAccess_" + dataFormat);
Appender appender = ((FileTablespace) TablespaceManager.getLocalFs())
.getAppender(meta, schema, tablePath);
appender.init();
@@ -728,12 +728,12 @@ public class TestBSTIndex {
BaseTupleComparator comp = new BaseTupleComparator(keySchema, sortKeys);
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testConcurrentAccess_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testConcurrentAccess_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -754,7 +754,7 @@ public class TestBSTIndex {
creater.close();
scanner.close();
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testConcurrentAccess_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testConcurrentAccess_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
@@ -776,9 +776,9 @@ public class TestBSTIndex {
@Test
public void testFindValueDescOrder() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testFindValueDescOrder_" + storeType);
+ Path tablePath = new Path(testDir, "testFindValueDescOrder_" + dataFormat);
Appender appender = ((FileTablespace) TablespaceManager.getLocalFs())
.getAppender(meta, schema, tablePath);
appender.init();
@@ -811,12 +811,12 @@ public class TestBSTIndex {
BSTIndex bst = new BSTIndex(conf);
- BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindValueDescOrder_" + storeType + ".idx"),
+ BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir, "testFindValueDescOrder_" + dataFormat + ".idx"),
BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -839,10 +839,10 @@ public class TestBSTIndex {
tuple = new VTuple(keySchema.size());
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindValueDescOrder_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindValueDescOrder_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
- scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -870,9 +870,9 @@ public class TestBSTIndex {
@Test
public void testFindNextKeyValueDescOrder() throws IOException {
- meta = CatalogUtil.newTableMeta(storeType);
+ meta = CatalogUtil.newTableMeta(dataFormat);
- Path tablePath = new Path(testDir, "testFindNextKeyValueDescOrder_" + storeType);
+ Path tablePath = new Path(testDir, "testFindNextKeyValueDescOrder_" + dataFormat);
Appender appender = ((FileTablespace) TablespaceManager.getLocalFs()).getAppender(meta, schema, tablePath);
appender.init();
@@ -904,11 +904,11 @@ public class TestBSTIndex {
BSTIndex bst = new BSTIndex(conf);
BSTIndexWriter creater = bst.getIndexWriter(new Path(testDir,
- "testFindNextKeyValueDescOrder_" + storeType + ".idx"), BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
+ "testFindNextKeyValueDescOrder_" + dataFormat + ".idx"), BSTIndex.TWO_LEVEL_INDEX, keySchema, comp);
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ SeekableScanner scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
@@ -930,14 +930,14 @@ public class TestBSTIndex {
scanner.close();
- BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyValueDescOrder_" + storeType + ".idx"),
+ BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "testFindNextKeyValueDescOrder_" + dataFormat + ".idx"),
keySchema, comp);
reader.open();
assertEquals(keySchema, reader.getKeySchema());
assertEquals(comp, reader.getComparator());
- scanner = OldStorageManager.getStorageManager(conf, meta.getStoreType()).
+ scanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat()).
getSeekableScanner(meta, schema, tablet.getProto(), schema);
scanner.init();
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java
index a001492..8262073 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/index/TestSingleCSVFileBSTIndex.java
@@ -111,7 +111,7 @@ public class TestSingleCSVFileBSTIndex {
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner fileScanner = OldStorageManager.getStorageManager(conf, meta.getStoreType())
+ SeekableScanner fileScanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat())
.getSeekableScanner(meta, schema, tablet.getProto(), schema);
fileScanner.init();
Tuple keyTuple;
@@ -136,7 +136,7 @@ public class TestSingleCSVFileBSTIndex {
BSTIndexReader reader = bst.getIndexReader(new Path(testDir,
"FindValueInCSV.idx"), keySchema, comp);
reader.open();
- fileScanner = OldStorageManager.getStorageManager(conf, meta.getStoreType())
+ fileScanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat())
.getSeekableScanner(meta, schema, tablet.getProto(), schema);
fileScanner.init();
for (int i = 0; i < TUPLE_NUM - 1; i++) {
@@ -202,7 +202,7 @@ public class TestSingleCSVFileBSTIndex {
creater.setLoadNum(LOAD_NUM);
creater.open();
- SeekableScanner fileScanner = OldStorageManager.getStorageManager(conf, meta.getStoreType())
+ SeekableScanner fileScanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat())
.getSeekableScanner(meta, schema, tablet.getProto(), schema);
fileScanner.init();
Tuple keyTuple;
@@ -224,7 +224,7 @@ public class TestSingleCSVFileBSTIndex {
BSTIndexReader reader = bst.getIndexReader(new Path(testDir, "FindNextKeyValueInCSV.idx"), keySchema, comp);
reader.open();
- fileScanner = OldStorageManager.getStorageManager(conf, meta.getStoreType())
+ fileScanner = OldStorageManager.getStorageManager(conf, meta.getDataFormat())
.getSeekableScanner(meta, schema, tablet.getProto(), schema);
fileScanner.init();
Tuple result;
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java
index bf9536e..1c963fd 100644
--- a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java
+++ b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java
@@ -94,7 +94,7 @@ public class JdbcFragment implements Fragment, Comparable<JdbcFragment>, Cloneab
CatalogProtos.FragmentProto.Builder fragmentBuilder = CatalogProtos.FragmentProto.newBuilder();
fragmentBuilder.setId(this.inputSourceId);
- fragmentBuilder.setStoreType("JDBC");
+ fragmentBuilder.setDataFormat("JDBC");
fragmentBuilder.setContents(builder.buildPartial().toByteString());
return fragmentBuilder.build();
}
[2/2] tajo git commit: TAJO-1663: Change the variable name storeType
to dataFormat.
Posted by hy...@apache.org.
TAJO-1663: Change the variable name storeType to dataFormat.
Closes #790
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/67c4541e
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/67c4541e
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/67c4541e
Branch: refs/heads/master
Commit: 67c4541ee43d00a1418919827cb9065ecc541170
Parents: 72dd1c0
Author: Hyunsik Choi <hy...@apache.org>
Authored: Mon Sep 28 14:38:45 2015 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Mon Sep 28 14:38:45 2015 -0700
----------------------------------------------------------------------
CHANGES | 2 +
.../java/org/apache/tajo/algebra/Insert.java | 2 +-
.../org/apache/tajo/catalog/CatalogUtil.java | 77 ++++++------
.../org/apache/tajo/catalog/DDLBuilder.java | 6 +-
.../java/org/apache/tajo/catalog/TableDesc.java | 4 +-
.../java/org/apache/tajo/catalog/TableMeta.java | 22 ++--
.../tajo/catalog/json/TableMetaAdapter.java | 7 +-
.../src/main/proto/CatalogProtos.proto | 8 +-
.../org/apache/tajo/catalog/TestTableMeta.java | 6 +-
.../tajo/catalog/store/HiveCatalogStore.java | 22 ++--
.../tajo/catalog/store/HiveCatalogUtil.java | 10 +-
.../dictionary/AbstractTableDescriptor.java | 2 +-
.../InfoSchemaMetadataDictionary.java | 4 +-
.../dictionary/TablesTableDescriptor.java | 2 +-
.../tajo/catalog/store/AbstractDBStore.java | 23 ++--
.../src/main/resources/schemas/derby/derby.xml | 5 +-
.../main/resources/schemas/mariadb/mariadb.xml | 5 +-
.../src/main/resources/schemas/mysql/mysql.xml | 5 +-
.../main/resources/schemas/oracle/oracle.xml | 5 +-
.../resources/schemas/postgresql/postgresql.xml | 5 +-
.../TestCatalogAgainstCaseSensitivity.java | 2 +-
.../schemas/derbytest/loadtest/derby.xml | 2 +-
.../org/apache/tajo/cli/tools/TajoDump.java | 3 +-
.../cli/tsql/commands/DescTableCommand.java | 2 +-
.../engine/planner/TestQueryValidation.java | 2 +-
.../planner/physical/TestPhysicalPlanner.java | 4 +-
.../apache/tajo/engine/query/TestCTASQuery.java | 10 +-
.../tajo/engine/query/TestCreateTable.java | 4 +-
.../TestCTASQuery/CtasWithDataFormat.sql | 12 ++
.../queries/TestCTASQuery/CtasWithStoreType.sql | 12 --
.../TestCTASQuery/testCtasWithDataFormat.sql | 1 +
.../TestCTASQuery/testCtasWithStoreType.sql | 1 -
.../engine/planner/PhysicalPlannerImpl.java | 2 +-
.../tajo/engine/planner/global/DataChannel.java | 22 ++--
.../engine/planner/global/GlobalPlanner.java | 36 +++---
.../global/builder/DistinctGroupbyBuilder.java | 6 +-
.../rewriter/rules/GlobalPlanRewriteUtil.java | 2 +-
.../planner/physical/BSTIndexScanExec.java | 2 +-
.../planner/physical/PhysicalPlanUtil.java | 16 +--
.../engine/planner/physical/StoreTableExec.java | 3 +-
.../org/apache/tajo/master/GlobalEngine.java | 4 +-
.../NonForwardQueryResultSystemScanner.java | 4 +-
.../apache/tajo/master/exec/QueryExecutor.java | 2 +-
.../apache/tajo/querymaster/Repartitioner.java | 6 +-
.../java/org/apache/tajo/querymaster/Stage.java | 8 +-
.../java/org/apache/tajo/querymaster/Task.java | 2 +-
.../resources/webapps/admin/catalogview.jsp | 2 +-
.../org/apache/tajo/plan/LogicalPlanner.java | 13 +--
.../org/apache/tajo/plan/TablePropertyUtil.java | 4 +-
.../tajo/plan/logical/CreateTableNode.java | 2 +-
.../apache/tajo/plan/logical/InsertNode.java | 2 +-
.../tajo/plan/logical/PersistentStoreNode.java | 2 +-
.../plan/serder/LogicalNodeDeserializer.java | 4 +-
.../org/apache/tajo/plan/util/PlannerUtil.java | 4 +-
.../plan/verifier/PreLogicalPlanVerifier.java | 6 +-
tajo-plan/src/main/proto/Plan.proto | 2 +-
.../org/apache/tajo/plan/TestLogicalNode.java | 2 -
.../apache/tajo/storage/OldStorageManager.java | 20 ++--
.../org/apache/tajo/storage/Tablespace.java | 16 +--
.../storage/fragment/FragmentConvertor.java | 14 +--
.../tajo/storage/hbase/HBaseFragment.java | 2 +-
.../tajo/storage/fragment/FileFragment.java | 2 +-
.../apache/tajo/storage/text/TextLineSerDe.java | 2 +-
.../tajo/storage/TestCompressionStorages.java | 26 ++---
.../apache/tajo/storage/TestMergeScanner.java | 22 ++--
.../org/apache/tajo/storage/TestStorages.java | 94 +++++++--------
.../apache/tajo/storage/index/TestBSTIndex.java | 116 +++++++++----------
.../index/TestSingleCSVFileBSTIndex.java | 8 +-
.../apache/tajo/storage/jdbc/JdbcFragment.java | 2 +-
69 files changed, 376 insertions(+), 383 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 2f3904a..431812d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -56,6 +56,8 @@ Release 0.11.0 - unreleased
IMPROVEMENT
+ TAJO-1663: Change the variable name storeType to dataFormat. (hyunsik)
+
TAJO-1885: Simple query with projection should be supported. (hyunsik)
TAJO-1890: Clean up debug and test modes and unhandled exceptions.
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-algebra/src/main/java/org/apache/tajo/algebra/Insert.java
----------------------------------------------------------------------
diff --git a/tajo-algebra/src/main/java/org/apache/tajo/algebra/Insert.java b/tajo-algebra/src/main/java/org/apache/tajo/algebra/Insert.java
index 8b9df97..4f76886 100644
--- a/tajo-algebra/src/main/java/org/apache/tajo/algebra/Insert.java
+++ b/tajo-algebra/src/main/java/org/apache/tajo/algebra/Insert.java
@@ -98,7 +98,7 @@ public class Insert extends Expr {
this.storageType = storageType;
}
- public String getStorageType() {
+ public String getDataFormat() {
return storageType;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
index 996bfaf..6dd12e6 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
@@ -30,13 +30,12 @@ import org.apache.tajo.catalog.partition.PartitionMethodDesc;
import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.catalog.proto.CatalogProtos.PartitionKeyProto;
import org.apache.tajo.catalog.proto.CatalogProtos.SchemaProto;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
+import org.apache.tajo.catalog.proto.CatalogProtos.DataFormat;
import org.apache.tajo.catalog.proto.CatalogProtos.TableDescProto;
import org.apache.tajo.catalog.proto.CatalogProtos.TableIdentifierProto;
import org.apache.tajo.common.TajoDataTypes;
import org.apache.tajo.common.TajoDataTypes.DataType;
import org.apache.tajo.exception.InvalidOperationException;
-import org.apache.tajo.exception.TajoRuntimeException;
import org.apache.tajo.exception.UndefinedOperatorException;
import org.apache.tajo.storage.StorageConstants;
import org.apache.tajo.util.KeyValueSet;
@@ -282,53 +281,53 @@ public class CatalogUtil {
}
- public static String getBackwardCompitablityStoreType(String storeType) {
- return getStoreTypeString(getStoreType(storeType));
+ public static String getBackwardCompitableDataFormat(String dataFormat) {
+ return getDataFormatAsString(asDataFormat(dataFormat));
}
- public static String getStoreTypeString(final StoreType type) {
- if (type == StoreType.TEXTFILE) {
+ public static String getDataFormatAsString(final DataFormat type) {
+ if (type == DataFormat.TEXTFILE) {
return BuiltinStorages.TEXT;
} else {
return type.name();
}
}
- public static StoreType getStoreType(final String typeStr) {
+ public static DataFormat asDataFormat(final String typeStr) {
if (typeStr.equalsIgnoreCase("CSV")) {
- return StoreType.TEXTFILE;
- } else if (typeStr.equalsIgnoreCase(StoreType.RAW.name())) {
- return StoreType.RAW;
- } else if (typeStr.equalsIgnoreCase(StoreType.ROWFILE.name())) {
- return StoreType.ROWFILE;
- } else if (typeStr.equalsIgnoreCase(StoreType.RCFILE.name())) {
- return StoreType.RCFILE;
- } else if (typeStr.equalsIgnoreCase(StoreType.ORC.name())) {
- return StoreType.ORC;
- } else if (typeStr.equalsIgnoreCase(StoreType.PARQUET.name())) {
- return StoreType.PARQUET;
- } else if (typeStr.equalsIgnoreCase(StoreType.SEQUENCEFILE.name())) {
- return StoreType.SEQUENCEFILE;
- } else if (typeStr.equalsIgnoreCase(StoreType.AVRO.name())) {
- return StoreType.AVRO;
+ return DataFormat.TEXTFILE;
+ } else if (typeStr.equalsIgnoreCase(DataFormat.RAW.name())) {
+ return CatalogProtos.DataFormat.RAW;
+ } else if (typeStr.equalsIgnoreCase(CatalogProtos.DataFormat.ROWFILE.name())) {
+ return DataFormat.ROWFILE;
+ } else if (typeStr.equalsIgnoreCase(DataFormat.RCFILE.name())) {
+ return DataFormat.RCFILE;
+ } else if (typeStr.equalsIgnoreCase(CatalogProtos.DataFormat.ORC.name())) {
+ return CatalogProtos.DataFormat.ORC;
+ } else if (typeStr.equalsIgnoreCase(DataFormat.PARQUET.name())) {
+ return DataFormat.PARQUET;
+ } else if (typeStr.equalsIgnoreCase(DataFormat.SEQUENCEFILE.name())) {
+ return DataFormat.SEQUENCEFILE;
+ } else if (typeStr.equalsIgnoreCase(DataFormat.AVRO.name())) {
+ return CatalogProtos.DataFormat.AVRO;
} else if (typeStr.equalsIgnoreCase(BuiltinStorages.TEXT)) {
- return StoreType.TEXTFILE;
- } else if (typeStr.equalsIgnoreCase(StoreType.JSON.name())) {
- return StoreType.JSON;
- } else if (typeStr.equalsIgnoreCase(StoreType.HBASE.name())) {
- return StoreType.HBASE;
+ return CatalogProtos.DataFormat.TEXTFILE;
+ } else if (typeStr.equalsIgnoreCase(CatalogProtos.DataFormat.JSON.name())) {
+ return CatalogProtos.DataFormat.JSON;
+ } else if (typeStr.equalsIgnoreCase(CatalogProtos.DataFormat.HBASE.name())) {
+ return CatalogProtos.DataFormat.HBASE;
} else {
return null;
}
}
- public static TableMeta newTableMeta(String storeType) {
- KeyValueSet defaultProperties = CatalogUtil.newDefaultProperty(storeType);
- return new TableMeta(storeType, defaultProperties);
+ public static TableMeta newTableMeta(String dataFormat) {
+ KeyValueSet defaultProperties = CatalogUtil.newDefaultProperty(dataFormat);
+ return new TableMeta(dataFormat, defaultProperties);
}
- public static TableMeta newTableMeta(String storeType, KeyValueSet options) {
- return new TableMeta(storeType, options);
+ public static TableMeta newTableMeta(String dataFormat, KeyValueSet options) {
+ return new TableMeta(dataFormat, options);
}
public static TableDesc newTableDesc(String tableName, Schema schema, TableMeta meta, Path path) {
@@ -980,21 +979,21 @@ public class CatalogUtil {
/**
* Create new table property with default configs. It is used to make TableMeta to be stored in Catalog.
*
- * @param storeType StoreType
+ * @param dataFormat DataFormat
* @return Table properties
*/
- public static KeyValueSet newDefaultProperty(String storeType) {
+ public static KeyValueSet newDefaultProperty(String dataFormat) {
KeyValueSet options = new KeyValueSet();
- if (storeType.equalsIgnoreCase(BuiltinStorages.TEXT)) {
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.TEXT)) {
options.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER);
- } else if (storeType.equalsIgnoreCase("JSON")) {
+ } else if (dataFormat.equalsIgnoreCase("JSON")) {
options.set(StorageConstants.TEXT_SERDE_CLASS, "org.apache.tajo.storage.json.JsonLineSerDe");
- } else if (storeType.equalsIgnoreCase("RCFILE")) {
+ } else if (dataFormat.equalsIgnoreCase("RCFILE")) {
options.set(StorageConstants.RCFILE_SERDE, StorageConstants.DEFAULT_BINARY_SERDE);
- } else if (storeType.equalsIgnoreCase("SEQUENCEFILE")) {
+ } else if (dataFormat.equalsIgnoreCase("SEQUENCEFILE")) {
options.set(StorageConstants.SEQUENCEFILE_SERDE, StorageConstants.DEFAULT_TEXT_SERDE);
options.set(StorageConstants.SEQUENCEFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER);
- } else if (storeType.equalsIgnoreCase("PARQUET")) {
+ } else if (dataFormat.equalsIgnoreCase("PARQUET")) {
options.set(BLOCK_SIZE, StorageConstants.PARQUET_DEFAULT_BLOCK_SIZE);
options.set(PAGE_SIZE, StorageConstants.PARQUET_DEFAULT_PAGE_SIZE);
options.set(COMPRESSION, StorageConstants.PARQUET_DEFAULT_COMPRESSION_CODEC_NAME);
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java
index baa1388..a5923cf 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/DDLBuilder.java
@@ -35,7 +35,7 @@ public class DDLBuilder {
sb.append("--\n")
.append("-- Name: ").append(CatalogUtil.denormalizeIdentifier(desc.getName())).append("; Type: TABLE;")
- .append(" Storage: ").append(desc.getMeta().getStoreType());
+ .append(" Storage: ").append(desc.getMeta().getDataFormat());
sb.append("\n-- Path: ").append(desc.getUri());
sb.append("\n--\n");
sb.append("CREATE EXTERNAL TABLE ").append(CatalogUtil.denormalizeIdentifier(desc.getName()));
@@ -58,7 +58,7 @@ public class DDLBuilder {
sb.append("--\n")
.append("-- Name: ").append(CatalogUtil.denormalizeIdentifier(desc.getName())).append("; Type: TABLE;")
- .append(" Storage: ").append(desc.getMeta().getStoreType());
+ .append(" Storage: ").append(desc.getMeta().getDataFormat());
sb.append("\n--\n");
sb.append("CREATE TABLE ").append(CatalogUtil.denormalizeIdentifier(desc.getName()));
buildSchema(sb, desc.getSchema());
@@ -114,7 +114,7 @@ public class DDLBuilder {
}
private static void buildUsingClause(StringBuilder sb, TableMeta meta) {
- sb.append(" USING " + CatalogUtil.getBackwardCompitablityStoreType(meta.getStoreType()));
+ sb.append(" USING " + CatalogUtil.getBackwardCompitableDataFormat(meta.getDataFormat()));
}
private static void buildWithClause(final StringBuilder sb, TableMeta meta) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableDesc.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableDesc.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableDesc.java
index ccf084e..3cdc00b 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableDesc.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableDesc.java
@@ -64,9 +64,9 @@ public class TableDesc implements ProtoObject<TableDescProto>, GsonObject, Clone
this(tableName, schema, meta, path, true);
}
- public TableDesc(String tableName, @Nullable Schema schema, String storeType, KeyValueSet options,
+ public TableDesc(String tableName, @Nullable Schema schema, String dataFormat, KeyValueSet options,
@Nullable URI path) {
- this(tableName, schema, new TableMeta(storeType, options), path);
+ this(tableName, schema, new TableMeta(dataFormat, options), path);
}
public TableDesc(TableDescProto proto) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableMeta.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableMeta.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableMeta.java
index 6838fe0..cfbbf75 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableMeta.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/TableMeta.java
@@ -35,21 +35,21 @@ import java.util.Map;
* It contains all information for scanning a fragmented table
*/
public class TableMeta implements ProtoObject<CatalogProtos.TableProto>, GsonObject, Cloneable {
- @Expose protected String storeType;
+ @Expose protected String dataFormat;
@Expose protected KeyValueSet options;
- public TableMeta(String storeType, KeyValueSet options) {
- this.storeType = storeType;
+ public TableMeta(String dataFormat, KeyValueSet options) {
+ this.dataFormat = dataFormat;
this.options = new KeyValueSet(options);
}
public TableMeta(TableProto proto) {
- this.storeType = proto.getStoreType();
+ this.dataFormat = proto.getDataFormat();
this.options = new KeyValueSet(proto.getParams());
}
- public String getStoreType() {
- return this.storeType;
+ public String getDataFormat() {
+ return this.dataFormat;
}
public void setOptions(KeyValueSet options) {
@@ -84,7 +84,7 @@ public class TableMeta implements ProtoObject<CatalogProtos.TableProto>, GsonObj
if(object instanceof TableMeta) {
TableMeta other = (TableMeta) object;
- boolean eq = this.getStoreType().equals(other.getStoreType());
+ boolean eq = this.getDataFormat().equals(other.getDataFormat());
eq = eq && this.getOptions().equals(other.getOptions());
return eq;
}
@@ -93,13 +93,13 @@ public class TableMeta implements ProtoObject<CatalogProtos.TableProto>, GsonObj
}
public int hashCode() {
- return Objects.hashCode(getStoreType(), getOptions());
+ return Objects.hashCode(getDataFormat(), getOptions());
}
@Override
public Object clone() throws CloneNotSupportedException {
TableMeta meta = (TableMeta) super.clone();
- meta.storeType = getStoreType();
+ meta.dataFormat = getDataFormat();
meta.options = (KeyValueSet) (toMap() != null ? options.clone() : null);
return meta;
}
@@ -115,7 +115,7 @@ public class TableMeta implements ProtoObject<CatalogProtos.TableProto>, GsonObj
////////////////////////////////////////////////////////////////////////
public TableProto getProto() {
TableProto.Builder builder = TableProto.newBuilder();
- builder.setStoreType(storeType);
+ builder.setDataFormat(dataFormat);
builder.setParams(options.getProto());
return builder.build();
}
@@ -127,7 +127,7 @@ public class TableMeta implements ProtoObject<CatalogProtos.TableProto>, GsonObj
}
public void mergeProtoToLocal() {
- getStoreType();
+ getDataFormat();
toMap();
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/json/TableMetaAdapter.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/json/TableMetaAdapter.java b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/json/TableMetaAdapter.java
index 2d164f6..766a8a9 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/json/TableMetaAdapter.java
+++ b/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/json/TableMetaAdapter.java
@@ -23,7 +23,6 @@ import com.google.gson.*;
import org.apache.tajo.json.CommonGsonHelper;
import org.apache.tajo.util.KeyValueSet;
import org.apache.tajo.catalog.TableMeta;
-import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.json.GsonSerDerAdapter;
import java.lang.reflect.Type;
@@ -36,17 +35,17 @@ public class TableMetaAdapter implements GsonSerDerAdapter<TableMeta> {
Preconditions.checkNotNull(json);
JsonObject jsonObject = json.getAsJsonObject();
- String storeType = CommonGsonHelper.getOrDie(jsonObject, "store").getAsString();
+ String dataFormat = CommonGsonHelper.getOrDie(jsonObject, "store").getAsString();
KeyValueSet keyValueSet = context.deserialize(CommonGsonHelper.getOrDie(jsonObject, "options"), KeyValueSet.class);
- return new TableMeta(storeType, keyValueSet);
+ return new TableMeta(dataFormat, keyValueSet);
}
@Override
public JsonElement serialize(TableMeta src, Type typeOfSrc,
JsonSerializationContext context) {
JsonObject jsonObj = new JsonObject();
- jsonObj.addProperty("store", src.getStoreType());
+ jsonObj.addProperty("store", src.getDataFormat());
jsonObj.add("options", context.serialize(src.getOptions(), KeyValueSet.class));
return jsonObj;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
index 08818b1..9a7b66a 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
+++ b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
@@ -25,7 +25,7 @@ option java_generate_equals_and_hash = true;
import "DataTypes.proto";
import "PrimitiveProtos.proto";
-enum StoreType {
+enum DataFormat {
MEM = 0;
TEXTFILE = 1;
RAW = 2;
@@ -75,12 +75,12 @@ message SchemaProto {
message FragmentProto {
required string id = 1;
- required string storeType = 2;
+ required string dataFormat = 2;
required bytes contents = 3;
}
message TableProto {
- required string storeType = 1;
+ required string dataFormat = 1;
optional KeyValueSetProto params = 2;
}
@@ -293,7 +293,7 @@ message TableDescriptorProto {
required string name = 3;
optional string tableType = 4;
required string path = 5;
- required string storeType = 6;
+ required string dataFormat = 6;
}
message AlterTablespaceProto {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java
index 9087262..3f1d5c5 100644
--- a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java
+++ b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableMeta.java
@@ -55,7 +55,7 @@ public class TestTableMeta {
TableMeta meta1 = CatalogUtil.newTableMeta("TEXT");
TableMeta meta2 = (TableMeta) meta1.clone();
- assertEquals(meta1.getStoreType(), meta2.getStoreType());
+ assertEquals(meta1.getDataFormat(), meta2.getDataFormat());
assertEquals(meta1, meta2);
}
@@ -73,7 +73,7 @@ public class TestTableMeta {
@Test
public void testGetStorageType() {
- assertEquals("TEXT", meta.getStoreType());
+ assertEquals("TEXT", meta.getDataFormat());
}
@Test
@@ -108,7 +108,7 @@ public class TestTableMeta {
optionBuilder.addKeyval(keyValueBuilder);
}
TableProto.Builder builder = TableProto.newBuilder();
- builder.setStoreType(BuiltinStorages.TEXT);
+ builder.setDataFormat(BuiltinStorages.TEXT);
builder.setParams(optionBuilder);
TableMeta meta2 = new TableMeta(builder.build());
assertTrue(meta1.equals(meta2));
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/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 72f7485..8a370b9 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
@@ -111,7 +111,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
org.apache.hadoop.hive.ql.metadata.Table table = null;
HiveCatalogStoreClientPool.HiveCatalogStoreClient client = null;
Path path = null;
- String storeType = null;
+ String dataFormat = null;
org.apache.tajo.catalog.Schema schema = null;
KeyValueSet options = null;
TableStats stats = null;
@@ -186,12 +186,12 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
// set file output format
String fileOutputformat = properties.getProperty(hive_metastoreConstants.FILE_OUTPUT_FORMAT);
- storeType = HiveCatalogUtil.getStoreType(fileOutputformat);
+ dataFormat = HiveCatalogUtil.getDataFormat(fileOutputformat);
- if (storeType.equalsIgnoreCase("TEXT")) {
+ if (dataFormat.equalsIgnoreCase("TEXT")) {
options.set(StorageConstants.TEXT_DELIMITER, StringEscapeUtils.escapeJava(fieldDelimiter));
options.set(StorageConstants.TEXT_NULL, StringEscapeUtils.escapeJava(nullFormat));
- } else if (storeType.equals("RCFILE")) {
+ } else if (dataFormat.equals("RCFILE")) {
options.set(StorageConstants.RCFILE_NULL, StringEscapeUtils.escapeJava(nullFormat));
String serde = properties.getProperty(serdeConstants.SERIALIZATION_LIB);
if (LazyBinaryColumnarSerDe.class.getName().equals(serde)) {
@@ -199,7 +199,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
} else if (ColumnarSerDe.class.getName().equals(serde)) {
options.set(StorageConstants.RCFILE_SERDE, StorageConstants.DEFAULT_TEXT_SERDE);
}
- } else if (storeType.equals("SEQUENCEFILE")) {
+ } else if (dataFormat.equals("SEQUENCEFILE")) {
options.set(StorageConstants.SEQUENCEFILE_DELIMITER, StringEscapeUtils.escapeJava(fieldDelimiter));
options.set(StorageConstants.SEQUENCEFILE_NULL, StringEscapeUtils.escapeJava(nullFormat));
String serde = properties.getProperty(serdeConstants.SERIALIZATION_LIB);
@@ -258,7 +258,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
} finally {
if(client != null) client.release();
}
- TableMeta meta = new TableMeta(storeType, options);
+ TableMeta meta = new TableMeta(dataFormat, options);
TableDesc tableDesc = new TableDesc(databaseName + "." + tableName, schema, meta, path.toUri());
if (table.getTableType().equals(TableType.EXTERNAL_TABLE)) {
tableDesc.setExternal(true);
@@ -479,7 +479,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
table.setPartitionKeys(partitionKeys);
}
- if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.RCFILE)) {
+ if (tableDesc.getMeta().getDataFormat().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());
@@ -494,7 +494,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(BuiltinStorages.TEXT)) {
+ } else if (tableDesc.getMeta().getDataFormat().equals(BuiltinStorages.TEXT)) {
sd.getSerdeInfo().setSerializationLib(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class.getName());
sd.setInputFormat(org.apache.hadoop.mapred.TextInputFormat.class.getName());
sd.setOutputFormat(org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat.class.getName());
@@ -518,7 +518,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().equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) {
+ } else if (tableDesc.getMeta().getDataFormat().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());
@@ -549,12 +549,12 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
table.getParameters().remove(StorageConstants.SEQUENCEFILE_NULL);
}
} else {
- if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.PARQUET)) {
+ if (tableDesc.getMeta().getDataFormat().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());
} else {
- throw new UnsupportedException(tableDesc.getMeta().getStoreType() + " in HivecatalogStore");
+ throw new UnsupportedException(tableDesc.getMeta().getDataFormat() + " in HivecatalogStore");
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java
index 67a1488..9e1da2b 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogUtil.java
@@ -32,8 +32,6 @@ import org.apache.tajo.exception.*;
import org.apache.thrift.TException;
import parquet.hadoop.mapred.DeprecatedParquetOutputFormat;
-import static org.apache.tajo.exception.ExceptionUtil.makeNotSupported;
-
public class HiveCatalogUtil {
public static void validateSchema(Table tblSchema) {
for (FieldSchema fieldSchema : tblSchema.getCols()) {
@@ -101,7 +99,7 @@ public class HiveCatalogUtil {
}
}
- public static String getStoreType(String fileFormat) {
+ public static String getDataFormat(String fileFormat) {
Preconditions.checkNotNull(fileFormat);
String[] fileFormatArrary = fileFormat.split("\\.");
@@ -113,11 +111,11 @@ public class HiveCatalogUtil {
if(outputFormatClass.equals(HiveIgnoreKeyTextOutputFormat.class.getSimpleName())) {
return BuiltinStorages.TEXT;
} else if(outputFormatClass.equals(HiveSequenceFileOutputFormat.class.getSimpleName())) {
- return CatalogProtos.StoreType.SEQUENCEFILE.name();
+ return CatalogProtos.DataFormat.SEQUENCEFILE.name();
} else if(outputFormatClass.equals(RCFileOutputFormat.class.getSimpleName())) {
- return CatalogProtos.StoreType.RCFILE.name();
+ return CatalogProtos.DataFormat.RCFILE.name();
} else if(outputFormatClass.equals(DeprecatedParquetOutputFormat.class.getSimpleName())) {
- return CatalogProtos.StoreType.PARQUET.name();
+ return CatalogProtos.DataFormat.PARQUET.name();
} else {
throw new TajoRuntimeException(new UnknownDataFormatException(fileFormat));
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/AbstractTableDescriptor.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/AbstractTableDescriptor.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/AbstractTableDescriptor.java
index f9b7c62..cb071aa 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/AbstractTableDescriptor.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/AbstractTableDescriptor.java
@@ -55,7 +55,7 @@ abstract class AbstractTableDescriptor implements TableDescriptor {
protected TableProto getTableProto() {
TableProto.Builder metaBuilder = TableProto.newBuilder();
- metaBuilder.setStoreType("SYSTEM");
+ metaBuilder.setDataFormat("SYSTEM");
metaBuilder.setParams(KeyValueSetProto.newBuilder().build());
return metaBuilder.build();
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java
index 2de9807..be2913f 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/InfoSchemaMetadataDictionary.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.tajo.exception.UndefinedTableException;
import org.apache.tajo.catalog.proto.CatalogProtos;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
+import org.apache.tajo.catalog.proto.CatalogProtos.DataFormat;
import org.apache.tajo.util.TUtil;
public class InfoSchemaMetadataDictionary {
@@ -131,6 +131,6 @@ public class InfoSchemaMetadataDictionary {
}
protected String getTablePath() {
- return StoreType.SYSTEM.name().toUpperCase();
+ return DataFormat.SYSTEM.name().toUpperCase();
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/TablesTableDescriptor.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/TablesTableDescriptor.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/TablesTableDescriptor.java
index 7485248..5522e00 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/TablesTableDescriptor.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/dictionary/TablesTableDescriptor.java
@@ -29,7 +29,7 @@ class TablesTableDescriptor extends AbstractTableDescriptor {
new ColumnDescriptor("table_name", Type.TEXT, 0),
new ColumnDescriptor("table_type", Type.TEXT, 0),
new ColumnDescriptor("path", Type.TEXT, 0),
- new ColumnDescriptor("store_type", Type.TEXT, 0)
+ new ColumnDescriptor("data_format", Type.TEXT, 0)
};
public TablesTableDescriptor(InfoSchemaMetadataDictionary metadataDictionary) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
index 700ef1a..c808a50 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/AbstractDBStore.java
@@ -38,7 +38,6 @@ import org.apache.tajo.exception.*;
import org.apache.tajo.util.JavaResourceUtil;
import org.apache.tajo.plan.expr.*;
import org.apache.tajo.plan.util.PartitionFilterAlgebraVisitor;
-import org.apache.tajo.util.FileUtil;
import org.apache.tajo.util.Pair;
import org.apache.tajo.util.TUtil;
@@ -839,7 +838,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
conn.setAutoCommit(false);
String sql = "INSERT INTO TABLES (DB_ID, " + COL_TABLES_NAME +
- ", TABLE_TYPE, PATH, STORE_TYPE, HAS_SELF_DESCRIBE_SCHEMA) VALUES(?, ?, ?, ?, ?, ?) ";
+ ", TABLE_TYPE, PATH, DATA_FORMAT, HAS_SELF_DESCRIBE_SCHEMA) VALUES(?, ?, ?, ?, ?, ?) ";
if (LOG.isDebugEnabled()) {
LOG.debug(sql);
@@ -854,7 +853,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
pstmt.setString(3, TableType.MANAGED.name());
}
pstmt.setString(4, table.getPath());
- pstmt.setString(5, table.getMeta().getStoreType());
+ pstmt.setString(5, table.getMeta().getDataFormat());
pstmt.setBoolean(6, table.getSchema() == null);
pstmt.executeUpdate();
pstmt.close();
@@ -1667,7 +1666,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
ResultSet res = null;
PreparedStatement pstmt = null;
CatalogProtos.TableDescProto.Builder tableBuilder = null;
- String storeType;
+ String dataFormat;
Pair<Integer, String> databaseIdAndUri = getDatabaseIdAndUri(databaseName);
@@ -1678,7 +1677,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
// Geting Table Description
//////////////////////////////////////////
String sql =
- "SELECT TID, " + COL_TABLES_NAME + ", TABLE_TYPE, PATH, STORE_TYPE, HAS_SELF_DESCRIBE_SCHEMA FROM TABLES " +
+ "SELECT TID, " + COL_TABLES_NAME + ", TABLE_TYPE, PATH, DATA_FORMAT, HAS_SELF_DESCRIBE_SCHEMA FROM TABLES " +
"WHERE DB_ID = ? AND " + COL_TABLES_NAME + "=?";
if (LOG.isDebugEnabled()) {
@@ -1703,7 +1702,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
}
tableBuilder.setPath(res.getString(4).trim());
- storeType = res.getString(5).trim();
+ dataFormat = res.getString(5).trim();
boolean hasSelfDescSchema = res.getBoolean(6);
res.close();
@@ -1741,7 +1740,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
//////////////////////////////////////////
CatalogProtos.TableProto.Builder metaBuilder = CatalogProtos.TableProto.newBuilder();
- metaBuilder.setStoreType(storeType);
+ metaBuilder.setDataFormat(dataFormat);
sql = "SELECT key_, value_ FROM " + TB_OPTIONS + " WHERE " + COL_TABLES_PK + " = ?";
if (LOG.isDebugEnabled()) {
@@ -1855,7 +1854,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
List<TableDescriptorProto> tables = new ArrayList<>();
try {
- String sql = "SELECT t.TID, t.DB_ID, t." + COL_TABLES_NAME + ", t.TABLE_TYPE, t.PATH, t.STORE_TYPE, " +
+ String sql = "SELECT t.TID, t.DB_ID, t." + COL_TABLES_NAME + ", t.TABLE_TYPE, t.PATH, t.DATA_FORMAT, " +
" s.SPACE_URI FROM " + TB_TABLES + " t, " + TB_DATABASES + " d, " + TB_SPACES +
" s WHERE t.DB_ID = d.DB_ID AND d.SPACE_ID = s.SPACE_ID";
@@ -1878,10 +1877,10 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
} else {
builder.setPath(resultSet.getString("PATH"));
}
- String storeType = resultSet.getString("STORE_TYPE");
- if (storeType != null) {
- storeType = storeType.trim();
- builder.setStoreType(storeType);
+ String dataFormat = resultSet.getString("DATA_FORMAT");
+ if (dataFormat != null) {
+ dataFormat = dataFormat.trim();
+ builder.setDataFormat(dataFormat);
}
tables.add(builder.build());
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
index 921d98e..ff0b20b 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/derby/derby.xml
@@ -19,6 +19,7 @@
<tns:store xmlns:tns="http://tajo.apache.org/catalogstore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
<!--
Catalog base version history
+ * 12 - 2015-09-28: Change the variable name storeType to dataFormat (TAJO-1663)
* 11 - 2015-09-23: Add contents length and file count for partition directory (TAJO-1493)
* 10 - 2015-09-22: Well support for self-describing data formats (TAJO-1832)
* 9 - 2015-09-12: Allow external catalog store for unit testing (TAJO-1813)
@@ -31,7 +32,7 @@
* 2 - 2014-06-09: First versioning
* 1- Before 2013-03-20
-->
- <tns:base version="11">
+ <tns:base version="12">
<tns:objects>
<tns:Object order="0" type="table" name="META">
<tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>
@@ -68,7 +69,7 @@
TABLE_NAME VARCHAR(128) NOT NULL,
TABLE_TYPE VARCHAR(128) NOT NULL,
PATH VARCHAR(4096),
- STORE_TYPE CHAR(16),
+ DATA_FORMAT CHAR(16),
HAS_SELF_DESCRIBE_SCHEMA BOOLEAN,
CONSTRAINT TABLES_PK PRIMARY KEY (TID),
CONSTRAINT C_TABLE_ID_UNIQ UNIQUE (DB_ID, TABLE_NAME)
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml
index a23d393..dbf82b6 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mariadb/mariadb.xml
@@ -19,6 +19,7 @@
<tns:store xmlns:tns="http://tajo.apache.org/catalogstore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
<!--
Catalog base version history
+ * 12 - 2015-09-28: Change the variable name storeType to dataFormat (TAJO-1663)
* 11 - 2015-09-23: Add contents length and file count for partition directory (TAJO-1493)
* 10 - 2015-09-22: Well support for self-describing data formats (TAJO-1832)
* 9 - 2015-09-12: Allow external catalog store for unit testing (TAJO-1813)
@@ -31,7 +32,7 @@
* 2 - 2014-06-09: First versioning
* 1- Before 2013-03-20
-->
- <tns:base version="11">
+ <tns:base version="12">
<tns:objects>
<tns:Object order="0" type="table" name="META">
<tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>
@@ -66,7 +67,7 @@
TABLE_NAME VARCHAR(128) BINARY NOT NULL,
TABLE_TYPE VARCHAR(128) NOT NULL,
PATH VARCHAR(4096) BINARY,
- STORE_TYPE CHAR(16),
+ DATA_FORMAT CHAR(16),
HAS_SELF_DESCRIBE_SCHEMA BOOLEAN,
FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID),
INDEX IDX_DB_ID (DB_ID),
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml
index 126a5e4..59ceae4 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/mysql/mysql.xml
@@ -19,6 +19,7 @@
<tns:store xmlns:tns="http://tajo.apache.org/catalogstore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
<!--
Catalog base version history
+ * 12 - 2015-09-28: Change the variable name storeType to dataFormat (TAJO-1663)
* 11 - 2015-09-23: Add contents length and file count for partition directory (TAJO-1493)
* 10 - 2015-09-22: Well support for self-describing data formats (TAJO-1832)
* 9 - 2015-09-12: Allow external catalog store for unit testing (TAJO-1813)
@@ -31,7 +32,7 @@
* 2 - 2014-06-09: First versioning
* 1- Before 2013-03-20
-->
- <tns:base version="11">
+ <tns:base version="12">
<tns:objects>
<tns:Object order="0" type="table" name="META">
<tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>
@@ -66,7 +67,7 @@
TABLE_NAME VARCHAR(128) BINARY NOT NULL,
TABLE_TYPE VARCHAR(128) NOT NULL,
PATH VARCHAR(4096) BINARY,
- STORE_TYPE CHAR(16),
+ DATA_FORMAT CHAR(16),
HAS_SELF_DESCRIBE_SCHEMA BOOLEAN,
FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID),
INDEX IDX_DB_ID (DB_ID),
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
index b5396ef..b61778a 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/oracle/oracle.xml
@@ -19,6 +19,7 @@
<tns:store xmlns:tns="http://tajo.apache.org/catalogstore" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
<!--
Catalog base version history
+ * 12 - 2015-09-28: Change the variable name storeType to dataFormat (TAJO-1663)
* 11 - 2015-09-23: Add contents length and file count for partition directory (TAJO-1493)
* 10 - 2015-09-22: Well support for self-describing data formats (TAJO-1832)
* 9 - 2015-09-12: Allow external catalog store for unit testing (TAJO-1813)
@@ -31,7 +32,7 @@
* 2 - 2014-06-09: First versioning
* 1- Before 2013-03-20
-->
- <tns:base version="11">
+ <tns:base version="12">
<tns:objects>
<tns:Object order="0" type="table" name="meta">
<tns:sql><![CDATA[
@@ -98,7 +99,7 @@
TABLE_TYPE VARCHAR2(128) NOT NULL,
PATH VARCHAR2(4000),
HAS_SELF_DESCRIBE_SCHEMA CHAR NOT NULL,
- STORE_TYPE CHAR(16),
+ DATA_FORMAT CHAR(16),
FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID),
CONSTRAINT C_TABLE_ID_UNIQ UNIQUE (DB_ID, TABLE_NAME)
)]]>
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
index 033c233..90449c1 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
+++ b/tajo-catalog/tajo-catalog-server/src/main/resources/schemas/postgresql/postgresql.xml
@@ -21,6 +21,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.xsd ">
<!--
Catalog base version history
+ * 12 - 2015-09-28: Change the variable name storeType to dataFormat (TAJO-1663)
* 11 - 2015-09-23: Add contents length and file count for partition directory (TAJO-1493)
* 10 - 2015-09-22: Well support for self-describing data formats (TAJO-1832)
* 9 - 2015-09-12: Allow external catalog store for unit testing (TAJO-1813)
@@ -34,7 +35,7 @@ xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.
* 2 - 2014-06-09: First versioning
* 1- Before 2013-03-20
-->
- <tns:base version="11">
+ <tns:base version="12">
<tns:objects>
<tns:Object name="META" type="table" order="0">
<tns:sql><![CDATA[CREATE TABLE META (VERSION INT NOT NULL)]]></tns:sql>
@@ -75,7 +76,7 @@ xsi:schemaLocation="http://tajo.apache.org/catalogstore ../DBMSSchemaDefinition.
TABLE_TYPE VARCHAR(128) NOT NULL,
PATH VARCHAR(4096),
HAS_SELF_DESCRIBE_SCHEMA BOOLEAN,
- STORE_TYPE CHAR(16),
+ DATA_FORMAT CHAR(16),
FOREIGN KEY (DB_ID) REFERENCES DATABASES_ (DB_ID),
UNIQUE (DB_ID, TABLE_NAME)
)]]>
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java
index 0ca6baa..794ae4a 100644
--- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java
+++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalogAgainstCaseSensitivity.java
@@ -115,7 +115,7 @@ public class TestCatalogAgainstCaseSensitivity {
assertTrue(tableDescs.containsKey(qualifiedTableName));
TableDesc desc = tableDescs.get(qualifiedTableName);
assertEquals(desc.getUri().toString(), eachTableDescriptor.getPath());
- assertEquals(desc.getMeta().getStoreType(), eachTableDescriptor.getStoreType());
+ assertEquals(desc.getMeta().getDataFormat(), eachTableDescriptor.getDataFormat());
}
//////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-catalog/tajo-catalog-server/src/test/resources/schemas/derbytest/loadtest/derby.xml
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/test/resources/schemas/derbytest/loadtest/derby.xml b/tajo-catalog/tajo-catalog-server/src/test/resources/schemas/derbytest/loadtest/derby.xml
index 86fd5e8..f7a2e14 100644
--- a/tajo-catalog/tajo-catalog-server/src/test/resources/schemas/derbytest/loadtest/derby.xml
+++ b/tajo-catalog/tajo-catalog-server/src/test/resources/schemas/derbytest/loadtest/derby.xml
@@ -54,7 +54,7 @@
TABLE_NAME VARCHAR(128) NOT NULL,
TABLE_TYPE VARCHAR(128) NOT NULL,
PATH VARCHAR(4096),
- STORE_TYPE CHAR(16),
+ DATA_FORMAT CHAR(16),
CONSTRAINT TABLES_PK PRIMARY KEY (TID),
CONSTRAINT C_TABLE_ID_UNIQ UNIQUE (DB_ID, TABLE_NAME)
)]]>
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java
----------------------------------------------------------------------
diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java
index c21e294..43ebeb0 100644
--- a/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java
+++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tools/TajoDump.java
@@ -22,7 +22,6 @@ import com.google.protobuf.ServiceException;
import org.apache.commons.cli.*;
import org.apache.tajo.auth.UserRoleInfo;
import org.apache.tajo.catalog.*;
-import org.apache.tajo.catalog.partition.PartitionDesc;
import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.catalog.proto.CatalogProtos.PartitionDescProto;
import org.apache.tajo.client.TajoClient;
@@ -178,7 +177,7 @@ public class TajoDump {
String fqName = CatalogUtil.buildFQName(databaseName, tableName);
TableDesc table = client.getTableDesc(fqName);
- if (table.getMeta().getStoreType().equalsIgnoreCase("SYSTEM")) {
+ if (table.getMeta().getDataFormat().equalsIgnoreCase("SYSTEM")) {
continue;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java
----------------------------------------------------------------------
diff --git a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java
index b17a336..55553aa 100644
--- a/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java
+++ b/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java
@@ -99,7 +99,7 @@ public class DescTableCommand extends TajoShellCommand {
StringBuilder sb = new StringBuilder();
sb.append("\ntable name: ").append(desc.getName()).append("\n");
sb.append("table uri: ").append(desc.getUri()).append("\n");
- sb.append("store type: ").append(desc.getMeta().getStoreType()).append("\n");
+ sb.append("store type: ").append(desc.getMeta().getDataFormat()).append("\n");
if (desc.getStats() != null) {
long row = desc.getStats().getNumRows();
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestQueryValidation.java
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestQueryValidation.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestQueryValidation.java
index cb299b4..0ef1150 100644
--- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestQueryValidation.java
+++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/TestQueryValidation.java
@@ -63,7 +63,7 @@ public class TestQueryValidation extends QueryTestCaseBase {
}
@Test
- public void testUnsupportedStoreType() throws IOException {
+ public void testUnsupportedDataFormat() throws IOException {
// See TAJO-1249
assertInvalidSQLFromFile("invalid_store_format.sql");
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
index 8bc619c..70c19b2 100644
--- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
+++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
@@ -645,7 +645,7 @@ public class TestPhysicalPlanner {
ctx.setDataChannel(dataChannel);
LogicalNode rootNode = optimizer.optimize(plan);
- TableMeta outputMeta = CatalogUtil.newTableMeta(dataChannel.getStoreType());
+ TableMeta outputMeta = CatalogUtil.newTableMeta(dataChannel.getDataFormat());
FileSystem fs = sm.getFileSystem();
QueryId queryId = id.getTaskId().getExecutionBlockId().getQueryId();
@@ -779,7 +779,7 @@ public class TestPhysicalPlanner {
ctx.setDataChannel(dataChannel);
optimizer.optimize(plan);
- TableMeta outputMeta = CatalogUtil.newTableMeta(dataChannel.getStoreType());
+ TableMeta outputMeta = CatalogUtil.newTableMeta(dataChannel.getDataFormat());
FileSystem fs = sm.getFileSystem();
QueryId queryId = id.getTaskId().getExecutionBlockId().getQueryId();
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
index f327c85..667d193 100644
--- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
+++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
@@ -210,8 +210,8 @@ public class TestCTASQuery extends QueryTestCaseBase {
}
@Test
- public final void testCtasWithStoreType() throws Exception {
- ResultSet res = executeFile("CtasWithStoreType.sql");
+ public final void testCtasWithDataFormat() throws Exception {
+ ResultSet res = executeFile("CtasWithDataFormat.sql");
res.close();
ResultSet res2 = executeQuery();
@@ -220,7 +220,7 @@ public class TestCTASQuery extends QueryTestCaseBase {
TableDesc desc = client.getTableDesc(CatalogUtil.normalizeIdentifier(res2.getMetaData().getTableName(1)));
assertNotNull(desc);
- assertTrue("RCFILE".equalsIgnoreCase(desc.getMeta().getStoreType()));
+ assertTrue("RCFILE".equalsIgnoreCase(desc.getMeta().getDataFormat()));
}
@Test
@@ -234,7 +234,7 @@ public class TestCTASQuery extends QueryTestCaseBase {
TableDesc desc = client.getTableDesc(CatalogUtil.normalizeIdentifier(res2.getMetaData().getTableName(1)));
assertNotNull(desc);
- assertTrue("TEXT".equalsIgnoreCase(desc.getMeta().getStoreType()));
+ assertTrue("TEXT".equalsIgnoreCase(desc.getMeta().getDataFormat()));
}
@Test
@@ -248,7 +248,7 @@ public class TestCTASQuery extends QueryTestCaseBase {
TableDesc desc = client.getTableDesc(CatalogUtil.normalizeIdentifier(res2.getMetaData().getTableName(1)));
assertNotNull(desc);
- assertTrue("TEXT".equalsIgnoreCase(desc.getMeta().getStoreType()));
+ assertTrue("TEXT".equalsIgnoreCase(desc.getMeta().getDataFormat()));
KeyValueSet options = desc.getMeta().getOptions();
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java
index f2f54ba..3450b03 100644
--- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java
+++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestCreateTable.java
@@ -20,7 +20,6 @@ package org.apache.tajo.engine.query;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.tajo.IntegrationTest;
import org.apache.tajo.QueryTestCaseBase;
import org.apache.tajo.catalog.*;
import org.apache.tajo.catalog.partition.PartitionMethodDesc;
@@ -28,7 +27,6 @@ import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.storage.StorageUtil;
import org.apache.tajo.util.KeyValueSet;
import org.junit.Test;
-import org.junit.experimental.categories.Category;
import java.sql.ResultSet;
import java.util.List;
@@ -434,7 +432,7 @@ public class TestCreateTable extends QueryTestCaseBase {
if(origTableDesc.getMeta() != null) {
TableMeta origMeta = origTableDesc.getMeta();
TableMeta newMeta = newTableDesc.getMeta();
- if(origMeta.getStoreType().equals(newMeta.getStoreType()) == false) {
+ if(origMeta.getDataFormat().equals(newMeta.getDataFormat()) == false) {
fail("Store type of input tables not equal");
return false;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core-tests/src/test/resources/queries/TestCTASQuery/CtasWithDataFormat.sql
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/resources/queries/TestCTASQuery/CtasWithDataFormat.sql b/tajo-core-tests/src/test/resources/queries/TestCTASQuery/CtasWithDataFormat.sql
new file mode 100644
index 0000000..c09305e
--- /dev/null
+++ b/tajo-core-tests/src/test/resources/queries/TestCTASQuery/CtasWithDataFormat.sql
@@ -0,0 +1,12 @@
+create table testCtasWithDataFormat (col1 float, col2 float) using rcfile as
+select
+ sum(l_orderkey) as total1,
+ avg(l_partkey) as total2
+from
+ lineitem
+group by
+ l_quantity
+order by
+ l_quantity
+limit
+ 3;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core-tests/src/test/resources/queries/TestCTASQuery/CtasWithStoreType.sql
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/resources/queries/TestCTASQuery/CtasWithStoreType.sql b/tajo-core-tests/src/test/resources/queries/TestCTASQuery/CtasWithStoreType.sql
deleted file mode 100644
index bee1a89..0000000
--- a/tajo-core-tests/src/test/resources/queries/TestCTASQuery/CtasWithStoreType.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-create table testCtasWithStoreType (col1 float, col2 float) using rcfile as
-select
- sum(l_orderkey) as total1,
- avg(l_partkey) as total2
-from
- lineitem
-group by
- l_quantity
-order by
- l_quantity
-limit
- 3;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core-tests/src/test/resources/queries/TestCTASQuery/testCtasWithDataFormat.sql
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/resources/queries/TestCTASQuery/testCtasWithDataFormat.sql b/tajo-core-tests/src/test/resources/queries/TestCTASQuery/testCtasWithDataFormat.sql
new file mode 100644
index 0000000..5c484f3
--- /dev/null
+++ b/tajo-core-tests/src/test/resources/queries/TestCTASQuery/testCtasWithDataFormat.sql
@@ -0,0 +1 @@
+select * from testCtasWithDataFormat;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core-tests/src/test/resources/queries/TestCTASQuery/testCtasWithStoreType.sql
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/resources/queries/TestCTASQuery/testCtasWithStoreType.sql b/tajo-core-tests/src/test/resources/queries/TestCTASQuery/testCtasWithStoreType.sql
deleted file mode 100644
index 9e7e337..0000000
--- a/tajo-core-tests/src/test/resources/queries/TestCTASQuery/testCtasWithStoreType.sql
+++ /dev/null
@@ -1 +0,0 @@
-select * from testCtasWithStoreType;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java
index 74f978b..cdc21d2 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java
@@ -106,7 +106,7 @@ public class PhysicalPlannerImpl implements PhysicalPlanner {
PhysicalExec execPlan) throws IOException {
DataChannel channel = context.getDataChannel();
ShuffleFileWriteNode shuffleFileWriteNode = LogicalPlan.createNodeWithoutPID(ShuffleFileWriteNode.class);
- shuffleFileWriteNode.setStorageType(context.getDataChannel().getStoreType());
+ shuffleFileWriteNode.setDataFormat(context.getDataChannel().getDataFormat());
shuffleFileWriteNode.setInSchema(plan.getOutSchema());
shuffleFileWriteNode.setOutSchema(plan.getOutSchema());
shuffleFileWriteNode.setShuffle(channel.getShuffleType(), channel.getShuffleKeys(), channel.getShuffleOutputNum());
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/DataChannel.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/DataChannel.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/DataChannel.java
index 2d32785..c779d2f 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/DataChannel.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/DataChannel.java
@@ -40,7 +40,7 @@ public class DataChannel {
private Schema schema;
- private String storeType = BuiltinStorages.RAW;
+ private String dataFormat = BuiltinStorages.RAW;
public DataChannel(ExecutionBlockId srcId, ExecutionBlockId targetId) {
this.srcId = srcId;
@@ -82,8 +82,8 @@ public class DataChannel {
this.numOutputs = proto.getNumOutputs();
}
- if (proto.hasStoreType()) {
- this.storeType = proto.getStoreType();
+ if (proto.hasDataFormat()) {
+ this.dataFormat = proto.getDataFormat();
}
}
@@ -144,16 +144,16 @@ public class DataChannel {
return numOutputs;
}
- public boolean hasStoreType() {
- return this.storeType != null;
+ public boolean hasDataFormat() {
+ return this.dataFormat != null;
}
- public void setStoreType(String storeType) {
- this.storeType = storeType;
+ public void setDataFormat(String dataFormat) {
+ this.dataFormat = dataFormat;
}
- public String getStoreType() {
- return storeType;
+ public String getDataFormat() {
+ return dataFormat;
}
public DataChannelProto getProto() {
@@ -176,8 +176,8 @@ public class DataChannel {
builder.setNumOutputs(numOutputs);
}
- if(storeType != null){
- builder.setStoreType(storeType);
+ if(dataFormat != null){
+ builder.setDataFormat(dataFormat);
}
return builder.build();
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
index 33277b0..576c880 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
@@ -68,8 +68,8 @@ public class GlobalPlanner {
private static Log LOG = LogFactory.getLog(GlobalPlanner.class);
private final TajoConf conf;
- private final String storeType;
- private final String finalOutputStoreType;
+ private final String dataFormat;
+ private final String finalOutputDataFormat;
private final CatalogService catalog;
private final GlobalPlanRewriteEngine rewriteEngine;
@@ -77,8 +77,8 @@ public class GlobalPlanner {
public GlobalPlanner(final TajoConf conf, final CatalogService catalog) throws IOException {
this.conf = conf;
this.catalog = catalog;
- this.storeType = conf.getVar(ConfVars.SHUFFLE_FILE_FORMAT).toUpperCase();
- this.finalOutputStoreType = conf.getVar(ConfVars.QUERY_OUTPUT_DEFAULT_FILE_FORMAT).toUpperCase();
+ this.dataFormat = conf.getVar(ConfVars.SHUFFLE_FILE_FORMAT).toUpperCase();
+ this.finalOutputDataFormat = conf.getVar(ConfVars.QUERY_OUTPUT_DEFAULT_FILE_FORMAT).toUpperCase();
Class<? extends GlobalPlanRewriteRuleProvider> clazz =
(Class<? extends GlobalPlanRewriteRuleProvider>) conf.getClassVar(GLOBAL_PLAN_REWRITE_RULE_PROVIDER_CLASS);
@@ -99,8 +99,8 @@ public class GlobalPlanner {
return catalog;
}
- public String getStoreType() {
- return storeType;
+ public String getDataFormat() {
+ return dataFormat;
}
public static class GlobalPlanContext {
@@ -163,7 +163,7 @@ public class GlobalPlanner {
private void setFinalOutputChannel(DataChannel outputChannel, Schema outputSchema) {
outputChannel.setShuffleType(NONE_SHUFFLE);
outputChannel.setShuffleOutputNum(1);
- outputChannel.setStoreType(finalOutputStoreType);
+ outputChannel.setDataFormat(finalOutputDataFormat);
outputChannel.setSchema(outputSchema);
}
@@ -171,7 +171,7 @@ public class GlobalPlanner {
Preconditions.checkArgument(channel.getSchema() != null,
"Channel schema (" + channel.getSrcId().getId() + " -> " + channel.getTargetId().getId() +
") is not initialized");
- TableMeta meta = new TableMeta(channel.getStoreType(), new KeyValueSet());
+ TableMeta meta = new TableMeta(channel.getDataFormat(), new KeyValueSet());
TableDesc desc = new TableDesc(
channel.getSrcId().toString(), channel.getSchema(), meta, StorageConstants.LOCAL_FS_URI);
ScanNode scanNode = plan.createNode(ScanNode.class);
@@ -184,7 +184,7 @@ public class GlobalPlanner {
ExecutionBlock childBlock = leftTable ? leftBlock : rightBlock;
DataChannel channel = new DataChannel(childBlock, parent, HASH_SHUFFLE, 32);
- channel.setStoreType(storeType);
+ channel.setDataFormat(dataFormat);
if (join.getJoinType() != JoinType.CROSS) {
// ShuffleKeys need to not have thea-join condition because Tajo supports only equi-join.
Column [][] joinColumns = PlannerUtil.joinJoinKeyForEachTable(join.getJoinQual(),
@@ -331,7 +331,7 @@ public class GlobalPlanner {
// create other side channel
if (otherSideBlock != null) {
DataChannel otherSideChannel = new DataChannel(otherSideBlock, targetBlock, HASH_SHUFFLE, 32);
- otherSideChannel.setStoreType(storeType);
+ otherSideChannel.setDataFormat(dataFormat);
if (otherSideShuffleKeys != null) {
otherSideChannel.setShuffleKeys(otherSideShuffleKeys);
}
@@ -587,7 +587,7 @@ public class GlobalPlanner {
channel = new DataChannel(firstStage, secondStage, HASH_SHUFFLE, 32);
channel.setShuffleKeys(secondPhaseGroupby.getGroupingColumns().clone());
channel.setSchema(firstStage.getPlan().getOutSchema());
- channel.setStoreType(storeType);
+ channel.setDataFormat(dataFormat);
// Setting for the second phase's logical plan
ScanNode scanNode = buildInputExecutor(context.plan.getLogicalPlan(), channel);
@@ -735,7 +735,7 @@ public class GlobalPlanner {
channel.setShuffleKeys(firstPhaseGroupby.getGroupingColumns());
}
channel.setSchema(firstPhaseGroupby.getOutSchema());
- channel.setStoreType(storeType);
+ channel.setDataFormat(dataFormat);
ScanNode scanNode = buildInputExecutor(masterPlan.getLogicalPlan(), channel);
secondPhaseGroupby.setChild(scanNode);
@@ -888,7 +888,7 @@ public class GlobalPlanner {
ExecutionBlock childBlock = masterPlan.getExecBlock(channel.getSrcId());
setShuffleKeysFromPartitionedTableStore(currentNode, channel);
channel.setSchema(childBlock.getPlan().getOutSchema());
- channel.setStoreType(storeType);
+ channel.setDataFormat(dataFormat);
lastChannel = channel;
}
@@ -911,7 +911,7 @@ public class GlobalPlanner {
DataChannel channel = new DataChannel(lastBlock, nextBlock, HASH_SHUFFLE, 32);
setShuffleKeysFromPartitionedTableStore(currentNode, channel);
channel.setSchema(lastBlock.getPlan().getOutSchema());
- channel.setStoreType(storeType);
+ channel.setDataFormat(dataFormat);
ScanNode scanNode = buildInputExecutor(masterPlan.getLogicalPlan(), channel);
currentNode.setChild(scanNode);
@@ -990,7 +990,7 @@ public class GlobalPlanner {
MasterPlan masterPlan = context.plan;
for (DataChannel dataChannel : masterPlan.getIncomingChannels(execBlock.getId())) {
- dataChannel.setStoreType(finalOutputStoreType);
+ dataChannel.setDataFormat(finalOutputDataFormat);
ExecutionBlock subBlock = masterPlan.getExecBlock(dataChannel.getSrcId());
ProjectionNode copy = PlannerUtil.clone(plan, node);
@@ -1035,7 +1035,7 @@ public class GlobalPlanner {
DataChannel newChannel = new DataChannel(execBlock, newExecBlock, HASH_SHUFFLE, 1);
newChannel.setShuffleKeys(new Column[]{});
newChannel.setSchema(node.getOutSchema());
- newChannel.setStoreType(storeType);
+ newChannel.setDataFormat(dataFormat);
ScanNode scanNode = buildInputExecutor(plan, newChannel);
LimitNode parentLimit = PlannerUtil.clone(context.plan.getLogicalPlan(), node);
@@ -1103,7 +1103,7 @@ public class GlobalPlanner {
channel.setShuffleKeys(null);
}
channel.setSchema(windowAgg.getInSchema());
- channel.setStoreType(storeType);
+ channel.setDataFormat(dataFormat);
LogicalNode childNode = windowAgg.getChild();
ScanNode scanNode = buildInputExecutor(masterPlan.getLogicalPlan(), channel);
@@ -1236,7 +1236,7 @@ public class GlobalPlanner {
for (ExecutionBlock childBlocks : queryBlockBlocks) {
DataChannel channel = new DataChannel(childBlocks, execBlock, NONE_SHUFFLE, 1);
- channel.setStoreType(storeType);
+ channel.setDataFormat(dataFormat);
masterPlan.addConnect(channel);
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java
index 459d9af..075ec15 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/builder/DistinctGroupbyBuilder.java
@@ -142,7 +142,7 @@ public class DistinctGroupbyBuilder {
firstChannel.setShuffleKeys(firstStageDistinctNode.getFirstStageShuffleKeyColumns());
firstChannel.setSchema(firstStageDistinctNode.getOutSchema());
- firstChannel.setStoreType(globalPlanner.getStoreType());
+ firstChannel.setDataFormat(globalPlanner.getDataFormat());
ScanNode scanNode = GlobalPlanner.buildInputExecutor(context.getPlan().getLogicalPlan(), firstChannel);
secondStageDistinctNode.setChild(scanNode);
@@ -161,7 +161,7 @@ public class DistinctGroupbyBuilder {
secondChannel.setShuffleKeys(firstStageDistinctNode.getGroupingColumns());
}
secondChannel.setSchema(secondStageDistinctNode.getOutSchema());
- secondChannel.setStoreType(globalPlanner.getStoreType());
+ secondChannel.setDataFormat(globalPlanner.getDataFormat());
scanNode = GlobalPlanner.buildInputExecutor(context.getPlan().getLogicalPlan(), secondChannel);
thirdStageDistinctNode.setChild(scanNode);
@@ -333,7 +333,7 @@ public class DistinctGroupbyBuilder {
channel.setShuffleKeys(firstStageDistinctNode.getGroupingColumns());
}
channel.setSchema(firstStageDistinctNode.getOutSchema());
- channel.setStoreType(globalPlanner.getStoreType());
+ channel.setDataFormat(globalPlanner.getDataFormat());
ScanNode scanNode = GlobalPlanner.buildInputExecutor(context.getPlan().getLogicalPlan(), channel);
secondStageDistinctNode.setChild(scanNode);
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/GlobalPlanRewriteUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/GlobalPlanRewriteUtil.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/GlobalPlanRewriteUtil.java
index df1f33b..b13cb0f 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/GlobalPlanRewriteUtil.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/rewriter/rules/GlobalPlanRewriteUtil.java
@@ -48,7 +48,7 @@ public class GlobalPlanRewriteUtil {
originalChannel.getShuffleOutputNum());
newChannel.setSchema(originalChannel.getSchema());
newChannel.setShuffleKeys(originalChannel.getShuffleKeys());
- newChannel.setStoreType(originalChannel.getStoreType());
+ newChannel.setDataFormat(originalChannel.getDataFormat());
newChannel.setTransmitType(originalChannel.getTransmitType());
plan.addConnect(newChannel);
plan.disconnect(eachGrandChild, child);
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
index 19b0c9a..53b5875 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/BSTIndexScanExec.java
@@ -181,7 +181,7 @@ public class BSTIndexScanExec extends ScanExec {
Schema fileScanOutSchema = mergeSubSchemas(projected, keySchema, plan.getTargets(), qual);
this.fileScanner = OldStorageManager.getStorageManager(context.getConf(),
- plan.getTableDesc().getMeta().getStoreType())
+ plan.getTableDesc().getMeta().getDataFormat())
.getSeekableScanner(plan.getTableDesc().getMeta(), plan.getPhysicalSchema(), fragment, fileScanOutSchema);
this.fileScanner.init();
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
index 2fc4fb4..6bd084b 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
@@ -209,12 +209,12 @@ public class PhysicalPlanUtil {
* @param nullChar A character for NULL representation
*/
private static void setNullCharForTextSerializer(TableMeta meta, String nullChar) {
- String storeType = meta.getStoreType();
- if (storeType.equalsIgnoreCase(BuiltinStorages.TEXT)) {
+ String dataFormat = meta.getDataFormat();
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.TEXT)) {
meta.putOption(StorageConstants.TEXT_NULL, nullChar);
- } else if (storeType.equalsIgnoreCase(BuiltinStorages.RCFILE)) {
+ } else if (dataFormat.equalsIgnoreCase(BuiltinStorages.RCFILE)) {
meta.putOption(StorageConstants.RCFILE_NULL, nullChar);
- } else if (storeType.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) {
+ } else if (dataFormat.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) {
meta.putOption(StorageConstants.SEQUENCEFILE_NULL, nullChar);
}
}
@@ -226,12 +226,12 @@ public class PhysicalPlanUtil {
* @return True if TableMeta contains NULL char property according to file format
*/
public static boolean containsNullChar(TableMeta meta) {
- String storeType = meta.getStoreType();
- if (storeType.equalsIgnoreCase(BuiltinStorages.TEXT)) {
+ String dataFormat = meta.getDataFormat();
+ if (dataFormat.equalsIgnoreCase(BuiltinStorages.TEXT)) {
return meta.containsOption(StorageConstants.TEXT_NULL);
- } else if (storeType.equalsIgnoreCase(BuiltinStorages.RCFILE)) {
+ } else if (dataFormat.equalsIgnoreCase(BuiltinStorages.RCFILE)) {
return meta.containsOption(StorageConstants.RCFILE_NULL);
- } else if (storeType.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) {
+ } else if (dataFormat.equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) {
return meta.containsOption(StorageConstants.SEQUENCEFILE_NULL);
} else {
return false;
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java
index 8db1f5d..2ebad1e 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/StoreTableExec.java
@@ -18,7 +18,6 @@
package org.apache.tajo.engine.planner.physical;
-import com.google.common.base.Optional;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path;
@@ -83,7 +82,7 @@ public class StoreTableExec extends UnaryPhysicalExec {
public void openNewFile(int suffixId) throws IOException {
Schema appenderSchema = (plan instanceof InsertNode) ? ((InsertNode) plan).getTableSchema() : outSchema;
- if (PlannerUtil.isFileStorageType(meta.getStoreType())) {
+ if (PlannerUtil.isFileStorageType(meta.getDataFormat())) {
String prevFile = null;
lastFileName = context.getOutputPath();
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
index 4f6873b..1966244 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
@@ -303,8 +303,8 @@ public class GlobalEngine extends AbstractService {
}
private void verifyInsertTableSchema(VerificationState state, LogicalPlan plan) {
- String storeType = PlannerUtil.getStoreType(plan);
- if (storeType != null) {
+ String dataFormat = PlannerUtil.getDataFormat(plan);
+ if (dataFormat != null) {
LogicalRootNode rootNode = plan.getRootBlock().getRoot();
if (rootNode.getChild().getType() == NodeType.INSERT) {
try {
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
index f2abe0e..7f6db9b 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
@@ -245,8 +245,8 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult
}
} else if ("path".equalsIgnoreCase(column.getSimpleName())) {
aTuple.put(fieldId, DatumFactory.createText(table.getPath()));
- } else if ("store_type".equalsIgnoreCase(column.getSimpleName())) {
- aTuple.put(fieldId, DatumFactory.createText(table.getStoreType()));
+ } else if ("data_format".equalsIgnoreCase(column.getSimpleName())) {
+ aTuple.put(fieldId, DatumFactory.createText(table.getDataFormat()));
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
index 7939e97..a9e4899 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/QueryExecutor.java
@@ -528,7 +528,7 @@ public class QueryExecutor {
List<CatalogProtos.ColumnProto> columns = new ArrayList<>();
CatalogProtos.TableDescProto tableDescProto = CatalogProtos.TableDescProto.newBuilder()
.setTableName(nodeUniqName)
- .setMeta(CatalogProtos.TableProto.newBuilder().setStoreType(BuiltinStorages.TEXT).build())
+ .setMeta(CatalogProtos.TableProto.newBuilder().setDataFormat(BuiltinStorages.TEXT).build())
.setSchema(CatalogProtos.SchemaProto.newBuilder().addAllFields(columns).build())
.setStats(stats.getProto())
.build();
http://git-wip-us.apache.org/repos/asf/tajo/blob/67c4541e/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java
index 9e05882..4fe7718 100644
--- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java
+++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java
@@ -195,7 +195,7 @@ public class Repartitioner {
int maxStatsScanIdx = -1;
StringBuilder nonLeafScanNamesBuilder = new StringBuilder();
for (int i = 0; i < scans.length; i++) {
- if (scans[i].getTableDesc().getMeta().getStoreType().equalsIgnoreCase("RAW")) {
+ if (scans[i].getTableDesc().getMeta().getDataFormat().equalsIgnoreCase("RAW")) {
// Intermediate data scan
hasNonLeafNode = true;
largeScanIndexList.add(i);
@@ -636,7 +636,7 @@ public class Repartitioner {
TupleRange mergedRange = TupleUtil.columnStatToRange(sortSpecs, sortSchema, totalStat.getColumnStats(), false);
if (sortNode.getSortPurpose() == SortPurpose.STORAGE_SPECIFIED) {
- String storeType = PlannerUtil.getStoreType(masterPlan.getLogicalPlan());
+ String dataFormat = PlannerUtil.getDataFormat(masterPlan.getLogicalPlan());
CatalogService catalog = stage.getContext().getQueryMasterContext().getWorkerContext().getCatalog();
LogicalRootNode rootNode = masterPlan.getLogicalPlan().getRootBlock().getRoot();
TableDesc tableDesc = null;
@@ -647,7 +647,7 @@ public class Repartitioner {
PlannerUtil.getStoreTableName(masterPlan.getLogicalPlan()));
}
- Tablespace space = TablespaceManager.getAnyByScheme(storeType).get();
+ Tablespace space = TablespaceManager.getAnyByScheme(dataFormat).get();
ranges = space.getInsertSortRanges(
stage.getContext().getQueryContext(),
tableDesc,