This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit b56466186c5f5a9eca1741ca56e4ae250e322f53 Merge: d7072db 0ce5f5a Author: Michael Blow <[email protected]> AuthorDate: Wed May 13 07:43:09 2020 -0400 Merge commit '4bf7048' from 'gerrit/mad-hatter' Change-Id: I06432e8daa1669862d1f23a04efdfec5b1e6d7b5 .../asterix/app/translator/QueryTranslator.java | 17 ++++++++-- .../create-dataset-inline-type-2.1.ddl.sqlpp | 36 ++++++++++++++++++++++ .../create-dataset-inline-type-2.2.query.sqlpp | 25 +++++++++++++++ .../create-dataset-inline-type-2.3.ddl.sqlpp | 28 +++++++++++++++++ .../create-dataset-inline-type-2.4.ddl.sqlpp | 31 +++++++++++++++++++ .../create-dataset-inline-type-2.2.adm | 1 + .../test/resources/runtimets/testsuite_sqlpp.xml | 7 +++++ .../metadata/declared/MetadataManagerUtil.java | 12 ++++++-- .../metadata/declared/MetadataProvider.java | 5 +++ 9 files changed, 158 insertions(+), 4 deletions(-) diff --cc asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java index 72d989a,6317d94..6ba8ba8 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java @@@ -23,7 -23,8 +23,9 @@@ import java.util.List import org.apache.asterix.common.cluster.IClusterStateManager; import org.apache.asterix.common.config.DatasetConfig.DatasetType; + import org.apache.asterix.common.exceptions.AsterixException; + import org.apache.asterix.common.exceptions.ErrorCode; +import org.apache.asterix.common.metadata.DataverseName; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; import org.apache.asterix.metadata.entities.Dataset; @@@ -48,19 -48,25 +50,25 @@@ public class MetadataManagerUtil throw new AssertionError("This util class should not be initialized."); } - public static IAType findType(MetadataTransactionContext mdTxnCtx, String dataverse, String typeName) + public static IAType findType(MetadataTransactionContext mdTxnCtx, DataverseName dataverseName, String typeName) throws AlgebricksException { - Datatype type = findTypeEntity(mdTxnCtx, dataverse, typeName); ++ Datatype type = findTypeEntity(mdTxnCtx, dataverseName, typeName); + return type != null ? type.getDatatype() : null; + } + - public static Datatype findTypeEntity(MetadataTransactionContext mdTxnCtx, String dataverse, String typeName) - throws AlgebricksException { - if (dataverse == null || typeName == null) { ++ public static Datatype findTypeEntity(MetadataTransactionContext mdTxnCtx, DataverseName dataverseName, ++ String typeName) throws AlgebricksException { + if (dataverseName == null || typeName == null) { return null; } - Datatype type = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, dataverse, typeName); + Datatype type = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, dataverseName, typeName); if (type == null) { - throw new AlgebricksException("Type name '" + typeName + "' unknown in dataverse '" + dataverseName + "'"); - throw new AsterixException(ErrorCode.UNKNOWN_TYPE, dataverse + "." + typeName); ++ throw new AsterixException(ErrorCode.UNKNOWN_TYPE, dataverseName + "." + typeName); } - return type.getDatatype(); + return type; } - public static ARecordType findOutputRecordType(MetadataTransactionContext mdTxnCtx, String dataverse, + public static ARecordType findOutputRecordType(MetadataTransactionContext mdTxnCtx, DataverseName dataverseName, String outputRecordType) throws AlgebricksException { if (outputRecordType == null) { return null; diff --cc asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java index 93e214e,6b6cc78..3107a00 --- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java +++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java @@@ -360,8 -346,12 +361,12 @@@ public class MetadataProvider implement return MetadataManagerUtil.findNodes(mdTxnCtx, nodeGroupName); } - public Datatype findTypeEntity(String dataverse, String typeName) throws AlgebricksException { - return MetadataManagerUtil.findTypeEntity(mdTxnCtx, dataverse, typeName); ++ public Datatype findTypeEntity(DataverseName dataverseName, String typeName) throws AlgebricksException { ++ return MetadataManagerUtil.findTypeEntity(mdTxnCtx, dataverseName, typeName); + } + - public IAType findType(String dataverse, String typeName) throws AlgebricksException { - return MetadataManagerUtil.findType(mdTxnCtx, dataverse, typeName); + public IAType findType(DataverseName dataverseName, String typeName) throws AlgebricksException { + return MetadataManagerUtil.findType(mdTxnCtx, dataverseName, typeName); } public IAType findType(Dataset dataset) throws AlgebricksException {
