honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Allow H2-based tests to run only with Gregorian calendar (elastic/x-pack-elasticsearch#3170) 

This PR detects non-gregorian calendars in H2 tests and overrides them. This is a temporary workaround to reduce amount of noise in CI. The permanent solution is tracked in elastic/x-pack-elasticsearch#3169.

Original commit: elastic/x-pack-elasticsearch@60991d1a11
This commit is contained in:
Igor Motov 2017-11-30 11:42:59 -05:00 committed by GitHub
parent 7cab29760d
commit d8ef52dc0d
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qa/sql/src/main/java/org/elasticsearch/xpack/qa/sql/jdbc/LocalH2.java
View File

@ -5,15 +5,22 @@
*/ */
package org.elasticsearch.xpack.qa.sql.jdbc; package org.elasticsearch.xpack.qa.sql.jdbc;
import org.apache.logging.log4j.Logger;
import org.elasticsearch.common.CheckedSupplier; import org.elasticsearch.common.CheckedSupplier;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.xpack.sql.client.shared.SuppressForbidden;
import org.junit.rules.ExternalResource; import org.junit.rules.ExternalResource;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager; import java.sql.DriverManager;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.Calendar;
import java.util.Locale;
import java.util.Properties; import java.util.Properties;
public class LocalH2 extends ExternalResource implements CheckedSupplier<Connection, SQLException> { public class LocalH2 extends ExternalResource implements CheckedSupplier<Connection, SQLException> {
private final Logger logger = Loggers.getLogger(getClass());
static { static {
try { try {
// Initialize h2 so we can use it for testing // Initialize h2 so we can use it for testing
@ -36,6 +43,7 @@ public class LocalH2 extends ExternalResource implements CheckedSupplier<Connect
private final String url; private final String url;
// H2 in-memory will keep the db alive as long as this connection is opened // H2 in-memory will keep the db alive as long as this connection is opened
private Connection keepAlive; private Connection keepAlive;
Locale locale;
/* /*
* The syntax on the connection string is fairly particular: * The syntax on the connection string is fairly particular:
@ -53,7 +61,13 @@ public class LocalH2 extends ExternalResource implements CheckedSupplier<Connect
} }
@Override @Override
@SuppressForbidden(reason = "H2 gets really confused with non Gregorian calendars")
protected void before() throws Throwable { protected void before() throws Throwable {
if ("gregory".equals(Calendar.getInstance().getCalendarType()) == false) {
logger.info("Non gregorian calendar is detected. Overriding locale.");
locale = Locale.getDefault();
Locale.setDefault(Locale.ROOT);
}
keepAlive = get(); keepAlive = get();
keepAlive.createStatement().execute("RUNSCRIPT FROM 'classpath:/setup_test_emp.sql'"); keepAlive.createStatement().execute("RUNSCRIPT FROM 'classpath:/setup_test_emp.sql'");
} }
@ -65,6 +79,11 @@ public class LocalH2 extends ExternalResource implements CheckedSupplier<Connect
} catch (SQLException ex) { } catch (SQLException ex) {
// close // close
} }
if (locale != null) {
logger.info("Restoring locale.");
Locale.setDefault(locale);
locale = null;
}
} }
@Override @Override