abhishekrb19 commented on code in PR #15908: URL: https://github.com/apache/druid/pull/15908#discussion_r1503102073
########## extensions-core/druid-catalog/src/test/java/org/apache/druid/catalog/sql/CatalogIngestionTest.java: ########## @@ -0,0 +1,174 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.catalog.sql; + +import org.apache.druid.catalog.CatalogException; +import org.apache.druid.catalog.model.Columns; +import org.apache.druid.catalog.model.TableMetadata; +import org.apache.druid.catalog.model.table.TableBuilder; +import org.apache.druid.catalog.storage.CatalogStorage; +import org.apache.druid.catalog.storage.CatalogTests; +import org.apache.druid.catalog.sync.CachedMetadataCatalog; +import org.apache.druid.catalog.sync.MetadataCatalog; +import org.apache.druid.java.util.common.granularity.Granularities; +import org.apache.druid.metadata.TestDerbyConnector; +import org.apache.druid.segment.column.ColumnType; +import org.apache.druid.segment.column.RowSignature; +import org.apache.druid.sql.calcite.CalciteIngestionDmlTest; +import org.apache.druid.sql.calcite.filtration.Filtration; +import org.apache.druid.sql.calcite.planner.CatalogResolver; +import org.apache.druid.sql.calcite.util.CalciteTests; +import org.apache.druid.sql.calcite.util.SqlTestFramework; +import org.junit.ClassRule; +import org.junit.Test; + +import java.util.Arrays; + +import static org.junit.Assert.fail; + +/** + * Test the use of catalog specs to drive MSQ ingestion. + */ +public class CatalogIngestionTest extends CalciteIngestionDmlTest +{ + @ClassRule + public static final TestDerbyConnector.DerbyConnectorRule DERBY_CONNECTION_RULE = + new TestDerbyConnector.DerbyConnectorRule(); + + /** + * Signature for the foo datasource after applying catalog metadata. + */ + private static final RowSignature FOO_SIGNATURE = RowSignature.builder() + .add("__time", ColumnType.LONG) + .add("extra1", ColumnType.STRING) + .add("dim2", ColumnType.STRING) + .add("dim1", ColumnType.STRING) + .add("cnt", ColumnType.LONG) + .add("m1", ColumnType.DOUBLE) + .add("extra2", ColumnType.LONG) + .add("extra3", ColumnType.STRING) + .add("m2", ColumnType.DOUBLE) + .build(); + + private static CatalogStorage storage; + + @Override + public CatalogResolver createCatalogResolver() + { + CatalogTests.DbFixture dbFixture = new CatalogTests.DbFixture(DERBY_CONNECTION_RULE); + storage = dbFixture.storage; + MetadataCatalog catalog = new CachedMetadataCatalog( + storage, + storage.schemaRegistry(), + storage.jsonMapper() + ); + return new LiveCatalogResolver(catalog); + } + + @Override + public void finalizeTestFramework(SqlTestFramework sqlTestFramework) + { + super.finalizeTestFramework(sqlTestFramework); + buildTargetDatasources(); + buildFooDatasource(); + } + + private void buildTargetDatasources() + { + TableMetadata spec = TableBuilder.datasource("hourDs", "PT1H") + .build(); + createTableMetadata(spec); + } + + public void buildFooDatasource() + { + TableMetadata spec = TableBuilder.datasource("foo", "ALL") + .timeColumn() + .column("extra1", null) + .column("dim2", null) + .column("dim1", null) + .column("cnt", null) + .column("m1", Columns.DOUBLE) + .column("extra2", Columns.LONG) + .column("extra3", Columns.STRING) + .hiddenColumns(Arrays.asList("dim3", "unique_dim1")) + .sealed(true) + .build(); + createTableMetadata(spec); + } + + private void createTableMetadata(TableMetadata table) + { + try { + storage.tables().create(table); + } + catch (CatalogException e) { + fail(e.getMessage()); + } + } + + /** + * If the segment grain is given in the catalog then use this value is used. Review Comment: ```suggestion If the segment grain is given in the catalog and absent in the PARTITIONED BY clause in the query, then use the value from the catalog. ``` ########## sql/src/main/java/org/apache/druid/sql/calcite/planner/DruidSqlValidator.java: ########## @@ -19,32 +19,72 @@ package org.apache.druid.sql.calcite.planner; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.prepare.BaseDruidSqlValidator; import org.apache.calcite.prepare.CalciteCatalogReader; +import org.apache.calcite.rel.type.RelDataType; +import org.apache.calcite.rel.type.RelDataTypeField; +import org.apache.calcite.rel.type.RelRecordType; import org.apache.calcite.runtime.CalciteContextException; import org.apache.calcite.runtime.CalciteException; import org.apache.calcite.sql.SqlCall; import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlInsert; import org.apache.calcite.sql.SqlKind; import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.SqlOperatorTable; +import org.apache.calcite.sql.SqlSelect; import org.apache.calcite.sql.SqlUtil; import org.apache.calcite.sql.SqlWindow; import org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.calcite.sql.type.SqlTypeName; +import org.apache.calcite.sql.validate.IdentifierNamespace; +import org.apache.calcite.sql.validate.SqlValidatorException; +import org.apache.calcite.sql.validate.SqlValidatorNamespace; import org.apache.calcite.sql.validate.SqlValidatorScope; +import org.apache.calcite.sql.validate.SqlValidatorTable; +import org.apache.calcite.util.Pair; import org.apache.calcite.util.Util; +import org.apache.druid.catalog.model.facade.DatasourceFacade; +import org.apache.druid.common.utils.IdUtils; +import org.apache.druid.error.InvalidSqlInput; import org.apache.druid.java.util.common.StringUtils; +import org.apache.druid.java.util.common.granularity.Granularity; import org.apache.druid.query.QueryContexts; +import org.apache.druid.sql.calcite.parser.DruidSqlIngest; +import org.apache.druid.sql.calcite.parser.DruidSqlInsert; +import org.apache.druid.sql.calcite.parser.DruidSqlParserUtils; +import org.apache.druid.sql.calcite.parser.ExternalDestinationSqlIdentifier; import org.apache.druid.sql.calcite.run.EngineFeature; +import org.apache.druid.sql.calcite.table.DatasourceTable; import org.checkerframework.checker.nullness.qual.Nullable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.regex.Pattern; + /** * Druid extended SQL validator. (At present, it doesn't actually * have any extensions yet, but it will soon.) */ class DruidSqlValidator extends BaseDruidSqlValidator { + private static final Pattern UNNAMED_COLUMN_PATTERN = Pattern.compile("^EXPR\\$\\d+$", Pattern.CASE_INSENSITIVE); + + // Copied here from MSQE since that extension is not visible here. + public static final String CTX_ROWS_PER_SEGMENT = "msqRowsPerSegment"; + + public interface ValidatorContext Review Comment: +1 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
