siddharthteotia commented on a change in pull request #7959: URL: https://github.com/apache/pinot/pull/7959#discussion_r780460346
########## File path: pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/SelectStarWithOtherColsRewriteTest.java ########## @@ -0,0 +1,90 @@ +/** + * 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.pinot.broker.requesthandler; + +import com.google.common.collect.ImmutableMap; +import java.util.List; +import java.util.Map; +import org.apache.pinot.common.request.Expression; +import org.apache.pinot.common.request.PinotQuery; +import org.apache.pinot.sql.parsers.CalciteSqlParser; +import org.testng.Assert; +import org.testng.annotations.Test; + + +public class SelectStarWithOtherColsRewriteTest { + + private static final Map<String, String> COL_MAP; + + static { + ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); + builder.put("homeRuns", "homeRuns"); + builder.put("playerStint", "playerStint"); + builder.put("groundedIntoDoublePlays", "groundedIntoDoublePlays"); + builder.put("playerID", "playerID"); + builder.put("$segmentName", "$segmentName"); + builder.put("$docId", "$docId"); + builder.put("$hostName", "$hostName"); + COL_MAP = builder.build(); + } + + @Test + public void testHappyCase() { + String sql = "SELECT $segmentName,*,$hostName FROM baseballStats"; + PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(sql); + BaseBrokerRequestHandler.updateColumnNames("baseballStats", pinotQuery, false, COL_MAP); + List<Expression> newSelections = pinotQuery.getSelectList(); + Assert.assertEquals(newSelections.get(0).getIdentifier().getName(), "$segmentName"); + Assert.assertEquals(newSelections.get(1).getIdentifier().getName(), "homeRuns"); + Assert.assertEquals(newSelections.get(2).getIdentifier().getName(), "playerStint"); + Assert.assertEquals(newSelections.get(3).getIdentifier().getName(), "groundedIntoDoublePlays"); + Assert.assertEquals(newSelections.get(4).getIdentifier().getName(), "playerID"); + Assert.assertEquals(newSelections.get(5).getIdentifier().getName(), "$hostName"); + } + + @Test + public void testDupCols() { + String sql = "SELECT playerID,homeRuns,* FROM baseballStats"; + PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(sql); + BaseBrokerRequestHandler.updateColumnNames("baseballStats", pinotQuery, false, COL_MAP); + List<Expression> newSelections = pinotQuery.getSelectList(); Review comment: In the above query `mysql> select *, cases, abs(cases) from covid_cases`, cases and abs(cases) are different since the latter is using function. By deduplication, I mean to do only for the identifiers (simple column names) in the SELECT list. My preference would be to deduplicate and not return the column twice as the output is cleaner that way. So, in the above query cases column should be returned exactly once. If the user wants to get the same column twice, they should use aliasing (like I mentioned earlier) `SELECT CustomerID AS C1, * FROM Customers` CustomerID should be returned twice -- once as C1 and next as CustomerID But if we want to stick to how MySQL or Postgres is doing and that is the general ANSI SQL / user expectation, then let's not deduplicate. I am ok with it. Just does not look clean Trying the query here seems to deduplicate -- https://www.w3schools.com/sql/trysql.asp?filename=trysql_select_all It says it uses MySQL but not sure which database it is using underneath ########## File path: pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/SelectStarWithOtherColsRewriteTest.java ########## @@ -0,0 +1,90 @@ +/** + * 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.pinot.broker.requesthandler; + +import com.google.common.collect.ImmutableMap; +import java.util.List; +import java.util.Map; +import org.apache.pinot.common.request.Expression; +import org.apache.pinot.common.request.PinotQuery; +import org.apache.pinot.sql.parsers.CalciteSqlParser; +import org.testng.Assert; +import org.testng.annotations.Test; + + +public class SelectStarWithOtherColsRewriteTest { + + private static final Map<String, String> COL_MAP; + + static { + ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); + builder.put("homeRuns", "homeRuns"); + builder.put("playerStint", "playerStint"); + builder.put("groundedIntoDoublePlays", "groundedIntoDoublePlays"); + builder.put("playerID", "playerID"); + builder.put("$segmentName", "$segmentName"); + builder.put("$docId", "$docId"); + builder.put("$hostName", "$hostName"); + COL_MAP = builder.build(); + } + + @Test + public void testHappyCase() { + String sql = "SELECT $segmentName,*,$hostName FROM baseballStats"; + PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(sql); + BaseBrokerRequestHandler.updateColumnNames("baseballStats", pinotQuery, false, COL_MAP); + List<Expression> newSelections = pinotQuery.getSelectList(); + Assert.assertEquals(newSelections.get(0).getIdentifier().getName(), "$segmentName"); + Assert.assertEquals(newSelections.get(1).getIdentifier().getName(), "homeRuns"); + Assert.assertEquals(newSelections.get(2).getIdentifier().getName(), "playerStint"); + Assert.assertEquals(newSelections.get(3).getIdentifier().getName(), "groundedIntoDoublePlays"); + Assert.assertEquals(newSelections.get(4).getIdentifier().getName(), "playerID"); + Assert.assertEquals(newSelections.get(5).getIdentifier().getName(), "$hostName"); + } + + @Test + public void testDupCols() { + String sql = "SELECT playerID,homeRuns,* FROM baseballStats"; + PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(sql); + BaseBrokerRequestHandler.updateColumnNames("baseballStats", pinotQuery, false, COL_MAP); + List<Expression> newSelections = pinotQuery.getSelectList(); Review comment: In the above query `mysql> select *, cases, abs(cases) from covid_cases`, cases and abs(cases) are different since the latter is using function. By deduplication, I mean to do only for the identifiers (simple column names) in the SELECT list. My preference would be to deduplicate and not return the column twice as the output is cleaner that way. So, in the above query cases column should be returned exactly once. If the user wants to get the same column twice, they should use aliasing (like I mentioned earlier) `SELECT CustomerID AS C1, * FROM Customers` CustomerID should be returned twice -- once as C1 and next as CustomerID But if we want to stick to how MySQL or Postgres is doing and that is the general ANSI SQL / user expectation, then let's not deduplicate. I am ok with it. Just does not look clean Trying the query here seems to deduplicate -- https://www.w3schools.com/sql/trysql.asp?filename=trysql_select_all Not sure which database it is using underneath ########## File path: pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/SelectStarWithOtherColsRewriteTest.java ########## @@ -0,0 +1,90 @@ +/** + * 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.pinot.broker.requesthandler; + +import com.google.common.collect.ImmutableMap; +import java.util.List; +import java.util.Map; +import org.apache.pinot.common.request.Expression; +import org.apache.pinot.common.request.PinotQuery; +import org.apache.pinot.sql.parsers.CalciteSqlParser; +import org.testng.Assert; +import org.testng.annotations.Test; + + +public class SelectStarWithOtherColsRewriteTest { + + private static final Map<String, String> COL_MAP; + + static { + ImmutableMap.Builder<String, String> builder = ImmutableMap.builder(); + builder.put("homeRuns", "homeRuns"); + builder.put("playerStint", "playerStint"); + builder.put("groundedIntoDoublePlays", "groundedIntoDoublePlays"); + builder.put("playerID", "playerID"); + builder.put("$segmentName", "$segmentName"); + builder.put("$docId", "$docId"); + builder.put("$hostName", "$hostName"); + COL_MAP = builder.build(); + } + + @Test + public void testHappyCase() { + String sql = "SELECT $segmentName,*,$hostName FROM baseballStats"; + PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(sql); + BaseBrokerRequestHandler.updateColumnNames("baseballStats", pinotQuery, false, COL_MAP); + List<Expression> newSelections = pinotQuery.getSelectList(); + Assert.assertEquals(newSelections.get(0).getIdentifier().getName(), "$segmentName"); + Assert.assertEquals(newSelections.get(1).getIdentifier().getName(), "homeRuns"); + Assert.assertEquals(newSelections.get(2).getIdentifier().getName(), "playerStint"); + Assert.assertEquals(newSelections.get(3).getIdentifier().getName(), "groundedIntoDoublePlays"); + Assert.assertEquals(newSelections.get(4).getIdentifier().getName(), "playerID"); + Assert.assertEquals(newSelections.get(5).getIdentifier().getName(), "$hostName"); + } + + @Test + public void testDupCols() { + String sql = "SELECT playerID,homeRuns,* FROM baseballStats"; + PinotQuery pinotQuery = CalciteSqlParser.compileToPinotQuery(sql); + BaseBrokerRequestHandler.updateColumnNames("baseballStats", pinotQuery, false, COL_MAP); + List<Expression> newSelections = pinotQuery.getSelectList(); Review comment: @amrishlal @suddendust -- 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]
