palashc commented on code in PR #1666: URL: https://github.com/apache/phoenix/pull/1666#discussion_r1327792286
########## phoenix-core/src/it/java/org/apache/phoenix/end2end/ServerMetadataCachingIT.java: ########## @@ -0,0 +1,281 @@ +/* + * 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.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.phoenix.cache.ServerMetadataCache; +import org.apache.phoenix.coprocessor.PhoenixRegionServerEndpoint; +import org.apache.phoenix.query.BaseTest; +import org.apache.phoenix.query.ConnectionQueryServices; +import org.apache.phoenix.query.QueryServices; +import org.apache.phoenix.schema.PName; +import org.apache.phoenix.schema.types.PVarchar; +import org.apache.phoenix.thirdparty.com.google.common.collect.Maps; +import org.apache.phoenix.util.PropertiesUtil; +import org.apache.phoenix.util.QueryUtil; +import org.apache.phoenix.util.ReadOnlyProps; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.experimental.categories.Category; +import org.mockito.Mockito; + +import java.io.IOException; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Map; +import java.util.Properties; +import java.util.Random; + +import static org.apache.hadoop.hbase.coprocessor.CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY; +import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.isNull; + +@Category({NeedsOwnMiniClusterTest.class }) +public class ServerMetadataCachingIT extends BaseTest { + + private final Random RANDOM = new Random(42); + + @BeforeClass + public static synchronized void doSetup() throws Exception { + Map<String, String> props = Maps.newHashMapWithExpectedSize(1); + props.put(REGIONSERVER_COPROCESSOR_CONF_KEY, + PhoenixRegionServerEndpoint.class.getName()); + props.put(QueryServices.LAST_DDL_TIMESTAMP_VALIDATION_ENABLED, Boolean.toString(true)); + setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); + } + + private void createTable(Connection conn, String tableName, long updateCacheFrequency) throws SQLException { + conn.createStatement().execute("CREATE TABLE " + tableName + + "(k INTEGER NOT NULL PRIMARY KEY, v1 INTEGER, v2 INTEGER)" + + (updateCacheFrequency == 0 ? "" : "UPDATE_CACHE_FREQUENCY="+updateCacheFrequency)); + } + + private void upsert(Connection conn, String tableName) throws SQLException { + conn.createStatement().execute("UPSERT INTO " + tableName + + " (k, v1, v2) VALUES ("+ RANDOM.nextInt() +", " + RANDOM.nextInt() + ", " + RANDOM.nextInt() +")"); + conn.commit(); + } + + private void query(Connection conn, String tableName) throws SQLException { + ResultSet rs = conn.createStatement().executeQuery("SELECT COUNT(*) FROM " + tableName); + rs.next(); + } + + private void alterTableAddColumn(Connection conn, String tableName, String columnName) throws SQLException { + conn.createStatement().execute("ALTER TABLE " + tableName + " ADD IF NOT EXISTS " + + columnName + " INTEGER"); + } + + /** + * Client-1 creates a table, upserts data and alters the table. + * Client-2 queries the table before and after the alter. + * Check queries work successfully in both cases and verify number of getTable RPCs. + */ + @Test + public void testSelectQueryWithOldDDLTimestamp() throws SQLException { + Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); + String url1 = QueryUtil.getConnectionUrl(props, config, "client1"); + String url2 = QueryUtil.getConnectionUrl(props, config, "client2"); + String tableName = generateUniqueName(); + ConnectionQueryServices spyCqs1 = Mockito.spy(driver.getConnectionQueryServices(url1, props)); + ConnectionQueryServices spyCqs2 = Mockito.spy(driver.getConnectionQueryServices(url2, props)); + int expectedNumGetTableRPCs; + + try (Connection conn1 = spyCqs1.connect(url1, props); + Connection conn2 = spyCqs2.connect(url2, props)) { + + // create table with UCF=never and upsert data using client-1 + createTable(conn1, tableName, Long.MAX_VALUE); + upsert(conn1, tableName); + + // select query from client-2 works to populate client side metadata cache + // there should be 1 getTable RPC + query(conn2, tableName); + expectedNumGetTableRPCs = 1; + Mockito.verify(spyCqs2, Mockito.times(expectedNumGetTableRPCs)) + .getTable((PName) isNull(), + any(), eq(PVarchar.INSTANCE.toBytes(tableName)), + anyLong(), anyLong()); + + // add column using client-1 to update last ddl timestamp + alterTableAddColumn(conn1, tableName, "newCol1"); + + // invalidate region server cache + ServerMetadataCache.resetCache(); + + // select query from client-2 with old ddl timestamp works + // there should be one more getTable RPC + query(conn2, tableName); + expectedNumGetTableRPCs += 1; + Mockito.verify(spyCqs2, Mockito.times(expectedNumGetTableRPCs)) Review Comment: @shahrs87 I changed the tests to verify number of `cqsi.addTable` invocations instead. -- 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]
