diff --git a/adapter/adapter-csv/src/test/java/com/hufudb/openhufu/owner/adapter/csv/CsvAdapterTest.java b/adapter/adapter-csv/src/test/java/com/hufudb/openhufu/owner/adapter/csv/CsvAdapterTest.java index f33743a5..95cb7aaa 100755 --- a/adapter/adapter-csv/src/test/java/com/hufudb/openhufu/owner/adapter/csv/CsvAdapterTest.java +++ b/adapter/adapter-csv/src/test/java/com/hufudb/openhufu/owner/adapter/csv/CsvAdapterTest.java @@ -10,9 +10,7 @@ import java.sql.Date; import java.sql.Time; import java.sql.Timestamp; -import java.util.ArrayList; import java.util.Calendar; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -42,7 +40,7 @@ public class CsvAdapterTest { @Test public void testLoadSingleFile() { - URL source = CsvAdapterTest.class.getClassLoader().getResource("data/test1.csv"); + URL source = CsvAdapterTest.class.getClassLoader().getResource("data"); CsvAdapterFactory factory = new CsvAdapterFactory(); AdapterConfig config = new AdapterConfig(); config.url = source.getPath(); @@ -51,8 +49,14 @@ public void testLoadSingleFile() { Adapter adapter = factory.create(config); SchemaManager manager = adapter.getSchemaManager(); List schemas = manager.getAllLocalTable(); - assertEquals(1, schemas.size()); - assertEquals("test1", schemas.get(0).getName()); + assertEquals(4, schemas.size()); + assertEquals(new HashSet<>() {{ + add("test1"); + add("test2"); + add("test3"); + add("test4"); + }}, + schemas.stream().map(TableSchema::getName).collect(Collectors.toSet())); } @Test @@ -92,8 +96,8 @@ public void testQuery() { t4.setActualName("test4"); t4.setPublishedName("traffic"); t4.setPublishedColumns(ImmutableList.of( - new PojoColumnDesc("id", ColumnTypeWrapper.INT, ModifierWrapper.PUBLIC, 0), - new PojoColumnDesc("location", ColumnTypeWrapper.POINT, ModifierWrapper.PUBLIC, 1))); + new PojoColumnDesc("id", ColumnTypeWrapper.INT, ModifierWrapper.PUBLIC, 0), + new PojoColumnDesc("location", ColumnTypeWrapper.POINT, ModifierWrapper.PUBLIC, 1))); manager.addPublishedTable(t1); manager.addPublishedTable(t2); manager.addPublishedTable(t3); @@ -198,7 +202,7 @@ public void testQuery() { date.set(Calendar.YEAR, 2018); date.set(Calendar.MONTH, 8); // Note: calendar month starts with 0 date.set(Calendar.DAY_OF_MONTH, 1); - Expression dateCmp = ExpressionFactory.createBinaryOperator(OperatorType.LT, ColumnType.BOOLEAN, + Expression dateCmp = ExpressionFactory.createBinaryOperator(OperatorType.LT, ColumnType.BOOLEAN, ExpressionFactory.createInputRef(1, ColumnType.DATE, Modifier.PUBLIC), ExpressionFactory.createLiteral(ColumnType.DATE, date)); plan.setWhereExps(ImmutableList.of(dateCmp)); @@ -218,7 +222,7 @@ public void testQuery() { time.set(Calendar.HOUR_OF_DAY, 10); time.set(Calendar.MINUTE, 14); time.set(Calendar.SECOND, 45); - Expression timeCmp = ExpressionFactory.createBinaryOperator(OperatorType.LT, ColumnType.BOOLEAN, + Expression timeCmp = ExpressionFactory.createBinaryOperator(OperatorType.LT, ColumnType.BOOLEAN, ExpressionFactory.createInputRef(2, ColumnType.TIME, Modifier.PUBLIC), ExpressionFactory.createLiteral(ColumnType.TIME, time)); plan.setWhereExps(ImmutableList.of(timeCmp)); @@ -241,9 +245,9 @@ public void testQuery() { ts.set(Calendar.HOUR_OF_DAY, 9); ts.set(Calendar.MINUTE, 5); ts.set(Calendar.SECOND, 10); - Expression tsCmp = ExpressionFactory.createBinaryOperator(OperatorType.GE, ColumnType.BOOLEAN, - ExpressionFactory.createInputRef(3, ColumnType.TIMESTAMP, Modifier.PUBLIC), - ExpressionFactory.createLiteral(ColumnType.TIMESTAMP, ts)); + Expression tsCmp = ExpressionFactory.createBinaryOperator(OperatorType.GE, ColumnType.BOOLEAN, + ExpressionFactory.createInputRef(3, ColumnType.TIMESTAMP, Modifier.PUBLIC), + ExpressionFactory.createLiteral(ColumnType.TIMESTAMP, ts)); plan.setWhereExps(ImmutableList.of(tsCmp)); result = adapter.query(plan); it = result.getIterator(); @@ -273,28 +277,4 @@ public void testQuery() { assertFalse(it.next()); result.close(); } - - @Test - public void testLoadDir() { - Set tableNames = new HashSet<>(){{ - add("customer"); - add("lineitem"); - add("nation"); - add("orders"); - add("part"); - add("partsupp"); - add("region"); - add("supplier"); - }}; - URL source = CsvAdapterTest.class.getClassLoader().getResource("tpc-h"); - CsvAdapterFactory factory = new CsvAdapterFactory(); - AdapterConfig config = new AdapterConfig(); - config.url = source.getPath(); - config.datasource = DataSourceType.CSV; - config.delimiter = "|"; - Adapter adapter = factory.create(config); - SchemaManager manager = adapter.getSchemaManager(); - List schemas = manager.getAllLocalTable(); - assertEquals(tableNames, schemas.stream().map(TableSchema::getName).collect(Collectors.toSet())); - } } diff --git a/adapter/adapter-csv/src/test/java/com/hufudb/openhufu/owner/adapter/csv/CsvTableTest.java b/adapter/adapter-csv/src/test/java/com/hufudb/openhufu/owner/adapter/csv/CsvTableTest.java index b39d0eee..ceb76c04 100755 --- a/adapter/adapter-csv/src/test/java/com/hufudb/openhufu/owner/adapter/csv/CsvTableTest.java +++ b/adapter/adapter-csv/src/test/java/com/hufudb/openhufu/owner/adapter/csv/CsvTableTest.java @@ -19,8 +19,9 @@ public class CsvTableTest { @Test public void testScanWithSchema() throws IOException { - URL source = CsvTableTest.class.getClassLoader().getResource("data/test2.csv"); - CsvTable table = new CsvTable("test2", null, Paths.get(source.getPath()), ","); + URL data = CsvTableTest.class.getClassLoader().getResource("data/test2.csv"); + URL schema = CsvTableTest.class.getClassLoader().getResource("data/test2.scm"); + CsvTable table = new CsvTable("test2", Paths.get(schema.getPath()), Paths.get(data.getPath()), ","); Schema.Builder builder = Schema.newBuilder(); builder.add("Department", ColumnType.STRING, Modifier.PUBLIC); builder.add("Name", ColumnType.STRING, Modifier.PUBLIC); diff --git a/adapter/adapter-csv/src/test/resources/data/test1.scm b/adapter/adapter-csv/src/test/resources/data/test1.scm new file mode 100755 index 00000000..929e3d08 --- /dev/null +++ b/adapter/adapter-csv/src/test/resources/data/test1.scm @@ -0,0 +1,2 @@ +age, workclass, fnlwgt, education, education-num, marital-status, occupation, relationship, race, sex, capital-gain, capital-loss, hours-per-week, native-country, income +INT, STRING, LONG, STRING, INT, STRING, STRING, STRING, STRING, STRING, INT, INT, INT, STRING, STRING \ No newline at end of file diff --git a/adapter/adapter-csv/src/test/resources/data/test2.scm b/adapter/adapter-csv/src/test/resources/data/test2.scm new file mode 100755 index 00000000..7ed7ab65 --- /dev/null +++ b/adapter/adapter-csv/src/test/resources/data/test2.scm @@ -0,0 +1,2 @@ +name, age, score, dept_name, weight +STRING, INT, INT, STRING, DOUBLE \ No newline at end of file diff --git a/adapter/adapter-csv/src/test/resources/data/test3.scm b/adapter/adapter-csv/src/test/resources/data/test3.scm new file mode 100755 index 00000000..78e2d498 --- /dev/null +++ b/adapter/adapter-csv/src/test/resources/data/test3.scm @@ -0,0 +1,2 @@ +license, cur_date, cur_time, time_stamp +LONG, DATE, TIME, TIMESTAMP \ No newline at end of file diff --git a/adapter/adapter-csv/src/test/resources/data/test4.scm b/adapter/adapter-csv/src/test/resources/data/test4.scm new file mode 100755 index 00000000..03476cce --- /dev/null +++ b/adapter/adapter-csv/src/test/resources/data/test4.scm @@ -0,0 +1,2 @@ +id,location +INT, POINT \ No newline at end of file diff --git a/benchmark/src/main/resources/tables.json b/benchmark/src/main/resources/tables.json index a9965ca0..dd3472c0 100644 --- a/benchmark/src/main/resources/tables.json +++ b/benchmark/src/main/resources/tables.json @@ -1,4 +1,38 @@ [ + { + "tableName": "customer", + "localTables": [ + { + "endpoint": "localhost:12345", + "localName": "customer" + }, + { + "endpoint": "localhost:12346", + "localName": "customer" + }, + { + "endpoint": "localhost:12347", + "localName": "customer" + } + ] + }, + { + "tableName": "lineitem", + "localTables": [ + { + "endpoint": "localhost:12345", + "localName": "lineitem" + }, + { + "endpoint": "localhost:12346", + "localName": "lineitem" + }, + { + "endpoint": "localhost:12347", + "localName": "lineitem" + } + ] + }, { "tableName": "nation", "localTables": [ @@ -15,5 +49,90 @@ "localName": "nation" } ] + }, + { + "tableName": "orders", + "localTables": [ + { + "endpoint": "localhost:12345", + "localName": "orders" + }, + { + "endpoint": "localhost:12346", + "localName": "orders" + }, + { + "endpoint": "localhost:12347", + "localName": "orders" + } + ] + }, + { + "tableName": "part", + "localTables": [ + { + "endpoint": "localhost:12345", + "localName": "part" + }, + { + "endpoint": "localhost:12346", + "localName": "part" + }, + { + "endpoint": "localhost:12347", + "localName": "part" + } + ] + }, + { + "tableName": "partsupp", + "localTables": [ + { + "endpoint": "localhost:12345", + "localName": "partsupp" + }, + { + "endpoint": "localhost:12346", + "localName": "partsupp" + }, + { + "endpoint": "localhost:12347", + "localName": "partsupp" + } + ] + }, + { + "tableName": "region", + "localTables": [ + { + "endpoint": "localhost:12345", + "localName": "region" + }, + { + "endpoint": "localhost:12346", + "localName": "region" + }, + { + "endpoint": "localhost:12347", + "localName": "region" + } + ] + }, + { + "tableName": "supplier", + "localTables": [ + { + "endpoint": "localhost:12345", + "localName": "supplier" + }, + { + "endpoint": "localhost:12346", + "localName": "supplier" + }, + { + "endpoint": "localhost:12347", + "localName": "supplier" + } + ] } ] \ No newline at end of file diff --git a/common/src/main/java/com/hufudb/openhufu/common/exception/ErrorCode.java b/common/src/main/java/com/hufudb/openhufu/common/exception/ErrorCode.java index 8df9bf78..ff1a961d 100644 --- a/common/src/main/java/com/hufudb/openhufu/common/exception/ErrorCode.java +++ b/common/src/main/java/com/hufudb/openhufu/common/exception/ErrorCode.java @@ -12,13 +12,14 @@ public enum ErrorCode implements BaseErrorCode { INTERNAL_SERVER_ERROR(10001), // config error - IMPLEMENTOR_CONFIG_MISSING(20001), - IMPLEMENTOR_CLASS_NOT_FOUND(20002), - IMPLEMENTOR_CONSTRUCTOR_NOT_FOUND(20003), - IMPLEMENTOR_CREATE_FAILED(20004), - - CSV_URL_NOT_EXISTS(20005), - CSV_URL_IS_NOT_FOLDER(20006), + OPENHUFU_ROOT_ENV_NOT_SET(20001), + ADAPTER_FOLDER_NOT_FOUND(20001), + IMPLEMENTOR_CONFIG_MISSING(20031), + IMPLEMENTOR_CLASS_NOT_FOUND(20032), + IMPLEMENTOR_CONSTRUCTOR_NOT_FOUND(20033), + IMPLEMENTOR_CREATE_FAILED(20034), + CSV_URL_NOT_EXISTS(20035), + CSV_URL_IS_NOT_FOLDER(20036), // udf error UDF_LOAD_FAILED(30001), diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/customer.csv b/dataset/sample/tpc-h/customer.csv similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/customer.csv rename to dataset/sample/tpc-h/customer.csv diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/customer.scm b/dataset/sample/tpc-h/customer.scm similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/customer.scm rename to dataset/sample/tpc-h/customer.scm diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/lineitem.csv b/dataset/sample/tpc-h/lineitem.csv similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/lineitem.csv rename to dataset/sample/tpc-h/lineitem.csv diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/lineitem.scm b/dataset/sample/tpc-h/lineitem.scm similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/lineitem.scm rename to dataset/sample/tpc-h/lineitem.scm diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/nation.csv b/dataset/sample/tpc-h/nation.csv similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/nation.csv rename to dataset/sample/tpc-h/nation.csv diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/nation.scm b/dataset/sample/tpc-h/nation.scm similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/nation.scm rename to dataset/sample/tpc-h/nation.scm diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/orders.csv b/dataset/sample/tpc-h/orders.csv similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/orders.csv rename to dataset/sample/tpc-h/orders.csv diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/orders.scm b/dataset/sample/tpc-h/orders.scm similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/orders.scm rename to dataset/sample/tpc-h/orders.scm diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/part.csv b/dataset/sample/tpc-h/part.csv similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/part.csv rename to dataset/sample/tpc-h/part.csv diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/part.scm b/dataset/sample/tpc-h/part.scm similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/part.scm rename to dataset/sample/tpc-h/part.scm diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/partsupp.csv b/dataset/sample/tpc-h/partsupp.csv similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/partsupp.csv rename to dataset/sample/tpc-h/partsupp.csv diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/partsupp.scm b/dataset/sample/tpc-h/partsupp.scm similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/partsupp.scm rename to dataset/sample/tpc-h/partsupp.scm diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/region.csv b/dataset/sample/tpc-h/region.csv similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/region.csv rename to dataset/sample/tpc-h/region.csv diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/region.scm b/dataset/sample/tpc-h/region.scm similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/region.scm rename to dataset/sample/tpc-h/region.scm diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/supplier.csv b/dataset/sample/tpc-h/supplier.csv similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/supplier.csv rename to dataset/sample/tpc-h/supplier.csv diff --git a/adapter/adapter-csv/src/test/resources/tpc-h/supplier.scm b/dataset/sample/tpc-h/supplier.scm similarity index 100% rename from adapter/adapter-csv/src/test/resources/tpc-h/supplier.scm rename to dataset/sample/tpc-h/supplier.scm diff --git a/owner/src/main/java/com/hufudb/openhufu/owner/config/OwnerConfigFile.java b/owner/src/main/java/com/hufudb/openhufu/owner/config/OwnerConfigFile.java index 628bf830..6996809c 100644 --- a/owner/src/main/java/com/hufudb/openhufu/owner/config/OwnerConfigFile.java +++ b/owner/src/main/java/com/hufudb/openhufu/owner/config/OwnerConfigFile.java @@ -1,6 +1,8 @@ package com.hufudb.openhufu.owner.config; import com.hufudb.openhufu.common.enums.DataSourceType; +import com.hufudb.openhufu.common.exception.ErrorCode; +import com.hufudb.openhufu.common.exception.OpenHuFuException; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; @@ -55,7 +57,14 @@ public OwnerConfigFile(int id, int port, int threadnum, String hostname, String public OwnerConfigFile() {} public static Adapter getAdapter(AdapterConfig config) { - Path adapterDir = Paths.get(System.getenv("OPENHUFU_ROOT"), "adapter"); + String openHuFuRoot = System.getenv("OPENHUFU_ROOT"); + if (null == openHuFuRoot || openHuFuRoot.length() == 0) { + throw new OpenHuFuException(ErrorCode.OPENHUFU_ROOT_ENV_NOT_SET); + } + Path adapterDir = Paths.get(openHuFuRoot, "adapter"); + if (!adapterDir.toFile().exists()) { + throw new OpenHuFuException(ErrorCode.ADAPTER_FOLDER_NOT_FOUND); + } Map adapterFactories = AdapterLoader.loadAdapters(adapterDir.toString()); AdapterFactory factory = adapterFactories.get(config.datasource); diff --git a/owner/src/main/resources/owner1.json b/owner/src/main/resources/owner1.json index 17400404..935b00b2 100644 --- a/owner/src/main/resources/owner1.json +++ b/owner/src/main/resources/owner1.json @@ -4,17 +4,173 @@ "hostname": "localhost", "adapterconfig": { "datasource": "CSV", - "url": "../../adapter/adapter-csv/src/test/resources/tpc-h", + "url": "dataset/sample/tpc-h", "delimiter": "|" }, "tables": [ + { + "actualName": "customer", + "publishedName": "customer", + "publishedColumns": [ + { + "name": "C_CUSTKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 0 + }, + { + "name": "C_NAME", + "type": "STRING", + "modifier": "hidden", + "columnId": 1 + }, + { + "name": "C_ADDRESS", + "type": "STRING", + "modifier": "hidden", + "columnId": 2 + }, + { + "name": "C_NATIONKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 3 + }, + { + "name": "C_PHONE", + "type": "STRING", + "modifier": "hidden", + "columnId": 4 + }, + { + "name": "C_ACCTBAL", + "type": "DOUBLE", + "modifier": "hidden", + "columnId": 5 + }, + { + "name": "C_MKTSEGMENT", + "type": "STRING", + "modifier": "hidden", + "columnId": 6 + }, + { + "name": "C_COMMENT", + "type": "STRING", + "modifier": "hidden", + "columnId": 7 + } + ] + }, + { + "actualName": "lineitem", + "publishedName": "lineitem", + "publishedColumns": [ + { + "name": "L_ORDERKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 0 + }, + { + "name": "L_PARTKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 1 + }, + { + "name": "L_SUPPKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 2 + }, + { + "name": "L_LINENUMBER", + "type": "LONG", + "modifier": "hidden", + "columnId": 3 + }, + { + "name": "L_QUANTITY", + "type": "LONG", + "modifier": "hidden", + "columnId": 4 + }, + { + "name": "L_EXTENDEDPRICE", + "type": "DOUBLE", + "modifier": "hidden", + "columnId": 5 + }, + { + "name": "L_DISCOUNT", + "type": "DOUBLE", + "modifier": "hidden", + "columnId": 6 + }, + { + "name": "L_TAX", + "type": "DOUBLE", + "modifier": "hidden", + "columnId": 7 + }, + { + "name": "L_RETURNFLAG", + "type": "STRING", + "modifier": "hidden", + "columnId": 8 + }, + { + "name": "L_LINESTATUS", + "type": "STRING", + "modifier": "hidden", + "columnId": 9 + }, + { + "name": "L_SHIPDATE", + "type": "DATE", + "modifier": "hidden", + "columnId": 10 + }, + { + "name": "L_COMMITDATE", + "type": "DATE", + "modifier": "hidden", + "columnId": 11 + }, + { + "name": "L_RECEIPTDATE", + "type": "DATE", + "modifier": "hidden", + "columnId": 12 + }, + { + "name": "L_SHIPINSTRUCT", + "type": "STRING", + "modifier": "hidden", + "columnId": 13 + }, + { + "name": "L_SHIPMODE", + "type": "STRING", + "modifier": "hidden", + "columnId": 14 + }, + { + "name": "L_COMMENT", + "type": "STRING", + "modifier": "hidden", + "columnId": 15 + } + ] + }, { "actualName": "nation", "publishedName": "nation", "publishedColumns": [ { "name": "N_NATIONKEY", - "type": "STRING", + "type": "LONG", "modifier": "hidden", "columnId": 0 }, @@ -22,19 +178,247 @@ "name": "N_NAME", "type": "STRING", "modifier": "hidden", - "columnId": 0 + "columnId": 1 }, { "name": "N_REGIONKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 2 + }, + { + "name": "N_COMMENT", "type": "STRING", "modifier": "hidden", + "columnId": 3 + } + ] + }, + { + "actualName": "orders", + "publishedName": "orders", + "publishedColumns": [ + { + "name": "O_ORDERKEY", + "type": "LONG", + "modifier": "hidden", "columnId": 0 }, { - "name": "N_COMMENT", + "name": "O_CUSTKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 1 + }, + { + "name": "O_ORDERSTATUS", "type": "STRING", "modifier": "hidden", + "columnId": 2 + }, + { + "name": "O_TOTALPRICE", + "type": "DOUBLE", + "modifier": "hidden", + "columnId": 3 + }, + { + "name": "O_ORDERDATE", + "type": "DATE", + "modifier": "hidden", + "columnId": 4 + }, + { + "name": "O_ORDER-PRIORITY", + "type": "STRING", + "modifier": "hidden", + "columnId": 5 + }, + { + "name": "O_CLERK", + "type": "STRING", + "modifier": "hidden", + "columnId": 6 + }, + { + "name": "O_SHIP-PRIORITY", + "type": "INT", + "modifier": "hidden", + "columnId": 7 + }, + { + "name": "O_COMMENT", + "type": "STRING", + "modifier": "hidden", + "columnId": 8 + } + ] + }, + { + "actualName": "part", + "publishedName": "part", + "publishedColumns": [ + { + "name": "P_PARTKEY", + "type": "LONG", + "modifier": "hidden", "columnId": 0 + }, + { + "name": "P_NAME", + "type": "STRING", + "modifier": "hidden", + "columnId": 1 + }, + { + "name": "P_MFGR", + "type": "STRING", + "modifier": "hidden", + "columnId": 2 + }, + { + "name": "P_BRAND", + "type": "STRING", + "modifier": "hidden", + "columnId": 3 + }, + { + "name": "P_TYPE", + "type": "STRING", + "modifier": "hidden", + "columnId": 4 + }, + { + "name": "P_SIZE", + "type": "INT", + "modifier": "hidden", + "columnId": 5 + }, + { + "name": "P_CONTAINER", + "type": "STRING", + "modifier": "hidden", + "columnId": 6 + }, + { + "name": "P_RETAILPRICE", + "type": "DOUBLE", + "modifier": "hidden", + "columnId": 7 + }, + { + "name": "P_COMMENT", + "type": "STRING", + "modifier": "hidden", + "columnId": 8 + } + ] + }, + { + "actualName": "partsupp", + "publishedName": "partsupp", + "publishedColumns": [ + { + "name": "PS_PARTKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 0 + }, + { + "name": "PS_SUPPKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 1 + }, + { + "name": "PS_AVAILQTY", + "type": "INT", + "modifier": "hidden", + "columnId": 2 + }, + { + "name": "PS_SUPPLYCOST", + "type": "DOUBLE", + "modifier": "hidden", + "columnId": 3 + }, + { + "name": "PS_COMMENT", + "type": "STRING", + "modifier": "hidden", + "columnId": 4 + } + ] + }, + { + "actualName": "region", + "publishedName": "region", + "publishedColumns": [ + { + "name": "R_REGIONKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 0 + }, + { + "name": "R_NAME", + "type": "STRING", + "modifier": "hidden", + "columnId": 1 + }, + { + "name": "R_COMMENT", + "type": "STRING", + "modifier": "hidden", + "columnId": 2 + } + ] + }, + { + "actualName": "supplier", + "publishedName": "supplier", + "publishedColumns": [ + { + "name": "S_SUPPKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 0 + }, + { + "name": "S_NAME", + "type": "STRING", + "modifier": "hidden", + "columnId": 1 + }, + { + "name": "S_ADDRESS", + "type": "STRING", + "modifier": "hidden", + "columnId": 2 + }, + { + "name": "S_NATIONKEY", + "type": "LONG", + "modifier": "hidden", + "columnId": 3 + }, + { + "name": "S_PHONE", + "type": "STRING", + "modifier": "hidden", + "columnId": 4 + }, + { + "name": "S_ACCTBAL", + "type": "DOUBLE", + "modifier": "hidden", + "columnId": 5 + }, + { + "name": "S_COMMENT", + "type": "STRING", + "modifier": "hidden", + "columnId": 6 } ] } diff --git a/release/config/owner1.json b/release/config/owner1.json index b4e087a4..cc0cb78c 100644 --- a/release/config/owner1.json +++ b/release/config/owner1.json @@ -4,7 +4,7 @@ "hostname": "localhost", "adapterconfig": { "datasource": "CSV", - "url": "../adapter/adapter-csv/src/test/resources/tpc-h", + "url": "../dataset/sample/tpc-h", "delimiter": "|" }, "tables": [ diff --git a/release/config/owner2.json b/release/config/owner2.json index 88ade463..858e7694 100644 --- a/release/config/owner2.json +++ b/release/config/owner2.json @@ -4,7 +4,7 @@ "hostname": "localhost", "adapterconfig": { "datasource": "CSV", - "url": "../adapter/adapter-csv/src/test/resources/tpc-h", + "url": "../dataset/sample/tpc-h", "delimiter": "|" }, "tables": [ diff --git a/release/config/owner3.json b/release/config/owner3.json index 0a80358f..45e362d6 100644 --- a/release/config/owner3.json +++ b/release/config/owner3.json @@ -4,7 +4,7 @@ "hostname": "localhost", "adapterconfig": { "datasource": "CSV", - "url": "../adapter/adapter-csv/src/test/resources/tpc-h", + "url": "../dataset/sample/tpc-h", "delimiter": "|" }, "tables": [