[Refactor](dialect) Add sql dialect converter plugins.

dutyu · Dec 25, 2023 · f8b62c5 · f8b62c5
1 parent 8bc7ea5
commit f8b62c5
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/fe_plugins/presto-converter/pom.xml → fe_plugins/http-dialect-converter/pom.xml b/fe_plugins/presto-converter/pom.xml → fe_plugins/http-dialect-converter/pom.xml
@@ -26,7 +26,7 @@ under the License.
  <relativePath>../pom.xml</relativePath>
  </parent>
  <modelVersion>4.0.0</modelVersion>
- <artifactId>presto-converter</artifactId>
+ <artifactId>http-dialect-converter</artifactId>
  <packaging>jar</packaging>
  <dependencies>
  <dependency>

diff --git a/...o-converter/src/main/assembly/plugin.conf → ...t-converter/src/main/assembly/plugin.conf b/...o-converter/src/main/assembly/plugin.conf → ...t-converter/src/main/assembly/plugin.conf
@@ -17,4 +17,5 @@
 
 ### plugin configuration
 # Replace the target url, set your sql converter service url here
-target_url=http://127.0.0.1:8080/api/v1/sql/convert
+target_url=http://127.0.0.1:8080/api/v1/sql/convert
+accept_dialects=presto
diff --git a/...erter/src/main/assembly/plugin.properties → ...erter/src/main/assembly/plugin.properties b/...erter/src/main/assembly/plugin.properties → ...erter/src/main/assembly/plugin.properties
@@ -20,4 +20,4 @@ type=DIALECT
 description=SQL dialect converter plugin for presto.
 version=1.0.0
 java.version=1.8.0
-classname=org.apache.doris.plugin.dialect.presto.PrestoDialectConverterPlugin
+classname=org.apache.doris.plugin.dialect.presto.HttpDialectConverterPlugin
diff --git a/...resto-converter/src/main/assembly/zip.xml → ...alect-converter/src/main/assembly/zip.xml b/...resto-converter/src/main/assembly/zip.xml → ...alect-converter/src/main/assembly/zip.xml
diff --git a/.../presto/PrestoDialectConverterPlugin.java → ...lect/http/HttpDialectConverterPlugin.java b/.../presto/PrestoDialectConverterPlugin.java → ...lect/http/HttpDialectConverterPlugin.java
@@ -15,9 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.plugin.dialect.presto;
+package org.apache.doris.plugin.dialect.http;
 
-import com.google.common.base.Preconditions;
 import org.apache.doris.nereids.parser.Dialect;
 import org.apache.doris.plugin.DialectConverterPlugin;
 import org.apache.doris.plugin.Plugin;
@@ -26,24 +25,27 @@
 import org.apache.doris.plugin.PluginInfo;
 import org.apache.doris.qe.SessionVariable;
 
+import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Properties;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 
-public class PrestoDialectConverterPlugin extends Plugin implements DialectConverterPlugin {
+public class HttpDialectConverterPlugin extends Plugin implements DialectConverterPlugin {
 
  private volatile boolean isInit = false;
  private volatile boolean isClosed = false;
  private volatile String targetURL = null;
+ private volatile ImmutableSet<Dialect> acceptDialects = null;
 
  @Override
  public void init(PluginInfo info, PluginContext ctx) throws PluginException {
@@ -83,6 +85,10 @@ private void loadConfig(PluginContext ctx, Map<String, String> pluginInfoPropert
  final Map<String, String> properties = props.stringPropertyNames().stream()
  .collect(Collectors.toMap(Function.identity(), props::getProperty));
  targetURL = properties.get("target_url");
+ acceptDialects = ImmutableSet.copyOf(Arrays.stream(properties.get("accept_dialects").split(","))
+ .map(Dialect::getByName)
+ .filter(dialect -> dialect!= null)
+ .collect(ImmutableSet.toImmutableSet()));
  }
 
  @Override
@@ -93,12 +99,12 @@ public void close() throws IOException {
 
  @Override
  public ImmutableSet<Dialect> acceptDialects() {
- return ImmutableSet.of(Dialect.PRESTO);
+ return acceptDialects;
  }
 
  @Override
  public @Nullable String convertSql(String originSql, SessionVariable sessionVariable) {
  Preconditions.checkNotNull(targetURL);
- return SQLDialectUtils.convertSql(targetURL, originSql);
+ return HttpDialectUtils.convertSql(targetURL, originSql);
  }
 }
diff --git a/...lugin/dialect/presto/SQLDialectUtils.java → ...plugin/dialect/http/HttpDialectUtils.java b/...lugin/dialect/presto/SQLDialectUtils.java → ...plugin/dialect/http/HttpDialectUtils.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.plugin.dialect.presto;
+package org.apache.doris.plugin.dialect.http;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -52,8 +52,8 @@
  * "code": 0,
  * "message": ""
  */
-public class SQLDialectUtils {
- private static final Logger LOG = LogManager.getLogger(SQLDialectUtils.class);
+public class HttpDialectUtils {
+ private static final Logger LOG = LogManager.getLogger(HttpDialectUtils.class);
 
  public static String convertSql(String targetURL, String originStmt) {
  ConvertRequest convertRequest = new ConvertRequest(originStmt, "presto");

diff --git a/...n/dialect/presto/SQLDialectUtilsTest.java → ...in/dialect/http/HttpDialectUtilsTest.java b/...n/dialect/presto/SQLDialectUtilsTest.java → ...in/dialect/http/HttpDialectUtilsTest.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.plugin.dialect.presto;
+package org.apache.doris.plugin.dialect.http;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -27,7 +27,7 @@
 import java.net.ServerSocket;
 import java.net.SocketException;
 
-public class SQLDialectUtilsTest {
+public class HttpDialectUtilsTest {
 
  private int port;
  private SimpleHttpServer server;

diff --git a/...ugin/dialect/presto/SimpleHttpServer.java → ...plugin/dialect/http/SimpleHttpServer.java b/...ugin/dialect/presto/SimpleHttpServer.java → ...plugin/dialect/http/SimpleHttpServer.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.apache.doris.plugin.dialect.presto;
+package org.apache.doris.plugin.dialect.http;
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;

diff --git a/fe_plugins/pom.xml b/fe_plugins/pom.xml
@@ -65,7 +65,7 @@ under the License.
  <modules>
  <module>auditdemo</module>
  <module>auditloader</module>
- <module>presto-converter</module>
+ <module>http-dialect-converter</module>
  <module>trino-converter</module>
  <module>sparksql-converter</module>
  </modules>