fix

Netflix · Oct 18, 2024 · 4947478 · 4947478
1 parent ecf8c78
commit 4947478
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...ts/metacat-test-cluster/etc-metacat/catalog/embedded-fast-hive-metastore-shard.properties b/...ts/metacat-test-cluster/etc-metacat/catalog/embedded-fast-hive-metastore-shard.properties
@@ -58,7 +58,7 @@ hive.metastore.fs.handler.class=com.netflix.metacat.connector.hive.metastore.Hiv
 
 javax.jdo.option.name=embedded-fast-hive-metastore-shard
 javax.jdo.option.username=metacat_user
-javax.jdo.option.url=jdbc:mysql://hive-metastore-db:3306/shardfasthive?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=@@innodb_lock_wait_timeout=120&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+javax.jdo.option.url=jdbc:mysql://hive-metastore-db:3306/shardfasthive?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=innodb_lock_wait_timeout=120&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
 javax.jdo.option.driverClassName=com.mysql.cj.jdbc.Driver
 javax.jdo.option.password=metacat_user_password
 javax.jdo.option.jmxEnabled=true

diff --git a/...al-tests/metacat-test-cluster/etc-metacat/catalog/embedded-fast-hive-metastore.properties b/...al-tests/metacat-test-cluster/etc-metacat/catalog/embedded-fast-hive-metastore.properties
@@ -37,7 +37,7 @@ hive.metastore.fs.handler.class=com.netflix.metacat.connector.hive.metastore.Hiv
 
 javax.jdo.option.name=embedded-fast-hive-metastore
 javax.jdo.option.username=metacat_user
-javax.jdo.option.url=jdbc:mysql://hive-metastore-db:3306/fasthive?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=@@innodb_lock_wait_timeout=120&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+javax.jdo.option.url=jdbc:mysql://hive-metastore-db:3306/fasthive?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=innodb_lock_wait_timeout=120&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
 javax.jdo.option.driverClassName=com.mysql.cj.jdbc.Driver
 javax.jdo.option.password=metacat_user_password
 javax.jdo.option.jmxEnabled=true

diff --git a/metacat-functional-tests/metacat-test-cluster/etc-metacat/catalog/s3-mysql-db.properties b/metacat-functional-tests/metacat-test-cluster/etc-metacat/catalog/s3-mysql-db.properties
@@ -21,11 +21,11 @@ metacat.has-data-external=true
 
 javax.jdo.option.name=s3-mysql-host
 javax.persistence.jdbc.user=metacat_user
-javax.persistence.jdbc.url=jdbc:mysql://hive-metastore-db:3306/s3?useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=@@innodb_lock_wait_timeout=300&rewriteBatchedStatements=true
+javax.persistence.jdbc.url=jdbc:mysql://hive-metastore-db:3306/s3?useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=innodb_lock_wait_timeout=300&rewriteBatchedStatements=true
 javax.persistence.jdbc.driver=com.mysql.cj.jdbc.Driver
 javax.persistence.schema-generation.database.action=none
 javax.persistence.jdbc.password=metacat_user_password
-javax.jdo.option.url=jdbc:mysql://hive-metastore-db:3306/s3?useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=@@innodb_lock_wait_timeout=300&rewriteBatchedStatements=true
+javax.jdo.option.url=jdbc:mysql://hive-metastore-db:3306/s3?useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=innodb_lock_wait_timeout=300&rewriteBatchedStatements=true
 javax.jdo.option.username=metacat_user
 javax.jdo.option.driverClassName=ccom.mysql.cj.jdbc.Driver
 javax.jdo.option.password=metacat_user_password

diff --git a/metacat-functional-tests/metacat-test-cluster/etc-metacat/usermetadata.properties b/metacat-functional-tests/metacat-test-cluster/etc-metacat/usermetadata.properties
@@ -15,7 +15,7 @@
 #
 #
 
-javax.jdo.option.url=jdbc:mysql://hive-metastore-db:3306/metacat?useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=@@innodb_lock_wait_timeout=120&rewriteBatchedStatements=true
+javax.jdo.option.url=jdbc:mysql://hive-metastore-db:3306/metacat?useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=innodb_lock_wait_timeout=120&rewriteBatchedStatements=true
 javax.jdo.option.username=metacat_user
 javax.jdo.option.driverClassName=com.mysql.cj.jdbc.Driver
 javax.jdo.option.password=metacat_user_password

diff --git a/...at-functional-tests/src/functionalTest/groovy/com/netflix/metacat/MetacatSmokeSpec.groovy b/...at-functional-tests/src/functionalTest/groovy/com/netflix/metacat/MetacatSmokeSpec.groovy
@@ -1935,7 +1935,7 @@ class MetacatSmokeSpec extends Specification {
     @Ignore
     def "Delete definition metadata for non-existant #name"() {
         when:
-        def metacatSource = Sql.newInstance('jdbc:mysql://hive-metastore-db:3306/metacat?useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=@@innodb_lock_wait_timeout=120&rewriteBatchedStatements=true', 'metacat_user','metacat_user_password', 'com.mysql.cj.jdbc.Driver')
+        def metacatSource = Sql.newInstance('jdbc:mysql://hive-metastore-db:3306/metacat?useUnicode=true&characterEncoding=latin1&autoReconnect=true&sessionVariables=innodb_lock_wait_timeout=120&rewriteBatchedStatements=true', 'metacat_user','metacat_user_password', 'com.mysql.cj.jdbc.Driver', 'metacat_user','metacat_user_password', 'com.mysql.cj.jdbc.Driver')
         metacatSource.execute("insert into definition_metadata(version,created_by,data,date_created,last_updated,last_updated_by,name) values (0,'test', '{}',now(), now(), 'test'," + name+ ")")
         metadataApi.deleteDefinitionMetadata(name, false)
         def list = metadataApi.getDefinitionMetadataList(null, null, null, null, null, null, name, null)