asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [50/51] [partial] asterixdb git commit: ASTERIXDB-1539: add aliases for several builtin types and builtin functions.
Date Fri, 23 Sep 2016 03:15:32 GMT
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
index db33184..9f2d5d8 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
@@ -33,10 +33,8 @@ import org.apache.asterix.lang.common.statement.DropDatasetStatement;
 import org.apache.asterix.lang.common.statement.InsertStatement;
 import org.apache.asterix.lang.common.statement.NodeGroupDropStatement;
 import org.apache.asterix.metadata.dataset.hints.DatasetHints;
-import org.apache.asterix.metadata.entities.AsterixBuiltinTypeMap;
 import org.apache.asterix.metadata.entities.Dataverse;
 import org.apache.asterix.metadata.utils.MetadataConstants;
-import org.apache.asterix.om.types.BuiltinType;
 import org.apache.asterix.runtime.util.AsterixAppContextInfo;
 import org.apache.asterix.runtime.util.ClusterStateManager;
 import org.apache.hyracks.algebricks.common.utils.Pair;
@@ -49,8 +47,6 @@ public abstract class AbstractLangTranslator {
 
     private static final Logger LOGGER = Logger.getLogger(AbstractLangTranslator.class.getName());
 
-    protected static final Map<String, BuiltinType> builtinTypeMap = AsterixBuiltinTypeMap.getBuiltinTypes();
-
     public void validateOperation(Dataverse defaultDataverse, Statement stmt) throws AsterixException {
 
         if (!(ClusterStateManager.INSTANCE.getState().equals(ClusterState.ACTIVE)

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java
index 2a30713..e50c7ca 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java
@@ -30,13 +30,13 @@ import org.apache.asterix.common.annotations.RecordDataGenAnnotation;
 import org.apache.asterix.common.exceptions.AsterixException;
 import org.apache.asterix.lang.common.expression.OrderedListTypeDefinition;
 import org.apache.asterix.lang.common.expression.RecordTypeDefinition;
-import org.apache.asterix.lang.common.expression.RecordTypeDefinition.RecordKind;
 import org.apache.asterix.lang.common.expression.TypeExpression;
 import org.apache.asterix.lang.common.expression.TypeReferenceExpression;
 import org.apache.asterix.lang.common.expression.UnorderedListTypeDefinition;
+import org.apache.asterix.lang.common.expression.RecordTypeDefinition.RecordKind;
 import org.apache.asterix.metadata.MetadataManager;
 import org.apache.asterix.metadata.MetadataTransactionContext;
-import org.apache.asterix.metadata.entities.AsterixBuiltinTypeMap;
+import org.apache.asterix.metadata.entities.BuiltinTypeMap;
 import org.apache.asterix.metadata.entities.Datatype;
 import org.apache.asterix.metadata.utils.MetadataConstants;
 import org.apache.asterix.om.types.AOrderedListType;
@@ -45,13 +45,11 @@ import org.apache.asterix.om.types.AUnionType;
 import org.apache.asterix.om.types.AUnorderedListType;
 import org.apache.asterix.om.types.AbstractCollectionType;
 import org.apache.asterix.om.types.AbstractComplexType;
-import org.apache.asterix.om.types.BuiltinType;
 import org.apache.asterix.om.types.IAType;
 import org.apache.asterix.om.types.TypeSignature;
 import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
 
 public class TypeTranslator {
-    private static final Map<String, BuiltinType> builtinTypeMap = AsterixBuiltinTypeMap.getBuiltinTypes();
 
     private TypeTranslator() {
     }
@@ -87,7 +85,7 @@ public class TypeTranslator {
             Map<TypeSignature, List<TypeSignature>> incompleteTopLevelTypeReferences, String typeDataverse)
             throws AlgebricksException {
 
-        if (builtinTypeMap.get(typeName) != null) {
+        if (BuiltinTypeMap.getBuiltinType(typeName) != null) {
             throw new AlgebricksException("Cannot redefine builtin type " + typeName + " .");
         }
         TypeSignature typeSignature = new TypeSignature(typeDataverse, typeName);
@@ -318,7 +316,7 @@ public class TypeTranslator {
     }
 
     private static IAType solveTypeReference(TypeSignature typeSignature, Map<TypeSignature, IAType> typeMap) {
-        IAType builtin = builtinTypeMap.get(typeSignature.getName());
+        IAType builtin = BuiltinTypeMap.getBuiltinType(typeSignature.getName());
         if (builtin != null) {
             return builtin;
         } else {

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index d5811c4..5a45dd1 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -34,9 +34,9 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Random;
+import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -56,21 +56,21 @@ import org.apache.asterix.app.result.ResultUtil;
 import org.apache.asterix.common.app.SessionConfig;
 import org.apache.asterix.common.config.AsterixExternalProperties;
 import org.apache.asterix.common.config.ClusterProperties;
+import org.apache.asterix.common.config.GlobalConfig;
 import org.apache.asterix.common.config.DatasetConfig.DatasetType;
 import org.apache.asterix.common.config.DatasetConfig.ExternalDatasetTransactionState;
 import org.apache.asterix.common.config.DatasetConfig.ExternalFilePendingOp;
 import org.apache.asterix.common.config.DatasetConfig.IndexType;
-import org.apache.asterix.common.config.GlobalConfig;
 import org.apache.asterix.common.exceptions.ACIDException;
 import org.apache.asterix.common.exceptions.AsterixException;
 import org.apache.asterix.common.functions.FunctionSignature;
 import org.apache.asterix.compiler.provider.ILangCompilationProvider;
 import org.apache.asterix.external.api.IAdapterFactory;
 import org.apache.asterix.external.feed.api.IFeed;
-import org.apache.asterix.external.feed.api.IFeed.FeedType;
 import org.apache.asterix.external.feed.api.IFeedJoint;
-import org.apache.asterix.external.feed.api.IFeedJoint.FeedJointType;
 import org.apache.asterix.external.feed.api.IFeedLifecycleEventSubscriber;
+import org.apache.asterix.external.feed.api.IFeed.FeedType;
+import org.apache.asterix.external.feed.api.IFeedJoint.FeedJointType;
 import org.apache.asterix.external.feed.api.IFeedLifecycleEventSubscriber.FeedLifecycleEvent;
 import org.apache.asterix.external.feed.management.FeedConnectionId;
 import org.apache.asterix.external.feed.management.FeedConnectionRequest;
@@ -78,9 +78,9 @@ import org.apache.asterix.external.feed.management.FeedEventsListener;
 import org.apache.asterix.external.feed.management.FeedJointKey;
 import org.apache.asterix.external.feed.management.FeedLifecycleEventSubscriber;
 import org.apache.asterix.external.feed.policy.FeedPolicyAccessor;
-import org.apache.asterix.external.feed.watch.FeedActivity.FeedActivityDetails;
 import org.apache.asterix.external.feed.watch.FeedConnectJobInfo;
 import org.apache.asterix.external.feed.watch.FeedIntakeInfo;
+import org.apache.asterix.external.feed.watch.FeedActivity.FeedActivityDetails;
 import org.apache.asterix.external.indexing.ExternalFile;
 import org.apache.asterix.external.util.FeedUtils.FeedRuntimeType;
 import org.apache.asterix.file.DatasetOperations;
@@ -137,6 +137,7 @@ import org.apache.asterix.metadata.bootstrap.MetadataBuiltinEntities;
 import org.apache.asterix.metadata.dataset.hints.DatasetHints;
 import org.apache.asterix.metadata.dataset.hints.DatasetHints.DatasetNodegroupCardinalityHint;
 import org.apache.asterix.metadata.declared.AqlMetadataProvider;
+import org.apache.asterix.metadata.entities.BuiltinTypeMap;
 import org.apache.asterix.metadata.entities.CompactionPolicy;
 import org.apache.asterix.metadata.entities.Dataset;
 import org.apache.asterix.metadata.entities.Datatype;
@@ -164,6 +165,8 @@ import org.apache.asterix.om.types.hierachy.ATypeHierarchy;
 import org.apache.asterix.runtime.util.AsterixAppContextInfo;
 import org.apache.asterix.transaction.management.service.transaction.DatasetIdFactory;
 import org.apache.asterix.translator.AbstractLangTranslator;
+import org.apache.asterix.translator.IStatementExecutor;
+import org.apache.asterix.translator.TypeTranslator;
 import org.apache.asterix.translator.CompiledStatements.CompiledConnectFeedStatement;
 import org.apache.asterix.translator.CompiledStatements.CompiledCreateIndexStatement;
 import org.apache.asterix.translator.CompiledStatements.CompiledDatasetDropStatement;
@@ -175,8 +178,6 @@ import org.apache.asterix.translator.CompiledStatements.CompiledLoadFromFileStat
 import org.apache.asterix.translator.CompiledStatements.CompiledSubscribeFeedStatement;
 import org.apache.asterix.translator.CompiledStatements.CompiledUpsertStatement;
 import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement;
-import org.apache.asterix.translator.IStatementExecutor;
-import org.apache.asterix.translator.TypeTranslator;
 import org.apache.asterix.translator.util.ValidateUtil;
 import org.apache.asterix.util.FlushDatasetUtils;
 import org.apache.asterix.util.JobUtils;
@@ -1158,7 +1159,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
                     throw new AlgebricksException("A datatype with this name " + typeName + " already exists.");
                 }
             } else {
-                if (builtinTypeMap.get(typeName) != null) {
+                if (BuiltinTypeMap.getBuiltinType(typeName) != null) {
                     throw new AlgebricksException("Cannot redefine builtin type " + typeName + ".");
                 } else {
                     Map<TypeSignature, IAType> typeMap = TypeTranslator.computeTypes(mdTxnCtx,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp
index 5ac3b5a..2081d2e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-agg.sqlpp
@@ -34,12 +34,12 @@ create type TinySocial.TweetMessageType as {
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create type TinySocial.FacebookMessageType as
  open {
-  `message-id` : int64
+  `message-id` : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp
index b9d4972..b901447 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/constant-gby-agg.sqlpp
@@ -34,12 +34,12 @@ create type TinySocial.TweetMessageType as {
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create type TinySocial.FacebookMessageType as
  open {
-  `message-id` : int64
+  `message-id` : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
index a224428..0c69f5b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/count-dataset.sqlpp
@@ -25,12 +25,12 @@ use TinySocial;
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
-COLL_COUNT(FacebookUsers);
+ARRAY_COUNT(FacebookUsers);
 
 drop dataverse TinySocial;
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp
index f738fad..a77a741 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/list-dataset.sqlpp
@@ -25,7 +25,7 @@ use TinySocial;
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
index c22d86d..40f5a48 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-2.sqlpp
@@ -26,10 +26,10 @@ use TinySocial;
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
-SELECT count(`friend-ids`) * avg(coll_count(`friend-ids`)) AS total
+SELECT count(`friend-ids`) * avg(array_count(`friend-ids`)) AS total
 FROM  FacebookUsers;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
index cbb9823..518afd1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626-3.sqlpp
@@ -26,12 +26,12 @@ use TinySocial;
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
 // The plan uses a group-by operator with the groupAll flag be true.
 WITH t AS 1
-SELECT count(`friend-ids`) * avg(coll_count(`friend-ids`)) AS total, t
+SELECT count(`friend-ids`) * avg(array_count(`friend-ids`)) AS total, t
 FROM  FacebookUsers;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
index 37ad467..ff8c5ba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/aggregate/query-ASTERIXDB-1626.sqlpp
@@ -26,10 +26,10 @@ use TinySocial;
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
 
-SELECT count(`friend-ids`), avg(coll_count(`friend-ids`))
+SELECT count(`friend-ids`), avg(array_count(`friend-ids`))
 FROM  FacebookUsers;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp
index 106fc9d..55afe6a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/primary-between-join_01.sqlpp
@@ -22,8 +22,8 @@ create dataverse test1;
 use test1;
 
 create type TestType as open {
-    key1: int32,
-    key2: int32,
+    key1: integer,
+    key2: integer,
     fname : string,
     lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp
index 6a85b6a..753b2d1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-2.sqlpp
@@ -24,11 +24,11 @@ create dataverse test;
 use test;
 
 create type FooType as {
-  fid: int32
+  fid: integer
 }
 
 create type BarType as {
-  bid: int32
+  bid: integer
 }
 
 create dataset Foo(FooType) primary key fid;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp
index e555352..687f9d0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch-3.sqlpp
@@ -24,11 +24,11 @@ create dataverse test;
 use test;
 
 create type FooType as {
-  fid: int32
+  fid: integer
 }
 
 create type BarType as {
-  bid: int32
+  bid: integer
 }
 
 create dataset Foo(FooType) primary key fid;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp
index 2b92d97..cce9f91 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/join-singletonbranch.sqlpp
@@ -24,11 +24,11 @@ create dataverse test;
 use test;
 
 create type FooType as {
-  fid: int32
+  fid: integer
 }
 
 create type BarType as {
-  bid: int32
+  bid: integer
 }
 
 create dataset Foo(FooType) primary key fid;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp
index fdf21bd..2a5ed3a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-core.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -34,7 +34,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp
index 214dffd..1a952d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/loj-sugar.sqlpp
@@ -25,7 +25,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int64,
+  id : bigint,
   dblpid : string,
   title : string,
   authors : string,
@@ -34,7 +34,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int64,
+  id : bigint,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
index 5b87757..f85161d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/query-ASTERIXDB-159-3.sqlpp
@@ -24,7 +24,7 @@ use TinySocial;
 
 create type TinySocial.FacebookUserType as
  open {
-  id : int64
+  id : bigint
 }
 
 create  dataset FacebookUsers(FacebookUserType) primary key id;
@@ -32,7 +32,7 @@ create  dataset FacebookUsers(FacebookUserType) primary key id;
 SELECT fu1.id id1, fu2.id id2
 FROM FacebookUsers fu1
 LEFT OUTER JOIN FacebookUsers fu2
-ON COLL_COUNT(RANGE(fu1.id, fu2.id))>2 AND COLL_COUNT(RANGE(fu1.id, fu2.id))<5
+ON ARRAY_COUNT(RANGE(fu1.id, fu2.id))>2 AND ARRAY_COUNT(RANGE(fu1.id, fu2.id))<5
 ORDER BY fu1.id DESC, fu2.id DESC
 LIMIT 5;
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp
index 020bb1f..a38359d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/exists.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp
index 606aaf1..270c81a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in.sqlpp
@@ -23,11 +23,11 @@ USE test;
 
 
 CREATE TYPE OrderType AS {
-  o_orderkey: int32
+  o_orderkey: integer
 }
 
 CREATE TYPE CustomerType AS {
-  c_custkey: int32
+  c_custkey: integer
 }
 
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp
index f994a65..dfbef68 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/in_correlated.sqlpp
@@ -24,11 +24,11 @@ USE test;
 
 
 CREATE TYPE OrderType AS {
-  o_orderkey: int32
+  o_orderkey: integer
 }
 
 CREATE TYPE CustomerType AS {
-  c_custkey: int32
+  c_custkey: integer
 }
 
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp
index 2f484b8..f31b7c1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/not_exists.sqlpp
@@ -23,22 +23,22 @@ USE test;
 
 
 CREATE TYPE OrderType AS CLOSED {
-  o_orderkey: int32,
-  o_custkey: int32,
+  o_orderkey: integer,
+  o_custkey: integer,
   o_orderstatus: string,
   o_totalprice: double,
   o_orderdate: string,
   o_orderpriority: string,
   o_clerk: string,
-  o_shippriority: int32,
+  o_shippriority: integer,
   o_comment: string
 }
 
 CREATE TYPE CustomerType AS CLOSED {
-  c_custkey: int32,
+  c_custkey: integer,
   c_name: string,
   c_address: string,
-  c_nationkey: int32,
+  c_nationkey: integer,
   c_phone: string,
   c_acctbal: double,
   c_mktsegment: string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/query-ASTERIXDB-1572.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/query-ASTERIXDB-1572.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/query-ASTERIXDB-1572.sqlpp
index 1bafb45..76568bb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/query-ASTERIXDB-1572.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/subquery/query-ASTERIXDB-1572.sqlpp
@@ -25,7 +25,7 @@ drop dataset samptable if exists;
 drop type samptabletype if exists;
 
 create type samptabletype as closed {
-  id: int64
+  id: bigint
 };
 
 create dataset samptable(samptabletype) primary key id;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp
index a43bee6..fc72375 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1580.sqlpp
@@ -23,7 +23,7 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.customer_address_type as closed {
-    ca_address_sk:              int64,
+    ca_address_sk:              bigint,
     ca_address_id:              string,
     ca_street_number:           string?,
     ca_street_name:             string?,
@@ -39,20 +39,20 @@ create type tpcds.customer_address_type as closed {
 }
 
 create type tpcds.customer_type as closed {
-    c_customer_sk:             int64,
+    c_customer_sk:             bigint,
     c_customer_id:             string,
-    c_current_cdemo_sk:        int64?,
-    c_current_hdemo_sk:        int64?,
-    c_current_addr_sk:         int64?,
-    c_first_shipto_date_sk:    int64?,
-    c_first_sales_date_sk:     int64?,
+    c_current_cdemo_sk:        bigint?,
+    c_current_hdemo_sk:        bigint?,
+    c_current_addr_sk:         bigint?,
+    c_first_shipto_date_sk:    bigint?,
+    c_first_sales_date_sk:     bigint?,
     c_salutation:              string?,
     c_first_name:              string?,
     c_last_name:               string?,
     c_preferred_cust_flag:     string?,
-    c_birth_day:               int64?,
-    c_birth_month:             int64?,
-    c_birth_year:              int64?,
+    c_birth_day:               bigint?,
+    c_birth_month:             bigint?,
+    c_birth_year:              bigint?,
     c_birth_country:           string?,
     c_login:                   string?,
     c_email_address:           string?,
@@ -60,17 +60,17 @@ create type tpcds.customer_type as closed {
 }
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -86,29 +86,29 @@ create type tpcds.store_sales_type as closed {
 }
 
 create type tpcds.date_dim_type as closed {
-    d_date_sk:                 int64,
+    d_date_sk:                 bigint,
     d_date_id:                 string,
     d_date:                    string? ,
-    d_month_seq:               int64?,
-    d_week_seq:                int64?,
-    d_quarter_seq:             int64?,
-    d_year:                    int64?,
-    d_dow:                     int64?,
-    d_moy:                     int64?,
-    d_dom:                     int64?,
-    d_qoy:                     int64?,
-    d_fy_year:                 int64?,
-    d_fy_quarter_seq:          int64?,
-    d_fy_week_seq:             int64?,
+    d_month_seq:               bigint?,
+    d_week_seq:                bigint?,
+    d_quarter_seq:             bigint?,
+    d_year:                    bigint?,
+    d_dow:                     bigint?,
+    d_moy:                     bigint?,
+    d_dom:                     bigint?,
+    d_qoy:                     bigint?,
+    d_fy_year:                 bigint?,
+    d_fy_quarter_seq:          bigint?,
+    d_fy_week_seq:             bigint?,
     d_day_name:                string?,
     d_quarter_name:            string?,
     d_holiday:                 string?,
     d_weekend:                 string?,
     d_following_holiday:       string?,
-    d_first_dom:               int64?,
-    d_last_dom:                int64?,
-    d_same_day_ly:             int64?,
-    d_same_day_lq:             int64?,
+    d_first_dom:               bigint?,
+    d_last_dom:                bigint?,
+    d_same_day_ly:             bigint?,
+    d_same_day_lq:             bigint?,
     d_current_day:             string?,
     d_current_week:            string?,
     d_current_month:           string?,
@@ -117,27 +117,27 @@ create type tpcds.date_dim_type as closed {
 }
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp
index 9f96f9b..39b3eac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581-correlated.sqlpp
@@ -23,17 +23,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -50,27 +50,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp
index 1fecc6c..d736540 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1581.sqlpp
@@ -23,17 +23,17 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -50,27 +50,27 @@ create type tpcds.store_sales_type as closed {
 
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp
index 42b9462..3886520 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1591.sqlpp
@@ -25,7 +25,7 @@ create dataverse tpcds;
 use tpcds;
 
 create type customer_address_type as closed {
-    ca_address_sk:              int64,
+    ca_address_sk:              bigint,
     ca_address_id:              string,
     ca_street_number:           string?,
     ca_street_name:             string?,
@@ -41,20 +41,20 @@ create type customer_address_type as closed {
 }
 
 create type customer_type as closed {
-    c_customer_sk:             int64,
+    c_customer_sk:             bigint,
     c_customer_id:             string,
-    c_current_cdemo_sk:        int64?,
-    c_current_hdemo_sk:        int64?,
-    c_current_addr_sk:         int64?,
-    c_first_shipto_date_sk:    int64?,
-    c_first_sales_date_sk:     int64?,
+    c_current_cdemo_sk:        bigint?,
+    c_current_hdemo_sk:        bigint?,
+    c_current_addr_sk:         bigint?,
+    c_first_shipto_date_sk:    bigint?,
+    c_first_sales_date_sk:     bigint?,
     c_salutation:              string?,
     c_first_name:              string?,
     c_last_name:               string?,
     c_preferred_cust_flag:     string?,
-    c_birth_day:               int64?,
-    c_birth_month:             int64?,
-    c_birth_year:              int64?,
+    c_birth_day:               bigint?,
+    c_birth_month:             bigint?,
+    c_birth_year:              bigint?,
     c_birth_country:           string?,
     c_login:                   string?,
     c_email_address:           string?,
@@ -62,17 +62,17 @@ create type customer_type as closed {
 }
 
 create type store_sales_type as closed {
-    ss_sold_date_sk:           int64?,
-    ss_sold_time_sk:           int64?,
-    ss_item_sk:                int64,
-    ss_customer_sk:            int64?,
-    ss_cdemo_sk:               int64?,
-    ss_hdemo_sk:               int64?,
-    ss_addr_sk:                int64?,
-    ss_store_sk:               int64?,
-    ss_promo_sk:               int64?,
-    ss_ticket_number:          int64,
-    ss_quantity:               int64?,
+    ss_sold_date_sk:           bigint?,
+    ss_sold_time_sk:           bigint?,
+    ss_item_sk:                bigint,
+    ss_customer_sk:            bigint?,
+    ss_cdemo_sk:               bigint?,
+    ss_hdemo_sk:               bigint?,
+    ss_addr_sk:                bigint?,
+    ss_store_sk:               bigint?,
+    ss_promo_sk:               bigint?,
+    ss_ticket_number:          bigint,
+    ss_quantity:               bigint?,
     ss_wholesale_cost:         double?,
     ss_list_price:             double?,
     ss_sales_price:            double?,
@@ -88,25 +88,25 @@ create type store_sales_type as closed {
 }
 
 create type catalog_sales_type as closed {
-    cs_sold_date_sk:           int64?,
-    cs_sold_time_sk:           int64?,
-    cs_ship_date_sk:           int64?,
-    cs_bill_customer_sk:       int64?,
-    cs_bill_cdemo_sk:          int64?,
-    cs_bill_hdemo_sk:          int64?,
-    cs_bill_addr_sk:           int64?,
-    cs_ship_customer_sk:       int64?,
-    cs_ship_cdemo_sk:          int64?,
-    cs_ship_hdemo_sk:          int64?,
-    cs_ship_addr_sk:           int64?,
-    cs_call_center_sk:         int64?,
-    cs_catalog_page_sk:        int64?,
-    cs_ship_mode_sk:           int64?,
-    cs_warehouse_sk:           int64?,
-    cs_item_sk:                int64,
-    cs_promo_sk:               int64?,
-    cs_order_number:           int64,
-    cs_quantity:               int64?,
+    cs_sold_date_sk:           bigint?,
+    cs_sold_time_sk:           bigint?,
+    cs_ship_date_sk:           bigint?,
+    cs_bill_customer_sk:       bigint?,
+    cs_bill_cdemo_sk:          bigint?,
+    cs_bill_hdemo_sk:          bigint?,
+    cs_bill_addr_sk:           bigint?,
+    cs_ship_customer_sk:       bigint?,
+    cs_ship_cdemo_sk:          bigint?,
+    cs_ship_hdemo_sk:          bigint?,
+    cs_ship_addr_sk:           bigint?,
+    cs_call_center_sk:         bigint?,
+    cs_catalog_page_sk:        bigint?,
+    cs_ship_mode_sk:           bigint?,
+    cs_warehouse_sk:           bigint?,
+    cs_item_sk:                bigint,
+    cs_promo_sk:               bigint?,
+    cs_order_number:           bigint,
+    cs_quantity:               bigint?,
     cs_wholesale_cost:         double?,
     cs_list_price:             double?,
     cs_sales_price:            double?,
@@ -125,24 +125,24 @@ create type catalog_sales_type as closed {
 }
 
 create type catalog_returns_type as closed {
-    cr_returned_date_sk:       int64?,
-    cr_returned_time_sk:       int64?,
-    cr_item_sk:                int64,
-    cr_refunded_customer_sk:   int64?,
-    cr_refunded_cdemo_sk:      int64?,
-    cr_refunded_hdemo_sk:      int64?,
-    cr_refunded_addr_sk:       int64?,
-    cr_returning_customer_sk:  int64?,
-    cr_returning_cdemo_sk:     int64?,
-    cr_returning_hdemo_sk:     int64?,
-    cr_returning_addr_sk:      int64?,
-    cr_call_center_sk:         int64?,
-    cr_catalog_page_sk:        int64?,
-    cr_ship_mode_sk:           int64?,
-    cr_warehouse_sk:           int64?,
-    cr_reason_sk:              int64?,
-    cr_order_number:           int64,
-    cr_return_quantity:        int64?,
+    cr_returned_date_sk:       bigint?,
+    cr_returned_time_sk:       bigint?,
+    cr_item_sk:                bigint,
+    cr_refunded_customer_sk:   bigint?,
+    cr_refunded_cdemo_sk:      bigint?,
+    cr_refunded_hdemo_sk:      bigint?,
+    cr_refunded_addr_sk:       bigint?,
+    cr_returning_customer_sk:  bigint?,
+    cr_returning_cdemo_sk:     bigint?,
+    cr_returning_hdemo_sk:     bigint?,
+    cr_returning_addr_sk:      bigint?,
+    cr_call_center_sk:         bigint?,
+    cr_catalog_page_sk:        bigint?,
+    cr_ship_mode_sk:           bigint?,
+    cr_warehouse_sk:           bigint?,
+    cr_reason_sk:              bigint?,
+    cr_order_number:           bigint,
+    cr_return_quantity:        bigint?,
     cr_return_amount:          double?,
     cr_return_tax:             double?,
     cr_return_amt_inc_tax:     double?,
@@ -155,29 +155,29 @@ create type catalog_returns_type as closed {
 }
 
 create type tpcds.date_dim_type as closed {
-    d_date_sk:                 int64,
+    d_date_sk:                 bigint,
     d_date_id:                 string,
     d_date:                    string? ,
-    d_month_seq:               int64?,
-    d_week_seq:                int64?,
-    d_quarter_seq:             int64?,
-    d_year:                    int64?,
-    d_dow:                     int64?,
-    d_moy:                     int64?,
-    d_dom:                     int64?,
-    d_qoy:                     int64?,
-    d_fy_year:                 int64?,
-    d_fy_quarter_seq:          int64?,
-    d_fy_week_seq:             int64?,
+    d_month_seq:               bigint?,
+    d_week_seq:                bigint?,
+    d_quarter_seq:             bigint?,
+    d_year:                    bigint?,
+    d_dow:                     bigint?,
+    d_moy:                     bigint?,
+    d_dom:                     bigint?,
+    d_qoy:                     bigint?,
+    d_fy_year:                 bigint?,
+    d_fy_quarter_seq:          bigint?,
+    d_fy_week_seq:             bigint?,
     d_day_name:                string?,
     d_quarter_name:            string?,
     d_holiday:                 string?,
     d_weekend:                 string?,
     d_following_holiday:       string?,
-    d_first_dom:               int64?,
-    d_last_dom:                int64?,
-    d_same_day_ly:             int64?,
-    d_same_day_lq:             int64?,
+    d_first_dom:               bigint?,
+    d_last_dom:                bigint?,
+    d_same_day_ly:             bigint?,
+    d_same_day_lq:             bigint?,
     d_current_day:             string?,
     d_current_week:            string?,
     d_current_month:           string?,
@@ -186,50 +186,50 @@ create type tpcds.date_dim_type as closed {
 }
 
 create type item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 
 create type web_sales_type as closed {
-    ws_sold_date_sk:           int64?,
-    ws_sold_time_sk:           int64?,
-    ws_ship_date_sk:           int64?,
-    ws_item_sk:                int64,
-    ws_bill_customer_sk:       int64?,
-    ws_bill_cdemo_sk:          int64?,
-    ws_bill_hdemo_sk:          int64?,
-    ws_bill_addr_sk:           int64?,
-    ws_ship_customer_sk:       int64?,
-    ws_ship_cdemo_sk:          int64?,
-    ws_ship_hdemo_sk:          int64?,
-    ws_ship_addr_sk:           int64?,
-    ws_web_page_sk:            int64?,
-    ws_web_site_sk:            int64?,
-    ws_ship_mode_sk:           int64?,
-    ws_warehouse_sk:           int64?,
-    ws_promo_sk:               int64?,
-    ws_order_number:           int64,
-    ws_quantity:               int64?,
+    ws_sold_date_sk:           bigint?,
+    ws_sold_time_sk:           bigint?,
+    ws_ship_date_sk:           bigint?,
+    ws_item_sk:                bigint,
+    ws_bill_customer_sk:       bigint?,
+    ws_bill_cdemo_sk:          bigint?,
+    ws_bill_hdemo_sk:          bigint?,
+    ws_bill_addr_sk:           bigint?,
+    ws_ship_customer_sk:       bigint?,
+    ws_ship_cdemo_sk:          bigint?,
+    ws_ship_hdemo_sk:          bigint?,
+    ws_ship_addr_sk:           bigint?,
+    ws_web_page_sk:            bigint?,
+    ws_web_site_sk:            bigint?,
+    ws_ship_mode_sk:           bigint?,
+    ws_warehouse_sk:           bigint?,
+    ws_promo_sk:               bigint?,
+    ws_order_number:           bigint,
+    ws_quantity:               bigint?,
     ws_wholesale_cost:         double?,
     ws_list_price:             double?,
     ws_sales_price:            double?,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp
index e13a3c5..a953e59 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpcds/query-ASTERIXDB-1596.sqlpp
@@ -23,25 +23,25 @@ create dataverse tpcds;
 use tpcds;
 
 create type tpcds.catalog_sales_type as closed {
-    cs_sold_date_sk:           int64?,
-    cs_sold_time_sk:           int64?,
-    cs_ship_date_sk:           int64?,
-    cs_bill_customer_sk:       int64?,
-    cs_bill_cdemo_sk:          int64?,
-    cs_bill_hdemo_sk:          int64?,
-    cs_bill_addr_sk:           int64?,
-    cs_ship_customer_sk:       int64?,
-    cs_ship_cdemo_sk:          int64?,
-    cs_ship_hdemo_sk:          int64?,
-    cs_ship_addr_sk:           int64?,
-    cs_call_center_sk:         int64?,
-    cs_catalog_page_sk:        int64?,
-    cs_ship_mode_sk:           int64?,
-    cs_warehouse_sk:           int64?,
-    cs_item_sk:                int64,
-    cs_promo_sk:               int64?,
-    cs_order_number:           int64,
-    cs_quantity:               int64?,
+    cs_sold_date_sk:           bigint?,
+    cs_sold_time_sk:           bigint?,
+    cs_ship_date_sk:           bigint?,
+    cs_bill_customer_sk:       bigint?,
+    cs_bill_cdemo_sk:          bigint?,
+    cs_bill_hdemo_sk:          bigint?,
+    cs_bill_addr_sk:           bigint?,
+    cs_ship_customer_sk:       bigint?,
+    cs_ship_cdemo_sk:          bigint?,
+    cs_ship_hdemo_sk:          bigint?,
+    cs_ship_addr_sk:           bigint?,
+    cs_call_center_sk:         bigint?,
+    cs_catalog_page_sk:        bigint?,
+    cs_ship_mode_sk:           bigint?,
+    cs_warehouse_sk:           bigint?,
+    cs_item_sk:                bigint,
+    cs_promo_sk:               bigint?,
+    cs_order_number:           bigint,
+    cs_quantity:               bigint?,
     cs_wholesale_cost:         double?,
     cs_list_price:             double?,
     cs_sales_price:            double?,
@@ -60,24 +60,24 @@ create type tpcds.catalog_sales_type as closed {
 }
 
 create type tpcds.catalog_returns_type as closed {
-    cr_returned_date_sk:       int64?,
-    cr_returned_time_sk:       int64?,
-    cr_item_sk:                int64,
-    cr_refunded_customer_sk:   int64?,
-    cr_refunded_cdemo_sk:      int64?,
-    cr_refunded_hdemo_sk:      int64?,
-    cr_refunded_addr_sk:       int64?,
-    cr_returning_customer_sk:  int64?,
-    cr_returning_cdemo_sk:     int64?,
-    cr_returning_hdemo_sk:     int64?,
-    cr_returning_addr_sk:      int64?,
-    cr_call_center_sk:         int64?,
-    cr_catalog_page_sk:        int64?,
-    cr_ship_mode_sk:           int64?,
-    cr_warehouse_sk:           int64?,
-    cr_reason_sk:              int64?,
-    cr_order_number:           int64,
-    cr_return_quantity:        int64?,
+    cr_returned_date_sk:       bigint?,
+    cr_returned_time_sk:       bigint?,
+    cr_item_sk:                bigint,
+    cr_refunded_customer_sk:   bigint?,
+    cr_refunded_cdemo_sk:      bigint?,
+    cr_refunded_hdemo_sk:      bigint?,
+    cr_refunded_addr_sk:       bigint?,
+    cr_returning_customer_sk:  bigint?,
+    cr_returning_cdemo_sk:     bigint?,
+    cr_returning_hdemo_sk:     bigint?,
+    cr_returning_addr_sk:      bigint?,
+    cr_call_center_sk:         bigint?,
+    cr_catalog_page_sk:        bigint?,
+    cr_ship_mode_sk:           bigint?,
+    cr_warehouse_sk:           bigint?,
+    cr_reason_sk:              bigint?,
+    cr_order_number:           bigint,
+    cr_return_quantity:        bigint?,
     cr_return_amount:          double?,
     cr_return_tax:             double?,
     cr_return_amt_inc_tax:     double?,
@@ -90,27 +90,27 @@ create type tpcds.catalog_returns_type as closed {
 }
 
 create type tpcds.item_type as closed {
-    i_item_sk:                 int64,
+    i_item_sk:                 bigint,
     i_item_id:                 string,
     i_rec_start_date:          string?,
     i_rec_end_date:            string?,
     i_item_desc:               string?,
     i_current_price:           double?,
     i_wholesale_cost:          double?,
-    i_brand_id:                int64? ,
+    i_brand_id:                bigint? ,
     i_brand:                   string?,
-    i_class_id:                int64? ,
+    i_class_id:                bigint? ,
     i_class:                   string?,
-    i_category_id:             int64? ,
+    i_category_id:             bigint? ,
     i_category:                string?,
-    i_manufact_id:             int64? ,
+    i_manufact_id:             bigint? ,
     i_manufact:                string?,
     i_size:                    string?,
     i_formulation:             string?,
     i_color:                   string?,
     i_units:                   string?,
     i_container:               string?,
-    i_manager_id:              int64?,
+    i_manager_id:              bigint?,
     i_product_name:            string?
 }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp
index d89ecf7..e1d10e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries/tpch/q12_shipping.sqlpp
@@ -25,11 +25,11 @@ USE tpch;
 
 
 CREATE TYPE LineItemType AS {
-  l_linenumber : int32
+  l_linenumber : integer
 }
 
 CREATE TYPE OrderType AS {
-  o_orderkey : int32
+  o_orderkey : integer
 }
 
 CREATE DATASET LineItem(LineItemType) PRIMARY KEY l_linenumber;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
index 2d375a7..bf58b28 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.sqlpp
@@ -33,22 +33,22 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageType as
  closed {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int32,
-  countB : int32
+  countA : integer,
+  countB : integer
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
@@ -69,6 +69,6 @@ select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         order by t2.tweetid
     )}
 from  TweetMessages as t1
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
index 758e84c..0d0933d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.sqlpp
@@ -33,22 +33,22 @@ create type test.TwitterUserType as
  closed {
   `screen-name` : string,
   lang : string,
-  `friends-count` : int32,
-  `statuses-count` : int32,
+  `friends-count` : integer,
+  `statuses-count` : integer,
   name : string,
-  `followers-count` : int32
+  `followers-count` : integer
 }
 
 create type test.TweetMessageType as
  closed {
-  tweetid : int64,
+  tweetid : bigint,
   user : TwitterUserType,
   `sender-location` : point,
   `send-time` : datetime,
   `referred-topics` : {{string}},
   `message-text` : string,
-  countA : int32,
-  countB : int32
+  countA : integer,
+  countB : integer
 }
 
 create  dataset TweetMessages(TweetMessageType) primary key tweetid;
@@ -69,6 +69,6 @@ select element {'tweetid1':t1.tweetid,'count1':t1.countA,'t2info':(
         order by t2.tweetid
     )}
 from  TweetMessages as t1
-where (t1.tweetid < test.int64('10'))
+where (t1.tweetid < test.bigint('10'))
 order by t1.tweetid
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp
index cdbab4f..81d06b1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-multipred.sqlpp
@@ -33,19 +33,19 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   lastorder : {
-      oid : int32,
+      oid : integer,
       total : float
   }
 
@@ -53,8 +53,8 @@ create type test.CustomerType as
 
 create type test.OrderType as
  closed {
-  oid : int32,
-  cid : int32,
+  oid : integer,
+  cid : integer,
   orderstatus : string,
   orderpriority : string,
   clerk : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp
index 2631181..07044bb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_01.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp
index 4b82b6f..33fa8a8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join-neg_02.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp
index 822774a..8be3a29 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_01.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp
index 2d5436b..8771300 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_02.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp
index 9b98317..9d70e51 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_03.sqlpp
@@ -31,19 +31,19 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   lastorder : {
-      oid : int32,
+      oid : integer,
       total : float
   }
 
@@ -51,8 +51,8 @@ create type test.CustomerType as
 
 create type test.OrderType as
  closed {
-  oid : int32,
-  cid : int32,
+  oid : integer,
+  cid : integer,
   orderstatus : string,
   orderpriority : string,
   clerk : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp
index 8731122..cd0f18f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_04.sqlpp
@@ -31,19 +31,19 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   lastorder : {
-      oid : int32,
+      oid : integer,
       total : float
   }
 
@@ -51,8 +51,8 @@ create type test.CustomerType as
 
 create type test.OrderType as
  closed {
-  oid : int32,
-  cid : int32,
+  oid : integer,
+  cid : integer,
   orderstatus : string,
   orderpriority : string,
   clerk : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp
index f8e4dc1..50d3c22 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-equi-join_05.sqlpp
@@ -31,19 +31,19 @@ use test;
 
 create type test.AddressType as
  closed {
-  number : int32,
+  number : integer,
   street : string,
   city : string
 }
 
 create type test.CustomerType as
  closed {
-  cid : int32,
+  cid : integer,
   name : string,
-  age : int32?,
+  age : integer?,
   address : AddressType?,
   lastorder : {
-      oid : int32,
+      oid : integer,
       total : float
   }
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp
index 5dac39c..531ae70 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_01.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp
index 2012048..9da023e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-ge-join_02.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp
index 1ab0ff0..c4a1aa4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_01.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp
index 9e92b48..6c10a54 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-gt-join_02.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp
index 1c964c6..77227a6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_01.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp
index 9a28a54..541c0eb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-le-join_02.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp
index 927854d..3711d3c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_01.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp
index d94c653..55bbbef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/primary-lt-join_02.sqlpp
@@ -28,8 +28,8 @@ create  dataverse test1;
 
 create type test1.TestType as
 {
-  key1 : int32,
-  key2 : int32,
+  key1 : integer,
+  key2 : integer,
   fname : string,
   lname : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp
index 43d7843..3704121 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multiindex.sqlpp
@@ -40,23 +40,23 @@ create type test.EmploymentType as
 
 create type test.FacebookUserType as
  closed {
-  id : int32,
-  `id-copy` : int32,
+  id : integer,
+  `id-copy` : integer,
   alias : string,
   name : string,
   `user-since` : datetime,
   `user-since-copy` : datetime,
-  `friend-ids` : {{int32}},
+  `friend-ids` : {{integer}},
   employment : [EmploymentType]
 }
 
 create type test.FacebookMessageType as
  closed {
-  `message-id` : int32,
-  `message-id-copy` : int32,
-  `author-id` : int32,
-  `author-id-copy` : int32,
-  `in-response-to` : int32?,
+  `message-id` : integer,
+  `message-id-copy` : integer,
+  `author-id` : integer,
+  `author-id-copy` : integer,
+  `in-response-to` : integer?,
   `sender-location` : point?,
   message : string
 }

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp
index 4972185..be83104 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join-multipred.sqlpp
@@ -33,7 +33,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -42,7 +42,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp
index 1205b85..9500353 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_01.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp
index 82bf7b9..ffcea23 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_02.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,
@@ -40,7 +40,7 @@ create type test.DBLPType as
 
 create type test.CSXType as
  closed {
-  id : int32,
+  id : integer,
   csxid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp
index 15e152e..8d9e478 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index-join/secondary-equi-join_03.sqlpp
@@ -31,7 +31,7 @@ use test;
 
 create type test.DBLPType as
  closed {
-  id : int32,
+  id : integer,
   dblpid : string,
   title : string,
   authors : string,

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp
index 67c3f96..d81beeb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-01.sqlpp
@@ -32,7 +32,7 @@ use emergencyTest;
 
 create type emergencyTest.CHPReport as
 {
-  id : int64,
+  id : bigint,
   timestamp : datetime,
   title : string,
   message : string
@@ -42,5 +42,5 @@ create  dataset CHPReports(CHPReport) primary key timestamp;
 
 select element emergency.message
 from  CHPReports as emergency
-where ((emergency.timestamp >= (emergencyTest.`current-datetime`() - emergencyTest.`day-time-duration`('PT10H'))) and (emergency.title = 'ghost'))
+where ((emergency.timestamp >= (emergencyTest.`current-datetime`() - emergencyTest.`day_time_duration`('PT10H'))) and (emergency.title = 'ghost'))
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp
index d4b1f1f..67d7dda 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-02.sqlpp
@@ -32,7 +32,7 @@ use emergencyTest;
 
 create type emergencyTest.CHPReport as
 {
-  id : int64,
+  id : bigint,
   timestamp : datetime,
   title : string,
   message : string
@@ -42,6 +42,6 @@ create  dataset CHPReports(CHPReport) primary key timestamp;
 
 select element emergency
 from  CHPReports as emergency
-with  time as (emergencyTest.`current-datetime`() - emergencyTest.`day-time-duration`('PT10H'))
+with  time as (emergencyTest.`current-datetime`() - emergencyTest.`day_time_duration`('PT10H'))
 where (emergency.timestamp >= time)
 ;

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/3b063f06/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp
index 8ba011b..9fefe73 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-datetime-03.sqlpp
@@ -32,7 +32,7 @@ use emergencyTest;
 
 create type emergencyTest.CHPReport as
 {
-  id : int64,
+  id : bigint,
   timestamp : datetime,
   title : string,
   message : string


Mime
View raw message