merged -r1401:1409 from asterix_stabilization to asterix_stabilization_func_type_check; removed a file mistakenly committed in r1409.
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_stabilization_func_type_check@1410 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.ddl.aql
index 99ffc17..733d940 100644
--- a/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.ddl.aql
+++ b/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.ddl.aql
@@ -1,6 +1,6 @@
drop dataverse tpch if exists;
create dataverse tpch;
-
+
use dataverse tpch;
create type LineItemType as closed {
@@ -88,3 +88,20 @@
ps_comment: string
}
+create dataset LineItem(LineItemType)
+ primary key l_orderkey, l_linenumber;
+create dataset Orders(OrderType)
+ primary key o_orderkey;
+create dataset Supplier(SupplierType)
+ primary key s_suppkey;
+create dataset Region(RegionType)
+ primary key r_regionkey;
+create dataset Nation(NationType)
+ primary key n_nationkey;
+create dataset Part(PartType)
+ primary key p_partkey;
+create dataset Partsupp(PartSuppType)
+ primary key ps_partkey, ps_suppkey;
+create dataset Customer(CustomerType)
+ primary key c_custkey;
+
diff --git a/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.ddl.aqlq6_forecast_revenue_change.1.ddl.aql b/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.ddl.aqlq6_forecast_revenue_change.1.ddl.aql
deleted file mode 100644
index 733d940..0000000
--- a/asterix-app/src/test/resources/runtimets/queries/tpch/q6_forecast_revenue_change/q6_forecast_revenue_change.1.ddl.aqlq6_forecast_revenue_change.1.ddl.aql
+++ /dev/null
@@ -1,107 +0,0 @@
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
- l_orderkey: int32,
- l_partkey: int32,
- l_suppkey: int32,
- l_linenumber: int32,
- l_quantity: int32,
- l_extendedprice: double,
- l_discount: double,
- l_tax: double,
- l_returnflag: string,
- l_linestatus: string,
- l_shipdate: string,
- l_commitdate: string,
- l_receiptdate: string,
- l_shipinstruct: string,
- l_shipmode: string,
- l_comment: string
-}
-
-create type OrderType as closed {
- o_orderkey: int32,
- o_custkey: int32,
- o_orderstatus: string,
- o_totalprice: double,
- o_orderdate: string,
- o_orderpriority: string,
- o_clerk: string,
- o_shippriority: int32,
- o_comment: string
-}
-
-create type CustomerType as closed {
- c_custkey: int32,
- c_name: string,
- c_address: string,
- c_nationkey: int32,
- c_phone: string,
- c_acctbal: double,
- c_mktsegment: string,
- c_comment: string
-}
-
-create type SupplierType as closed {
- s_suppkey: int32,
- s_name: string,
- s_address: string,
- s_nationkey: int32,
- s_phone: string,
- s_acctbal: double,
- s_comment: string
-}
-
-create type NationType as closed {
- n_nationkey: int32,
- n_name: string,
- n_regionkey: int32,
- n_comment: string
-}
-
-create type RegionType as closed {
- r_regionkey: int32,
- r_name: string,
- r_comment: string
-}
-
-create type PartType as closed {
- p_partkey: int32,
- p_name: string,
- p_mfgr: string,
- p_brand: string,
- p_type: string,
- p_size: int32,
- p_container: string,
- p_retailprice: double,
- p_comment: string
-}
-
-create type PartSuppType as closed {
- ps_partkey: int32,
- ps_suppkey: int32,
- ps_availqty: int32,
- ps_supplycost: double,
- ps_comment: string
-}
-
-create dataset LineItem(LineItemType)
- primary key l_orderkey, l_linenumber;
-create dataset Orders(OrderType)
- primary key o_orderkey;
-create dataset Supplier(SupplierType)
- primary key s_suppkey;
-create dataset Region(RegionType)
- primary key r_regionkey;
-create dataset Nation(NationType)
- primary key n_nationkey;
-create dataset Part(PartType)
- primary key p_partkey;
-create dataset Partsupp(PartSuppType)
- primary key ps_partkey, ps_suppkey;
-create dataset Customer(CustomerType)
- primary key c_custkey;
-
diff --git a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/common/AsterixFunctionInputTypeException.java b/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/common/AsterixFunctionInputTypeException.java
deleted file mode 100644
index d0014a2..0000000
--- a/asterix-runtime/src/main/java/edu/uci/ics/asterix/runtime/evaluators/common/AsterixFunctionInputTypeException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package edu.uci.ics.asterix.runtime.evaluators.common;
-
-import edu.uci.ics.asterix.om.types.ATypeTag;
-import edu.uci.ics.hyracks.algebricks.common.exceptions.AlgebricksException;
-import edu.uci.ics.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-
-public class AsterixFunctionInputTypeException extends AlgebricksException {
-
- private static final long serialVersionUID = 1L;
-
- public AsterixFunctionInputTypeException(FunctionIdentifier funcID, String message) {
- super(funcID.getName() + ": " + message);
- }
-
- public AsterixFunctionInputTypeException(FunctionIdentifier funcID, String message, ATypeTag... inputTypes) {
- super(getErrorMsg(funcID, message, inputTypes));
- }
-
- public static String getErrorMsg(FunctionIdentifier funcID, String message, ATypeTag[] inputTypes) {
- StringBuilder sbder = new StringBuilder();
- sbder.append(funcID.getName()).append(" (").append(inputTypes[0].name());
- for (ATypeTag tTag : inputTypes) {
- sbder.append(", ").append(tTag.name());
- }
- sbder.append(": ").append(message);
- return sbder.toString();
- }
-
-}
diff --git a/asterix-test-framework/src/main/java/edu/uci/ics/asterix/testframework/context/TestCaseContext.java b/asterix-test-framework/src/main/java/edu/uci/ics/asterix/testframework/context/TestCaseContext.java
index 74c47ac..d1818ff 100644
--- a/asterix-test-framework/src/main/java/edu/uci/ics/asterix/testframework/context/TestCaseContext.java
+++ b/asterix-test-framework/src/main/java/edu/uci/ics/asterix/testframework/context/TestCaseContext.java
@@ -55,9 +55,17 @@
String fileNames[] = path.list();
for (String fName : fileNames) {
+ if (fName.startsWith(".")) {
+ continue;
+ }
+
File testFile = new File(path, fName);
TestFileContext tfsc = new TestFileContext(testFile);
String[] nameSplits = fName.split("\\.");
+ if (nameSplits.length < 3) {
+ throw new IllegalArgumentException("Test file '" + cUnit.getName() + File.separatorChar
+ + fName + "' does not have the proper test file name format.");
+ }
tfsc.setSeqNum(nameSplits[nameSplits.length - 3]);
tfsc.setType(nameSplits[nameSplits.length - 2]);
testFileCtxs.add(tfsc);
@@ -78,9 +86,19 @@
if (fileNames != null) {
for (String fName : fileNames) {
+ if (fName.startsWith(".")) {
+ continue;
+ }
+
File testFile = new File(path, fName);
TestFileContext tfsc = new TestFileContext(testFile);
String[] nameSplits = fName.split("\\.");
+
+ if (nameSplits.length < 3) {
+ throw new IllegalArgumentException("Test file '" + cUnit.getName() + File.separatorChar
+ + fName + "' does not have the proper test file name format.");
+ }
+
tfsc.setSeqNum(nameSplits[nameSplits.length - 2]);
resultFileCtxs.add(tfsc);
}
