goiri commented on code in PR #4858: URL: https://github.com/apache/hadoop/pull/4858#discussion_r968858363
########## hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/store/sql/TestFederationSQLServerScriptAccuracy.java: ########## @@ -0,0 +1,62 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.yarn.server.federation.store.sql; + +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.federation.store.impl.SQLServerFederationStateStore; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.sql.SQLException; +import java.util.List; + +public class TestFederationSQLServerScriptAccuracy extends FederationSQLAccuracyTest { + + private static final Logger LOG = + LoggerFactory.getLogger(TestFederationSQLServerScriptAccuracy.class); + + private final String DATABASE_URL_SQLSERVER = "jdbc:hsqldb:mem-sqlserver:state-sqlserver"; + private final String SQLSERVER_COMPATIBILITY = ";sql.syntax_mss=true"; + + @Override + protected SQLServerFederationStateStore createStateStore() { + YarnConfiguration conf = new YarnConfiguration(); + conf.set(YarnConfiguration.FEDERATION_STATESTORE_SQL_JDBC_CLASS, HSQLDB_DRIVER); + conf.set(YarnConfiguration.FEDERATION_STATESTORE_SQL_USERNAME, DATABASE_USERNAME); + conf.set(YarnConfiguration.FEDERATION_STATESTORE_SQL_PASSWORD, DATABASE_PASSWORD); + conf.set(YarnConfiguration.FEDERATION_STATESTORE_SQL_URL, + DATABASE_URL_SQLSERVER + System.currentTimeMillis() + SQLSERVER_COMPATIBILITY); + super.setConf(conf); + return new SQLServerFederationStateStore(); + } + + @Test + public void checkSqlServerScriptAccuracy() throws SQLException { + SQLServerFederationStateStore federationStateStore = this.createStateStore(); + federationStateStore.init(getConf()); + + // get a list of tables + List<String> tables = federationStateStore.getTables(); + for (String table : tables) { + federationStateStore.getConn().prepareStatement(table).execute(); + } + + LOG.info("[SqlServer] - FederationStateStore create table."); Review Comment: Do we need this [SqlServer] tag? Logger should already give the class name. ########## hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/src/test/java/org/apache/hadoop/yarn/server/federation/store/sql/TestFederationSQLServerScriptAccuracy.java: ########## @@ -0,0 +1,62 @@ +/** + * 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 + * <p> + * http://www.apache.org/licenses/LICENSE-2.0 + * <p> + * 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.hadoop.yarn.server.federation.store.sql; + +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.federation.store.impl.SQLServerFederationStateStore; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.sql.SQLException; +import java.util.List; + +public class TestFederationSQLServerScriptAccuracy extends FederationSQLAccuracyTest { + + private static final Logger LOG = + LoggerFactory.getLogger(TestFederationSQLServerScriptAccuracy.class); + + private final String DATABASE_URL_SQLSERVER = "jdbc:hsqldb:mem-sqlserver:state-sqlserver"; + private final String SQLSERVER_COMPATIBILITY = ";sql.syntax_mss=true"; + + @Override + protected SQLServerFederationStateStore createStateStore() { + YarnConfiguration conf = new YarnConfiguration(); + conf.set(YarnConfiguration.FEDERATION_STATESTORE_SQL_JDBC_CLASS, HSQLDB_DRIVER); + conf.set(YarnConfiguration.FEDERATION_STATESTORE_SQL_USERNAME, DATABASE_USERNAME); + conf.set(YarnConfiguration.FEDERATION_STATESTORE_SQL_PASSWORD, DATABASE_PASSWORD); + conf.set(YarnConfiguration.FEDERATION_STATESTORE_SQL_URL, Review Comment: The only difference between MySQL and SQLServer is this line right? We would just have an abstract function called getSQLURL() which we implement for each. ########## hadoop-project/pom.xml: ########## @@ -185,7 +185,7 @@ <make-maven-plugin.version>1.0-beta-1</make-maven-plugin.version> <surefire.fork.timeout>900</surefire.fork.timeout> <aws-java-sdk.version>1.12.262</aws-java-sdk.version> - <hsqldb.version>2.3.4</hsqldb.version> + <hsqldb.version>2.5.2</hsqldb.version> Review Comment: We probably need to do this separately. -- 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]
