merge master and update

Author: ClaireLytt

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/StorageContainerFactory.java

@@ -22,7 +22,6 @@
 import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.option.StorageContainerConfigurationOption;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.DockerStorageContainer;
-import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.type.docker.impl.HiveContainer;
 import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
 
 /**
@@ -62,7 +61,7 @@ public static StorageContainer newInstance(final DatabaseType databaseType, fina
             case "MariaDB":
                 return new DockerStorageContainer(storageContainerImage, option, scenario);
             case "Hive":
-                return new HiveContainer(storageContainerImage, option, scenario);
+                return new DockerStorageContainer(storageContainerImage, option, scenario);
             default:
                 throw new RuntimeException(String.format("Database `%s` is unknown.", databaseType.getType()));
         }

test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java

@@ -36,6 +36,8 @@
 import org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
 
 import javax.sql.DataSource;
+import java.io.IOException;
+import lombok.extern.slf4j.Slf4j;
 import java.sql.DriverManager;
 import java.time.Duration;
 import java.util.Collection;
@@ -50,6 +52,7 @@
 /**
  * Docker storage container.
  */
+@Slf4j
 public class DockerStorageContainer extends DockerITContainer implements StorageContainer {
 
     private final StorageContainerConfigurationOption option;
@@ -114,10 +117,26 @@ private String getURL() {
 
     @Override
     protected void postStart() {
+        if ("Hive".equalsIgnoreCase(option.getDatabaseType())) {
+            executeHiveMountedSQLScripts();
+        }
         actualDataSourceMap.putAll(createAccessDataSources(getDataSourceNames(getDataSourceNameAndTypeMap(Type.ACTUAL))));
         expectedDataSourceMap.putAll(createAccessDataSources(getDataSourceNames(getDataSourceNameAndTypeMap(Type.EXPECTED))));
     }
 
+    private void executeHiveMountedSQLScripts() {
+        try {
+            execInContainer("bash", "-c",
+                    "if [ -f /docker-entrypoint-initdb.d/50-scenario-actual-init.sql ]; then beeline -u \"jdbc:hive2://localhost:10000/default\" -f "
+                            + "/docker-entrypoint-initdb.d/50-scenario-actual-init.sql; fi");
+            execInContainer("bash", "-c",
+                    "if [ -f /docker-entrypoint-initdb.d/60-scenario-expected-init.sql ]; then beeline -u \"jdbc:hive2://localhost:10000/default\" -f "
+                            + "/docker-entrypoint-initdb.d/60-scenario-expected-init.sql; fi");
+        } catch (final InterruptedException | IOException ex) {
+            log.warn("Hive init scripts execution failed.", ex);
+        }
+    }
+    
     private Map<String, DatabaseType> getDataSourceNameAndTypeMap(final Type type) {
         return null == scenario ? Collections.emptyMap() : DatabaseEnvironmentManager.getDatabaseTypes(scenario, option.getType(), type);
     }