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/05/12 00:30:27 UTC
[1/7] tajo git commit: initial work for TAJO-1591.
Repository: tajo
Updated Branches:
refs/heads/master 0d1bf41f3 -> 53ed1c376
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 456ea00..7c75973 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
@@ -108,14 +108,14 @@ public class TestStorages {
" ]\n" +
"}\n";
- private StoreType storeType;
+ private String storeType;
private boolean splitable;
private boolean statsable;
private boolean seekable;
private Path testDir;
private FileSystem fs;
- public TestStorages(StoreType type, boolean splitable, boolean statsable, boolean seekable) throws IOException {
+ public TestStorages(String type, boolean splitable, boolean statsable, boolean seekable) throws IOException {
this.storeType = type;
this.splitable = splitable;
this.statsable = statsable;
@@ -123,7 +123,7 @@ public class TestStorages {
conf = new TajoConf();
- if (storeType == StoreType.RCFILE) {
+ if (storeType.equalsIgnoreCase("RCFILE")) {
conf.setInt(RCFile.RECORD_INTERVAL_CONF_STR, 100);
}
@@ -135,14 +135,14 @@ public class TestStorages {
public static Collection<Object[]> generateParameters() {
return Arrays.asList(new Object[][] {
//type, splitable, statsable, seekable
- {StoreType.CSV, true, true, true},
- {StoreType.RAW, false, true, true},
- {StoreType.RCFILE, true, true, false},
- {StoreType.PARQUET, false, false, false},
- {StoreType.SEQUENCEFILE, true, true, false},
- {StoreType.AVRO, false, false, false},
- {StoreType.TEXTFILE, true, true, true},
- {StoreType.JSON, true, true, false},
+ {"CSV", true, true, true},
+ {"RAW", false, true, true},
+ {"RCFILE", true, true, false},
+ {"PARQUET", false, false, false},
+ {"SEQUENCEFILE", true, true, false},
+ {"AVRO", false, false, false},
+ {"TEXT", true, true, true},
+ {"JSON", true, true, false},
});
}
@@ -203,7 +203,7 @@ public class TestStorages {
@Test
public void testRCFileSplitable() throws IOException {
- if (storeType == StoreType.RCFILE) {
+ if (storeType.equalsIgnoreCase("StoreType.RCFILE")) {
Schema schema = new Schema();
schema.addColumn("id", Type.INT4);
schema.addColumn("age", Type.INT8);
@@ -265,7 +265,7 @@ public class TestStorages {
TableMeta meta = CatalogUtil.newTableMeta(storeType);
meta.setOptions(CatalogUtil.newPhysicalProperties(storeType));
- if (storeType == StoreType.AVRO) {
+ if (storeType.equalsIgnoreCase("AVRO")) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL,
TEST_PROJECTION_AVRO_SCHEMA);
}
@@ -297,11 +297,11 @@ public class TestStorages {
int tupleCnt = 0;
Tuple tuple;
while ((tuple = scanner.next()) != null) {
- if (storeType == StoreType.RCFILE
- || storeType == StoreType.CSV
- || storeType == StoreType.PARQUET
- || storeType == StoreType.SEQUENCEFILE
- || storeType == StoreType.AVRO) {
+ if (storeType.equalsIgnoreCase("RCFILE")
+ || storeType.equalsIgnoreCase("CSV")
+ || storeType.equalsIgnoreCase("PARQUET")
+ || storeType.equalsIgnoreCase("SEQUENCEFILE")
+ || storeType.equalsIgnoreCase("AVRO")) {
assertTrue(tuple.get(0) == null);
}
assertTrue(tupleCnt + 2 == tuple.get(1).asInt8());
@@ -315,7 +315,7 @@ public class TestStorages {
@Test
public void testVariousTypes() throws IOException {
- boolean handleProtobuf = storeType != StoreType.JSON;
+ boolean handleProtobuf = !storeType.equalsIgnoreCase("JSON");
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -336,7 +336,7 @@ public class TestStorages {
KeyValueSet options = new KeyValueSet();
TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
meta.setOptions(CatalogUtil.newPhysicalProperties(storeType));
- if (storeType == StoreType.AVRO) {
+ if (storeType.equalsIgnoreCase("AVRO")) {
String path = FileUtil.getResourcePath("dataset/testVariousTypes.avsc").toString();
meta.putOption(StorageConstants.AVRO_SCHEMA_URL, path);
}
@@ -387,7 +387,7 @@ public class TestStorages {
@Test
public void testNullHandlingTypes() throws IOException {
- boolean handleProtobuf = storeType != StoreType.JSON;
+ boolean handleProtobuf = !storeType.equalsIgnoreCase("JSON");
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -413,7 +413,7 @@ public class TestStorages {
meta.putOption(StorageConstants.RCFILE_NULL, "\\\\N");
meta.putOption(StorageConstants.RCFILE_SERDE, TextSerializerDeserializer.class.getName());
meta.putOption(StorageConstants.SEQUENCEFILE_NULL, "\\");
- if (storeType == StoreType.AVRO) {
+ if (storeType.equalsIgnoreCase("AVRO")) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL,
TEST_NULL_HANDLING_TYPES_AVRO_SCHEMA);
}
@@ -485,7 +485,7 @@ public class TestStorages {
@Test
public void testRCFileTextSerializeDeserialize() throws IOException {
- if(storeType != StoreType.RCFILE) return;
+ if(!storeType.equalsIgnoreCase("RCFILE")) return;
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -555,7 +555,7 @@ public class TestStorages {
@Test
public void testRCFileBinarySerializeDeserialize() throws IOException {
- if(storeType != StoreType.RCFILE) return;
+ if(!storeType.equalsIgnoreCase("RCFILE")) return;
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -625,7 +625,7 @@ public class TestStorages {
@Test
public void testSequenceFileTextSerializeDeserialize() throws IOException {
- if(storeType != StoreType.SEQUENCEFILE) return;
+ if(!storeType.equalsIgnoreCase("SEQUENCEFILE")) return;
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -699,7 +699,7 @@ public class TestStorages {
@Test
public void testSequenceFileBinarySerializeDeserialize() throws IOException {
- if(storeType != StoreType.SEQUENCEFILE) return;
+ if(!storeType.equalsIgnoreCase("SEQUENCEFILE")) return;
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@ -773,7 +773,7 @@ public class TestStorages {
@Test
public void testTime() throws IOException {
- if (storeType == StoreType.CSV || storeType == StoreType.RAW) {
+ if (storeType.equalsIgnoreCase("CSV") || storeType.equalsIgnoreCase("RAW")) {
Schema schema = new Schema();
schema.addColumn("col1", Type.DATE);
schema.addColumn("col2", Type.TIME);
@@ -902,11 +902,11 @@ public class TestStorages {
KeyValueSet options = new KeyValueSet();
TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
- if (storeType == StoreType.AVRO) {
+ if (storeType.equalsIgnoreCase("AVRO")) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL, TEST_MAX_VALUE_AVRO_SCHEMA);
}
- if (storeType == StoreType.RAW) {
+ if (storeType.equalsIgnoreCase("RAW")) {
StorageManager.clearCache();
/* TAJO-1250 reproduce BufferOverflow of RAWFile */
int headerSize = 4 + 2 + 1; //Integer record length + Short null-flag length + 1 byte null flags
@@ -948,7 +948,7 @@ public class TestStorages {
scanner.close();
- if (storeType == StoreType.RAW){
+ if (storeType.equalsIgnoreCase("RAW")){
StorageManager.clearCache();
}
}
@@ -956,7 +956,7 @@ public class TestStorages {
@Test
public void testLessThanSchemaSize() throws IOException {
/* RAW is internal storage. It must be same with schema size */
- if (storeType == StoreType.RAW || storeType == StoreType.AVRO){
+ if (storeType.equalsIgnoreCase("RAW") || storeType.equalsIgnoreCase("AVRO")){
return;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/avro/TestAvroUtil.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/avro/TestAvroUtil.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/avro/TestAvroUtil.java
index 7b83894..341cc07 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/avro/TestAvroUtil.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/avro/TestAvroUtil.java
@@ -22,7 +22,6 @@ import org.apache.avro.Schema;
import org.apache.tajo.HttpFileServer;
import org.apache.tajo.catalog.CatalogUtil;
import org.apache.tajo.catalog.TableMeta;
-import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.storage.StorageConstants;
import org.apache.tajo.util.FileUtil;
@@ -58,12 +57,12 @@ public class TestAvroUtil {
@Test
public void testGetSchema() throws IOException, URISyntaxException {
- TableMeta meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.AVRO);
+ TableMeta meta = CatalogUtil.newTableMeta("AVRO");
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL, FileUtil.readTextFile(new File(schemaUrl.getPath())));
Schema schema = AvroUtil.getAvroSchema(meta, new TajoConf());
assertEquals(expected, schema);
- meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.AVRO);
+ meta = CatalogUtil.newTableMeta("AVRO");
meta.putOption(StorageConstants.AVRO_SCHEMA_URL, schemaUrl.getPath());
schema = AvroUtil.getAvroSchema(meta, new TajoConf());
assertEquals(expected, schema);
@@ -74,7 +73,7 @@ public class TestAvroUtil {
InetSocketAddress addr = server.getBindAddress();
String url = "http://127.0.0.1:" + addr.getPort() + schemaUrl.getPath();
- meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.AVRO);
+ meta = CatalogUtil.newTableMeta("AVRO");
meta.putOption(StorageConstants.AVRO_SCHEMA_URL, url);
schema = AvroUtil.getAvroSchema(meta, new TajoConf());
} finally {
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 068f726..114a9cc 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
@@ -55,9 +55,9 @@ public class TestBSTIndex {
private static final String TEST_PATH = "target/test-data/TestIndex";
private Path testDir;
private FileSystem fs;
- private StoreType storeType;
+ private String storeType;
- public TestBSTIndex(StoreType type) {
+ public TestBSTIndex(String type) {
this.storeType = type;
conf = new TajoConf();
conf.setVar(TajoConf.ConfVars.ROOT_DIR, TEST_PATH);
@@ -73,9 +73,9 @@ public class TestBSTIndex {
@Parameterized.Parameters
public static Collection<Object[]> generateParameters() {
return Arrays.asList(new Object[][]{
- {StoreType.CSV},
- {StoreType.RAW},
- {StoreType.TEXTFILE}
+ {"CSV"},
+ {"RAW"},
+ {"TEXT"}
});
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 d7c9f49..cb94353 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
@@ -73,7 +73,7 @@ public class TestSingleCSVFileBSTIndex {
@Test
public void testFindValueInSingleCSV() throws IOException {
- meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ meta = CatalogUtil.newTableMeta("CSV");
Path tablePath = StorageUtil.concatPath(testDir, "testFindValueInSingleCSV", "table.csv");
fs.mkdirs(tablePath.getParent());
@@ -162,7 +162,7 @@ public class TestSingleCSVFileBSTIndex {
@Test
public void testFindNextKeyValueInSingleCSV() throws IOException {
- meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ meta = CatalogUtil.newTableMeta("CSV");
Path tablePath = StorageUtil.concatPath(testDir, "testFindNextKeyValueInSingleCSV",
"table1.csv");
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java
index 70282d9..349da07 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/json/TestJsonSerDe.java
@@ -68,7 +68,7 @@ public class TestJsonSerDe {
public void testVarioutType() throws IOException {
TajoConf conf = new TajoConf();
- TableMeta meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.JSON);
+ TableMeta meta = CatalogUtil.newTableMeta("JSON");
Path tablePath = new Path(getResourcePath("dataset", "TestJsonSerDe"), "testVariousType.json");
FileSystem fs = FileSystem.getLocal(conf);
FileStatus status = fs.getFileStatus(tablePath);
[6/7] tajo git commit: Add error log message to exception.
Posted by hy...@apache.org.
Add error log message to exception.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/70df3a8d
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/70df3a8d
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/70df3a8d
Branch: refs/heads/master
Commit: 70df3a8d2a5d6b6cef5ae233a546d8a405780964
Parents: d9776b3
Author: Hyunsik Choi <hy...@apache.org>
Authored: Sun May 10 21:38:02 2015 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Sun May 10 21:38:02 2015 -0700
----------------------------------------------------------------------
.../tajo/plan/function/python/PythonScriptEngine.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/70df3a8d/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java
index 49dce87..8980de1 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java
@@ -478,7 +478,7 @@ public class PythonScriptEngine extends TajoScriptEngine {
try {
result = outputHandler.getNext().get(0);
} catch (Exception e) {
- throw new RuntimeException("Problem getting output", e);
+ throw new RuntimeException("Problem getting output: " + e.getMessage(), e);
}
return result;
@@ -512,7 +512,7 @@ public class PythonScriptEngine extends TajoScriptEngine {
try {
outputHandler.getNext();
} catch (Exception e) {
- throw new RuntimeException("Problem getting output", e);
+ throw new RuntimeException("Problem getting output: " + e.getMessage(), e);
}
}
@@ -532,7 +532,7 @@ public class PythonScriptEngine extends TajoScriptEngine {
try {
outputHandler.getNext();
} catch (Exception e) {
- throw new RuntimeException("Problem getting output", e);
+ throw new RuntimeException("Problem getting output: " + e.getMessage(), e);
}
}
@@ -552,7 +552,7 @@ public class PythonScriptEngine extends TajoScriptEngine {
try {
outputHandler.getNext(functionContext);
} catch (Exception e) {
- throw new RuntimeException("Problem getting output", e);
+ throw new RuntimeException("Problem getting output: " + e.getMessage(), e);
}
}
@@ -573,7 +573,7 @@ public class PythonScriptEngine extends TajoScriptEngine {
try {
return outputHandler.getPartialResultString();
} catch (Exception e) {
- throw new RuntimeException("Problem getting output", e);
+ throw new RuntimeException("Problem getting output: " + e.getMessage(), e);
}
}
@@ -595,7 +595,7 @@ public class PythonScriptEngine extends TajoScriptEngine {
try {
result = outputHandler.getNext().get(0);
} catch (Exception e) {
- throw new RuntimeException("Problem getting output", e);
+ throw new RuntimeException("Problem getting output: " + e.getMessage(), e);
}
return result;
[5/7] tajo git commit: Merge branch 'master' of
github.com:apache/tajo into TAJO-1591
Posted by hy...@apache.org.
Merge branch 'master' of github.com:apache/tajo into TAJO-1591
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d9776b32
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d9776b32
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d9776b32
Branch: refs/heads/master
Commit: d9776b32df0ef79b99087310ece41277ae517e9a
Parents: 285b179 1baf8dc
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri May 8 00:56:05 2015 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri May 8 00:56:05 2015 -0700
----------------------------------------------------------------------
CHANGES | 10 +++
.../apache/tajo/function/FunctionSignature.java | 10 ++-
.../org/apache/tajo/function/FunctionUtil.java | 39 +++++++++
.../cli/tsql/DefaultTajoCliOutputFormatter.java | 4 +-
.../cli/tsql/commands/DescFunctionCommand.java | 18 +---
.../java/org/apache/tajo/util/ClassSize.java | 18 +++-
.../java/org/apache/tajo/util/NumberUtil.java | 54 ++++++++++++
.../java/org/apache/tajo/util/UnsafeUtil.java | 28 +++++++
.../apache/tajo/querymaster/Repartitioner.java | 18 ++--
.../java/org/apache/tajo/querymaster/Task.java | 56 ++++++-------
.../main/java/org/apache/tajo/util/JSPUtil.java | 14 ----
.../tajo/worker/ExecutionBlockContext.java | 32 ++-----
.../src/main/proto/TajoWorkerProtocol.proto | 16 +---
.../main/resources/webapps/admin/functions.jsp | 3 +-
.../cli/tsql/TestDefaultCliOutputFormatter.java | 13 ++-
.../apache/tajo/master/TestRepartitioner.java | 77 +++++++----------
.../tajo/querymaster/TestIntermediateEntry.java | 24 +++---
.../tajo/storage/HashShuffleAppender.java | 87 ++++++++++++++------
.../storage/HashShuffleAppenderManager.java | 12 +--
19 files changed, 316 insertions(+), 217 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/d9776b32/tajo-core/src/main/java/org/apache/tajo/querymaster/Repartitioner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/d9776b32/tajo-core/src/main/proto/TajoWorkerProtocol.proto
----------------------------------------------------------------------
[4/7] tajo git commit: Fixed some literal string to constants.
Posted by hy...@apache.org.
Fixed some literal string to constants.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/285b1790
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/285b1790
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/285b1790
Branch: refs/heads/master
Commit: 285b179067fcd52fa1eead1a4f4b04da3813182b
Parents: 863e53e
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri May 8 00:50:17 2015 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri May 8 00:50:17 2015 -0700
----------------------------------------------------------------------
.../tajo/catalog/store/HiveCatalogStore.java | 9 +++---
.../java/org/apache/tajo/BuiltinStorages.java | 32 ++++++++++++++++++++
2 files changed, 37 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/285b1790/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java
index 835a158..51d1044 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.hive.serde2.columnar.ColumnarSerDe;
import org.apache.hadoop.hive.serde2.columnar.LazyBinaryColumnarSerDe;
import org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe;
import org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe;
+import org.apache.tajo.BuiltinStorages;
import org.apache.tajo.TajoConstants;
import org.apache.tajo.catalog.*;
import org.apache.tajo.catalog.exception.*;
@@ -472,7 +473,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
table.setPartitionKeys(partitionKeys);
}
- if (tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.RCFILE)) {
+ if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.RCFILE)) {
String serde = tableDesc.getMeta().getOption(StorageConstants.RCFILE_SERDE);
sd.setInputFormat(org.apache.hadoop.hive.ql.io.RCFileInputFormat.class.getName());
sd.setOutputFormat(org.apache.hadoop.hive.ql.io.RCFileOutputFormat.class.getName());
@@ -487,7 +488,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
table.putToParameters(serdeConstants.SERIALIZATION_NULL_FORMAT,
StringEscapeUtils.unescapeJava(tableDesc.getMeta().getOption(StorageConstants.RCFILE_NULL)));
}
- } else if (tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.CSV)
+ } else if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.CSV)
|| tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.TEXTFILE)) {
sd.getSerdeInfo().setSerializationLib(org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe.class.getName());
sd.setInputFormat(org.apache.hadoop.mapred.TextInputFormat.class.getName());
@@ -512,7 +513,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
StringEscapeUtils.unescapeJava(tableDesc.getMeta().getOption(StorageConstants.TEXT_NULL)));
table.getParameters().remove(StorageConstants.TEXT_NULL);
}
- } else if (tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.SEQUENCEFILE)) {
+ } else if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.SEQUENCE_FILE)) {
String serde = tableDesc.getMeta().getOption(StorageConstants.SEQUENCEFILE_SERDE);
sd.setInputFormat(org.apache.hadoop.mapred.SequenceFileInputFormat.class.getName());
sd.setOutputFormat(org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat.class.getName());
@@ -543,7 +544,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
table.getParameters().remove(StorageConstants.SEQUENCEFILE_NULL);
}
} else {
- if (tableDesc.getMeta().getStoreType().equals("PARQUET")) {
+ if (tableDesc.getMeta().getStoreType().equalsIgnoreCase(BuiltinStorages.PARQUET)) {
sd.setInputFormat(parquet.hive.DeprecatedParquetInputFormat.class.getName());
sd.setOutputFormat(parquet.hive.DeprecatedParquetOutputFormat.class.getName());
sd.getSerdeInfo().setSerializationLib(parquet.hive.serde.ParquetHiveSerDe.class.getName());
http://git-wip-us.apache.org/repos/asf/tajo/blob/285b1790/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java b/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java
new file mode 100644
index 0000000..318270c
--- /dev/null
+++ b/tajo-common/src/main/java/org/apache/tajo/BuiltinStorages.java
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tajo;
+
+public class BuiltinStorages {
+ public static final String CSV = "CSV";
+ public static final String TEXT = "TEXT";
+ public static final String JSON = "JSON";
+ public static final String RAW = "RAW";
+ public static final String RCFILE = "RCFILE";
+ public static final String ROW = "ROW";
+ public static final String PARQUET = "PARQUET";
+ public static final String SEQUENCE_FILE = "SEQUENCEFILE";
+ public static final String AVRO = "AVRO";
+ public static final String HBASE = "HBASE";
+}
[7/7] tajo git commit: TAJO-1591: Change StoreType represented as
Enum to String type. (hyunsik)
Posted by hy...@apache.org.
TAJO-1591: Change StoreType represented as Enum to String type. (hyunsik)
Closes #564
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/53ed1c37
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/53ed1c37
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/53ed1c37
Branch: refs/heads/master
Commit: 53ed1c376f4969b5a2c54e30ddbd8113847a8768
Parents: 70df3a8 0d1bf41
Author: Hyunsik Choi <hy...@apache.org>
Authored: Mon May 11 15:29:17 2015 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Mon May 11 15:29:17 2015 -0700
----------------------------------------------------------------------
CHANGES | 11 +-
.../org/apache/tajo/catalog/CatalogUtil.java | 12 +-
.../org/apache/tajo/catalog/NestedPathUtil.java | 109 ++++++
.../java/org/apache/tajo/catalog/Schema.java | 109 +++++-
.../org/apache/tajo/catalog/SchemaUtil.java | 33 +-
.../tajo/catalog/store/HiveCatalogStore.java | 4 +-
.../cli/tsql/commands/DescTableCommand.java | 4 +-
.../org/apache/tajo/storage/RowStoreUtil.java | 2 +-
.../java/org/apache/tajo/storage/Tuple.java | 2 +-
.../java/org/apache/tajo/util/StringUtils.java | 70 ++++
.../main/java/org/apache/tajo/util/TUtil.java | 32 --
.../org/apache/tajo/engine/parser/SQLParser.g4 | 2 +-
.../apache/tajo/engine/parser/SQLAnalyzer.java | 17 +-
.../engine/planner/PhysicalPlannerImpl.java | 17 +-
.../tajo/engine/planner/global/DataChannel.java | 4 +-
.../engine/planner/global/GlobalPlanner.java | 6 +-
.../global/builder/DistinctGroupbyBuilder.java | 6 +-
.../DistinctGroupbyThirdAggregationExec.java | 2 +-
.../planner/physical/PhysicalPlanUtil.java | 2 +-
.../engine/planner/physical/SeqScanExec.java | 27 +-
.../tajo/engine/utils/TupleCacheScanner.java | 2 +-
.../org/apache/tajo/engine/utils/TupleUtil.java | 8 +-
.../exec/NonForwardQueryResultFileScanner.java | 2 +-
.../NonForwardQueryResultSystemScanner.java | 20 +-
.../tajo/worker/ExecutionBlockContext.java | 15 +-
.../java/org/apache/tajo/worker/TaskRunner.java | 1 +
.../resources/webapps/admin/catalogview.jsp | 5 +-
.../engine/function/TestFunctionLoader.java | 5 +-
.../tajo/engine/planner/TestLogicalPlanner.java | 8 +-
.../apache/tajo/engine/query/TestCTASQuery.java | 4 +-
.../tajo/engine/query/TestJoinBroadcast.java | 2 +-
.../engine/query/TestSelectNestedRecord.java | 71 ++++
.../java/org/apache/tajo/jdbc/TestTajoJdbc.java | 2 +-
.../rs/resources/TestQueryResultResource.java | 6 +-
.../TestSelectNestedRecord/sample1/table.json | 3 +
.../TestSelectNestedRecord/tweets/sample1.json | 4 +
.../TestSelectNestedRecord/sample1_ddl.sql | 7 +
.../TestSelectNestedRecord/sample2_ddl.sql | 19 ++
.../testNestedFieldAsGroupbyKey1.sql | 7 +
.../testNestedFieldAsJoinKey1.sql | 7 +
.../TestSelectNestedRecord/testSelect1.sql | 1 +
.../TestSelectNestedRecord/testSelect2.sql | 61 ++++
.../TestSelectNestedRecord/tweets_ddl.sql | 74 +++++
.../testSelectWithParentheses2.sql | 2 +-
.../testNestedFieldAsGroupbyKey1.result | 6 +
.../testNestedFieldAsJoinKey1.result | 6 +
.../TestSelectNestedRecord/testSelect1.result | 5 +
.../TestSelectNestedRecord/testSelect2.result | 6 +
.../apache/tajo/jdbc/TajoDatabaseMetaData.java | 2 +-
.../tajo/plan/LogicalPlanPreprocessor.java | 4 +-
.../org/apache/tajo/plan/LogicalPlanner.java | 32 +-
.../apache/tajo/plan/expr/RowConstantEval.java | 3 +-
.../tajo/plan/expr/WindowFunctionEval.java | 3 +-
.../GreedyHeuristicJoinOrderAlgorithm.java | 8 +-
.../apache/tajo/plan/joinorder/JoinEdge.java | 4 +-
.../apache/tajo/plan/joinorder/JoinGraph.java | 6 +-
.../tajo/plan/logical/DistinctGroupbyNode.java | 4 +-
.../apache/tajo/plan/logical/EvalExprNode.java | 3 +-
.../apache/tajo/plan/logical/GroupbyNode.java | 10 +-
.../tajo/plan/logical/ProjectionNode.java | 3 +-
.../apache/tajo/plan/logical/RelationNode.java | 12 +
.../tajo/plan/logical/ShuffleFileWriteNode.java | 3 +-
.../tajo/plan/logical/TruncateTableNode.java | 4 +-
.../apache/tajo/plan/logical/WindowAggNode.java | 7 +-
.../tajo/plan/nameresolver/NameResolver.java | 194 ++++++++---
.../plan/nameresolver/ResolverByLegacy.java | 8 +-
.../plan/rewrite/rules/FilterPushDownRule.java | 4 +-
.../rewrite/rules/PartitionedTableRewriter.java | 4 +-
.../org/apache/tajo/plan/util/PlannerUtil.java | 2 +-
.../tajo/plan/verifier/LogicalPlanVerifier.java | 24 +-
.../plan/verifier/PreLogicalPlanVerifier.java | 6 +-
.../org/apache/tajo/rpc/AsyncRpcServer.java | 6 +-
.../org/apache/tajo/rpc/BlockingRpcServer.java | 6 +-
.../org/apache/tajo/storage/MergeScanner.java | 2 +-
.../org/apache/tajo/storage/RowStoreUtil.java | 2 +-
.../java/org/apache/tajo/storage/Scanner.java | 9 +
.../org/apache/tajo/storage/StorageManager.java | 4 +-
.../storage/hbase/AbstractHBaseAppender.java | 2 -
.../tajo/storage/hbase/ColumnMapping.java | 2 +-
.../HBaseBinarySerializerDeserializer.java | 10 +-
.../apache/tajo/storage/hbase/HBaseScanner.java | 22 +-
.../tajo/storage/hbase/HBaseStorageManager.java | 6 +-
.../java/org/apache/tajo/storage/CSVFile.java | 2 +-
.../org/apache/tajo/storage/FileScanner.java | 2 +-
.../apache/tajo/storage/FileStorageManager.java | 2 +-
.../apache/tajo/storage/avro/AvroScanner.java | 25 +-
.../tajo/storage/json/JsonLineDeserializer.java | 331 +++++++++++--------
.../apache/tajo/storage/json/JsonLineSerDe.java | 5 +-
.../tajo/storage/json/JsonLineSerializer.java | 2 -
.../storage/parquet/TajoRecordConverter.java | 7 +-
.../org/apache/tajo/storage/rcfile/RCFile.java | 10 +-
.../sequencefile/SequenceFileScanner.java | 16 +-
.../tajo/storage/text/CSVLineDeserializer.java | 26 +-
.../apache/tajo/storage/text/CSVLineSerDe.java | 5 +-
.../tajo/storage/text/DelimitedTextFile.java | 11 +-
.../tajo/storage/text/TextLineDeserializer.java | 4 +-
.../apache/tajo/storage/text/TextLineSerDe.java | 3 +-
.../apache/tajo/storage/TestMergeScanner.java | 16 +-
.../org/apache/tajo/storage/TestStorages.java | 36 +-
99 files changed, 1292 insertions(+), 462 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/CHANGES
----------------------------------------------------------------------
diff --cc CHANGES
index 9788307,84be66a..73fd2f3
--- a/CHANGES
+++ b/CHANGES
@@@ -24,6 -24,6 +24,8 @@@ Release 0.11.0 - unrelease
IMPROVEMENT
++ TAJO-1591: Change StoreType represented as Enum to String type. (hyunsik)
++
TAJO-1452: Improve function listing order (Contributed Dongjoon Hyun,
Committed by hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-catalog/tajo-catalog-common/src/main/java/org/apache/tajo/catalog/CatalogUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/main/java/org/apache/tajo/catalog/store/HiveCatalogStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-cli/src/main/java/org/apache/tajo/cli/tsql/commands/DescTableCommand.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/DataChannel.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-core/src/main/java/org/apache/tajo/engine/planner/global/GlobalPlanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/PhysicalPlanUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-core/src/main/java/org/apache/tajo/master/exec/NonForwardQueryResultSystemScanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-plan/src/main/java/org/apache/tajo/plan/LogicalPlanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ShuffleFileWriteNode.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-plan/src/main/java/org/apache/tajo/plan/verifier/PreLogicalPlanVerifier.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseScanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileStorageManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java
----------------------------------------------------------------------
diff --cc tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestMergeScanner.java
index e2cfe8f,322818d..2c856e1
--- 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
@@@ -175,7 -175,19 +175,19 @@@ public class TestMergeScanner
Tuple tuple;
while ((tuple = scanner.next()) != null) {
totalCounts++;
- if (isProjectableStorage(meta.getStoreType())) {
+
- if (storeType == StoreType.RAW) {
++ if (storeType.equalsIgnoreCase("RAW")) {
+ assertEquals(4, tuple.size());
+ assertNotNull(tuple.get(0));
+ assertNotNull(tuple.get(1));
+ assertNotNull(tuple.get(2));
+ assertNotNull(tuple.get(3));
+ } else if (scanner.isProjectable()) {
+ assertEquals(2, tuple.size());
+ assertNotNull(tuple.get(0));
+ assertNotNull(tuple.get(1));
+ } else {
+ assertEquals(4, tuple.size());
assertNotNull(tuple.get(0));
assertNull(tuple.get(1));
assertNotNull(tuple.get(2));
@@@ -187,15 -199,15 +199,13 @@@
assertEquals(tupleNum * 2, totalCounts);
}
- private static boolean isProjectableStorage(StoreType type) {
- switch (type) {
- case CSV:
- case SEQUENCEFILE:
- case RAW:
- case ROWFILE:
- return false;
- default:
+ private static boolean isProjectableStorage(String type) {
+ if (type.equalsIgnoreCase("RCFILE") ||
+ type.equalsIgnoreCase("PARQUET") ||
- type.equalsIgnoreCase("SEQUENCEFILE") ||
- type.equalsIgnoreCase("CSV") ||
+ type.equalsIgnoreCase("AVRO")) {
return true;
+ } else {
+ return false;
}
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/53ed1c37/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java
----------------------------------------------------------------------
diff --cc tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestStorages.java
index 7c75973,a735307..949e2e8
--- 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
@@@ -313,9 -305,23 +305,23 @@@ public class TestStorages
assertEquals(tupleNum, tupleCnt);
}
+ private void verifyProjectedFields(boolean projectable, Tuple tuple, int tupleCnt) {
+ if (projectable) {
+ assertTrue(tupleCnt + 2 == tuple.get(0).asInt8());
+ assertTrue(tupleCnt + 3 == tuple.get(1).asFloat4());
+ } else {
+ // RAW and ROW always project all fields.
- if (storeType != StoreType.RAW && storeType != StoreType.ROWFILE) {
++ if (!storeType.equalsIgnoreCase("RAW") && !storeType.equalsIgnoreCase("ROWFILE")) {
+ assertTrue(tuple.get(0) == null);
+ }
+ assertTrue(tupleCnt + 2 == tuple.get(1).asInt8());
+ assertTrue(tupleCnt + 3 == tuple.get(2).asFloat4());
+ }
+ }
+
@Test
public void testVariousTypes() throws IOException {
- boolean handleProtobuf = storeType != StoreType.JSON;
+ boolean handleProtobuf = !storeType.equalsIgnoreCase("JSON");
Schema schema = new Schema();
schema.addColumn("col1", Type.BOOLEAN);
@@@ -956,7 -962,7 +962,8 @@@
@Test
public void testLessThanSchemaSize() throws IOException {
/* RAW is internal storage. It must be same with schema size */
- if (storeType.equalsIgnoreCase("RAW") || storeType.equalsIgnoreCase("AVRO")){
- if (storeType == StoreType.RAW || storeType == StoreType.AVRO || storeType == StoreType.PARQUET) {
++ if (storeType.equalsIgnoreCase("RAW") || storeType.equalsIgnoreCase("AVRO")
++ || storeType.equalsIgnoreCase("PARQUET")){
return;
}
[3/7] tajo git commit: initial work for TAJO-1591.
Posted by hy...@apache.org.
initial work for TAJO-1591.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/863e53ea
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/863e53ea
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/863e53ea
Branch: refs/heads/master
Commit: 863e53eae091bb6073efb31a1efd8acf4ff88ea0
Parents: 9b3824b
Author: Hyunsik Choi <hy...@apache.org>
Authored: Thu May 7 21:59:21 2015 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Thu May 7 21:59:21 2015 -0700
----------------------------------------------------------------------
.../org/apache/tajo/catalog/CatalogUtil.java | 24 ++++----
.../org/apache/tajo/catalog/DDLBuilder.java | 6 +-
.../java/org/apache/tajo/catalog/TableDesc.java | 5 +-
.../java/org/apache/tajo/catalog/TableMeta.java | 8 +--
.../tajo/catalog/json/TableMetaAdapter.java | 7 +--
.../src/main/proto/CatalogProtos.proto | 2 +-
.../org/apache/tajo/catalog/TestTableDesc.java | 5 +-
.../org/apache/tajo/catalog/TestTableMeta.java | 12 ++--
.../tajo/catalog/store/HiveCatalogStore.java | 15 +++--
.../catalog/store/TestHiveCatalogStore.java | 22 +++----
.../dictionary/AbstractTableDescriptor.java | 2 +-
.../tajo/catalog/store/AbstractDBStore.java | 8 +--
.../org/apache/tajo/catalog/store/MemStore.java | 2 +-
.../org/apache/tajo/catalog/TestCatalog.java | 24 ++++----
.../org/apache/tajo/cli/tools/TajoDump.java | 2 +-
.../cli/tsql/commands/DescTableCommand.java | 3 +-
.../java/org/apache/tajo/benchmark/TPCH.java | 2 +-
.../tajo/engine/planner/global/DataChannel.java | 6 +-
.../engine/planner/global/GlobalPlanner.java | 10 ++--
.../planner/physical/ExternalSortExec.java | 4 +-
.../planner/physical/PhysicalPlanUtil.java | 54 ++++++++---------
.../physical/RangeShuffleFileWriteExec.java | 2 +-
.../org/apache/tajo/master/GlobalEngine.java | 2 +-
.../apache/tajo/master/exec/DDLExecutor.java | 3 +-
.../NonForwardQueryResultSystemScanner.java | 2 +-
.../apache/tajo/master/exec/QueryExecutor.java | 6 +-
.../java/org/apache/tajo/querymaster/Query.java | 4 +-
.../tajo/querymaster/QueryMasterTask.java | 2 +-
.../apache/tajo/querymaster/Repartitioner.java | 4 +-
.../java/org/apache/tajo/querymaster/Stage.java | 4 +-
.../src/main/proto/TajoWorkerProtocol.proto | 2 +-
.../org/apache/tajo/BackendTestingUtil.java | 2 +-
.../apache/tajo/LocalTajoTestingUtility.java | 2 +-
.../org/apache/tajo/TajoTestingCluster.java | 2 +-
.../apache/tajo/cli/tools/TestDDLBuilder.java | 2 +-
.../apache/tajo/engine/eval/ExprTestBase.java | 4 +-
.../tajo/engine/eval/TestEvalTreeUtil.java | 2 +-
.../engine/planner/TestLogicalOptimizer.java | 6 +-
.../tajo/engine/planner/TestLogicalPlanner.java | 10 ++--
.../tajo/engine/planner/TestPlannerUtil.java | 9 ++-
.../planner/global/TestBroadcastJoinPlan.java | 2 +-
.../planner/physical/TestBNLJoinExec.java | 4 +-
.../planner/physical/TestBSTIndexExec.java | 2 +-
.../planner/physical/TestExternalSortExec.java | 2 +-
.../physical/TestFullOuterHashJoinExec.java | 8 +--
.../physical/TestFullOuterMergeJoinExec.java | 11 ++--
.../planner/physical/TestHashAntiJoinExec.java | 4 +-
.../planner/physical/TestHashJoinExec.java | 4 +-
.../planner/physical/TestHashSemiJoinExec.java | 4 +-
.../physical/TestLeftOuterHashJoinExec.java | 8 +--
.../physical/TestLeftOuterNLJoinExec.java | 8 +--
.../planner/physical/TestMergeJoinExec.java | 4 +-
.../engine/planner/physical/TestNLJoinExec.java | 4 +-
.../planner/physical/TestPhysicalPlanner.java | 14 ++---
.../physical/TestProgressExternalSortExec.java | 2 +-
.../physical/TestRightOuterHashJoinExec.java | 6 +-
.../physical/TestRightOuterMergeJoinExec.java | 10 ++--
.../engine/planner/physical/TestSortExec.java | 2 +-
.../apache/tajo/engine/query/TestCTASQuery.java | 6 +-
.../tajo/engine/query/TestHBaseTable.java | 10 ++--
.../org/apache/tajo/jdbc/TestResultSet.java | 3 +-
.../tajo/master/TestExecutionBlockCursor.java | 2 +-
.../apache/tajo/master/TestGlobalPlanner.java | 2 +-
.../org/apache/tajo/storage/TestRowFile.java | 2 +-
.../ws/rs/resources/TestTablesResource.java | 31 ++++------
.../org/apache/tajo/plan/LogicalPlanner.java | 8 +--
.../function/python/PythonScriptEngine.java | 2 +-
.../tajo/plan/logical/PersistentStoreNode.java | 8 +--
.../tajo/plan/logical/ShuffleFileWriteNode.java | 2 +-
.../tajo/plan/logical/StoreTableNode.java | 2 +-
.../org/apache/tajo/plan/util/PlannerUtil.java | 16 ++---
.../plan/verifier/PreLogicalPlanVerifier.java | 3 +-
tajo-plan/src/main/proto/Plan.proto | 2 +-
.../org/apache/tajo/plan/TestLogicalNode.java | 6 +-
.../org/apache/tajo/storage/StorageManager.java | 47 +++++----------
.../storage/hbase/AddSortForInsertRewriter.java | 3 +-
.../tajo/storage/hbase/HBasePutAppender.java | 3 +-
.../apache/tajo/storage/hbase/HBaseScanner.java | 3 +-
.../tajo/storage/hbase/HBaseStorageManager.java | 3 +-
.../tajo/storage/hbase/TestColumnMapping.java | 3 +-
.../storage/hbase/TestHBaseStorageManager.java | 2 +-
.../apache/tajo/storage/FileStorageManager.java | 7 +--
.../tajo/storage/TestCompressionStorages.java | 22 +++----
.../tajo/storage/TestDelimitedTextFile.java | 8 +--
.../tajo/storage/TestFileStorageManager.java | 10 ++--
.../apache/tajo/storage/TestFileSystems.java | 2 +-
.../org/apache/tajo/storage/TestLineReader.java | 8 +--
.../apache/tajo/storage/TestMergeScanner.java | 37 ++++++------
.../org/apache/tajo/storage/TestStorages.java | 62 ++++++++++----------
.../apache/tajo/storage/avro/TestAvroUtil.java | 7 +--
.../apache/tajo/storage/index/TestBSTIndex.java | 10 ++--
.../index/TestSingleCSVFileBSTIndex.java | 4 +-
.../apache/tajo/storage/json/TestJsonSerDe.java | 2 +-
93 files changed, 342 insertions(+), 398 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 12f36b1..5c1b9b3 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
@@ -295,13 +295,13 @@ public class CatalogUtil {
}
}
- public static TableMeta newTableMeta(StoreType type) {
- KeyValueSet defaultProperties = CatalogUtil.newPhysicalProperties(type);
- return new TableMeta(type, defaultProperties);
+ public static TableMeta newTableMeta(String storeType) {
+ KeyValueSet defaultProperties = CatalogUtil.newPhysicalProperties(storeType);
+ return new TableMeta(storeType, defaultProperties);
}
- public static TableMeta newTableMeta(StoreType type, KeyValueSet options) {
- return new TableMeta(type, options);
+ public static TableMeta newTableMeta(String storeType, KeyValueSet options) {
+ return new TableMeta(storeType, options);
}
public static TableDesc newTableDesc(String tableName, Schema schema, TableMeta meta, Path path) {
@@ -851,21 +851,21 @@ public class CatalogUtil {
/**
* Create new table property with default configs. It is used to make TableMeta to be stored in Catalog.
*
- * @param type StoreType
+ * @param storeType StoreType
* @return Table properties
*/
- public static KeyValueSet newPhysicalProperties(StoreType type) {
+ public static KeyValueSet newPhysicalProperties(String storeType) {
KeyValueSet options = new KeyValueSet();
- if (StoreType.CSV == type || StoreType.TEXTFILE == type) {
+ if (storeType.equalsIgnoreCase("CSV") || storeType.equalsIgnoreCase("TEXT")) {
options.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER);
- } else if (StoreType.JSON == type) {
+ } else if (storeType.equalsIgnoreCase("JSON")) {
options.set(StorageConstants.TEXT_SERDE_CLASS, "org.apache.tajo.storage.json.JsonLineSerDe");
- } else if (StoreType.RCFILE == type) {
+ } else if (storeType.equalsIgnoreCase("RCFILE")) {
options.set(StorageConstants.RCFILE_SERDE, StorageConstants.DEFAULT_BINARY_SERDE);
- } else if (StoreType.SEQUENCEFILE == type) {
+ } else if (storeType.equalsIgnoreCase("SEQUENCEFILE")) {
options.set(StorageConstants.SEQUENCEFILE_SERDE, StorageConstants.DEFAULT_TEXT_SERDE);
options.set(StorageConstants.SEQUENCEFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER);
- } else if (type == StoreType.PARQUET) {
+ } else if (storeType.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/863e53ea/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 1a59e88..65640b9 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
@@ -31,7 +31,7 @@ public class DDLBuilder {
sb.append("--\n")
.append("-- Name: ").append(CatalogUtil.denormalizeIdentifier(desc.getName())).append("; Type: TABLE;")
- .append(" Storage: ").append(CatalogUtil.getStoreTypeString(desc.getMeta().getStoreType()));
+ .append(" Storage: ").append(desc.getMeta().getStoreType());
sb.append("\n-- Path: ").append(desc.getPath());
sb.append("\n--\n");
sb.append("CREATE EXTERNAL TABLE ").append(CatalogUtil.denormalizeIdentifier(desc.getName()));
@@ -54,7 +54,7 @@ public class DDLBuilder {
sb.append("--\n")
.append("-- Name: ").append(CatalogUtil.denormalizeIdentifier(desc.getName())).append("; Type: TABLE;")
- .append(" Storage: ").append(CatalogUtil.getStoreTypeString(desc.getMeta().getStoreType()));
+ .append(" Storage: ").append(desc.getMeta().getStoreType());
sb.append("\n--\n");
sb.append("CREATE TABLE ").append(CatalogUtil.denormalizeIdentifier(desc.getName()));
buildSchema(sb, desc.getSchema());
@@ -88,7 +88,7 @@ public class DDLBuilder {
}
private static void buildUsingClause(StringBuilder sb, TableMeta meta) {
- sb.append(" USING " + CatalogUtil.getStoreTypeString(meta.getStoreType()));
+ sb.append(" USING " + meta.getStoreType());
}
private static void buildWithClause(StringBuilder sb, TableMeta meta) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 ee096a2..17f9146 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
@@ -27,7 +27,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tajo.catalog.json.CatalogGsonHelper;
import org.apache.tajo.catalog.partition.PartitionMethodDesc;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.catalog.proto.CatalogProtos.TableDescProto;
import org.apache.tajo.catalog.statistics.TableStats;
import org.apache.tajo.common.ProtoObject;
@@ -68,8 +67,8 @@ public class TableDesc implements ProtoObject<TableDescProto>, GsonObject, Clone
this(tableName, schema, meta, path, true);
}
- public TableDesc(String tableName, Schema schema, StoreType type, KeyValueSet options, URI path) {
- this(tableName, schema, new TableMeta(type, options), path);
+ public TableDesc(String tableName, Schema schema, String storeType, KeyValueSet options, URI path) {
+ this(tableName, schema, new TableMeta(storeType, options), path);
}
public TableDesc(TableDescProto proto) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 2d95e6b..59cba44 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
@@ -41,16 +41,16 @@ public class TableMeta implements ProtoObject<CatalogProtos.TableProto>, GsonObj
private TableProto proto = TableProto.getDefaultInstance();
private boolean viaProto = false;
- @Expose protected StoreType storeType;
+ @Expose protected String storeType;
@Expose protected KeyValueSet options;
private TableMeta() {
builder = TableProto.newBuilder();
}
- public TableMeta(StoreType type, KeyValueSet options) {
+ public TableMeta(String storeType, KeyValueSet options) {
this();
- this.storeType = type;
+ this.storeType = storeType;
this.options = new KeyValueSet(options);
}
@@ -59,7 +59,7 @@ public class TableMeta implements ProtoObject<CatalogProtos.TableProto>, GsonObj
viaProto = true;
}
- public StoreType getStoreType() {
+ public String getStoreType() {
TableProtoOrBuilder p = viaProto ? proto : builder;
if (this.storeType != null) {
return storeType;
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 3f4304a..2d164f6 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
@@ -36,18 +36,17 @@ public class TableMetaAdapter implements GsonSerDerAdapter<TableMeta> {
Preconditions.checkNotNull(json);
JsonObject jsonObject = json.getAsJsonObject();
- CatalogProtos.StoreType type = CatalogProtos.StoreType.valueOf(
- CommonGsonHelper.getOrDie(jsonObject, "store").getAsString());
+ String storeType = CommonGsonHelper.getOrDie(jsonObject, "store").getAsString();
KeyValueSet keyValueSet = context.deserialize(CommonGsonHelper.getOrDie(jsonObject, "options"), KeyValueSet.class);
- return new TableMeta(type, keyValueSet);
+ return new TableMeta(storeType, keyValueSet);
}
@Override
public JsonElement serialize(TableMeta src, Type typeOfSrc,
JsonSerializationContext context) {
JsonObject jsonObj = new JsonObject();
- jsonObj.addProperty("store", src.getStoreType().name());
+ jsonObj.addProperty("store", src.getStoreType());
jsonObj.add("options", context.serialize(src.getOptions(), KeyValueSet.class));
return jsonObj;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 c467b4e..b213916 100644
--- a/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
+++ b/tajo-catalog/tajo-catalog-common/src/main/proto/CatalogProtos.proto
@@ -80,7 +80,7 @@ message FragmentProto {
}
message TableProto {
- required StoreType storeType = 1;
+ required string storeType = 1;
optional KeyValueSetProto params = 2;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java
index feeaadd..9d84de6 100644
--- a/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java
+++ b/tajo-catalog/tajo-catalog-common/src/test/java/org/apache/tajo/catalog/TestTableDesc.java
@@ -21,7 +21,6 @@ package org.apache.tajo.catalog;
import org.apache.hadoop.fs.Path;
import org.apache.tajo.catalog.json.CatalogGsonHelper;
import org.apache.tajo.catalog.proto.CatalogProtos;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.catalog.statistics.ColumnStats;
import org.apache.tajo.catalog.statistics.TableStats;
import org.apache.tajo.common.TajoDataTypes.Type;
@@ -45,7 +44,7 @@ public class TestTableDesc {
schema = new Schema();
schema.addColumn("name", Type.BLOB);
schema.addColumn("addr", Type.TEXT);
- info = CatalogUtil.newTableMeta(StoreType.CSV);
+ info = CatalogUtil.newTableMeta("CSV");
path = new Path(CommonTestingUtil.getTestDir(), "table1");
desc = new TableDesc("table1", schema, info, path.toUri());
stats = new TableStats();
@@ -71,7 +70,7 @@ public class TestTableDesc {
Schema schema = new Schema();
schema.addColumn("name", Type.BLOB);
schema.addColumn("addr", Type.TEXT);
- TableMeta info = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta info = CatalogUtil.newTableMeta("CSV");
testClone(info);
Path path = new Path(CommonTestingUtil.getTestDir(), "tajo");
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 904b4bc..e1c0158 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
@@ -32,7 +32,7 @@ public class TestTableMeta {
@Before
public void setUp() {
- meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ meta = CatalogUtil.newTableMeta("CSV");
}
@Test
@@ -40,7 +40,7 @@ public class TestTableMeta {
Schema schema1 = new Schema();
schema1.addColumn("name", Type.BLOB);
schema1.addColumn("addr", Type.TEXT);
- TableMeta meta1 = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta1 = CatalogUtil.newTableMeta("CSV");
TableMeta meta2 = new TableMeta(meta1.getProto());
assertEquals(meta1, meta2);
@@ -51,7 +51,7 @@ public class TestTableMeta {
Schema schema1 = new Schema();
schema1.addColumn("name", Type.BLOB);
schema1.addColumn("addr", Type.TEXT);
- TableMeta meta1 = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta1 = CatalogUtil.newTableMeta("CSV");
TableMeta meta2 = (TableMeta) meta1.clone();
assertEquals(meta1.getStoreType(), meta2.getStoreType());
@@ -63,7 +63,7 @@ public class TestTableMeta {
Schema schema1 = new Schema();
schema1.addColumn("name", Type.BLOB);
schema1.addColumn("addr", Type.TEXT);
- TableMeta meta1 = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta1 = CatalogUtil.newTableMeta("CSV");
TableMeta meta2 = (TableMeta) meta1.clone();
@@ -72,7 +72,7 @@ public class TestTableMeta {
@Test
public void testGetStorageType() {
- assertEquals(StoreType.CSV, meta.getStoreType());
+ assertEquals("CSV", meta.getStoreType());
}
@Test
@@ -80,7 +80,7 @@ public class TestTableMeta {
Schema schema2 = new Schema();
schema2.addColumn("name", Type.BLOB);
schema2.addColumn("addr", Type.TEXT);
- TableMeta meta2 = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta2 = CatalogUtil.newTableMeta("CSV");
assertTrue(meta.equals(meta2));
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 5b1a996..835a158 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
@@ -110,7 +110,7 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
org.apache.hadoop.hive.ql.metadata.Table table = null;
HiveCatalogStoreClientPool.HiveCatalogStoreClient client = null;
Path path = null;
- CatalogProtos.StoreType storeType = null;
+ String storeType = null;
org.apache.tajo.catalog.Schema schema = null;
KeyValueSet options = null;
TableStats stats = null;
@@ -185,12 +185,12 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
// set file output format
String fileOutputformat = properties.getProperty(hive_metastoreConstants.FILE_OUTPUT_FORMAT);
- storeType = CatalogUtil.getStoreType(HiveCatalogUtil.getStoreType(fileOutputformat));
+ storeType = HiveCatalogUtil.getStoreType(fileOutputformat);
- if (storeType.equals(CatalogProtos.StoreType.TEXTFILE)) {
+ if (storeType.equalsIgnoreCase("TEXT")) {
options.set(StorageConstants.TEXT_DELIMITER, StringEscapeUtils.escapeJava(fieldDelimiter));
options.set(StorageConstants.TEXT_NULL, StringEscapeUtils.escapeJava(nullFormat));
- } else if (storeType.equals(CatalogProtos.StoreType.RCFILE)) {
+ } else if (storeType.equals("RCFILE")) {
options.set(StorageConstants.RCFILE_NULL, StringEscapeUtils.escapeJava(nullFormat));
String serde = properties.getProperty(serdeConstants.SERIALIZATION_LIB);
if (LazyBinaryColumnarSerDe.class.getName().equals(serde)) {
@@ -198,7 +198,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(CatalogProtos.StoreType.SEQUENCEFILE) ) {
+ } else if (storeType.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);
@@ -543,13 +543,12 @@ public class HiveCatalogStore extends CatalogConstants implements CatalogStore {
table.getParameters().remove(StorageConstants.SEQUENCEFILE_NULL);
}
} else {
- if (tableDesc.getMeta().getStoreType().equals(CatalogProtos.StoreType.PARQUET)) {
+ if (tableDesc.getMeta().getStoreType().equals("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 CatalogException(new NotImplementedException(tableDesc.getMeta().getStoreType
- ().name()));
+ throw new CatalogException(new NotImplementedException(tableDesc.getMeta().getStoreType()));
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java
index 05e4e0a..6e91b89 100644
--- a/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java
+++ b/tajo-catalog/tajo-catalog-drivers/tajo-hive/src/test/java/org/apache/tajo/catalog/store/TestHiveCatalogStore.java
@@ -86,7 +86,7 @@ public class TestHiveCatalogStore {
@Test
public void testTableUsingTextFile() throws Exception {
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.CSV, new KeyValueSet());
+ TableMeta meta = new TableMeta("CSV", new KeyValueSet());
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("c_custkey", TajoDataTypes.Type.INT4);
@@ -120,7 +120,7 @@ public class TestHiveCatalogStore {
public void testTableUsingRCFileWithBinarySerde() throws Exception {
KeyValueSet options = new KeyValueSet();
options.set(StorageConstants.RCFILE_SERDE, StorageConstants.DEFAULT_BINARY_SERDE);
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.RCFILE, options);
+ TableMeta meta = new TableMeta("RCFILE", options);
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("r_regionkey", TajoDataTypes.Type.INT4);
@@ -149,7 +149,7 @@ public class TestHiveCatalogStore {
public void testTableUsingRCFileWithTextSerde() throws Exception {
KeyValueSet options = new KeyValueSet();
options.set(StorageConstants.RCFILE_SERDE, StorageConstants.DEFAULT_TEXT_SERDE);
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.RCFILE, options);
+ TableMeta meta = new TableMeta("RCFILE", options);
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("r_regionkey", TajoDataTypes.Type.INT4);
@@ -178,7 +178,7 @@ public class TestHiveCatalogStore {
KeyValueSet options = new KeyValueSet();
options.set(StorageConstants.TEXT_DELIMITER, StringEscapeUtils.escapeJava("\u0002"));
options.set(StorageConstants.TEXT_NULL, StringEscapeUtils.escapeJava("\u0003"));
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.CSV, options);
+ TableMeta meta = new TableMeta("CSV", options);
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("s_suppkey", TajoDataTypes.Type.INT4);
@@ -221,7 +221,7 @@ public class TestHiveCatalogStore {
@Test
public void testAddTableByPartition() throws Exception {
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.CSV, new KeyValueSet());
+ TableMeta meta = new TableMeta("CSV", new KeyValueSet());
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("n_name", TajoDataTypes.Type.TEXT);
@@ -329,7 +329,7 @@ public class TestHiveCatalogStore {
@Test
public void testGetAllTableNames() throws Exception{
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.CSV, new KeyValueSet());
+ TableMeta meta = new TableMeta("CSV", new KeyValueSet());
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("n_name", TajoDataTypes.Type.TEXT);
schema.addColumn("n_regionkey", TajoDataTypes.Type.INT4);
@@ -357,7 +357,7 @@ public class TestHiveCatalogStore {
@Test
public void testDeleteTable() throws Exception {
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.CSV, new KeyValueSet());
+ TableMeta meta = new TableMeta("CSV", new KeyValueSet());
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("n_name", TajoDataTypes.Type.TEXT);
schema.addColumn("n_regionkey", TajoDataTypes.Type.INT4);
@@ -381,7 +381,7 @@ public class TestHiveCatalogStore {
public void testTableUsingSequenceFileWithBinarySerde() throws Exception {
KeyValueSet options = new KeyValueSet();
options.set(StorageConstants.SEQUENCEFILE_SERDE, StorageConstants.DEFAULT_BINARY_SERDE);
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.SEQUENCEFILE, options);
+ TableMeta meta = new TableMeta("SEQUENCEFILE", options);
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("r_regionkey", TajoDataTypes.Type.INT4);
@@ -410,7 +410,7 @@ public class TestHiveCatalogStore {
public void testTableUsingSequenceFileWithTextSerde() throws Exception {
KeyValueSet options = new KeyValueSet();
options.set(StorageConstants.SEQUENCEFILE_SERDE, StorageConstants.DEFAULT_TEXT_SERDE);
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.SEQUENCEFILE, options);
+ TableMeta meta = new TableMeta("SEQUENCEFILE", options);
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("r_regionkey", TajoDataTypes.Type.INT4);
@@ -437,7 +437,7 @@ public class TestHiveCatalogStore {
@Test
public void testTableUsingParquet() throws Exception {
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.PARQUET, new KeyValueSet());
+ TableMeta meta = new TableMeta("PARQUET", new KeyValueSet());
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("c_custkey", TajoDataTypes.Type.INT4);
@@ -469,7 +469,7 @@ public class TestHiveCatalogStore {
public void testDataTypeCompatibility() throws Exception {
String tableName = CatalogUtil.normalizeIdentifier("testDataTypeCompatibility");
- TableMeta meta = new TableMeta(CatalogProtos.StoreType.CSV, new KeyValueSet());
+ TableMeta meta = new TableMeta("CSV", new KeyValueSet());
org.apache.tajo.catalog.Schema schema = new org.apache.tajo.catalog.Schema();
schema.addColumn("col1", TajoDataTypes.Type.INT4);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 a8b384c..f2dc3cf 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
@@ -60,7 +60,7 @@ abstract class AbstractTableDescriptor implements TableDescriptor {
protected TableProto getTableProto() {
TableProto.Builder metaBuilder = TableProto.newBuilder();
- metaBuilder.setStoreType(StoreType.SYSTEM);
+ metaBuilder.setStoreType("SYSTEM");
metaBuilder.setParams(KeyValueSetProto.newBuilder().build());
return metaBuilder.build();
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 b10e5a5..7fe6ef3 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
@@ -764,7 +764,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
pstmt.setString(2, tableName);
pstmt.setString(3, TableType.EXTERNAL_TABLE.name());
pstmt.setString(4, table.getPath());
- pstmt.setString(5, CatalogUtil.getStoreTypeString(table.getMeta().getStoreType()));
+ pstmt.setString(5, table.getMeta().getStoreType());
pstmt.executeUpdate();
pstmt.close();
} else {
@@ -778,7 +778,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
pstmt.setInt(1, dbid);
pstmt.setString(2, tableName);
pstmt.setString(3, TableType.BASE_TABLE.name());
- pstmt.setString(4, CatalogUtil.getStoreTypeString(table.getMeta().getStoreType()));
+ pstmt.setString(4, table.getMeta().getStoreType());
pstmt.executeUpdate();
pstmt.close();
}
@@ -1567,7 +1567,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
PreparedStatement pstmt = null;
CatalogProtos.TableDescProto.Builder tableBuilder = null;
- StoreType storeType;
+ String storeType;
try {
tableBuilder = CatalogProtos.TableDescProto.newBuilder();
@@ -1609,7 +1609,7 @@ public abstract class AbstractDBStore extends CatalogConstants implements Catalo
tableBuilder.setPath(res.getString(4).trim());
}
- storeType = CatalogUtil.getStoreType(res.getString(5).trim());
+ storeType = res.getString(5).trim();
res.close();
pstmt.close();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
index 821b00c..55c4336 100644
--- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
+++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/store/MemStore.java
@@ -429,7 +429,7 @@ public class MemStore implements CatalogStore {
builder.setName(tableName);
builder.setPath(tableDesc.getPath());
builder.setTableType(tableDesc.getIsExternal()?"EXTERNAL":"BASE");
- builder.setStoreType(CatalogUtil.getStoreTypeString(tableDesc.getMeta().getStoreType()));
+ builder.setStoreType(tableDesc.getMeta().getStoreType());
tableList.add(builder.build());
tableId++;
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
index 306f581..cbcec83 100644
--- a/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
+++ b/tajo-catalog/tajo-catalog-server/src/test/java/org/apache/tajo/catalog/TestCatalog.java
@@ -264,7 +264,7 @@ public class TestCatalog {
TableDesc table = new TableDesc(
CatalogUtil.buildFQName(databaseName, tableName),
schema1,
- new TableMeta(StoreType.CSV, new KeyValueSet()),
+ new TableMeta("CSV", new KeyValueSet()),
path.toUri(), true);
return table;
}
@@ -317,7 +317,7 @@ public class TestCatalog {
TableDesc table = new TableDesc(
CatalogUtil.buildFQName(databaseName, tableName),
schema,
- new TableMeta(StoreType.CSV, new KeyValueSet()),
+ new TableMeta("CSV", new KeyValueSet()),
path.toUri(), true);
assertTrue(catalog.createTable(table));
@@ -331,7 +331,7 @@ public class TestCatalog {
table = new TableDesc(
CatalogUtil.buildFQName(databaseName, tableName),
schema,
- new TableMeta(StoreType.CSV, new KeyValueSet()),
+ new TableMeta("CSV", new KeyValueSet()),
path.toUri(), true);
assertTrue(catalog.createTable(table));
@@ -421,7 +421,7 @@ public class TestCatalog {
TableDesc meta = new TableDesc(
CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "getTable"),
schema1,
- StoreType.CSV,
+ "CSV",
new KeyValueSet(),
path.toUri());
@@ -441,7 +441,7 @@ public class TestCatalog {
TableDesc tableDesc = new TableDesc(
CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, tableName),
schema,
- StoreType.CSV,
+ "CSV",
new KeyValueSet(),
path.toUri());
@@ -561,7 +561,7 @@ public class TestCatalog {
String tableName = "indexed";
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
return new TableDesc(
CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, tableName), schema, meta,
new Path(CommonTestingUtil.getTestDir(), "indexed").toUri());
@@ -732,7 +732,7 @@ public class TestCatalog {
String tableName = CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "addedtable");
KeyValueSet opts = new KeyValueSet();
opts.set("file.delimiter", ",");
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV, opts);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV", opts);
Schema partSchema = new Schema();
@@ -772,7 +772,7 @@ public class TestCatalog {
String tableName = CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "addedtable");
KeyValueSet opts = new KeyValueSet();
opts.set("file.delimiter", ",");
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV, opts);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV", opts);
Schema partSchema = new Schema();
partSchema.addColumn("id", Type.INT4);
@@ -810,7 +810,7 @@ public class TestCatalog {
String tableName = CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "addedtable");
KeyValueSet opts = new KeyValueSet();
opts.set("file.delimiter", ",");
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV, opts);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV", opts);
Schema partSchema = new Schema();
partSchema.addColumn("id", Type.INT4);
@@ -847,7 +847,7 @@ public class TestCatalog {
String tableName = CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "addedtable");
KeyValueSet opts = new KeyValueSet();
opts.set("file.delimiter", ",");
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV, opts);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV", opts);
Schema partSchema = new Schema();
partSchema.addColumn("id", Type.INT4);
@@ -884,7 +884,7 @@ public class TestCatalog {
String tableName = CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "addedtable");
KeyValueSet opts = new KeyValueSet();
opts.set("file.delimiter", ",");
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV, opts);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV", opts);
Schema partSchema = new Schema();
partSchema.addColumn("id", Type.INT4);
@@ -999,7 +999,7 @@ public class TestCatalog {
TableDesc setPropertyDesc = catalog.getTableDesc("default","mynewcooltable");
KeyValueSet options = new KeyValueSet();
options.set("timezone", "GMT+9"); // Seoul, Korea
- setPropertyDesc.setMeta(new TableMeta(StoreType.CSV, options));
+ setPropertyDesc.setMeta(new TableMeta("CSV", options));
String prevTimeZone = setPropertyDesc.getMeta().getOption("timezone");
String newTimeZone = "GMT-7"; // Silicon Valley, California
catalog.alterTable(createMockAlterTableSetProperty(newTimeZone));
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 497ccb6..7fefc5a 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
@@ -177,7 +177,7 @@ public class TajoDump {
try {
TableDesc table = client.getTableDesc(CatalogUtil.buildFQName(databaseName, tableName));
- if (table.getMeta().getStoreType() == StoreType.SYSTEM) {
+ if (table.getMeta().getStoreType().equalsIgnoreCase("SYSTEM")) {
continue;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 a3960e6..f888c36 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
@@ -21,7 +21,6 @@ package org.apache.tajo.cli.tsql.commands;
import org.apache.commons.lang.CharUtils;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.tajo.TajoConstants;
-import org.apache.tajo.catalog.CatalogUtil;
import org.apache.tajo.catalog.Column;
import org.apache.tajo.catalog.TableDesc;
import org.apache.tajo.catalog.partition.PartitionMethodDesc;
@@ -80,7 +79,7 @@ public class DescTableCommand extends TajoShellCommand {
StringBuilder sb = new StringBuilder();
sb.append("\ntable name: ").append(desc.getName()).append("\n");
sb.append("table path: ").append(desc.getPath()).append("\n");
- sb.append("store type: ").append(CatalogUtil.getStoreTypeString(desc.getMeta().getStoreType())).append("\n");
+ sb.append("store type: ").append(desc.getMeta().getStoreType()).append("\n");
if (desc.getStats() != null) {
long row = desc.getStats().getNumRows();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java b/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java
index 609e49c..9994634 100644
--- a/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java
+++ b/tajo-core/src/main/java/org/apache/tajo/benchmark/TPCH.java
@@ -207,7 +207,7 @@ public class TPCH extends BenchmarkSet {
}
public void loadTable(String tableName) throws ServiceException {
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
meta.putOption(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER);
PartitionMethodDesc partitionMethodDesc = null;
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 11548d3..3738dd3 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 StoreType storeType = StoreType.RAW;
+ private String storeType = "RAW";
public DataChannel(ExecutionBlockId srcId, ExecutionBlockId targetId) {
this.srcId = srcId;
@@ -144,11 +144,11 @@ public class DataChannel {
return this.storeType != null;
}
- public void setStoreType(StoreType storeType) {
+ public void setStoreType(String storeType) {
this.storeType = storeType;
}
- public StoreType getStoreType() {
+ public String getStoreType() {
return storeType;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 36bdf21..e18b2eb 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
@@ -69,7 +69,7 @@ public class GlobalPlanner {
private static Log LOG = LogFactory.getLog(GlobalPlanner.class);
private final TajoConf conf;
- private final CatalogProtos.StoreType storeType;
+ private final String storeType;
private final CatalogService catalog;
private final GlobalPlanRewriteEngine rewriteEngine;
@@ -77,7 +77,7 @@ public class GlobalPlanner {
public GlobalPlanner(final TajoConf conf, final CatalogService catalog) throws IOException {
this.conf = conf;
this.catalog = catalog;
- this.storeType = CatalogProtos.StoreType.valueOf(conf.getVar(ConfVars.SHUFFLE_FILE_FORMAT).toUpperCase());
+ this.storeType = conf.getVar(ConfVars.SHUFFLE_FILE_FORMAT).toUpperCase();
Preconditions.checkArgument(storeType != null);
Class<? extends GlobalPlanRewriteRuleProvider> clazz =
@@ -99,7 +99,7 @@ public class GlobalPlanner {
return catalog;
}
- public CatalogProtos.StoreType getStoreType() {
+ public String getStoreType() {
return storeType;
}
@@ -175,7 +175,7 @@ public class GlobalPlanner {
private static void setFinalOutputChannel(DataChannel outputChannel, Schema outputSchema) {
outputChannel.setShuffleType(NONE_SHUFFLE);
outputChannel.setShuffleOutputNum(1);
- outputChannel.setStoreType(CatalogProtos.StoreType.CSV);
+ outputChannel.setStoreType("CSV");
outputChannel.setSchema(outputSchema);
}
@@ -1184,7 +1184,7 @@ public class GlobalPlanner {
for (DataChannel dataChannel : masterPlan.getIncomingChannels(execBlock.getId())) {
// This data channel will be stored in staging directory, but RawFile, default file type, does not support
// distributed file system. It needs to change the file format for distributed file system.
- dataChannel.setStoreType(CatalogProtos.StoreType.CSV);
+ dataChannel.setStoreType("CSV");
ExecutionBlock subBlock = masterPlan.getExecBlock(dataChannel.getSrcId());
ProjectionNode copy = PlannerUtil.clone(plan, node);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
index 3da296c..13b5a3a 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/ExternalSortExec.java
@@ -110,7 +110,7 @@ public class ExternalSortExec extends SortExec {
super(context, plan.getInSchema(), plan.getOutSchema(), null, plan.getSortKeys());
this.plan = plan;
- this.meta = CatalogUtil.newTableMeta(StoreType.ROWFILE);
+ this.meta = CatalogUtil.newTableMeta("ROWFILE");
this.defaultFanout = context.getConf().getIntVar(ConfVars.EXECUTOR_EXTERNAL_SORT_FANOUT);
if (defaultFanout < 2) {
@@ -163,7 +163,7 @@ public class ExternalSortExec extends SortExec {
*/
private Path sortAndStoreChunk(int chunkId, List<Tuple> tupleBlock)
throws IOException {
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.RAW);
+ TableMeta meta = CatalogUtil.newTableMeta("RAW");
int rowNum = tupleBlock.size();
long sortStart = System.currentTimeMillis();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 247b373..f2bd75f 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
@@ -29,12 +29,15 @@ import org.apache.tajo.catalog.TableMeta;
import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.engine.planner.PhysicalPlanningException;
-import org.apache.tajo.plan.util.PlannerUtil;
+import org.apache.tajo.engine.query.QueryContext;
import org.apache.tajo.plan.expr.EvalNode;
import org.apache.tajo.plan.logical.NodeType;
import org.apache.tajo.plan.logical.PersistentStoreNode;
-import org.apache.tajo.engine.query.QueryContext;
-import org.apache.tajo.storage.*;
+import org.apache.tajo.plan.util.PlannerUtil;
+import org.apache.tajo.storage.BaseTupleComparator;
+import org.apache.tajo.storage.FileStorageManager;
+import org.apache.tajo.storage.StorageConstants;
+import org.apache.tajo.storage.TupleComparator;
import org.apache.tajo.storage.fragment.FileFragment;
import org.apache.tajo.storage.fragment.FragmentConvertor;
@@ -205,20 +208,15 @@ public class PhysicalPlanUtil {
* @param nullChar A character for NULL representation
*/
private static void setNullCharForTextSerializer(TableMeta meta, String nullChar) {
- switch (meta.getStoreType()) {
- case CSV:
- meta.putOption(StorageConstants.TEXT_NULL, nullChar);
- break;
- case TEXTFILE:
- meta.putOption(StorageConstants.TEXT_NULL, nullChar);
- break;
- case RCFILE:
- meta.putOption(StorageConstants.RCFILE_NULL, nullChar);
- break;
- case SEQUENCEFILE:
- meta.putOption(StorageConstants.SEQUENCEFILE_NULL, nullChar);
- break;
- default: // nothing to do
+ String storeType = meta.getStoreType();
+ if (storeType.equalsIgnoreCase("CSV")) {
+ meta.putOption(StorageConstants.TEXT_NULL, nullChar);
+ } else if (storeType.equalsIgnoreCase("TEXT")) {
+ meta.putOption(StorageConstants.TEXT_NULL, nullChar);
+ } else if (storeType.equalsIgnoreCase("RCFILE")) {
+ meta.putOption(StorageConstants.RCFILE_NULL, nullChar);
+ } else if (storeType.equalsIgnoreCase("SEQUENCEFILE")) {
+ meta.putOption(StorageConstants.SEQUENCEFILE_NULL, nullChar);
}
}
@@ -229,17 +227,17 @@ public class PhysicalPlanUtil {
* @return True if TableMeta contains NULL char property according to file format
*/
public static boolean containsNullChar(TableMeta meta) {
- switch (meta.getStoreType()) {
- case CSV:
- return meta.containsOption(StorageConstants.TEXT_NULL);
- case TEXTFILE:
- return meta.containsOption(StorageConstants.TEXT_NULL);
- case RCFILE:
- return meta.containsOption(StorageConstants.RCFILE_NULL);
- case SEQUENCEFILE:
- return meta.containsOption(StorageConstants.SEQUENCEFILE_NULL);
- default: // nothing to do
- return false;
+ String storeType = meta.getStoreType();
+ if (storeType.equalsIgnoreCase("CSV")) {
+ return meta.containsOption(StorageConstants.TEXT_NULL);
+ } else if (storeType.equalsIgnoreCase("TEXT")) {
+ return meta.containsOption(StorageConstants.TEXT_NULL);
+ } else if (storeType.equalsIgnoreCase("RCFILE")) {
+ return meta.containsOption(StorageConstants.RCFILE_NULL);
+ } else if (storeType.equalsIgnoreCase("SEQUENCEFILE")) {
+ return meta.containsOption(StorageConstants.SEQUENCEFILE_NULL);
+ } else {
+ return false;
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java
index 8da1a03..cb1fa05 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/RangeShuffleFileWriteExec.java
@@ -75,7 +75,7 @@ public class RangeShuffleFileWriteExec extends UnaryPhysicalExec {
Path storeTablePath = new Path(context.getWorkDir(), "output");
LOG.info("Output data directory: " + storeTablePath);
this.meta = CatalogUtil.newTableMeta(context.getDataChannel() != null ?
- context.getDataChannel().getStoreType() : CatalogProtos.StoreType.RAW);
+ context.getDataChannel().getStoreType() : "RAW");
FileSystem fs = new RawLocalFileSystem();
fs.mkdirs(storeTablePath);
this.appender = (FileAppender) ((FileStorageManager)StorageManager.getFileStorageManager(context.getConf()))
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 074f34e..adbc8a4 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
@@ -293,7 +293,7 @@ public class GlobalEngine extends AbstractService {
}
private void verifyInsertTableSchema(QueryContext queryContext, VerificationState state, LogicalPlan plan) {
- StoreType storeType = PlannerUtil.getStoreType(plan);
+ String storeType = PlannerUtil.getStoreType(plan);
if (storeType != null) {
LogicalRootNode rootNode = plan.getRootBlock().getRoot();
if (rootNode.getChild().getType() == NodeType.INSERT) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java b/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java
index 9264c68..c84b0c7 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/exec/DDLExecutor.java
@@ -29,7 +29,6 @@ import org.apache.tajo.annotation.Nullable;
import org.apache.tajo.catalog.*;
import org.apache.tajo.catalog.exception.*;
import org.apache.tajo.catalog.partition.PartitionMethodDesc;
-import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.catalog.proto.CatalogProtos.AlterTablespaceProto;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.engine.query.QueryContext;
@@ -210,7 +209,7 @@ public class DDLExecutor {
createTable.getPartitionMethod(), ifNotExists);
}
- public TableDesc createTable(QueryContext queryContext, String tableName, CatalogProtos.StoreType storeType,
+ public TableDesc createTable(QueryContext queryContext, String tableName, String storeType,
Schema schema, TableMeta meta, Path path, boolean isExternal,
PartitionMethodDesc partitionDesc, boolean ifNotExists) throws IOException {
String databaseName;
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 958c252..307a155 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
@@ -120,7 +120,7 @@ public class NonForwardQueryResultSystemScanner implements NonForwardQueryResult
.createPlan(taskContext, leafBlock.getPlan());
tableDesc = new TableDesc("table_"+System.currentTimeMillis(), physicalExec.getSchema(),
- new TableMeta(StoreType.SYSTEM, new KeyValueSet()), null);
+ new TableMeta("SYSTEM", new KeyValueSet()), null);
outSchema = physicalExec.getSchema();
encoder = RowStoreUtil.createEncoder(getLogicalSchema());
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 ad1a8e3..481bdbe 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
@@ -415,7 +415,7 @@ public class QueryExecutor {
List<CatalogProtos.ColumnProto> columns = new ArrayList<CatalogProtos.ColumnProto>();
CatalogProtos.TableDescProto tableDescProto = CatalogProtos.TableDescProto.newBuilder()
.setTableName(nodeUniqName)
- .setMeta(CatalogProtos.TableProto.newBuilder().setStoreType(CatalogProtos.StoreType.CSV).build())
+ .setMeta(CatalogProtos.TableProto.newBuilder().setStoreType("CSV").build())
.setSchema(CatalogProtos.SchemaProto.newBuilder().addAllFields(columns).build())
.setStats(stats.getProto())
.build();
@@ -436,7 +436,7 @@ public class QueryExecutor {
SubmitQueryResponse.Builder responseBuilder) throws Exception {
LogicalRootNode rootNode = plan.getRootBlock().getRoot();
- CatalogProtos.StoreType storeType = PlannerUtil.getStoreType(plan);
+ String storeType = PlannerUtil.getStoreType(plan);
if (storeType != null) {
StorageManager sm = StorageManager.getStorageManager(context.getConf(), storeType);
StorageProperty storageProperty = sm.getStorageProperty();
@@ -474,7 +474,7 @@ public class QueryExecutor {
public static MasterPlan compileMasterPlan(LogicalPlan plan, QueryContext context, GlobalPlanner planner)
throws Exception {
- CatalogProtos.StoreType storeType = PlannerUtil.getStoreType(plan);
+ String storeType = PlannerUtil.getStoreType(plan);
if (storeType != null) {
StorageManager sm = StorageManager.getStorageManager(planner.getConf(), storeType);
StorageProperty storageProperty = sm.getStorageProperty();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java
index 1ce15fc..a2e434b 100644
--- a/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java
+++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/Query.java
@@ -420,7 +420,7 @@ public class Query implements EventHandler<QueryEvent> {
if (finalState != QueryState.QUERY_SUCCEEDED) {
Stage lastStage = query.getStage(stageEvent.getExecutionBlockId());
if (lastStage != null && lastStage.getTableMeta() != null) {
- StoreType storeType = lastStage.getTableMeta().getStoreType();
+ String storeType = lastStage.getTableMeta().getStoreType();
if (storeType != null) {
LogicalRootNode rootNode = lastStage.getMasterPlan().getLogicalPlan().getRootBlock().getRoot();
try {
@@ -439,7 +439,7 @@ public class Query implements EventHandler<QueryEvent> {
private QueryState finalizeQuery(Query query, QueryCompletedEvent event) {
Stage lastStage = query.getStage(event.getExecutionBlockId());
- StoreType storeType = lastStage.getTableMeta().getStoreType();
+ String storeType = lastStage.getTableMeta().getStoreType();
try {
LogicalRootNode rootNode = lastStage.getMasterPlan().getLogicalPlan().getRootBlock().getRoot();
CatalogService catalog = lastStage.getContext().getQueryMasterContext().getWorkerContext().getCatalog();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java
index 465fa84..8d20141 100644
--- a/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java
+++ b/tajo-core/src/main/java/org/apache/tajo/querymaster/QueryMasterTask.java
@@ -322,7 +322,7 @@ public class QueryMasterTask extends CompositeService {
jsonExpr = null; // remove the possible OOM
plan = planner.createPlan(queryContext, expr);
- StoreType storeType = PlannerUtil.getStoreType(plan);
+ String storeType = PlannerUtil.getStoreType(plan);
if (storeType != null) {
sm = StorageManager.getStorageManager(systemConf, storeType);
StorageProperty storageProperty = sm.getStorageProperty();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 8e9e343..986d16a 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
@@ -232,7 +232,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() == StoreType.RAW) {
+ if (scans[i].getTableDesc().getMeta().getStoreType().equalsIgnoreCase("RAW")) {
// Intermediate data scan
hasNonLeafNode = true;
largeScanIndexList.add(i);
@@ -670,7 +670,7 @@ public class Repartitioner {
TupleRange mergedRange = TupleUtil.columnStatToRange(sortSpecs, sortSchema, totalStat.getColumnStats(), false);
if (sortNode.getSortPurpose() == SortPurpose.STORAGE_SPECIFIED) {
- StoreType storeType = PlannerUtil.getStoreType(masterPlan.getLogicalPlan());
+ String storeType = PlannerUtil.getStoreType(masterPlan.getLogicalPlan());
CatalogService catalog = stage.getContext().getQueryMasterContext().getWorkerContext().getCatalog();
LogicalRootNode rootNode = masterPlan.getLogicalPlan().getRootBlock().getRoot();
TableDesc tableDesc = PlannerUtil.getTableDesc(catalog, rootNode.getChild());
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 d82d078..f03ee2f 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
@@ -721,10 +721,10 @@ public class Stage implements EventHandler<StageEvent> {
DataChannel channel = masterPlan.getOutgoingChannels(getId()).get(0);
// if store plan (i.e., CREATE or INSERT OVERWRITE)
- StoreType storeType = PlannerUtil.getStoreType(masterPlan.getLogicalPlan());
+ String storeType = PlannerUtil.getStoreType(masterPlan.getLogicalPlan());
if (storeType == null) {
// get default or store type
- storeType = StoreType.CSV;
+ storeType = "CSV";
}
schema = channel.getSchema();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/main/proto/TajoWorkerProtocol.proto
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/proto/TajoWorkerProtocol.proto b/tajo-core/src/main/proto/TajoWorkerProtocol.proto
index fddef8f..e660a30 100644
--- a/tajo-core/src/main/proto/TajoWorkerProtocol.proto
+++ b/tajo-core/src/main/proto/TajoWorkerProtocol.proto
@@ -189,7 +189,7 @@ message DataChannelProto {
repeated ColumnProto shuffleKeys = 7;
optional int32 numOutputs = 9 [default = 1];
- optional StoreType storeType = 10 [default = CSV];
+ optional string storeType = 10;
}
message RunExecutionBlockRequestProto {
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java b/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java
index 308ed28..0774eff 100644
--- a/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java
+++ b/tajo-core/src/test/java/org/apache/tajo/BackendTestingUtil.java
@@ -42,7 +42,7 @@ public class BackendTestingUtil {
mockupSchema = new Schema();
mockupSchema.addColumn("deptname", Type.TEXT);
mockupSchema.addColumn("score", Type.INT4);
- mockupMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ mockupMeta = CatalogUtil.newTableMeta("CSV");
}
public static void writeTmpTable(TajoConf conf, Path tablePath)
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/LocalTajoTestingUtility.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/LocalTajoTestingUtility.java b/tajo-core/src/test/java/org/apache/tajo/LocalTajoTestingUtility.java
index 5407ff5..6691df1 100644
--- a/tajo-core/src/test/java/org/apache/tajo/LocalTajoTestingUtility.java
+++ b/tajo-core/src/test/java/org/apache/tajo/LocalTajoTestingUtility.java
@@ -116,7 +116,7 @@ public class LocalTajoTestingUtility {
fs.mkdirs(tablePath);
Path dfsPath = new Path(tablePath, localPath.getName());
fs.copyFromLocalFile(localPath, dfsPath);
- TableMeta meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.TEXTFILE, option);
+ TableMeta meta = CatalogUtil.newTableMeta("TEXT", option);
// Add fake table statistic data to tables.
// It gives more various situations to unit tests.
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java b/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java
index 54f9e92..59f6da5 100644
--- a/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java
+++ b/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java
@@ -669,7 +669,7 @@ public class TajoTestingCluster {
out.close();
}
}
- TableMeta meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.CSV, tableOption);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV", tableOption);
client.createExternalTable(tableName, schema, tablePath.toUri(), meta);
} finally {
client.close();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java b/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java
index 704980b..aac5f90 100644
--- a/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java
+++ b/tajo-core/src/test/java/org/apache/tajo/cli/tools/TestDDLBuilder.java
@@ -41,7 +41,7 @@ public class TestDDLBuilder {
schema1.addColumn("name", TajoDataTypes.Type.BLOB);
schema1.addColumn("addr", TajoDataTypes.Type.TEXT);
- meta1 = CatalogUtil.newTableMeta(CatalogProtos.StoreType.CSV);
+ meta1 = CatalogUtil.newTableMeta("CSV");
meta1.putOption(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER);
meta1.putOption(StorageConstants.COMPRESSION_CODEC, GzipCodec.class.getName());
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java b/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
index 36ffd0c..af86abc 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/eval/ExprTestBase.java
@@ -264,8 +264,8 @@ public class ExprTestBase {
vtuple.put(i, lazyTuple.get(i));
}
}
- cat.createTable(new TableDesc(qualifiedTableName, inputSchema,
- CatalogProtos.StoreType.CSV, new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()));
+ cat.createTable(new TableDesc(qualifiedTableName, inputSchema,"CSV",
+ new KeyValueSet(), CommonTestingUtil.getTestDir().toUri()));
}
Target [] targets;
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java b/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
index 0466a24..dd5a75a 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/eval/TestEvalTreeUtil.java
@@ -103,7 +103,7 @@ public class TestEvalTreeUtil {
schema.addColumn("score", TajoDataTypes.Type.INT4);
schema.addColumn("age", TajoDataTypes.Type.INT4);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
TableDesc desc = new TableDesc(
CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "people"), schema, meta,
CommonTestingUtil.getTestDir().toUri());
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
index c9b52fd..a408fd6 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalOptimizer.java
@@ -79,7 +79,7 @@ public class TestLogicalOptimizer {
schema3.addColumn("score", Type.INT4);
schema3.addColumn("phone", Type.INT4);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
TableDesc people = new TableDesc(
CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, meta,
CommonTestingUtil.getTestDir().toUri());
@@ -87,13 +87,13 @@ public class TestLogicalOptimizer {
TableDesc student =
new TableDesc(
- CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, StoreType.CSV, new KeyValueSet(),
+ CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "CSV", new KeyValueSet(),
CommonTestingUtil.getTestDir().toUri());
catalog.createTable(student);
TableDesc score =
new TableDesc(
- CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, StoreType.CSV, new KeyValueSet(),
+ CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "CSV", new KeyValueSet(),
CommonTestingUtil.getTestDir().toUri());
catalog.createTable(score);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
index af0aa6a..d5d5779 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestLogicalPlanner.java
@@ -92,19 +92,19 @@ public class TestLogicalPlanner {
schema3.addColumn("deptname", Type.TEXT);
schema3.addColumn("score", Type.INT4);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
TableDesc people = new TableDesc(
CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, meta,
CommonTestingUtil.getTestDir().toUri());
catalog.createTable(people);
TableDesc student = new TableDesc(
- CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, StoreType.CSV, new KeyValueSet(),
+ CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "CSV", new KeyValueSet(),
CommonTestingUtil.getTestDir().toUri());
catalog.createTable(student);
TableDesc score = new TableDesc(
- CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, StoreType.CSV, new KeyValueSet(),
+ CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "CSV", new KeyValueSet(),
CommonTestingUtil.getTestDir().toUri());
catalog.createTable(score);
@@ -121,7 +121,7 @@ public class TestLogicalPlanner {
tpch.loadSchemas();
tpch.loadOutSchema();
for (String table : tpchTables) {
- TableMeta m = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta m = CatalogUtil.newTableMeta("CSV");
TableDesc d = CatalogUtil.newTableDesc(
CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, table), tpch.getSchema(table), m,
CommonTestingUtil.getTestDir());
@@ -979,7 +979,7 @@ public class TestLogicalPlanner {
assertEquals(Type.INT8, def.getColumn(2).getDataType().getType());
assertEquals("score", def.getColumn(3).getSimpleName());
assertEquals(Type.FLOAT4, def.getColumn(3).getDataType().getType());
- assertEquals(StoreType.CSV, createTable.getStorageType());
+ assertTrue("CSV".equalsIgnoreCase(createTable.getStorageType()));
assertEquals("/tmp/data", createTable.getPath().toString());
assertTrue(createTable.hasOptions());
assertEquals("|", createTable.getOptions().get("csv.delimiter"));
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
index 9ce7b5b..0082800 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/TestPlannerUtil.java
@@ -29,7 +29,6 @@ import org.apache.tajo.algebra.Expr;
import org.apache.tajo.catalog.*;
import org.apache.tajo.catalog.proto.CatalogProtos.FragmentProto;
import org.apache.tajo.catalog.proto.CatalogProtos.FunctionType;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.datum.DatumFactory;
import org.apache.tajo.engine.function.builtin.SumInt;
@@ -40,10 +39,10 @@ import org.apache.tajo.plan.PlanningException;
import org.apache.tajo.plan.expr.*;
import org.apache.tajo.plan.logical.*;
import org.apache.tajo.plan.util.PlannerUtil;
-import org.apache.tajo.storage.fragment.FileFragment;
import org.apache.tajo.storage.Tuple;
import org.apache.tajo.storage.TupleComparator;
import org.apache.tajo.storage.VTuple;
+import org.apache.tajo.storage.fragment.FileFragment;
import org.apache.tajo.storage.fragment.FragmentConvertor;
import org.apache.tajo.util.CommonTestingUtil;
import org.apache.tajo.util.KeyValueSet;
@@ -85,7 +84,7 @@ public class TestPlannerUtil {
schema3.addColumn("deptname", Type.TEXT);
schema3.addColumn("score", CatalogUtil.newSimpleDataType(Type.INT4));
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
TableDesc people = new TableDesc(
CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, meta,
CommonTestingUtil.getTestDir().toUri());
@@ -93,13 +92,13 @@ public class TestPlannerUtil {
TableDesc student =
new TableDesc(
- CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, StoreType.CSV,
+ CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "dept"), schema2, "CSV",
new KeyValueSet(), CommonTestingUtil.getTestDir().toUri());
catalog.createTable(student);
TableDesc score =
new TableDesc(
- CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, StoreType.CSV,
+ CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, "score"), schema3, "CSV",
new KeyValueSet(), CommonTestingUtil.getTestDir().toUri());
catalog.createTable(score);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
index eb92bcf..9ff360f 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/global/TestBroadcastJoinPlan.java
@@ -128,7 +128,7 @@ public class TestBroadcastJoinPlan {
}
private TableDesc makeTestData(String tableName, Schema schema, int dataSize) throws Exception {
- TableMeta tableMeta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.CSV);
+ TableMeta tableMeta = CatalogUtil.newTableMeta("CSV");
Path dataPath = new Path(testDir, tableName + ".csv");
String contentsData = "";
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
index 842a120..a50d813 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBNLJoinExec.java
@@ -85,7 +85,7 @@ public class TestBNLJoinExec {
schema.addColumn("memid", Type.INT4);
schema.addColumn("deptname", Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV");
Path employeePath = new Path(testDir, "employee.csv");
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(employeeMeta, schema, employeePath);
@@ -107,7 +107,7 @@ public class TestBNLJoinExec {
peopleSchema.addColumn("fk_memid", Type.INT4);
peopleSchema.addColumn("name", Type.TEXT);
peopleSchema.addColumn("age", Type.INT4);
- TableMeta peopleMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV");
Path peoplePath = new Path(testDir, "people.csv");
appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(peopleMeta, peopleSchema, peoplePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
index b22a87e..ac8860f 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java
@@ -112,7 +112,7 @@ public class TestBSTIndexExec {
writer.open();
long offset;
- meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ meta = CatalogUtil.newTableMeta("CSV");
tablePath = StorageUtil.concatPath(workDir, "employee", "table.csv");
fs = tablePath.getFileSystem(conf);
fs.mkdirs(tablePath.getParent());
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
index 0ef8294..0b93c76 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java
@@ -81,7 +81,7 @@ public class TestExternalSortExec {
schema.addColumn("empid", Type.INT4);
schema.addColumn("deptname", Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV");
Path employeePath = new Path(testDir, "employee.csv");
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(employeeMeta, schema, employeePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
index 780e698..e5ba9b3 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterHashJoinExec.java
@@ -103,7 +103,7 @@ public class TestFullOuterHashJoinExec {
dep3Schema.addColumn("loc_id", Type.INT4);
- TableMeta dep3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV");
Path dep3Path = new Path(testDir, "dep3.csv");
Appender appender1 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(dep3Meta, dep3Schema, dep3Path);
@@ -133,7 +133,7 @@ public class TestFullOuterHashJoinExec {
job3Schema.addColumn("job_title", Type.TEXT);
- TableMeta job3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta job3Meta = CatalogUtil.newTableMeta("CSV");
Path job3Path = new Path(testDir, "job3.csv");
Appender appender2 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(job3Meta, job3Schema, job3Path);
@@ -173,7 +173,7 @@ public class TestFullOuterHashJoinExec {
emp3Schema.addColumn("job_id", Type.INT4);
- TableMeta emp3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV");
Path emp3Path = new Path(testDir, "emp3.csv");
Appender appender3 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(emp3Meta, emp3Schema, emp3Path);
@@ -226,7 +226,7 @@ public class TestFullOuterHashJoinExec {
phone3Schema.addColumn("phone_number", Type.TEXT);
- TableMeta phone3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV");
Path phone3Path = new Path(testDir, "phone3.csv");
Appender appender5 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(phone3Meta, phone3Schema, phone3Path);
[2/7] tajo git commit: initial work for TAJO-1591.
Posted by hy...@apache.org.
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
index ef6f1ce..1bbaa66 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestFullOuterMergeJoinExec.java
@@ -24,7 +24,6 @@ import org.apache.tajo.TajoConstants;
import org.apache.tajo.TajoTestingCluster;
import org.apache.tajo.algebra.Expr;
import org.apache.tajo.catalog.*;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
@@ -108,7 +107,7 @@ public class TestFullOuterMergeJoinExec {
dep3Schema.addColumn("loc_id", Type.INT4);
- TableMeta dep3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV");
Path dep3Path = new Path(testDir, "dep3.csv");
Appender appender1 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(dep3Meta, dep3Schema, dep3Path);
@@ -147,7 +146,7 @@ public class TestFullOuterMergeJoinExec {
dep4Schema.addColumn("loc_id", Type.INT4);
- TableMeta dep4Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta dep4Meta = CatalogUtil.newTableMeta("CSV");
Path dep4Path = new Path(testDir, "dep4.csv");
Appender appender4 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(dep4Meta, dep4Schema, dep4Path);
@@ -179,7 +178,7 @@ public class TestFullOuterMergeJoinExec {
job3Schema.addColumn("job_title", Type.TEXT);
- TableMeta job3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta job3Meta = CatalogUtil.newTableMeta("CSV");
Path job3Path = new Path(testDir, "job3.csv");
Appender appender2 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(job3Meta, job3Schema, job3Path);
@@ -219,7 +218,7 @@ public class TestFullOuterMergeJoinExec {
emp3Schema.addColumn("job_id", Type.INT4);
- TableMeta emp3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV");
Path emp3Path = new Path(testDir, "emp3.csv");
Appender appender3 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(emp3Meta, emp3Schema, emp3Path);
@@ -272,7 +271,7 @@ public class TestFullOuterMergeJoinExec {
phone3Schema.addColumn("phone_number", Type.TEXT);
- TableMeta phone3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV");
Path phone3Path = new Path(testDir, "phone3.csv");
Appender appender5 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(phone3Meta, phone3Schema, phone3Path);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
index 64efa28..30b9b19 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashAntiJoinExec.java
@@ -82,7 +82,7 @@ public class TestHashAntiJoinExec {
employeeSchema.addColumn("memid", Type.INT4);
employeeSchema.addColumn("deptname", Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV");
Path employeePath = new Path(testDir, "employee.csv");
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(employeeMeta, employeeSchema, employeePath);
@@ -108,7 +108,7 @@ public class TestHashAntiJoinExec {
peopleSchema.addColumn("fk_memid", Type.INT4);
peopleSchema.addColumn("name", Type.TEXT);
peopleSchema.addColumn("age", Type.INT4);
- TableMeta peopleMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV");
Path peoplePath = new Path(testDir, "people.csv");
appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(peopleMeta, peopleSchema, peoplePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
index 578b586..cd42d80 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashJoinExec.java
@@ -84,7 +84,7 @@ public class TestHashJoinExec {
employeeSchema.addColumn("memid", Type.INT4);
employeeSchema.addColumn("deptname", Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV");
Path employeePath = new Path(testDir, "employee.csv");
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(employeeMeta, employeeSchema, employeePath);
@@ -107,7 +107,7 @@ public class TestHashJoinExec {
peopleSchema.addColumn("fk_memid", Type.INT4);
peopleSchema.addColumn("name", Type.TEXT);
peopleSchema.addColumn("age", Type.INT4);
- TableMeta peopleMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV");
Path peoplePath = new Path(testDir, "people.csv");
appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(peopleMeta, peopleSchema, peoplePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
index 42a018b..95debd4 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestHashSemiJoinExec.java
@@ -83,7 +83,7 @@ public class TestHashSemiJoinExec {
employeeSchema.addColumn("memid", Type.INT4);
employeeSchema.addColumn("deptname", Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV");
Path employeePath = new Path(testDir, "employee.csv");
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(employeeMeta, employeeSchema, employeePath);
@@ -109,7 +109,7 @@ public class TestHashSemiJoinExec {
peopleSchema.addColumn("fk_memid", Type.INT4);
peopleSchema.addColumn("name", Type.TEXT);
peopleSchema.addColumn("age", Type.INT4);
- TableMeta peopleMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV");
Path peoplePath = new Path(testDir, "people.csv");
appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(peopleMeta, peopleSchema, peoplePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
index 5747e58..e20686b 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterHashJoinExec.java
@@ -104,7 +104,7 @@ public class TestLeftOuterHashJoinExec {
dep3Schema.addColumn("loc_id", Type.INT4);
- TableMeta dep3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV");
Path dep3Path = new Path(testDir, "dep3.csv");
Appender appender1 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(dep3Meta, dep3Schema, dep3Path);
@@ -134,7 +134,7 @@ public class TestLeftOuterHashJoinExec {
job3Schema.addColumn("job_title", Type.TEXT);
- TableMeta job3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta job3Meta = CatalogUtil.newTableMeta("CSV");
Path job3Path = new Path(testDir, "job3.csv");
Appender appender2 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(job3Meta, job3Schema, job3Path);
@@ -174,7 +174,7 @@ public class TestLeftOuterHashJoinExec {
emp3Schema.addColumn("job_id", Type.INT4);
- TableMeta emp3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV");
Path emp3Path = new Path(testDir, "emp3.csv");
Appender appender3 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(emp3Meta, emp3Schema, emp3Path);
@@ -227,7 +227,7 @@ public class TestLeftOuterHashJoinExec {
phone3Schema.addColumn("phone_number", Type.TEXT);
- TableMeta phone3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV");
Path phone3Path = new Path(testDir, "phone3.csv");
Appender appender5 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(phone3Meta, phone3Schema, phone3Path);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
index ab4b881..10fd3d4 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestLeftOuterNLJoinExec.java
@@ -100,7 +100,7 @@ public class TestLeftOuterNLJoinExec {
dep3Schema.addColumn("loc_id", Type.INT4);
- TableMeta dep3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV");
Path dep3Path = new Path(testDir, "dep3.csv");
Appender appender1 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(dep3Meta, dep3Schema, dep3Path);
@@ -130,7 +130,7 @@ public class TestLeftOuterNLJoinExec {
job3Schema.addColumn("job_title", Type.TEXT);
- TableMeta job3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta job3Meta = CatalogUtil.newTableMeta("CSV");
Path job3Path = new Path(testDir, "job3.csv");
Appender appender2 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(job3Meta, job3Schema, job3Path);
@@ -170,7 +170,7 @@ public class TestLeftOuterNLJoinExec {
emp3Schema.addColumn("job_id", Type.INT4);
- TableMeta emp3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV");
Path emp3Path = new Path(testDir, "emp3.csv");
Appender appender3 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(emp3Meta, emp3Schema, emp3Path);
@@ -223,7 +223,7 @@ public class TestLeftOuterNLJoinExec {
phone3Schema.addColumn("phone_number", Type.TEXT);
- TableMeta phone3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV");
Path phone3Path = new Path(testDir, "phone3.csv");
Appender appender5 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(phone3Meta, phone3Schema, phone3Path);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
index 1cc4e63..6e7b5dc 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestMergeJoinExec.java
@@ -84,7 +84,7 @@ public class TestMergeJoinExec {
employeeSchema.addColumn("memid", Type.INT4);
employeeSchema.addColumn("deptname", Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV");
Path employeePath = new Path(testDir, "employee.csv");
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(employeeMeta, employeeSchema, employeePath);
@@ -113,7 +113,7 @@ public class TestMergeJoinExec {
peopleSchema.addColumn("fk_memid", Type.INT4);
peopleSchema.addColumn("name", Type.TEXT);
peopleSchema.addColumn("age", Type.INT4);
- TableMeta peopleMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV");
Path peoplePath = new Path(testDir, "people.csv");
appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(peopleMeta, peopleSchema, peoplePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
index 240e7fd..96c28ee 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestNLJoinExec.java
@@ -82,7 +82,7 @@ public class TestNLJoinExec {
schema.addColumn("memid", Type.INT4);
schema.addColumn("deptname", Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV");
Path employeePath = new Path(testDir, "employee.csv");
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(employeeMeta, schema, employeePath);
@@ -106,7 +106,7 @@ public class TestNLJoinExec {
peopleSchema.addColumn("fk_memid", Type.INT4);
peopleSchema.addColumn("name", Type.TEXT);
peopleSchema.addColumn("age", Type.INT4);
- TableMeta peopleMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta peopleMeta = CatalogUtil.newTableMeta("CSV");
Path peoplePath = new Path(testDir, "people.csv");
appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(peopleMeta, peopleSchema, peoplePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
index e2216b9..3e0b231 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestPhysicalPlanner.java
@@ -118,7 +118,7 @@ public class TestPhysicalPlanner {
scoreSchema.addColumn("score", Type.INT4);
scoreSchema.addColumn("nullable", Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("CSV");
Path employeePath = new Path(testDir, "employee.csv");
@@ -139,7 +139,7 @@ public class TestPhysicalPlanner {
catalog.createTable(employee);
Path scorePath = new Path(testDir, "score");
- TableMeta scoreMeta = CatalogUtil.newTableMeta(StoreType.CSV, new KeyValueSet());
+ TableMeta scoreMeta = CatalogUtil.newTableMeta("CSV", new KeyValueSet());
appender = sm.getAppender(scoreMeta, scoreSchema, scorePath);
appender.init();
score = new TableDesc(
@@ -180,7 +180,7 @@ public class TestPhysicalPlanner {
CommonTestingUtil.cleanupTestDir(scoreLargePath.toString());
Schema scoreSchmea = score.getSchema();
- TableMeta scoreLargeMeta = CatalogUtil.newTableMeta(StoreType.RAW, new KeyValueSet());
+ TableMeta scoreLargeMeta = CatalogUtil.newTableMeta("RAW", new KeyValueSet());
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(scoreLargeMeta, scoreSchmea, scoreLargePath);
appender.enableStats();
@@ -435,7 +435,7 @@ public class TestPhysicalPlanner {
LogicalPlan plan = planner.createPlan(defaultContext, context);
LogicalNode rootNode = optimizer.optimize(plan);
- TableMeta outputMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta outputMeta = CatalogUtil.newTableMeta("CSV");
PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf);
PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode);
@@ -504,7 +504,7 @@ public class TestPhysicalPlanner {
long totalNum = 0;
for (FileStatus status : fs.listStatus(ctx.getOutputPath().getParent())) {
Scanner scanner = ((FileStorageManager)StorageManager.getFileStorageManager(conf)).getFileScanner(
- CatalogUtil.newTableMeta(StoreType.CSV),
+ CatalogUtil.newTableMeta("CSV"),
rootNode.getOutSchema(),
status.getPath());
@@ -532,7 +532,7 @@ public class TestPhysicalPlanner {
LogicalPlan plan = planner.createPlan(defaultContext, context);
LogicalNode rootNode = optimizer.optimize(plan);
- TableMeta outputMeta = CatalogUtil.newTableMeta(StoreType.RCFILE);
+ TableMeta outputMeta = CatalogUtil.newTableMeta("RCFILE");
PhysicalPlanner phyPlanner = new PhysicalPlannerImpl(conf);
PhysicalExec exec = phyPlanner.createPlan(ctx, rootNode);
@@ -742,7 +742,7 @@ public class TestPhysicalPlanner {
long expectedFileNum = (long) Math.ceil(fileVolumSum / (float)StorageUnit.MB);
assertEquals(expectedFileNum, fileStatuses.length);
}
- TableMeta outputMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta outputMeta = CatalogUtil.newTableMeta("CSV");
Scanner scanner = new MergeScanner(conf, rootNode.getOutSchema(), outputMeta, TUtil.newList(fragments));
scanner.init();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
index 161b0d8..d56c3b0 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java
@@ -85,7 +85,7 @@ public class TestProgressExternalSortExec {
schema.addColumn("empid", TajoDataTypes.Type.INT4);
schema.addColumn("deptname", TajoDataTypes.Type.TEXT);
- TableMeta employeeMeta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.RAW);
+ TableMeta employeeMeta = CatalogUtil.newTableMeta("RAW");
Path employeePath = new Path(testDir, "employee.csv");
Appender appender = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(employeeMeta, schema, employeePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
index 06ab6c8..097d75b 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterHashJoinExec.java
@@ -99,7 +99,7 @@ public class TestRightOuterHashJoinExec {
dep3Schema.addColumn("loc_id", Type.INT4);
- TableMeta dep3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV");
Path dep3Path = new Path(testDir, "dep3.csv");
Appender appender1 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(dep3Meta, dep3Schema, dep3Path);
@@ -129,7 +129,7 @@ public class TestRightOuterHashJoinExec {
job3Schema.addColumn("job_title", Type.TEXT);
- TableMeta job3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta job3Meta = CatalogUtil.newTableMeta("CSV");
Path job3Path = new Path(testDir, "job3.csv");
Appender appender2 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(job3Meta, job3Schema, job3Path);
@@ -169,7 +169,7 @@ public class TestRightOuterHashJoinExec {
emp3Schema.addColumn("job_id", Type.INT4);
- TableMeta emp3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV");
Path emp3Path = new Path(testDir, "emp3.csv");
Appender appender3 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(emp3Meta, emp3Schema, emp3Path);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
index 30fd999..181f70e 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestRightOuterMergeJoinExec.java
@@ -106,7 +106,7 @@ public class TestRightOuterMergeJoinExec {
dep3Schema.addColumn("loc_id", Type.INT4);
- TableMeta dep3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta dep3Meta = CatalogUtil.newTableMeta("CSV");
Path dep3Path = new Path(testDir, "dep3.csv");
Appender appender1 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(dep3Meta, dep3Schema, dep3Path);
@@ -145,7 +145,7 @@ public class TestRightOuterMergeJoinExec {
dep4Schema.addColumn("loc_id", Type.INT4);
- TableMeta dep4Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta dep4Meta = CatalogUtil.newTableMeta("CSV");
Path dep4Path = new Path(testDir, "dep4.csv");
Appender appender4 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(dep4Meta, dep4Schema, dep4Path);
@@ -177,7 +177,7 @@ public class TestRightOuterMergeJoinExec {
job3Schema.addColumn("job_title", Type.TEXT);
- TableMeta job3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta job3Meta = CatalogUtil.newTableMeta("CSV");
Path job3Path = new Path(testDir, "job3.csv");
Appender appender2 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(job3Meta, job3Schema, job3Path);
@@ -217,7 +217,7 @@ public class TestRightOuterMergeJoinExec {
emp3Schema.addColumn("job_id", Type.INT4);
- TableMeta emp3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta emp3Meta = CatalogUtil.newTableMeta("CSV");
Path emp3Path = new Path(testDir, "emp3.csv");
Appender appender3 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(emp3Meta, emp3Schema, emp3Path);
@@ -270,7 +270,7 @@ public class TestRightOuterMergeJoinExec {
phone3Schema.addColumn("phone_number", Type.TEXT);
- TableMeta phone3Meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta phone3Meta = CatalogUtil.newTableMeta("CSV");
Path phone3Path = new Path(testDir, "phone3.csv");
Appender appender5 = ((FileStorageManager)StorageManager.getFileStorageManager(conf))
.getAppender(phone3Meta, phone3Schema, phone3Path);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
index f2c2b1a..32746f8 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestSortExec.java
@@ -77,7 +77,7 @@ public class TestSortExec {
schema.addColumn("empid", Type.INT4);
schema.addColumn("deptname", Type.TEXT);
- employeeMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ employeeMeta = CatalogUtil.newTableMeta("CSV");
tablePath = StorageUtil.concatPath(workDir, "employee", "table1");
sm.getFileSystem().mkdirs(tablePath.getParent());
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
index f79f703..38d718e 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestCTASQuery.java
@@ -220,7 +220,7 @@ public class TestCTASQuery extends QueryTestCaseBase {
TableDesc desc = client.getTableDesc(CatalogUtil.normalizeIdentifier(res2.getMetaData().getTableName(1)));
assertNotNull(desc);
- assertEquals(CatalogProtos.StoreType.RCFILE, desc.getMeta().getStoreType());
+ assertTrue("RCFILE".equalsIgnoreCase(desc.getMeta().getStoreType()));
}
@Test
@@ -234,7 +234,7 @@ public class TestCTASQuery extends QueryTestCaseBase {
TableDesc desc = client.getTableDesc(CatalogUtil.normalizeIdentifier(res2.getMetaData().getTableName(1)));
assertNotNull(desc);
- assertEquals(CatalogProtos.StoreType.TEXTFILE, desc.getMeta().getStoreType());
+ assertTrue("TEXT".equalsIgnoreCase(desc.getMeta().getStoreType()));
}
@Test
@@ -248,7 +248,7 @@ public class TestCTASQuery extends QueryTestCaseBase {
TableDesc desc = client.getTableDesc(CatalogUtil.normalizeIdentifier(res2.getMetaData().getTableName(1)));
assertNotNull(desc);
- assertEquals(CatalogProtos.StoreType.CSV, desc.getMeta().getStoreType());
+ assertTrue("CSV".equalsIgnoreCase(desc.getMeta().getStoreType()));
KeyValueSet options = desc.getMeta().getOptions();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
index 7ca766f..2bc16c6 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
@@ -205,7 +205,7 @@ public class TestHBaseTable extends QueryTestCaseBase {
assertTableExists("external_hbase_mapped_table");
- HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, StoreType.HBASE))
+ HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, "HBASE"))
.getConnection(testingCluster.getHBaseUtil().getConf());
HTableInterface htable = hconn.getTable("external_hbase_table");
@@ -244,7 +244,7 @@ public class TestHBaseTable extends QueryTestCaseBase {
assertTableExists("external_hbase_mapped_table");
- HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, StoreType.HBASE))
+ HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, "HBASE"))
.getConnection(testingCluster.getHBaseUtil().getConf());
HTableInterface htable = hconn.getTable("external_hbase_table");
@@ -297,7 +297,7 @@ public class TestHBaseTable extends QueryTestCaseBase {
assertTableExists("external_hbase_mapped_table");
- HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, StoreType.HBASE))
+ HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, "HBASE"))
.getConnection(testingCluster.getHBaseUtil().getConf());
HTableInterface htable = hconn.getTable("external_hbase_table");
@@ -334,7 +334,7 @@ public class TestHBaseTable extends QueryTestCaseBase {
assertTableExists("external_hbase_mapped_table");
- HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, StoreType.HBASE))
+ HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, "HBASE"))
.getConnection(testingCluster.getHBaseUtil().getConf());
HTableInterface htable = hconn.getTable("external_hbase_table");
@@ -469,7 +469,7 @@ public class TestHBaseTable extends QueryTestCaseBase {
EvalNode evalNodeEq = new BinaryEval(EvalType.EQUAL, new FieldEval(tableDesc.getLogicalSchema().getColumn("rk")),
new ConstEval(new TextDatum("021")));
scanNode.setQual(evalNodeEq);
- StorageManager storageManager = StorageManager.getStorageManager(conf, StoreType.HBASE);
+ StorageManager storageManager = StorageManager.getStorageManager(conf, "HBASE");
List<Fragment> fragments = storageManager.getSplits("hbase_mapped_table", tableDesc, scanNode);
assertEquals(1, fragments.size());
assertEquals("021", new String(((HBaseFragment)fragments.get(0)).getStartRow()));
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java b/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java
index 98e5ff9..1e4543c 100644
--- a/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java
+++ b/tajo-core/src/test/java/org/apache/tajo/jdbc/TestResultSet.java
@@ -32,7 +32,6 @@ import org.apache.tajo.catalog.CatalogUtil;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.catalog.TableDesc;
import org.apache.tajo.catalog.TableMeta;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.catalog.statistics.TableStats;
import org.apache.tajo.client.TajoClient;
import org.apache.tajo.common.TajoDataTypes.Type;
@@ -72,7 +71,7 @@ public class TestResultSet {
scoreSchema = new Schema();
scoreSchema.addColumn("deptname", Type.TEXT);
scoreSchema.addColumn("score", Type.INT4);
- scoreMeta = CatalogUtil.newTableMeta(StoreType.CSV);
+ scoreMeta = CatalogUtil.newTableMeta("CSV");
TableStats stats = new TableStats();
Path p = sm.getTablePath("score");
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java b/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
index 712243b..3d23d16 100644
--- a/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
+++ b/tajo-core/src/test/java/org/apache/tajo/master/TestExecutionBlockCursor.java
@@ -69,7 +69,7 @@ public class TestExecutionBlockCursor {
tpch.loadSchemas();
tpch.loadOutSchema();
for (String table : tpch.getTableNames()) {
- TableMeta m = CatalogUtil.newTableMeta(CatalogProtos.StoreType.CSV);
+ TableMeta m = CatalogUtil.newTableMeta("CSV");
TableDesc d = CatalogUtil.newTableDesc(
CatalogUtil.buildFQName(DEFAULT_DATABASE_NAME, table), tpch.getSchema(table), m, CommonTestingUtil.getTestDir());
TableStats stats = new TableStats();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java b/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
index 45c94a3..8591f88 100644
--- a/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
+++ b/tajo-core/src/test/java/org/apache/tajo/master/TestGlobalPlanner.java
@@ -90,7 +90,7 @@ public class TestGlobalPlanner {
tpch.loadSchemas();
tpch.loadOutSchema();
for (int i = 0; i < tables.length; i++) {
- TableMeta m = CatalogUtil.newTableMeta(CatalogProtos.StoreType.CSV);
+ TableMeta m = CatalogUtil.newTableMeta("CSV");
TableStats stats = new TableStats();
stats.setNumBytes(volumes[i]);
TableDesc d = CatalogUtil.newTableDesc(
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java b/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java
index 859a1f2..362cb24 100644
--- a/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java
+++ b/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java
@@ -66,7 +66,7 @@ public class TestRowFile {
schema.addColumn("age", Type.INT8);
schema.addColumn("description", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.ROWFILE);
+ TableMeta meta = CatalogUtil.newTableMeta("ROWFILE");
FileStorageManager sm =
(FileStorageManager)StorageManager.getFileStorageManager(conf);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-core/src/test/java/org/apache/tajo/ws/rs/resources/TestTablesResource.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/ws/rs/resources/TestTablesResource.java b/tajo-core/src/test/java/org/apache/tajo/ws/rs/resources/TestTablesResource.java
index 6144534..8b1ca14 100644
--- a/tajo-core/src/test/java/org/apache/tajo/ws/rs/resources/TestTablesResource.java
+++ b/tajo-core/src/test/java/org/apache/tajo/ws/rs/resources/TestTablesResource.java
@@ -17,24 +17,9 @@
*/
package org.apache.tajo.ws.rs.resources;
-import java.net.URI;
-import java.util.List;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.core.GenericType;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
+import com.google.gson.internal.StringMap;
import org.apache.tajo.QueryTestCaseBase;
-import org.apache.tajo.catalog.CatalogUtil;
-import org.apache.tajo.catalog.Column;
-import org.apache.tajo.catalog.Schema;
-import org.apache.tajo.catalog.TableDesc;
-import org.apache.tajo.catalog.TableMeta;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
+import org.apache.tajo.catalog.*;
import org.apache.tajo.common.TajoDataTypes;
import org.apache.tajo.conf.TajoConf.ConfVars;
import org.apache.tajo.storage.StorageConstants;
@@ -46,7 +31,15 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.gson.internal.StringMap;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.core.GenericType;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import java.net.URI;
+import java.util.List;
import static org.junit.Assert.*;
@@ -84,7 +77,7 @@ public class TestTablesResource extends QueryTestCaseBase {
Schema tableSchema = new Schema(new Column[] {new Column("column1", TajoDataTypes.Type.TEXT)});
KeyValueSet tableOptions = new KeyValueSet();
tableOptions.set(StorageConstants.TEXT_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER);
- TableMeta tableMeta = new TableMeta(StoreType.CSV, tableOptions);
+ TableMeta tableMeta = new TableMeta("CSV", tableOptions);
return new TableDesc(tableName, tableSchema, tableMeta, null);
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 e0b4f7e..8b1b56d 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
@@ -1325,7 +1325,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
}
private void updatePhysicalInfo(TableDesc desc) {
- if (desc.getPath() != null && desc.getMeta().getStoreType() != StoreType.SYSTEM) {
+ if (desc.getPath() != null && desc.getMeta().getStoreType() != "SYSTEM") {
try {
Path path = new Path(desc.getPath());
FileSystem fs = path.getFileSystem(new Configuration());
@@ -1666,7 +1666,7 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
insertNode.setTargetLocation(new Path(expr.getLocation()));
if (expr.hasStorageType()) {
- insertNode.setStorageType(CatalogUtil.getStoreType(expr.getStorageType()));
+ insertNode.setStorageType(expr.getStorageType());
}
if (expr.hasParams()) {
KeyValueSet options = new KeyValueSet();
@@ -1740,9 +1740,9 @@ public class LogicalPlanner extends BaseAlgebraVisitor<LogicalPlanner.PlanContex
return handleCreateTableLike(context, expr, createTableNode);
if (expr.hasStorageType()) { // If storage type (using clause) is specified
- createTableNode.setStorageType(CatalogUtil.getStoreType(expr.getStorageType()));
+ createTableNode.setStorageType(expr.getStorageType());
} else { // otherwise, default type
- createTableNode.setStorageType(CatalogProtos.StoreType.CSV);
+ createTableNode.setStorageType("CSV");
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java
index 878553f..49dce87 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/function/python/PythonScriptEngine.java
@@ -272,7 +272,7 @@ public class PythonScriptEngine extends TajoScriptEngine {
private int[] projectionCols;
private final CSVLineSerDe lineSerDe = new CSVLineSerDe();
- private final TableMeta pipeMeta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.TEXTFILE);
+ private final TableMeta pipeMeta = CatalogUtil.newTableMeta("TEXT");
private final Tuple EMPTY_INPUT = new VTuple(0);
private final Schema EMPTY_SCHEMA = new Schema();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 556ae7a..19a1820 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
@@ -25,26 +25,24 @@ import org.apache.tajo.plan.PlanString;
import org.apache.tajo.util.KeyValueSet;
import org.apache.tajo.util.TUtil;
-import static org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
-
/**
* <code>PersistentStoreNode</code> an expression for a persistent data store step.
* This includes some basic information for materializing data.
*/
public abstract class PersistentStoreNode extends UnaryNode implements Cloneable {
- @Expose protected StoreType storageType = StoreType.CSV;
+ @Expose protected String storageType = "CSV";
@Expose protected KeyValueSet options = new KeyValueSet();
protected PersistentStoreNode(int pid, NodeType nodeType) {
super(pid, nodeType);
}
- public void setStorageType(StoreType storageType) {
+ public void setStorageType(String storageType) {
this.storageType = storageType;
}
- public StoreType getStorageType() {
+ public String getStorageType() {
return this.storageType;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ShuffleFileWriteNode.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ShuffleFileWriteNode.java b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ShuffleFileWriteNode.java
index 8215f51..537abdc 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ShuffleFileWriteNode.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ShuffleFileWriteNode.java
@@ -103,7 +103,7 @@ public class ShuffleFileWriteNode extends PersistentStoreNode implements Cloneab
public String toString() {
StringBuilder sb = new StringBuilder("Shuffle Write (type=" + shuffleType.name().toLowerCase());
if (storageType != null) {
- sb.append(", storage="+ storageType.name());
+ sb.append(", storage="+ storageType);
}
sb.append(", part number=").append(numOutputs);
if (shuffleKeys != null) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-plan/src/main/java/org/apache/tajo/plan/logical/StoreTableNode.java
----------------------------------------------------------------------
diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/StoreTableNode.java b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/StoreTableNode.java
index 62f7db4..3a40f83 100644
--- a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/StoreTableNode.java
+++ b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/StoreTableNode.java
@@ -111,7 +111,7 @@ public class StoreTableNode extends PersistentStoreNode implements Cloneable {
public String toString() {
StringBuilder sb = new StringBuilder("Store Table (table=").append(tableName);
if (storageType != null) {
- sb.append(", storage="+ storageType.name());
+ sb.append(", storage="+ storageType);
}
sb.append(")");
return sb.toString();
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 763f938..f018546 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
@@ -179,7 +179,7 @@ public class PlannerUtil {
for (LogicalNode node: scanNodes) {
scanNode = (ScanNode) node;
- isVirtualTable &= (scanNode.getTableDesc().getMeta().getStoreType() == StoreType.SYSTEM);
+ isVirtualTable &= (scanNode.getTableDesc().getMeta().getStoreType().equalsIgnoreCase("SYSTEM"));
}
return !checkIfDDLPlan(rootNode) && hasScanNode && isVirtualTable;
@@ -855,9 +855,9 @@ public class PlannerUtil {
}
public static void applySessionToTableProperties(OverridableConf sessionVars,
- StoreType storeType,
+ String storeType,
KeyValueSet tableProperties) {
- if (storeType == CSV || storeType == TEXTFILE) {
+ if (storeType.equalsIgnoreCase("CSV") || storeType.equalsIgnoreCase("TEXT")) {
if (sessionVars.containsKey(SessionVars.NULL_CHAR)) {
tableProperties.set(StorageConstants.TEXT_NULL, sessionVars.get(SessionVars.NULL_CHAR));
}
@@ -890,15 +890,7 @@ public class PlannerUtil {
}
}
- public static boolean isFileStorageType(StoreType storageType) {
- if (storageType== StoreType.HBASE) {
- return false;
- } else {
- return true;
- }
- }
-
- public static StoreType getStoreType(LogicalPlan plan) {
+ public static String getStoreType(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/863e53ea/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 275ab3a..99b87e9 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
@@ -181,8 +181,7 @@ public class PreLogicalPlanVerifier extends BaseAlgebraVisitor<PreLogicalPlanVer
private boolean assertSupportedStoreType(VerificationState state, String name) {
Preconditions.checkNotNull(name);
- CatalogProtos.StoreType storeType = CatalogUtil.getStoreType(name);
- if (storeType == null || storeType == CatalogProtos.StoreType.RAW) {
+ if (name.equalsIgnoreCase("RAW")) {
state.addVerification(String.format("Store format %s is not supported.", name));
return false;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 de949d5..e8172ba 100644
--- a/tajo-plan/src/main/proto/Plan.proto
+++ b/tajo-plan/src/main/proto/Plan.proto
@@ -217,7 +217,7 @@ message PartitionTableScanSpec {
message PersistentStoreNode {
required int32 childSeq = 1;
- required StoreType storageType = 2;
+ required string storageType = 2;
required KeyValueSetProto tableProperties = 3;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 bff7efb..694eeeb 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
@@ -44,13 +44,13 @@ public class TestLogicalNode {
GroupbyNode groupbyNode = new GroupbyNode(0);
groupbyNode.setGroupingColumns(new Column[]{schema.getColumn(1), schema.getColumn(2)});
ScanNode scanNode = new ScanNode(0);
- scanNode.init(CatalogUtil.newTableDesc("in", schema, CatalogUtil.newTableMeta(StoreType.CSV), new Path("in")));
+ scanNode.init(CatalogUtil.newTableDesc("in", schema, CatalogUtil.newTableMeta("CSV"), new Path("in")));
GroupbyNode groupbyNode2 = new GroupbyNode(0);
groupbyNode2.setGroupingColumns(new Column[]{schema.getColumn(1), schema.getColumn(2)});
JoinNode joinNode = new JoinNode(0);
ScanNode scanNode2 = new ScanNode(0);
- scanNode2.init(CatalogUtil.newTableDesc("in2", schema, CatalogUtil.newTableMeta(StoreType.CSV), new Path("in2")));
+ scanNode2.init(CatalogUtil.newTableDesc("in2", schema, CatalogUtil.newTableMeta("CSV"), new Path("in2")));
groupbyNode.setChild(scanNode);
groupbyNode2.setChild(joinNode);
@@ -61,7 +61,7 @@ public class TestLogicalNode {
assertFalse(groupbyNode.deepEquals(groupbyNode2));
ScanNode scanNode3 = new ScanNode(0);
- scanNode3.init(CatalogUtil.newTableDesc("in", schema, CatalogUtil.newTableMeta(StoreType.CSV), new Path("in")));
+ scanNode3.init(CatalogUtil.newTableDesc("in", schema, CatalogUtil.newTableMeta("CSV"), new Path("in")));
groupbyNode2.setChild(scanNode3);
assertTrue(groupbyNode.equals(groupbyNode2));
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageManager.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageManager.java
index ce963c8..fb497fb 100644
--- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageManager.java
+++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/StorageManager.java
@@ -28,7 +28,6 @@ import org.apache.tajo.*;
import org.apache.tajo.catalog.*;
import org.apache.tajo.catalog.proto.CatalogProtos;
import org.apache.tajo.catalog.proto.CatalogProtos.FragmentProto;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.conf.TajoConf.ConfVars;
import org.apache.tajo.plan.LogicalPlan;
@@ -79,7 +78,7 @@ public abstract class StorageManager {
};
protected TajoConf conf;
- protected StoreType storeType;
+ protected String storeType;
/**
* Cache of StorageManager.
@@ -106,7 +105,7 @@ public abstract class StorageManager {
private static final Map<Class<?>, Constructor<?>> CONSTRUCTOR_CACHE =
new ConcurrentHashMap<Class<?>, Constructor<?>>();
- public StorageManager(StoreType storeType) {
+ public StorageManager(String storeType) {
this.storeType = storeType;
}
@@ -222,7 +221,7 @@ public abstract class StorageManager {
* Returns the current storage type.
* @return
*/
- public StoreType getStoreType() {
+ public String getStoreType() {
return storeType;
}
@@ -271,7 +270,7 @@ public abstract class StorageManager {
* @throws java.io.IOException
*/
public static StorageManager getFileStorageManager(TajoConf tajoConf) throws IOException {
- return getStorageManager(tajoConf, StoreType.CSV);
+ return getStorageManager(tajoConf, "CSV");
}
/**
@@ -283,22 +282,6 @@ public abstract class StorageManager {
* @throws java.io.IOException
*/
public static StorageManager getStorageManager(TajoConf tajoConf, String storeType) throws IOException {
- if ("HBASE".equalsIgnoreCase(storeType)) {
- return getStorageManager(tajoConf, StoreType.HBASE);
- } else {
- return getStorageManager(tajoConf, StoreType.CSV);
- }
- }
-
- /**
- * Returns the proper StorageManager instance according to the storeType.
- *
- * @param tajoConf Tajo system property.
- * @param storeType Storage type
- * @return
- * @throws java.io.IOException
- */
- public static StorageManager getStorageManager(TajoConf tajoConf, StoreType storeType) throws IOException {
FileSystem fileSystem = TajoConf.getWarehouseDir(tajoConf).getFileSystem(tajoConf);
if (fileSystem != null) {
return getStorageManager(tajoConf, storeType, fileSystem.getUri().toString());
@@ -317,15 +300,13 @@ public abstract class StorageManager {
* @throws java.io.IOException
*/
private static synchronized StorageManager getStorageManager (
- TajoConf tajoConf, StoreType storeType, String managerKey) throws IOException {
+ TajoConf tajoConf, String storeType, String managerKey) throws IOException {
String typeName;
- switch (storeType) {
- case HBASE:
- typeName = "hbase";
- break;
- default:
- typeName = "hdfs";
+ if (storeType.equalsIgnoreCase("HBASE")) {
+ typeName = "hbase";
+ } else {
+ typeName = "hdfs";
}
synchronized (storageManagers) {
@@ -344,7 +325,7 @@ public abstract class StorageManager {
Constructor<? extends StorageManager> constructor =
(Constructor<? extends StorageManager>) CONSTRUCTOR_CACHE.get(storageManagerClass);
if (constructor == null) {
- constructor = storageManagerClass.getDeclaredConstructor(new Class<?>[]{StoreType.class});
+ constructor = storageManagerClass.getDeclaredConstructor(new Class<?>[]{String.class});
constructor.setAccessible(true);
CONSTRUCTOR_CACHE.put(storageManagerClass, constructor);
}
@@ -449,7 +430,7 @@ public abstract class StorageManager {
Class<? extends Appender> appenderClass;
- String handlerName = CatalogUtil.getStoreTypeString(meta.getStoreType()).toLowerCase();
+ String handlerName = meta.getStoreType().toLowerCase();
appenderClass = APPENDER_HANDLER_CACHE.get(handlerName);
if (appenderClass == null) {
appenderClass = conf.getClass(
@@ -532,8 +513,8 @@ public abstract class StorageManager {
* @return The Scanner class
* @throws java.io.IOException
*/
- public Class<? extends Scanner> getScannerClass(CatalogProtos.StoreType storeType) throws IOException {
- String handlerName = CatalogUtil.getStoreTypeString(storeType).toLowerCase();
+ public Class<? extends Scanner> getScannerClass(String storeType) throws IOException {
+ String handlerName = storeType.toLowerCase();
Class<? extends Scanner> scannerClass = SCANNER_HANDLER_CACHE.get(handlerName);
if (scannerClass == null) {
scannerClass = conf.getClass(
@@ -542,7 +523,7 @@ public abstract class StorageManager {
}
if (scannerClass == null) {
- throw new IOException("Unknown Storage Type: " + storeType.name());
+ throw new IOException("Unknown Storage Type: " + storeType);
}
return scannerClass;
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/AddSortForInsertRewriter.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/AddSortForInsertRewriter.java b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/AddSortForInsertRewriter.java
index e95aeec..32f1e43 100644
--- a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/AddSortForInsertRewriter.java
+++ b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/AddSortForInsertRewriter.java
@@ -23,7 +23,6 @@ import org.apache.tajo.catalog.Column;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.catalog.SortSpec;
import org.apache.tajo.catalog.TableDesc;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.plan.LogicalPlan;
import org.apache.tajo.plan.PlanningException;
import org.apache.tajo.plan.logical.LogicalNode;
@@ -55,7 +54,7 @@ public class AddSortForInsertRewriter implements LogicalPlanRewriteRule {
@Override
public boolean isEligible(OverridableConf queryContext, LogicalPlan plan) {
- StoreType storeType = PlannerUtil.getStoreType(plan);
+ String storeType = PlannerUtil.getStoreType(plan);
return storeType != null;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBasePutAppender.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBasePutAppender.java b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBasePutAppender.java
index 45a1bff..7f3cb04 100644
--- a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBasePutAppender.java
+++ b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBasePutAppender.java
@@ -26,7 +26,6 @@ import org.apache.hadoop.hbase.client.Put;
import org.apache.tajo.TaskAttemptId;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.catalog.TableMeta;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.datum.Datum;
import org.apache.tajo.storage.StorageManager;
@@ -48,7 +47,7 @@ public class HBasePutAppender extends AbstractHBaseAppender {
super.init();
Configuration hbaseConf = HBaseStorageManager.getHBaseConfiguration(conf, meta);
- HConnection hconn = ((HBaseStorageManager) StorageManager.getStorageManager((TajoConf)conf, StoreType.HBASE))
+ HConnection hconn = ((HBaseStorageManager) StorageManager.getStorageManager((TajoConf)conf, "HBASE"))
.getConnection(hbaseConf);
htable = hconn.getTable(columnMapping.getHbaseTableName());
htable.setAutoFlushTo(false);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseScanner.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseScanner.java b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseScanner.java
index ab56252..4303b59 100644
--- a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseScanner.java
+++ b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseScanner.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.hbase.filter.KeyOnlyFilter;
import org.apache.tajo.catalog.Column;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.catalog.TableMeta;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.catalog.statistics.ColumnStats;
import org.apache.tajo.catalog.statistics.TableStats;
import org.apache.tajo.conf.TajoConf;
@@ -179,7 +178,7 @@ public class HBaseScanner implements Scanner {
}
if (htable == null) {
- HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, StoreType.HBASE))
+ HConnection hconn = ((HBaseStorageManager)StorageManager.getStorageManager(conf, "HBASE"))
.getConnection(hbaseConf);
htable = hconn.getTable(fragment.getHbaseTableName());
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
index a9e5bde..a7c579a 100644
--- a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
+++ b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
@@ -37,7 +37,6 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter;
import org.apache.hadoop.mapreduce.task.JobContextImpl;
import org.apache.tajo.*;
import org.apache.tajo.catalog.*;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.catalog.statistics.TableStats;
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.conf.TajoConf;
@@ -70,7 +69,7 @@ public class HBaseStorageManager extends StorageManager {
private Map<HConnectionKey, HConnection> connMap = new HashMap<HConnectionKey, HConnection>();
- public HBaseStorageManager (StoreType storeType) {
+ public HBaseStorageManager (String storeType) {
super(storeType);
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestColumnMapping.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestColumnMapping.java b/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestColumnMapping.java
index 68939d6..dd52324 100644
--- a/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestColumnMapping.java
+++ b/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestColumnMapping.java
@@ -20,7 +20,6 @@ package org.apache.tajo.storage.hbase;
import org.apache.tajo.catalog.Schema;
import org.apache.tajo.catalog.TableMeta;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.common.TajoDataTypes.Type;
import org.apache.tajo.util.KeyValueSet;
import org.junit.Test;
@@ -42,7 +41,7 @@ public class TestColumnMapping {
schema.addColumn("c3", Type.TEXT);
schema.addColumn("c4", Type.TEXT);
- TableMeta tableMeta = new TableMeta(StoreType.HBASE, keyValueSet);
+ TableMeta tableMeta = new TableMeta("HBASE", keyValueSet);
ColumnMapping columnMapping = new ColumnMapping(schema, tableMeta);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestHBaseStorageManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestHBaseStorageManager.java b/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestHBaseStorageManager.java
index 1fc4065..aa7aa28 100644
--- a/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestHBaseStorageManager.java
+++ b/tajo-storage/tajo-storage-hbase/src/test/java/org/apache/tajo/storage/hbase/TestHBaseStorageManager.java
@@ -48,7 +48,7 @@ public class TestHBaseStorageManager {
scanNode.setQual(evalNodeA);
HBaseStorageManager storageManager =
- (HBaseStorageManager) StorageManager.getStorageManager(new TajoConf(), StoreType.HBASE);
+ (HBaseStorageManager) StorageManager.getStorageManager(new TajoConf(), "HBASE");
List<Set<EvalNode>> indexEvals = storageManager.findIndexablePredicateSet(scanNode, new Column[]{rowkeyColumn});
assertNotNull(indexEvals);
assertEquals(1, indexEvals.size());
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileStorageManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileStorageManager.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileStorageManager.java
index 8d425b4..fd4ab84 100644
--- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileStorageManager.java
+++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileStorageManager.java
@@ -28,10 +28,9 @@ import org.apache.hadoop.fs.*;
import org.apache.hadoop.hdfs.DFSConfigKeys;
import org.apache.hadoop.hdfs.DistributedFileSystem;
import org.apache.tajo.OverridableConf;
-import org.apache.tajo.TaskAttemptId;
import org.apache.tajo.TajoConstants;
+import org.apache.tajo.TaskAttemptId;
import org.apache.tajo.catalog.*;
-import org.apache.tajo.catalog.proto.CatalogProtos.StoreType;
import org.apache.tajo.catalog.statistics.TableStats;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.plan.logical.LogicalNode;
@@ -86,7 +85,7 @@ public class FileStorageManager extends StorageManager {
protected boolean blocksMetadataEnabled;
private static final HdfsVolumeId zeroVolumeId = new HdfsVolumeId(Bytes.toBytes(0));
- public FileStorageManager(StoreType storeType) {
+ public FileStorageManager(String storeType) {
super(storeType);
}
@@ -855,7 +854,7 @@ public class FileStorageManager extends StorageManager {
public StorageProperty getStorageProperty() {
StorageProperty storageProperty = new StorageProperty();
storageProperty.setSortedInsert(false);
- if (storeType == StoreType.RAW) {
+ if (storeType.equalsIgnoreCase("RAW")) {
storageProperty.setSupportsInsertInto(false);
} else {
storageProperty.setSupportsInsertInto(true);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 3c78d6b..68a2cf2 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
@@ -54,11 +54,11 @@ public class TestCompressionStorages {
private TajoConf conf;
private static String TEST_PATH = "target/test-data/TestCompressionStorages";
- private StoreType storeType;
+ private String storeType;
private Path testDir;
private FileSystem fs;
- public TestCompressionStorages(StoreType type) throws IOException {
+ public TestCompressionStorages(String type) throws IOException {
this.storeType = type;
conf = new TajoConf();
@@ -69,10 +69,10 @@ public class TestCompressionStorages {
@Parameterized.Parameters
public static Collection<Object[]> generateParameters() {
return Arrays.asList(new Object[][]{
- {StoreType.CSV},
- {StoreType.RCFILE},
- {StoreType.SEQUENCEFILE},
- {StoreType.TEXTFILE}
+ {"CSV"},
+ {"RCFILE"},
+ {"SEQUENCEFILE"},
+ {"TEXT"}
});
}
@@ -83,11 +83,11 @@ public class TestCompressionStorages {
@Test
public void testGzipCodecCompressionData() throws IOException {
- if (storeType == StoreType.RCFILE) {
+ if (storeType.equalsIgnoreCase("RCFILE")) {
if( ZlibFactory.isNativeZlibLoaded(conf)) {
storageCompressionTest(storeType, GzipCodec.class);
}
- } else if (storeType == StoreType.SEQUENCEFILE) {
+ } else if (storeType.equalsIgnoreCase("SEQUENCEFILE")) {
if( ZlibFactory.isNativeZlibLoaded(conf)) {
storageCompressionTest(storeType, GzipCodec.class);
}
@@ -109,7 +109,7 @@ public class TestCompressionStorages {
storageCompressionTest(storeType, Lz4Codec.class);
}
- private void storageCompressionTest(StoreType storeType, Class<? extends CompressionCodec> codec) throws IOException {
+ private void storageCompressionTest(String storeType, Class<? extends CompressionCodec> codec) throws IOException {
Schema schema = new Schema();
schema.addColumn("id", Type.INT4);
schema.addColumn("age", Type.FLOAT4);
@@ -157,7 +157,7 @@ public class TestCompressionStorages {
Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, tablets[0], schema);
- if (StoreType.CSV == storeType) {
+ if (storeType.equalsIgnoreCase("CSV")) {
if (SplittableCompressionCodec.class.isAssignableFrom(codec)) {
assertTrue(scanner.isSplittable());
} else {
@@ -166,7 +166,7 @@ public class TestCompressionStorages {
}
scanner.init();
- if (storeType == StoreType.SEQUENCEFILE) {
+ if (storeType.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/863e53ea/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java
index 2db916a..6e15c51 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java
@@ -101,7 +101,7 @@ public class TestDelimitedTextFile {
public void testIgnoreAllErrors() throws IOException {
TajoConf conf = new TajoConf();
- TableMeta meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.JSON);
+ TableMeta meta = CatalogUtil.newTableMeta("JSON");
meta.putOption(StorageUtil.TEXT_ERROR_TOLERANCE_MAXNUM, "-1");
FileFragment fragment = getFileFragment("testErrorTolerance1.json");
Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment);
@@ -123,7 +123,7 @@ public class TestDelimitedTextFile {
TajoConf conf = new TajoConf();
- TableMeta meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.JSON);
+ TableMeta meta = CatalogUtil.newTableMeta("JSON");
meta.putOption(StorageUtil.TEXT_ERROR_TOLERANCE_MAXNUM, "1");
FileFragment fragment = getFileFragment("testErrorTolerance1.json");
Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment);
@@ -145,7 +145,7 @@ public class TestDelimitedTextFile {
@Test
public void testNoErrorTolerance() throws IOException {
TajoConf conf = new TajoConf();
- TableMeta meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.JSON);
+ TableMeta meta = CatalogUtil.newTableMeta("JSON");
meta.putOption(StorageUtil.TEXT_ERROR_TOLERANCE_MAXNUM, "0");
FileFragment fragment = getFileFragment("testErrorTolerance2.json");
Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment);
@@ -164,7 +164,7 @@ public class TestDelimitedTextFile {
@Test
public void testIgnoreTruncatedValueErrorTolerance() throws IOException {
TajoConf conf = new TajoConf();
- TableMeta meta = CatalogUtil.newTableMeta(CatalogProtos.StoreType.JSON);
+ TableMeta meta = CatalogUtil.newTableMeta("JSON");
meta.putOption(StorageUtil.TEXT_ERROR_TOLERANCE_MAXNUM, "1");
FileFragment fragment = getFileFragment("testErrorTolerance3.json");
Scanner scanner = StorageManager.getFileStorageManager(conf).getScanner(meta, schema, fragment);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileStorageManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileStorageManager.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileStorageManager.java
index 4b39cdd..7d5eee1 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileStorageManager.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileStorageManager.java
@@ -68,7 +68,7 @@ public class TestFileStorageManager {
schema.addColumn("age",Type.INT4);
schema.addColumn("name",Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
Tuple[] tuples = new Tuple[4];
for(int i=0; i < tuples.length; i++) {
@@ -135,7 +135,7 @@ public class TestFileStorageManager {
schema.addColumn("id", Type.INT4);
schema.addColumn("age",Type.INT4);
schema.addColumn("name",Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
List<Fragment> splits = Lists.newArrayList();
// Get FileFragments in partition batch
@@ -189,7 +189,7 @@ public class TestFileStorageManager {
schema.addColumn("id", Type.INT4);
schema.addColumn("age", Type.INT4);
schema.addColumn("name", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
List<Fragment> splits = Lists.newArrayList();
splits.addAll(sm.getSplits("data", meta, schema, tablePath));
@@ -221,11 +221,11 @@ public class TestFileStorageManager {
try {
/* Local FileSystem */
- FileStorageManager sm = (FileStorageManager)StorageManager.getStorageManager(conf, StoreType.CSV);
+ FileStorageManager sm = (FileStorageManager)StorageManager.getStorageManager(conf, "CSV");
assertEquals(fs.getUri(), sm.getFileSystem().getUri());
/* Distributed FileSystem */
- sm = (FileStorageManager)StorageManager.getStorageManager(tajoConf, StoreType.CSV);
+ sm = (FileStorageManager)StorageManager.getStorageManager(tajoConf, "CSV");
assertNotEquals(fs.getUri(), sm.getFileSystem().getUri());
assertEquals(cluster.getFileSystem().getUri(), sm.getFileSystem().getUri());
} finally {
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileSystems.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileSystems.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileSystems.java
index ff7fe13..b4a60fc 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileSystems.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileSystems.java
@@ -103,7 +103,7 @@ public class TestFileSystems {
schema.addColumn("age", Type.INT4);
schema.addColumn("name", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.CSV);
+ TableMeta meta = CatalogUtil.newTableMeta("CSV");
Tuple[] tuples = new Tuple[4];
for (int i = 0; i < tuples.length; i++) {
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java
index f405734..1078b84 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestLineReader.java
@@ -64,7 +64,7 @@ public class TestLineReader {
schema.addColumn("comment", Type.TEXT);
schema.addColumn("comment2", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.TEXTFILE);
+ TableMeta meta = CatalogUtil.newTableMeta("TEXT");
Path tablePath = new Path(testDir, "line.data");
FileAppender appender = (FileAppender) StorageManager.getFileStorageManager(conf).getAppender(
null, null, meta, schema, tablePath);
@@ -115,7 +115,7 @@ public class TestLineReader {
schema.addColumn("comment", Type.TEXT);
schema.addColumn("comment2", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.TEXTFILE);
+ TableMeta meta = CatalogUtil.newTableMeta("TEXT");
meta.putOption("compression.codec", DeflateCodec.class.getCanonicalName());
Path tablePath = new Path(testDir, "testLineDelimitedReaderWithCompression." + DeflateCodec.class.getSimpleName());
@@ -174,7 +174,7 @@ public class TestLineReader {
schema.addColumn("comment", Type.TEXT);
schema.addColumn("comment2", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.TEXTFILE);
+ TableMeta meta = CatalogUtil.newTableMeta("TEXT");
Path tablePath = new Path(testDir, "testLineDelimitedReader");
FileAppender appender = (FileAppender) StorageManager.getFileStorageManager(conf).getAppender(
@@ -278,7 +278,7 @@ public class TestLineReader {
schema.addColumn("comment", Type.TEXT);
schema.addColumn("comment2", Type.TEXT);
- TableMeta meta = CatalogUtil.newTableMeta(StoreType.TEXTFILE);
+ TableMeta meta = CatalogUtil.newTableMeta("TEXT");
Path tablePath = new Path(testDir, "testSeekableByteBufLineReader.data");
FileAppender appender = (FileAppender) StorageManager.getFileStorageManager(conf).getAppender(
null, null, meta, schema, tablePath);
http://git-wip-us.apache.org/repos/asf/tajo/blob/863e53ea/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 561e2ef..e2cfe8f 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
@@ -67,22 +67,22 @@ public class TestMergeScanner {
"}\n";
private Path testDir;
- private StoreType storeType;
+ private String storeType;
private FileSystem fs;
- public TestMergeScanner(StoreType storeType) {
+ public TestMergeScanner(String storeType) {
this.storeType = storeType;
}
@Parameters
public static Collection<Object[]> generateParameters() {
return Arrays.asList(new Object[][] {
- {StoreType.CSV},
- {StoreType.RAW},
- {StoreType.RCFILE},
- {StoreType.PARQUET},
- {StoreType.SEQUENCEFILE},
- {StoreType.AVRO},
+ {"CSV"},
+ {"RAW"},
+ {"RCFILE"},
+ {"PARQUET"},
+ {"SEQUENCEFILE"},
+ {"AVRO"},
// RowFile requires Byte-buffer read support, so we omitted RowFile.
//{StoreType.ROWFILE},
});
@@ -109,7 +109,7 @@ public class TestMergeScanner {
KeyValueSet options = new KeyValueSet();
TableMeta meta = CatalogUtil.newTableMeta(storeType, options);
meta.setOptions(CatalogUtil.newPhysicalProperties(storeType));
- if (storeType == StoreType.AVRO) {
+ if (storeType.equalsIgnoreCase("AVRO")) {
meta.putOption(StorageConstants.AVRO_SCHEMA_LITERAL,
TEST_MULTIPLE_FILES_AVRO_SCHEMA);
}
@@ -187,16 +187,15 @@ public class TestMergeScanner {
assertEquals(tupleNum * 2, totalCounts);
}
- private static boolean isProjectableStorage(StoreType type) {
- switch (type) {
- case RCFILE:
- case PARQUET:
- case SEQUENCEFILE:
- case CSV:
- case AVRO:
- return true;
- default:
- return false;
+ private static boolean isProjectableStorage(String type) {
+ if (type.equalsIgnoreCase("RCFILE") ||
+ type.equalsIgnoreCase("PARQUET") ||
+ type.equalsIgnoreCase("SEQUENCEFILE") ||
+ type.equalsIgnoreCase("CSV") ||
+ type.equalsIgnoreCase("AVRO")) {
+ return true;
+ } else {
+ return false;
}
}
}