gokceni commented on a change in pull request #514: URL: https://github.com/apache/phoenix/pull/514#discussion_r437084281
########## File path: phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterAddCascadeIndexIT.java ########## @@ -0,0 +1,272 @@ +/* + * 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.phoenix.end2end; + +import org.apache.phoenix.schema.PTableImpl; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Properties; + +@RunWith(Parameterized.class) +public class AlterAddCascadeIndexIT extends ParallelStatsDisabledIT { + + @Rule + public ExpectedException exception = ExpectedException.none(); + private static Connection conn; + private Properties prop; + private boolean isViewIndex; + private boolean isLocalIndex; + private String databaseObjectName; + private String indexesName; + private String planOutput; + private final String tableDDLOptions; + + + public AlterAddCascadeIndexIT(boolean isViewIndex, boolean isLocalIndex, boolean mutable, boolean columnEncoded) { + this.isViewIndex = isViewIndex; + this.isLocalIndex = isLocalIndex; + StringBuilder optionBuilder = new StringBuilder(); + if (!columnEncoded) { + optionBuilder.append("COLUMN_ENCODED_BYTES=0"); + } + if (!mutable && !columnEncoded) { + optionBuilder.append(",IMMUTABLE_ROWS=true"); + } else if (!mutable && columnEncoded) { + optionBuilder.append("IMMUTABLE_ROWS=true"); + } + if (!columnEncoded && !mutable) { + optionBuilder.append(",IMMUTABLE_STORAGE_SCHEME="+ PTableImpl.ImmutableStorageScheme.ONE_CELL_PER_COLUMN); + } + this.tableDDLOptions = optionBuilder.toString(); + } + + @Parameters(name="AlterAddCascadeIndexIT_isViewIndex={0},isLocalIndex={1},mutable={2},columnEncoded={3}") + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] { + { true, true, true, true}, + { true, true, true, false}, + { true, true, false, true}, + { true, true, false, false}, + { true, false, true, true}, + { true, false, true, false}, + { true, false, false, true}, + { true, false, false, false}, + { false, true, true, true}, + { false, true, true, false}, + { false, true, false, true}, + { false, true, false, false}, + { false, false, true, true}, + { false, false, true, false}, + { false, false, false, true}, + { false, false, false, false} + }); + } + + @Before + public void setup() throws SQLException { + prop = new Properties(); + conn = DriverManager.getConnection(getUrl(), prop); + conn.setAutoCommit(true); + conn.createStatement().execute("CREATE TABLE IF NOT EXISTS us_population (\n" + + " state CHAR(2) NOT NULL,\n" + + " city VARCHAR NOT NULL,\n" + + " population BIGINT,\n" + + " CONSTRAINT my_pk PRIMARY KEY (state, city)) " + tableDDLOptions); + + loadData(); + + if(isViewIndex) { + conn.createStatement().execute("CREATE VIEW IF NOT EXISTS us_population_gv" + + "(city_area INTEGER, avg_fam_size INTEGER) AS " + + "SELECT * FROM us_population WHERE state = 'CA'"); + + conn.createStatement().execute("CREATE "+(isLocalIndex ? "LOCAL " : "") +"INDEX IF NOT EXISTS us_population_gv_gi ON " + + "us_population_gv (city_area) INCLUDE (population)"); + conn.createStatement().execute("CREATE "+(isLocalIndex ? "LOCAL " : "")+"INDEX IF NOT EXISTS us_population_gv_gi_2 ON " + + "us_population_gv (avg_fam_size) INCLUDE (population)"); + databaseObjectName = "us_population_gv"; + indexesName = "us_population_gv_gi, us_population_gv_gi_2"; + planOutput = isLocalIndex? "US_POPULATION" : "_IDX_US_POPULATION"; Review comment: This is not exactly plan output. I recommend either using full plan output or just rename the variable to be actualUsedTable ########## File path: phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterAddCascadeIndexIT.java ########## @@ -0,0 +1,272 @@ +/* + * 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.phoenix.end2end; + +import org.apache.phoenix.schema.PTableImpl; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Properties; + +@RunWith(Parameterized.class) +public class AlterAddCascadeIndexIT extends ParallelStatsDisabledIT { + + @Rule + public ExpectedException exception = ExpectedException.none(); + private static Connection conn; + private Properties prop; + private boolean isViewIndex; + private boolean isLocalIndex; + private String databaseObjectName; + private String indexesName; + private String planOutput; + private final String tableDDLOptions; + + + public AlterAddCascadeIndexIT(boolean isViewIndex, boolean isLocalIndex, boolean mutable, boolean columnEncoded) { + this.isViewIndex = isViewIndex; + this.isLocalIndex = isLocalIndex; + StringBuilder optionBuilder = new StringBuilder(); + if (!columnEncoded) { + optionBuilder.append("COLUMN_ENCODED_BYTES=0"); + } + if (!mutable && !columnEncoded) { + optionBuilder.append(",IMMUTABLE_ROWS=true"); + } else if (!mutable && columnEncoded) { + optionBuilder.append("IMMUTABLE_ROWS=true"); + } + if (!columnEncoded && !mutable) { + optionBuilder.append(",IMMUTABLE_STORAGE_SCHEME="+ PTableImpl.ImmutableStorageScheme.ONE_CELL_PER_COLUMN); + } + this.tableDDLOptions = optionBuilder.toString(); + } + + @Parameters(name="AlterAddCascadeIndexIT_isViewIndex={0},isLocalIndex={1},mutable={2},columnEncoded={3}") + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] { + { true, true, true, true}, + { true, true, true, false}, + { true, true, false, true}, + { true, true, false, false}, + { true, false, true, true}, + { true, false, true, false}, + { true, false, false, true}, + { true, false, false, false}, + { false, true, true, true}, + { false, true, true, false}, + { false, true, false, true}, + { false, true, false, false}, + { false, false, true, true}, + { false, false, true, false}, + { false, false, false, true}, + { false, false, false, false} + }); + } + + @Before + public void setup() throws SQLException { + prop = new Properties(); + conn = DriverManager.getConnection(getUrl(), prop); + conn.setAutoCommit(true); + conn.createStatement().execute("CREATE TABLE IF NOT EXISTS us_population (\n" + + " state CHAR(2) NOT NULL,\n" + + " city VARCHAR NOT NULL,\n" + + " population BIGINT,\n" + + " CONSTRAINT my_pk PRIMARY KEY (state, city)) " + tableDDLOptions); + + loadData(); + + if(isViewIndex) { + conn.createStatement().execute("CREATE VIEW IF NOT EXISTS us_population_gv" + + "(city_area INTEGER, avg_fam_size INTEGER) AS " + + "SELECT * FROM us_population WHERE state = 'CA'"); + + conn.createStatement().execute("CREATE "+(isLocalIndex ? "LOCAL " : "") +"INDEX IF NOT EXISTS us_population_gv_gi ON " + + "us_population_gv (city_area) INCLUDE (population)"); + conn.createStatement().execute("CREATE "+(isLocalIndex ? "LOCAL " : "")+"INDEX IF NOT EXISTS us_population_gv_gi_2 ON " + + "us_population_gv (avg_fam_size) INCLUDE (population)"); + databaseObjectName = "us_population_gv"; + indexesName = "us_population_gv_gi, us_population_gv_gi_2"; + planOutput = isLocalIndex? "US_POPULATION" : "_IDX_US_POPULATION"; + + } else { + conn.createStatement().execute("CREATE "+ (isLocalIndex ? "LOCAL " : "") + "INDEX IF NOT EXISTS us_population_gi ON " + + "us_population (population)"); + conn.createStatement().execute("CREATE "+ (isLocalIndex ? "LOCAL " : "") + "INDEX IF NOT EXISTS us_population_gi_2 ON " + + "us_population (state, population)"); + databaseObjectName = "us_population"; + indexesName = "us_population_gi, us_population_gi_2"; + planOutput = isLocalIndex? "US_POPULATION" : "us_population_gi"; + } + } + + private void loadData() throws SQLException { + PreparedStatement ps = conn.prepareStatement("UPSERT INTO us_population VALUES('NY','New York',8143197)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('CA','Los Angeles',3844829)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('IL','Chicago',2842518)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('TX','Houston',2016582)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('PA','Philadelphia',1463281)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('AZ','Phoenix',1461575)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('TX','San Antonio',1256509)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('CA','San Diego',1255540)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('TX','Dallas',1213825)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('CA','San Jose',912332)"); + ps.executeUpdate(); + } + + // Test with ALTER TABLE CASCADE INDEX ALL + @Test + public void testAlterDBOAddCascadeIndexAll() throws SQLException { + String query = "ALTER " +(isViewIndex? "VIEW " : "TABLE ") + databaseObjectName +" ADD new_column VARCHAR CASCADE INDEX ALL"; + conn.createStatement().execute(query); + query = "EXPLAIN SELECT new_column FROM "+databaseObjectName; + ResultSet rs = conn.prepareStatement(query).executeQuery(); + rs.next(); + //confirm it is using global index to access the column + Assert.assertTrue(rs.getString(1).contains(planOutput.toUpperCase())); Review comment: In fact, it would be easier if you have separate variables like globalIndexPlanOutput. It is easier to see what you are comparing against that way. If you add another test and just have planOutput comparison without a comment on top, it would be difficult to understand what you are asserting for. ########## File path: phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterAddCascadeIndexIT.java ########## @@ -0,0 +1,272 @@ +/* + * 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.phoenix.end2end; + +import org.apache.phoenix.schema.PTableImpl; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; + +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Properties; + +@RunWith(Parameterized.class) +public class AlterAddCascadeIndexIT extends ParallelStatsDisabledIT { + + @Rule + public ExpectedException exception = ExpectedException.none(); + private static Connection conn; + private Properties prop; + private boolean isViewIndex; + private boolean isLocalIndex; + private String databaseObjectName; + private String indexesName; + private String planOutput; + private final String tableDDLOptions; + + + public AlterAddCascadeIndexIT(boolean isViewIndex, boolean isLocalIndex, boolean mutable, boolean columnEncoded) { + this.isViewIndex = isViewIndex; + this.isLocalIndex = isLocalIndex; + StringBuilder optionBuilder = new StringBuilder(); + if (!columnEncoded) { + optionBuilder.append("COLUMN_ENCODED_BYTES=0"); + } + if (!mutable && !columnEncoded) { + optionBuilder.append(",IMMUTABLE_ROWS=true"); + } else if (!mutable && columnEncoded) { + optionBuilder.append("IMMUTABLE_ROWS=true"); + } + if (!columnEncoded && !mutable) { + optionBuilder.append(",IMMUTABLE_STORAGE_SCHEME="+ PTableImpl.ImmutableStorageScheme.ONE_CELL_PER_COLUMN); + } + this.tableDDLOptions = optionBuilder.toString(); + } + + @Parameters(name="AlterAddCascadeIndexIT_isViewIndex={0},isLocalIndex={1},mutable={2},columnEncoded={3}") + public static Collection<Object[]> data() { + return Arrays.asList(new Object[][] { + { true, true, true, true}, + { true, true, true, false}, + { true, true, false, true}, + { true, true, false, false}, + { true, false, true, true}, + { true, false, true, false}, + { true, false, false, true}, + { true, false, false, false}, + { false, true, true, true}, + { false, true, true, false}, + { false, true, false, true}, + { false, true, false, false}, + { false, false, true, true}, + { false, false, true, false}, + { false, false, false, true}, + { false, false, false, false} + }); + } + + @Before + public void setup() throws SQLException { + prop = new Properties(); + conn = DriverManager.getConnection(getUrl(), prop); + conn.setAutoCommit(true); + conn.createStatement().execute("CREATE TABLE IF NOT EXISTS us_population (\n" + + " state CHAR(2) NOT NULL,\n" + + " city VARCHAR NOT NULL,\n" + + " population BIGINT,\n" + + " CONSTRAINT my_pk PRIMARY KEY (state, city)) " + tableDDLOptions); + + loadData(); + + if(isViewIndex) { + conn.createStatement().execute("CREATE VIEW IF NOT EXISTS us_population_gv" + + "(city_area INTEGER, avg_fam_size INTEGER) AS " + + "SELECT * FROM us_population WHERE state = 'CA'"); + + conn.createStatement().execute("CREATE "+(isLocalIndex ? "LOCAL " : "") +"INDEX IF NOT EXISTS us_population_gv_gi ON " + + "us_population_gv (city_area) INCLUDE (population)"); + conn.createStatement().execute("CREATE "+(isLocalIndex ? "LOCAL " : "")+"INDEX IF NOT EXISTS us_population_gv_gi_2 ON " + + "us_population_gv (avg_fam_size) INCLUDE (population)"); + databaseObjectName = "us_population_gv"; + indexesName = "us_population_gv_gi, us_population_gv_gi_2"; + planOutput = isLocalIndex? "US_POPULATION" : "_IDX_US_POPULATION"; + + } else { + conn.createStatement().execute("CREATE "+ (isLocalIndex ? "LOCAL " : "") + "INDEX IF NOT EXISTS us_population_gi ON " + + "us_population (population)"); + conn.createStatement().execute("CREATE "+ (isLocalIndex ? "LOCAL " : "") + "INDEX IF NOT EXISTS us_population_gi_2 ON " + + "us_population (state, population)"); + databaseObjectName = "us_population"; + indexesName = "us_population_gi, us_population_gi_2"; + planOutput = isLocalIndex? "US_POPULATION" : "us_population_gi"; + } + } + + private void loadData() throws SQLException { + PreparedStatement ps = conn.prepareStatement("UPSERT INTO us_population VALUES('NY','New York',8143197)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('CA','Los Angeles',3844829)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('IL','Chicago',2842518)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('TX','Houston',2016582)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('PA','Philadelphia',1463281)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('AZ','Phoenix',1461575)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('TX','San Antonio',1256509)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('CA','San Diego',1255540)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('TX','Dallas',1213825)"); + ps.executeUpdate(); + ps = conn.prepareStatement("UPSERT INTO us_population VALUES('CA','San Jose',912332)"); + ps.executeUpdate(); + } + + // Test with ALTER TABLE CASCADE INDEX ALL + @Test + public void testAlterDBOAddCascadeIndexAll() throws SQLException { + String query = "ALTER " +(isViewIndex? "VIEW " : "TABLE ") + databaseObjectName +" ADD new_column VARCHAR CASCADE INDEX ALL"; + conn.createStatement().execute(query); + query = "EXPLAIN SELECT new_column FROM "+databaseObjectName; + ResultSet rs = conn.prepareStatement(query).executeQuery(); + rs.next(); + //confirm it is using global index to access the column + Assert.assertTrue(rs.getString(1).contains(planOutput.toUpperCase())); + } + + // Test with ALTER VIEW CASCADE INDEX ALL + @Test + public void testAlterDBOAddCascadeIndexAllUpsert() throws SQLException { + String query = "ALTER " +(isViewIndex? "VIEW " : "TABLE ") + databaseObjectName +" ADD new_column_3 VARCHAR CASCADE INDEX ALL"; + conn.createStatement().execute(query); + PreparedStatement ps; + if(isViewIndex) { + ps = conn.prepareStatement("UPSERT INTO us_population_gv(state,city,population,city_area,avg_fam_size,new_column_3) " + + "VALUES('CA','Santa Barbara',912332,1300,4,'test_column')"); + } else { + ps = conn.prepareStatement("UPSERT INTO us_population(state,city,population,new_column_3) " + + "VALUES('CA','Santa Barbara',912332,'test_column')"); + } + ps.executeUpdate(); + query = "EXPLAIN SELECT new_column_3 FROM "+databaseObjectName+" where new_column_3 = 'test_column'"; + ResultSet rs = conn.prepareStatement(query).executeQuery(); + rs.next(); + //confirm it is using global index to access the column + Assert.assertTrue(rs.getString(1).contains(planOutput.toUpperCase())); + query = "SELECT new_column_3 FROM "+databaseObjectName+" where new_column_3 = 'test_column'"; + rs = conn.prepareStatement(query).executeQuery(); + rs.next(); + Assert.assertEquals(rs.getString(1),"test_column"); + } + + // Test with CASCADE INDEX <index_name> + @Test + public void testAlterDBOAddCascadeIndex() throws SQLException { + String query = "ALTER " + (isViewIndex? "VIEW " : "TABLE ") + + databaseObjectName + " ADD new_column_1 FLOAT CASCADE INDEX " + indexesName.split(",")[0]; + conn.createStatement().execute(query); + query = "EXPLAIN SELECT new_column_1 FROM " + databaseObjectName; + ResultSet rs = conn.prepareStatement(query).executeQuery(); + rs.next(); + //confirm it is using global index to access the column + System.out.println(rs.getString(1)); + Assert.assertTrue(rs.getString(1).contains(planOutput.toUpperCase())); + } + + // Test with CASCADE INDEX <index_name> + @Test + public void testAlterDBOAddCascadeIndexTwoCols() throws SQLException { + String query = "ALTER " + (isViewIndex ? "VIEW " : "TABLE ") + databaseObjectName + + " ADD new_column_1 FLOAT, new_column_2 BIGINT CASCADE INDEX " + indexesName.split(",")[0]; + conn.createStatement().execute(query); + query = "EXPLAIN SELECT new_column_1, new_column_2 FROM " + databaseObjectName; + ResultSet rs = conn.prepareStatement(query).executeQuery(); + rs.next(); + //confirm it is using global index to access the column + Assert.assertTrue(rs.getString(1).contains(planOutput.toUpperCase())); + } + + // Test with CASCADE INDEX <index_name>, <index_name> + @Test + public void testAlterDBOAddCascadeIndexes() throws SQLException { + String query = "ALTER " + (isViewIndex ? "VIEW " : "TABLE ") + + databaseObjectName + " ADD new_column_1 DOUBLE CASCADE INDEX " + indexesName; + conn.createStatement().execute(query); + query = "EXPLAIN SELECT new_column_1 FROM " + databaseObjectName; + ResultSet rs = conn.prepareStatement(query).executeQuery(); + rs.next(); + //confirm it is using global index to access the column + Assert.assertTrue(rs.getString(1).contains(planOutput.toUpperCase())); + } + + // Exception for invalid grammar + @Test + public void testAlterDBOInvalidGrammarI() throws SQLException { + String query = "ALTER " + (isViewIndex ? "VIEW " : "TABLE ") + databaseObjectName + " ADD new_column VARCHAR ALL"; + exception.expectMessage("Syntax error"); + conn.createStatement().execute(query); + } + + // Exception for invalid grammar + @Test + public void testAlterDBOInvalidGrammarII() throws SQLException { + String query = "ALTER " + (isViewIndex ? "VIEW " : "TABLE ") + databaseObjectName + + " ADD new_column VARCHAR CASCADE " + indexesName.split(",")[0]; + exception.expectMessage("Syntax error"); Review comment: Recommend to make this a constant string ########## File path: phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java ########## @@ -3528,14 +3529,24 @@ private void mutateStringProperty(String tenantId, String schemaName, String tab public MutationState addColumn(AddColumnStatement statement) throws SQLException { PTable table = FromCompiler.getResolver(statement, connection).getTables().get(0).getTable(); - return addColumn(table, statement.getColumnDefs(), statement.getProps(), statement.ifNotExists(), false, statement.getTable(), statement.getTableType()); + return addColumn(table, statement.getColumnDefs(), statement.getProps(), statement.ifNotExists(), false, statement.getTable(), statement.getTableType(), statement.isCascade(), statement.getIndexes()); } public MutationState addColumn(PTable table, List<ColumnDef> origColumnDefs, ListMultimap<String, Pair<String, Object>> stmtProperties, boolean ifNotExists, - boolean removeTableProps, NamedTableNode namedTableNode, PTableType tableType) + boolean removeTableProps, NamedTableNode namedTableNode, PTableType tableType, boolean cascade, List<NamedNode> indexes) throws SQLException { connection.rollback(); + List<PTable> indexesPTable = Lists.newArrayListWithExpectedSize(indexes != null ? + indexes.size() : table.getIndexes().size()); + // if cascade keyword is passed and indexes are provided either implicitly or explicitly + if (cascade && (indexes == null || indexes.size()>0)) { + if (indexes == null) { + indexesPTable = table.getIndexes(table.getType().equals(PTableType.VIEW)); Review comment: This means we are making an assumption here that if indexes is null this must be a VIEW. What if there is no index? Can we instead check if table is a view directly? ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: [email protected]
