You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/06/16 04:06:39 UTC
[incubator-linkis] branch dev-1.2.0 updated: [Feature-2082]DataSource Manager module optimization (#2181)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
new caccf89dd [Feature-2082]DataSource Manager module optimization (#2181)
caccf89dd is described below
commit caccf89dd4fec12dc0aa155d3f18fe392dbf53ee
Author: Casion <ca...@gmail.com>
AuthorDate: Thu Jun 16 12:06:35 2022 +0800
[Feature-2082]DataSource Manager module optimization (#2181)
* rename linkis-metadata-manager to linkis-metadata-query
* rename linkis-metadata-manager to linkis-metadata-query
* rename linkis-metadata-manager to linkis-metadata-query
* add docs info-1.1.3
* adjust metadataquery scripts
* optimize of metadata source client
* for compatible with metadata module name refactoring
* fix typo
* add test for MetadataQueryRestful
* fix merge conflict
---
...operties => linkis-ps-metadataquery.properties} | 2 +-
.../assembly-combined/conf/linkis.properties | 1 +
...-ps-metadatamanager => linkis-ps-metadataquery} | 6 +-
.../assembly-combined/sbin/linkis-start-all.sh | 16 +-
.../assembly-combined/sbin/linkis-stop-all.sh | 8 +-
.../src/main/assembly/assembly.xml | 4 +-
assembly-combined-package/bin/install.sh | 6 +-
.../deploy-config/linkis-env.sh | 8 +-
docs/info-1.1.3.md | 7 +
.../apache/linkis/rpc/conf/RPCConfiguration.scala | 4 +
.../linkis-datasource-client/pom.xml | 2 +-
.../datasource/client/DataSourceRemoteClient.scala | 12 ++
.../datasource/client/MetaDataRemoteClient.scala | 5 +
.../linkis/datasource/client/RemoteClient.scala | 4 +-
.../client/config/DatasourceClientConfig.scala | 5 +-
.../client/impl/LinkisMetaDataRemoteClient.scala | 1 +
.../client/request/DataSourceAction.scala | 3 +-
.../client/request/MetadataGetColumnsAction.scala | 16 +-
.../request/MetadataGetDatabasesAction.scala | 15 +-
.../request/MetadataGetPartitionsAction.scala | 16 +-
.../request/MetadataGetTablePropsAction.scala | 23 +--
.../client/request/MetadataGetTablesAction.scala | 14 +-
.../client/response/MetadataGetColumnsResult.scala | 7 +-
.../response/MetadataGetDatabasesResult.scala | 2 +-
.../response/MetadataGetPartitionsResult.scala | 10 +-
.../response/MetadataGetTablePropsResult.scala | 2 +-
.../client/response/MetadataGetTablesResult.scala | 2 +-
.../linkis/datasource/client/TestHiveClient.scala | 9 +-
.../linkis/datasource/client/TestMysqlClient.scala | 10 +-
.../linkis-datasource-manager/server/pom.xml | 2 +-
.../core/restful/DataSourceCoreRestfulApi.java | 2 +-
.../core/restful/DataSourceOperateRestfulApi.java | 2 +-
.../service/impl/MetadataOperateServiceImpl.java | 4 +-
.../core/service/MetadataOperateServiceTest.java | 4 +-
.../common/pom.xml | 2 +-
.../metadata/query}/common/MdmConfiguration.java | 4 +-
.../query}/common/cache/CacheConfiguration.java | 2 +-
.../metadata/query}/common/cache/CacheManager.java | 2 +-
.../query}/common/cache/ConnCacheManager.java | 2 +-
.../query}/common/domain/MetaColumnInfo.java | 2 +-
.../query}/common/domain/MetaPartitionInfo.java | 2 +-
.../exception/MetaMethodInvokeException.java | 2 +-
.../common/exception/MetaRuntimeException.java | 2 +-
.../query}/common/service/AbstractMetaService.java | 14 +-
.../query}/common/service/BaseMetadataService.java | 2 +-
.../query}/common/service/MetadataConnection.java | 2 +-
.../query}/common/service/MetadataDbService.java | 6 +-
.../query}/common/service/MetadataService.java | 2 +-
.../common/protocol/MetadataOperateProtocol.scala | 8 +-
.../query}/common/protocol/MetadataProtocol.scala | 8 +-
.../common/protocol/MetadataQueryProtocol.scala | 8 +-
.../server/pom.xml | 4 +-
.../server/src/main/assembly/distribution.xml | 2 +-
.../server/LinkisMetadataQueryApplication.java} | 8 +-
.../server/loader/MetaClassLoaderManager.java | 14 +-
.../query}/server/restful/MetadataCoreRestful.java | 58 +++----
.../server/restful/MetadataQueryRestful.java} | 151 ++++++++---------
.../server/service/MetadataQueryService.java} | 102 ++++++++++--
.../service/impl/MetadataQueryServiceImpl.java} | 182 +++++++++++++++++++--
.../query}/server/utils/MetadataUtils.java | 6 +-
.../query}/server/receiver/BaseMetaReceiver.scala | 20 +--
.../query}/server/WebApplicationServer.java | 2 +-
.../server/restful/MetadataCoreRestfulTest.java | 112 +++++++++----
.../server/restful/MetadataQueryRestfulTest.java} | 164 ++++++++++++-------
.../metadata/query}/server/restful/MvcUtils.java | 2 +-
.../src/test/resources/application.properties | 0
.../service/elasticsearch/pom.xml | 4 +-
.../src/main/assembly/distribution.xml | 4 +-
.../metadat/query}/service/ElasticConnection.java | 2 +-
.../query}/service/ElasticParamsMapper.java | 2 +-
.../metadat/query}/service/EsMetaService.java | 8 +-
.../service/hive/pom.xml | 4 +-
.../hive/src/main/assembly/distribution.xml | 4 +-
.../metadat/query}/service/HiveConnection.java | 2 +-
.../metadat/query}/service/HiveMetaService.java | 12 +-
.../metadat/query}/service/HiveParamsMapper.java | 2 +-
.../service/kafka/pom.xml | 4 +-
.../kafka/src/main/assembly/distribution.xml | 4 +-
.../metadat/query}/service/KafkaConnection.java | 2 +-
.../metadat/query}/service/KafkaMetaService.java | 8 +-
.../metadat/query}/service/KafkaParamsMapper.java | 2 +-
.../service/mysql/pom.xml | 4 +-
.../mysql/src/main/assembly/distribution.xml | 4 +-
.../metadat/query}/service/MysqlMetaService.java | 8 +-
.../metadat/query}/service/SqlConnection.java | 4 +-
.../metadat/query}/service/SqlParamsMapper.java | 2 +-
.../linkis-datasource/pom.xml | 12 +-
.../linkis/gateway/parser/GatewayParser.scala | 44 +++--
88 files changed, 820 insertions(+), 453 deletions(-)
diff --git a/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties b/assembly-combined-package/assembly-combined/conf/linkis-ps-metadataquery.properties
similarity index 97%
rename from assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties
rename to assembly-combined-package/assembly-combined/conf/linkis-ps-metadataquery.properties
index 3a348317a..02450d77b 100644
--- a/assembly-combined-package/assembly-combined/conf/linkis-ps-metadatamanager.properties
+++ b/assembly-combined-package/assembly-combined/conf/linkis-ps-metadataquery.properties
@@ -14,7 +14,7 @@
#
wds.linkis.server.mdm.service.instance.expire-in-seconds=1800
-wds.linkis.server.restful.scan.packages=org.apache.linkis.metadatamanager.server.restful
+wds.linkis.server.restful.scan.packages=org.apache.linkis.metadata.query.server.restful
wds.linkis.server.dsm.app.name=linkis-ps-data-source-manager
##Spring
diff --git a/assembly-combined-package/assembly-combined/conf/linkis.properties b/assembly-combined-package/assembly-combined/conf/linkis.properties
index dc04db719..073407a82 100644
--- a/assembly-combined-package/assembly-combined/conf/linkis.properties
+++ b/assembly-combined-package/assembly-combined/conf/linkis.properties
@@ -53,6 +53,7 @@ wds.linkis.governance.station.admin=hadoop
wds.linkis.gateway.conf.publicservice.list=query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource
wds.linkis.server.user.restful.uri.pass.auth=/actuator/prometheus,/api/rest_j/v1/offline,/api/rest_j/v1/entrance/api/metrics/runningtask
+wds.linkis.gateway.conf.metadataquery.list=metadatamanager,metadataquery
spring.spring.servlet.multipart.max-file-size=500MB
spring.spring.servlet.multipart.max-request-size=500MB
diff --git a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadataquery
similarity index 87%
rename from assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager
rename to assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadataquery
index d7b78f64c..8bfeece41 100644
--- a/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadatamanager
+++ b/assembly-combined-package/assembly-combined/sbin/ext/linkis-ps-metadataquery
@@ -13,16 +13,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# description: ps-metadatamanager start cmd
+# description: ps-metadataquery start cmd
#
# Modified for Linkis 1.1.0
#
-export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-metadatamanager"
+export SERVER_SUFFIX="linkis-public-enhancements/linkis-ps-metadataquery"
#export DEBUG_PORT=
-export SERVER_CLASS=org.apache.linkis.metadatamanager.server.LinkisMetadataManagerApplication
+export SERVER_CLASS=org.apache.linkis.metadata.query.server.LinkisMetadataQueryApplication
export COMMON_START_BIN=$LINKIS_HOME/sbin/ext/linkis-common-start
if [[ ! -f "${COMMON_START_BIN}" ]]; then
diff --git a/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh b/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
index f3881fd6a..233529c60 100644
--- a/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
+++ b/assembly-combined-package/assembly-combined/sbin/linkis-start-all.sh
@@ -110,15 +110,15 @@ SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
startApp
-if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
#linkis-ps-data-source-manager
SERVER_NAME="ps-data-source-manager"
SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
startApp
- #linkis-ps-metadatamanager
- SERVER_NAME="ps-metadatamanager"
- SERVER_IP=$METADATA_MANAGER_INSTALL_IP
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
startApp
fi
@@ -197,15 +197,15 @@ SERVER_NAME="cg-engineplugin"
SERVER_IP=$ENGINECONN_PLUGIN_SERVER_INSTALL_IP
checkServer
-if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
#linkis-ps-data-source-manager
SERVER_NAME="ps-data-source-manager"
SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
checkServer
- #linkis-ps-metadatamanager
- SERVER_NAME="ps-metadatamanager"
- SERVER_IP=$METADATA_MANAGER_INSTALL_IP
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
checkServer
fi
diff --git a/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh b/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
index 3cd914614..c5e098f0c 100644
--- a/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
+++ b/assembly-combined-package/assembly-combined/sbin/linkis-stop-all.sh
@@ -67,15 +67,15 @@ SERVER_NAME="ps-cs"
SERVER_IP=$CS_INSTALL_IP
stopApp
-if [ "$ENABLE_METADATA_MANAGER" == "true" ]; then
+if [ "$ENABLE_METADATA_QUERY" == "true" ]; then
#linkis-ps-data-source-manager
SERVER_NAME="ps-data-source-manager"
SERVER_IP=$DATASOURCE_MANAGER_INSTALL_IP
stopApp
- #linkis-ps-metadatamanager
- SERVER_NAME="ps-metadatamanager"
- SERVER_IP=$METADATA_MANAGER_INSTALL_IP
+ #linkis-ps-metadataquery
+ SERVER_NAME="ps-metadataquery"
+ SERVER_IP=$METADATA_QUERY_INSTALL_IP
stopApp
fi
diff --git a/assembly-combined-package/assembly-combined/src/main/assembly/assembly.xml b/assembly-combined-package/assembly-combined/src/main/assembly/assembly.xml
index 9f2d250b2..423d1b6ae 100644
--- a/assembly-combined-package/assembly-combined/src/main/assembly/assembly.xml
+++ b/assembly-combined-package/assembly-combined/src/main/assembly/assembly.xml
@@ -353,10 +353,10 @@
<!-- metadata manager -->
<fileSet>
<directory>
- ../../linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/target/out/lib/
+ ../../linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/target/out/lib/
</directory>
<outputDirectory>
- lib/linkis-public-enhancements/linkis-ps-metadatamanager
+ lib/linkis-public-enhancements/linkis-ps-metadataquery
</outputDirectory>
<includes>
<include>**/*</include>
diff --git a/assembly-combined-package/bin/install.sh b/assembly-combined-package/bin/install.sh
index 04a1f5cc5..e97d6e5a7 100644
--- a/assembly-combined-package/bin/install.sh
+++ b/assembly-combined-package/bin/install.sh
@@ -362,10 +362,10 @@ then
sed -i ${txt} "s#spring.server.port.*#spring.server.port=$PUBLICSERVICE_PORT#g" $publicservice_conf
fi
-metadatamanage_conf=$LINKIS_HOME/conf/linkis-ps-metadatamanager.properties
-if [ "$METADATA_MANAGER_PORT" != "" ]
+metadataquery_conf=$LINKIS_HOME/conf/linkis-ps-metadataquery.properties
+if [ "$METADATA_QUERY_PORT" != "" ]
then
- sed -i ${txt} "s#spring.server.port.*#spring.server.port=$METADATA_MANAGER_PORT#g" $metadatamanage_conf
+ sed -i ${txt} "s#spring.server.port.*#spring.server.port=$METADATA_QUERY_PORT#g" $metadataquery_conf
fi
diff --git a/assembly-combined-package/deploy-config/linkis-env.sh b/assembly-combined-package/deploy-config/linkis-env.sh
index 8c8b1c002..81bf36ef0 100644
--- a/assembly-combined-package/deploy-config/linkis-env.sh
+++ b/assembly-combined-package/deploy-config/linkis-env.sh
@@ -122,9 +122,9 @@ CS_PORT=9108
#DATASOURCE_MANAGER_INSTALL_IP=127.0.0.1
DATASOURCE_MANAGER_PORT=9109
-##linkis-ps-metadatamanager
-#METADATA_MANAGER_INSTALL_IP=127.0.0.1
-METADATA_MANAGER_PORT=9110
+##linkis-ps-metadataquery
+#METADATA_QUERY_INSTALL_IP=127.0.0.1
+METADATA_QUERY_PORT=9110
########################################################################################
@@ -152,7 +152,7 @@ LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module
export PROMETHEUS_ENABLE=false
#If you want to start metadata related microservices, you can set this export ENABLE_METADATA_MANAGE=true
-export ENABLE_METADATA_MANAGER=false
+export ENABLE_METADATA_QUERY=false
#If you only want to experience linkis streamlined services, not rely on hdfs
#you can set the following configuration to false and for the configuration related to the file directory,
diff --git a/docs/info-1.1.3.md b/docs/info-1.1.3.md
new file mode 100644
index 000000000..e0cdfc4e8
--- /dev/null
+++ b/docs/info-1.1.3.md
@@ -0,0 +1,7 @@
+## 参数变化
+
+
+| 模块名(服务名)| 类型 | 参数名 | 默认值 | 描述 |
+| ----------- | ----- | -------------------------------------------------------- | ---------------- | ------------------------------------------------------- |
+|ps-metadataquery | 修改 | wds.linkis.server.mdm.module.name<br/>-><br/> linkis.server.mdq.module.name | metadataquery|元数据查询服务名|
+|ps-metadataquery | 修改 | wds.linkis.server.dsm.module.name<br/>-><br/> linkis.server.dsm.module.name | data-source-manager|数据源管理服务名 |
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
index c50280ec4..c3e7d38ee 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala
@@ -40,6 +40,10 @@ object RPCConfiguration {
val ENABLE_PUBLIC_SERVICE = CommonVars("wds.linkis.gateway.conf.enable.publicservice", true)
val PUBLIC_SERVICE_APPLICATION_NAME = CommonVars("wds.linkis.gateway.conf.publicservice.name", "linkis-ps-publicservice")
val PUBLIC_SERVICE_LIST = CommonVars("wds.linkis.gateway.conf.publicservice.list", "query,jobhistory,application,configuration,filesystem,udf,variable,microservice,errorcode,bml,datasource").getValue.split(",")
+
+ val METADATAQUERY_SERVICE_APPLICATION_NAME = CommonVars("wds.linkis.gateway.conf.publicservice.name", "linkis-ps-metadataquery")
+ val METADATAQUERY_SERVICE_LIST = CommonVars("wds.linkis.gateway.conf.metadataquery.list", "metadatamanager,metadataquery").getValue.split(",")
+
val PUBLIC_SERVICE_APP_PREFIX = CommonVars("wds.linkis.gateway.conf.publicservice.name", "linkis-ps-").getValue
val BDP_RPC_INSTANCE_ALIAS_SERVICE_REFRESH_INTERVAL = CommonVars("wds.linkis.rpc.instancealias.refresh.interval", new TimeType("3s"))
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
index 52916b6dd..a1467dec0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-manager-common</artifactId>
+ <artifactId>linkis-metadata-query-common</artifactId>
<version>${linkis.version}</version>
</dependency>
</dependencies>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
index a0985a6e2..22a67ebf4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala
@@ -22,18 +22,30 @@ import org.apache.linkis.datasource.client.response._
trait DataSourceRemoteClient extends RemoteClient {
def getAllDataSourceTypes(action: GetAllDataSourceTypesAction): GetAllDataSourceTypesResult
+
def queryDataSourceEnv(action: QueryDataSourceEnvAction): QueryDataSourceEnvResult
def getInfoByDataSourceId(action: GetInfoByDataSourceIdAction): GetInfoByDataSourceIdResult
def getInfoByDataSourceName(action: GetInfoByDataSourceNameAction): GetInfoByDataSourceNameResult
+
def queryDataSource(action: QueryDataSourceAction): QueryDataSourceResult
+
def getConnectParams(action: GetConnectParamsByDataSourceIdAction): GetConnectParamsByDataSourceIdResult
+
def createDataSource(action: CreateDataSourceAction): CreateDataSourceResult
+
def getDataSourceTestConnect(action: DataSourceTestConnectAction): DataSourceTestConnectResult
+
def deleteDataSource(action: DeleteDataSourceAction): DeleteDataSourceResult
+
def expireDataSource(action: ExpireDataSourceAction): ExpireDataSourceResult
+
def getDataSourceVersions(action: GetDataSourceVersionsAction): GetDataSourceVersionsResult
+
def publishDataSourceVersion(action: PublishDataSourceVersionAction): PublishDataSourceVersionResult
+
def updateDataSource(action: UpdateDataSourceAction): UpdateDataSourceResult
+
def updateDataSourceParameter(action: UpdateDataSourceParameterAction): UpdateDataSourceParameterResult
+
def getKeyDefinitionsByType(action: GetKeyTypeDatasourceAction): GetKeyTypeDatasourceResult
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala
index da9214cab..1c002a4fb 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala
@@ -21,9 +21,14 @@ import org.apache.linkis.datasource.client.request._
import org.apache.linkis.datasource.client.response._
trait MetaDataRemoteClient extends RemoteClient {
+
def getDatabases(action: MetadataGetDatabasesAction): MetadataGetDatabasesResult
+
def getTables(action: MetadataGetTablesAction): MetadataGetTablesResult
+
def getTableProps(action: MetadataGetTablePropsAction): MetadataGetTablePropsResult
+
def getPartitions(action: MetadataGetPartitionsAction): MetadataGetPartitionsResult
+
def getColumns(action: MetadataGetColumnsAction): MetadataGetColumnsResult
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
index 10d6fb474..e43cba693 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala
@@ -17,11 +17,11 @@
package org.apache.linkis.datasource.client
+import java.io.Closeable
+
import org.apache.linkis.httpclient.request.Action
import org.apache.linkis.httpclient.response.Result
-import java.io.Closeable
-
trait RemoteClient extends Closeable {
protected def execute(action: Action): Result
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
index 015dcd88f..d7cef0fe5 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
@@ -20,9 +20,10 @@ package org.apache.linkis.datasource.client.config
import org.apache.linkis.common.conf.CommonVars
object DatasourceClientConfig {
- var METADATA_SERVICE_MODULE: CommonVars[String] = CommonVars.apply("wds.linkis.server.mdm.module.name", "metadatamanager")
- var DATA_SOURCE_SERVICE_MODULE: CommonVars[String] = CommonVars.apply("wds.linkis.server.dsm.module.name", "data-source-manager")
+ var METADATA_SERVICE_MODULE: CommonVars[String] = CommonVars.apply("linkis.server.mdq.module.name", "metadataQuery")
+
+ var DATA_SOURCE_SERVICE_MODULE: CommonVars[String] = CommonVars.apply("linkis.server.dsm.module.name", "data-source-manager")
val AUTH_TOKEN_KEY: CommonVars[String] = CommonVars[String]("wds.linkis.server.dsm.auth.token.key", "Token-Code")
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala
index 3f2001084..249168c65 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala
@@ -24,6 +24,7 @@ import org.apache.linkis.httpclient.dws.DWSHttpClient
import org.apache.linkis.httpclient.dws.config.DWSClientConfig
class LinkisMetaDataRemoteClient(clientConfig: DWSClientConfig) extends AbstractRemoteClient with MetaDataRemoteClient {
+
protected override val dwsHttpClient = new DWSHttpClient(clientConfig, "MetaData-Client")
override def getDatabases(action: MetadataGetDatabasesAction): MetadataGetDatabasesResult = execute(action).asInstanceOf[MetadataGetDatabasesResult]
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala
index 9defeb28d..ddb42b20b 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala
@@ -18,5 +18,6 @@
package org.apache.linkis.datasource.client.request
import org.apache.linkis.httpclient.dws.request.DWSHttpAction
+import org.apache.linkis.httpclient.request.UserAction
-trait DataSourceAction extends DWSHttpAction with org.apache.linkis.httpclient.request.UserAction
+trait DataSourceAction extends DWSHttpAction with UserAction
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
index 39955ba07..027b7d7fa 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
@@ -23,11 +23,13 @@ import org.apache.linkis.httpclient.request.GetAction
class MetadataGetColumnsAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
+
+ private var dataSourceName: String = _
+
private var database: String = _
private var table: String = _
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "columns", dataSourceId.toString, "db", database, "table", table)
+ override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getColumns")
private var user: String = _
@@ -41,7 +43,7 @@ object MetadataGetColumnsAction {
def builder(): Builder = new Builder
class Builder private[MetadataGetColumnsAction]() {
- private var dataSourceId: Long = _
+ private var dataSourceName: String = _
private var database: String = _
private var table: String = _
private var system: String = _
@@ -52,8 +54,8 @@ object MetadataGetColumnsAction {
this
}
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
+ def setDataSourceName(dataSourceName: String): Builder = {
+ this.dataSourceName = dataSourceName
this
}
@@ -73,7 +75,7 @@ object MetadataGetColumnsAction {
}
def build(): MetadataGetColumnsAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
+ if (dataSourceName == null) throw new DataSourceClientBuilderException("dataSourceName is needed!")
if(database == null) throw new DataSourceClientBuilderException("database is needed!")
if(table == null) throw new DataSourceClientBuilderException("table is needed!")
if(system == null) throw new DataSourceClientBuilderException("system is needed!")
@@ -81,7 +83,7 @@ object MetadataGetColumnsAction {
val metadataGetColumnsAction = new MetadataGetColumnsAction
- metadataGetColumnsAction.dataSourceId = this.dataSourceId
+ metadataGetColumnsAction.dataSourceName = this.dataSourceName
metadataGetColumnsAction.database = this.database
metadataGetColumnsAction.table = this.table
metadataGetColumnsAction.setParameter("system", system)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
index bff6435b4..035690b60 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
@@ -23,9 +23,10 @@ import org.apache.linkis.httpclient.request.GetAction
class MetadataGetDatabasesAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "dbs", dataSourceId.toString)
+ private var dataSourceName: String = _
+
+ override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getDatabases")
private var user: String = _
@@ -38,7 +39,7 @@ object MetadataGetDatabasesAction {
def builder(): Builder = new Builder
class Builder private[MetadataGetDatabasesAction]() {
- private var dataSourceId: Long = _
+ private var dataSourceName: String = _
private var system: String = _
private var user: String = _
@@ -47,8 +48,8 @@ object MetadataGetDatabasesAction {
this
}
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
+ def setDataSourceName(dataSourceName: String): Builder = {
+ this.dataSourceName = dataSourceName
this
}
@@ -58,12 +59,12 @@ object MetadataGetDatabasesAction {
}
def build(): MetadataGetDatabasesAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
+ if (dataSourceName == null) throw new DataSourceClientBuilderException("dataSourceName is needed!")
if(system == null) throw new DataSourceClientBuilderException("system is needed!")
if(user == null) throw new DataSourceClientBuilderException("user is needed!")
val metadataGetDatabasesAction = new MetadataGetDatabasesAction
- metadataGetDatabasesAction.dataSourceId = this.dataSourceId
+ metadataGetDatabasesAction.dataSourceName = this.dataSourceName
metadataGetDatabasesAction.setParameter("system", system)
metadataGetDatabasesAction.setUser(user)
metadataGetDatabasesAction
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
index 3073084cf..c081a991e 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
@@ -23,12 +23,12 @@ import org.apache.linkis.httpclient.request.GetAction
class MetadataGetPartitionsAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
+ private var dataSourceName: String = _
private var database: String = _
private var table: String = _
private var traverse: Boolean = false
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "partitions", dataSourceId.toString, "db", database, "table", table)
+ override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getPartitions")
private var user: String = _
@@ -42,7 +42,7 @@ object MetadataGetPartitionsAction {
def builder(): Builder = new Builder
class Builder private[MetadataGetPartitionsAction]() {
- private var dataSourceId: Long = _
+ private var dataSourceName: String = _
private var database: String = _
private var table: String = _
private var system: String = _
@@ -54,8 +54,8 @@ object MetadataGetPartitionsAction {
this
}
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
+ def setDataSourceName(dataSourceName: String): Builder = {
+ this.dataSourceName = dataSourceName
this
}
@@ -80,18 +80,18 @@ object MetadataGetPartitionsAction {
}
def build(): MetadataGetPartitionsAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
+ if (dataSourceName == null) throw new DataSourceClientBuilderException("dataSourceName is needed!")
if(database == null) throw new DataSourceClientBuilderException("database is needed!")
if(table == null) throw new DataSourceClientBuilderException("table is needed!")
if(system == null) throw new DataSourceClientBuilderException("system is needed!")
val metadataGetPartitionsAction = new MetadataGetPartitionsAction
- metadataGetPartitionsAction.dataSourceId = this.dataSourceId
+ metadataGetPartitionsAction.dataSourceName = this.dataSourceName
metadataGetPartitionsAction.database = this.database
metadataGetPartitionsAction.table = this.table
metadataGetPartitionsAction.setParameter("system", system)
metadataGetPartitionsAction.setUser(user)
- metadataGetPartitionsAction.traverse=this.traverse
+ metadataGetPartitionsAction.traverse = this.traverse
metadataGetPartitionsAction
}
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
index 1f67f225f..87ee3030a 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
@@ -23,11 +23,12 @@ import org.apache.linkis.httpclient.request.GetAction
class MetadataGetTablePropsAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
+ private var dataSourceName: String = _
+
private var database: String = _
private var table: String = _
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "props", dataSourceId.toString, "db", database, "table", table)
+ override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getTableProps")
private var user: String = _
@@ -40,7 +41,7 @@ object MetadataGetTablePropsAction {
def builder(): Builder = new Builder
class Builder private[MetadataGetTablePropsAction]() {
- private var dataSourceId: Long = _
+ private var dataSourceName: String = _
private var database: String = _
private var table: String = _
private var system: String = _
@@ -51,8 +52,8 @@ object MetadataGetTablePropsAction {
this
}
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
+ def setDataSourceName(dataSourceName: String): Builder = {
+ this.dataSourceName = dataSourceName
this
}
@@ -72,14 +73,14 @@ object MetadataGetTablePropsAction {
}
def build(): MetadataGetTablePropsAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
- if(database == null) throw new DataSourceClientBuilderException("database is needed!")
- if(table == null) throw new DataSourceClientBuilderException("table is needed!")
- if(system == null) throw new DataSourceClientBuilderException("system is needed!")
- if(user == null) throw new DataSourceClientBuilderException("user is needed!")
+ if (dataSourceName == null) throw new DataSourceClientBuilderException("dataSourceName is needed!")
+ if (database == null) throw new DataSourceClientBuilderException("database is needed!")
+ if (table == null) throw new DataSourceClientBuilderException("table is needed!")
+ if (system == null) throw new DataSourceClientBuilderException("system is needed!")
+ if (user == null) throw new DataSourceClientBuilderException("user is needed!")
val metadataGetTablePropsAction = new MetadataGetTablePropsAction
- metadataGetTablePropsAction.dataSourceId = this.dataSourceId
+ metadataGetTablePropsAction.dataSourceName = this.dataSourceName
metadataGetTablePropsAction.database = this.database
metadataGetTablePropsAction.table = this.table
metadataGetTablePropsAction.setParameter("system", system)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
index be9494fbf..9646e4429 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala
@@ -23,10 +23,10 @@ import org.apache.linkis.httpclient.request.GetAction
class MetadataGetTablesAction extends GetAction with DataSourceAction {
- private var dataSourceId: Long = _
+ private var dataSourceName: String = _
private var database: String = _
- override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "tables", dataSourceId.toString, "db", database)
+ override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getTables")
private var user: String = _
@@ -39,7 +39,7 @@ object MetadataGetTablesAction {
def builder(): Builder = new Builder
class Builder private[MetadataGetTablesAction]() {
- private var dataSourceId: Long = _
+ private var dataSourceName: String = _
private var database: String = _
private var system: String = _
private var user: String = _
@@ -48,8 +48,8 @@ object MetadataGetTablesAction {
this.user = user
this
}
- def setDataSourceId(dataSourceId: Long): Builder = {
- this.dataSourceId = dataSourceId
+ def setDataSourceName(dataSourceId: String): Builder = {
+ this.dataSourceName = dataSourceId
this
}
@@ -64,13 +64,13 @@ object MetadataGetTablesAction {
}
def build(): MetadataGetTablesAction = {
- if (dataSourceId == null) throw new DataSourceClientBuilderException("dataSourceId is needed!")
+ if (dataSourceName == null) throw new DataSourceClientBuilderException("dataSourceName is needed!")
if(database == null) throw new DataSourceClientBuilderException("database is needed!")
if(system == null) throw new DataSourceClientBuilderException("system is needed!")
if(user == null) throw new DataSourceClientBuilderException("user is needed!")
val metadataGetTablesAction = new MetadataGetTablesAction
- metadataGetTablesAction.dataSourceId = this.dataSourceId
+ metadataGetTablesAction.dataSourceName = this.dataSourceName
metadataGetTablesAction.database = this.database
metadataGetTablesAction.setParameter("system", system)
metadataGetTablesAction.setUser(user)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
index e5f5e349c..078ed8f61 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala
@@ -20,12 +20,13 @@ package org.apache.linkis.datasource.client.response
import org.apache.linkis.httpclient.dws.DWSHttpClient
import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
import org.apache.linkis.httpclient.dws.response.DWSResult
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo
-
import java.util
+
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo
+
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/columns/(\\S+)/db/(\\S+)/table/(\\S+)")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getColumns")
class MetadataGetColumnsResult extends DWSResult{
@BeanProperty var columns: util.List[java.util.Map[String, Any]] = _
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
index 225956742..1f4a2a634 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult
import java.util
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/dbs/(\\S+)")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getDatabases")
class MetadataGetDatabasesResult extends DWSResult{
@BeanProperty var dbs: util.List[String] = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
index cac46416e..b7b883d20 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala
@@ -20,15 +20,17 @@ package org.apache.linkis.datasource.client.response
import org.apache.linkis.httpclient.dws.DWSHttpClient
import org.apache.linkis.httpclient.dws.annotation.DWSHttpMessageResult
import org.apache.linkis.httpclient.dws.response.DWSResult
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo
import java.util
+
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo
+
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/partitions/(\\S+)/db/(\\S+)/table/(\\S+)")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getPartitions")
class MetadataGetPartitionsResult extends DWSResult{
- @BeanProperty var props: util.Map[String, Any] = _
+ @BeanProperty var partitions: util.Map[String, Any] = _
def getPartitionInfo: MetaPartitionInfo = {
- this.props match {
+ this.partitions match {
case map : util.Map[String, Any] =>
DWSHttpClient.jacksonJson.convertValue(map, classOf[MetaPartitionInfo])
case _ => null
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
index ee4548daf..e0601f0cf 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult
import java.util
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/props/(\\S+)/db/(\\S+)/table/(\\S+)")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getTableProp")
class MetadataGetTablePropsResult extends DWSResult{
@BeanProperty var props: util.Map[String, String] = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
index 8f636ea27..bcd907099 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala
@@ -23,7 +23,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult
import java.util
import scala.beans.BeanProperty
-@DWSHttpMessageResult("/api/rest_j/v\\d+/metadatamanager/tables/(\\S+)/db/(\\S+)")
+@DWSHttpMessageResult("/api/rest_j/v\\d+/metadataQuery/getTables")
class MetadataGetTablesResult extends DWSResult{
@BeanProperty var tables: util.List[String] = _
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala
index c677f735b..743b90bdb 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala
@@ -69,8 +69,9 @@ object TestHiveClient {
def testCreateDataSourceMysql: Unit = {
val user = "hadoop"
val system = "Linkis"
+ val dataSourceName = "for-mysql-test"
val dataSource = new DataSource();
- dataSource.setDataSourceName("for-hive-test")
+ dataSource.setDataSourceName(dataSourceName)
dataSource.setDataSourceDesc("this is for hive test")
dataSource.setCreateSystem(system)
dataSource.setDataSourceTypeId(4L)
@@ -110,14 +111,14 @@ object TestHiveClient {
//example of use
val metadataGetDatabasesAction: MetadataGetDatabasesAction = MetadataGetDatabasesAction.builder()
.setUser(user)
- .setDataSourceId(dataSourceId)
+ .setDataSourceName(dataSourceName)
.setSystem(system)
.build()
val metadataGetDatabasesResult: MetadataGetDatabasesResult = metaDataClient.getDatabases(metadataGetDatabasesAction)
val metadataGetTablesAction: MetadataGetTablesAction = MetadataGetTablesAction.builder()
.setUser(user)
- .setDataSourceId(dataSourceId)
+ .setDataSourceName(dataSourceName)
.setDatabase("linkis_test_ind")
.setSystem(system)
.build()
@@ -127,7 +128,7 @@ object TestHiveClient {
val metadataGetColumnsAction = MetadataGetColumnsAction.builder()
.setUser(user)
- .setDataSourceId(dataSourceId)
+ .setDataSourceName(dataSourceName)
.setDatabase("linkis_test_ind")
.setSystem(system)
.setTable("test")
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala
index 7f9a81d0d..0191beed4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala
@@ -69,7 +69,8 @@ object TestMysqlClient {
val user = "hadoop"
val system = "Linkis"
val dataSource = new DataSource();
- dataSource.setDataSourceName("for-mysql-test")
+ val dataSourceName = "for-mysql-test"
+ dataSource.setDataSourceName(dataSourceName)
dataSource.setDataSourceDesc("this is for mysql test")
dataSource.setCreateSystem(system)
dataSource.setDataSourceTypeId(1L)
@@ -115,7 +116,7 @@ object TestMysqlClient {
//example of use
val metadataGetDatabasesAction: MetadataGetDatabasesAction = MetadataGetDatabasesAction.builder()
.setUser(user)
- .setDataSourceId(dataSourceId)
+ .setDataSourceName(dataSourceName)
.setSystem(system)
.build()
val metadataGetDatabasesResult: MetadataGetDatabasesResult = metaDataClient.getDatabases(metadataGetDatabasesAction)
@@ -123,7 +124,7 @@ object TestMysqlClient {
val metadataGetTablesAction: MetadataGetTablesAction = MetadataGetTablesAction.builder()
.setUser(user)
- .setDataSourceId(dataSourceId)
+ .setDataSourceName(dataSourceName)
.setDatabase("linkis")
.setSystem(system)
.build()
@@ -133,14 +134,13 @@ object TestMysqlClient {
val metadataGetColumnsAction = MetadataGetColumnsAction.builder()
.setUser(user)
- .setDataSourceId(dataSourceId)
+ .setDataSourceName(dataSourceName)
.setDatabase("linkis")
.setSystem(system)
.setTable("linkis_datasource")
.build()
val metadataGetColumnsResult: MetadataGetColumnsResult = metaDataClient.getColumns(metadataGetColumnsAction)
-
}
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
index f9ef4374b..87720dd73 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml
@@ -100,7 +100,7 @@
<!--Metadata common-->
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-manager-common</artifactId>
+ <artifactId>linkis-metadata-query-common</artifactId>
<version>${linkis.version}</version>
</dependency>
</dependencies>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
index 220904e9b..a4888597b 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceCoreRestfulApi.java
@@ -33,7 +33,7 @@ import org.apache.linkis.datasourcemanager.core.service.hooks.DataSourceParamsHo
import org.apache.linkis.datasourcemanager.core.validate.ParameterValidateException;
import org.apache.linkis.datasourcemanager.core.validate.ParameterValidator;
import org.apache.linkis.datasourcemanager.core.vo.DataSourceVo;
-import org.apache.linkis.metadatamanager.common.MdmConfiguration;
+import org.apache.linkis.metadata.query.common.MdmConfiguration;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java
index 9508fe53f..86e8860ee 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/restful/DataSourceOperateRestfulApi.java
@@ -29,7 +29,7 @@ import org.apache.linkis.datasourcemanager.core.service.MetadataOperateService;
import org.apache.linkis.datasourcemanager.core.service.hooks.DataSourceParamsHook;
import org.apache.linkis.datasourcemanager.core.validate.ParameterValidateException;
import org.apache.linkis.datasourcemanager.core.validate.ParameterValidator;
-import org.apache.linkis.metadatamanager.common.MdmConfiguration;
+import org.apache.linkis.metadata.query.common.MdmConfiguration;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java
index 25097bb62..c9c859df7 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/datasourcemanager/core/service/impl/MetadataOperateServiceImpl.java
@@ -22,8 +22,8 @@ import org.apache.linkis.common.exception.WarnException;
import org.apache.linkis.datasourcemanager.core.formdata.FormStreamContent;
import org.apache.linkis.datasourcemanager.core.service.BmlAppService;
import org.apache.linkis.datasourcemanager.core.service.MetadataOperateService;
-import org.apache.linkis.metadatamanager.common.protocol.MetadataConnect;
-import org.apache.linkis.metadatamanager.common.protocol.MetadataResponse;
+import org.apache.linkis.metadata.query.common.protocol.MetadataConnect;
+import org.apache.linkis.metadata.query.common.protocol.MetadataResponse;
import org.apache.linkis.rpc.Sender;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/service/MetadataOperateServiceTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/service/MetadataOperateServiceTest.java
index 8e93e78a9..35385590f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/service/MetadataOperateServiceTest.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/datasourcemanager/core/service/MetadataOperateServiceTest.java
@@ -21,8 +21,8 @@ import org.apache.linkis.common.exception.ErrorException;
import org.apache.linkis.common.exception.WarnException;
import org.apache.linkis.datasourcemanager.core.formdata.FormStreamContent;
import org.apache.linkis.datasourcemanager.core.service.impl.MetadataOperateServiceImpl;
-import org.apache.linkis.metadatamanager.common.protocol.MetadataConnect;
-import org.apache.linkis.metadatamanager.common.protocol.MetadataResponse;
+import org.apache.linkis.metadata.query.common.protocol.MetadataConnect;
+import org.apache.linkis.metadata.query.common.protocol.MetadataResponse;
import org.apache.linkis.rpc.BaseRPCSender;
import org.apache.linkis.rpc.Sender;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml
similarity index 97%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml
index 757955839..3ae3ff9b2 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>linkis-metadata-manager-common</artifactId>
+ <artifactId>linkis-metadata-query-common</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/MdmConfiguration.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java
similarity index 93%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/MdmConfiguration.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java
index 6c714025a..87abf4ee0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/MdmConfiguration.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common;
+package org.apache.linkis.metadata.query.common;
import org.apache.linkis.common.conf.CommonVars;
public class MdmConfiguration {
public static CommonVars<String> METADATA_SERVICE_APPLICATION =
- CommonVars.apply("wds.linkis.server.mdm.service.app.name", "linkis-ps-metadatamanager");
+ CommonVars.apply("wds.linkis.server.mdm.service.app.name", "linkis-ps-metadataquery");
public static CommonVars<String> DATA_SOURCE_SERVICE_APPLICATION =
CommonVars.apply("wds.linkis.server.dsm.app.name", "linkis-ps-data-source-manager");
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/CacheConfiguration.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/CacheConfiguration.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
index c14dea3d7..1f4b14395 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/CacheConfiguration.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.cache;
+package org.apache.linkis.metadata.query.common.cache;
import org.apache.linkis.common.conf.CommonVars;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/CacheManager.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/CacheManager.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java
index eaad6bc27..bdb7d2612 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/CacheManager.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.cache;
+package org.apache.linkis.metadata.query.common.cache;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheLoader;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/ConnCacheManager.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java
similarity index 98%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/ConnCacheManager.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java
index a75c498a0..5c16e25fd 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/cache/ConnCacheManager.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.cache;
+package org.apache.linkis.metadata.query.common.cache;
import com.google.common.cache.*;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/domain/MetaColumnInfo.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/domain/MetaColumnInfo.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java
index f5e0e08d1..a12de2d40 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/domain/MetaColumnInfo.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.domain;
+package org.apache.linkis.metadata.query.common.domain;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/domain/MetaPartitionInfo.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java
similarity index 97%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/domain/MetaPartitionInfo.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java
index dc306dd38..7b1dbc30d 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/domain/MetaPartitionInfo.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.domain;
+package org.apache.linkis.metadata.query.common.domain;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/exception/MetaMethodInvokeException.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/exception/MetaMethodInvokeException.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java
index ad0ca2f60..e89661a75 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/exception/MetaMethodInvokeException.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.exception;
+package org.apache.linkis.metadata.query.common.exception;
import org.apache.linkis.common.exception.ErrorException;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/exception/MetaRuntimeException.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java
similarity index 95%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/exception/MetaRuntimeException.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java
index d6eff6aa2..71d5e8c99 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/exception/MetaRuntimeException.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.exception;
+package org.apache.linkis.metadata.query.common.exception;
import org.apache.linkis.common.exception.WarnException;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/AbstractMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractMetaService.java
similarity index 95%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/AbstractMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractMetaService.java
index d62bf1521..ef721c4ab 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/AbstractMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractMetaService.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.service;
+package org.apache.linkis.metadata.query.common.service;
import org.apache.linkis.common.exception.WarnException;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.linkis.metadatamanager.common.cache.CacheConfiguration;
-import org.apache.linkis.metadatamanager.common.cache.CacheManager;
-import org.apache.linkis.metadatamanager.common.cache.ConnCacheManager;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
-import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
+import org.apache.linkis.metadata.query.common.cache.CacheConfiguration;
+import org.apache.linkis.metadata.query.common.cache.CacheManager;
+import org.apache.linkis.metadata.query.common.cache.ConnCacheManager;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.common.exception.MetaRuntimeException;
import org.apache.commons.lang.StringUtils;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/BaseMetadataService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java
similarity index 95%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/BaseMetadataService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java
index 17ba20ca3..d2cf8bf45 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/BaseMetadataService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.service;
+package org.apache.linkis.metadata.query.common.service;
import java.io.Closeable;
import java.util.Map;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java
index f40a365b9..44fc57b57 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataConnection.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.service;
+package org.apache.linkis.metadata.query.common.service;
import java.util.concurrent.locks.ReentrantLock;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataDbService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java
similarity index 93%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataDbService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java
index 68db9f0c5..43f51de68 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataDbService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.service;
+package org.apache.linkis.metadata.query.common.service;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
import java.util.List;
import java.util.Map;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataService.java
similarity index 93%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataService.java
index c1f0e6046..502ff0793 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/java/org/apache/linkis/metadatamanager/common/service/MetadataService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataService.java
@@ -15,6 +15,6 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.common.service;
+package org.apache.linkis.metadata.query.common.service;
public interface MetadataService extends MetadataDbService {}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataOperateProtocol.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala
similarity index 94%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataOperateProtocol.scala
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala
index 67c688d82..9d3075c6a 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataOperateProtocol.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala
@@ -5,17 +5,17 @@
* 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
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* 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.linkis.metadatamanager.common.protocol
+
+package org.apache.linkis.metadata.query.common.protocol
import java.util
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataProtocol.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala
similarity index 93%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataProtocol.scala
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala
index 34d9cb8dd..bc5d0e41f 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataProtocol.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala
@@ -5,17 +5,17 @@
* 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
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* 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.linkis.metadatamanager.common.protocol
+
+package org.apache.linkis.metadata.query.common.protocol
trait MetadataProtocol {
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataQueryProtocol.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataQueryProtocol.scala
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala
index 9487e0008..b3e8c03e0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/common/src/main/scala/org/apache/linkis/metadatamanager/common/protocol/MetadataQueryProtocol.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala
@@ -5,17 +5,17 @@
* 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
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* 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.linkis.metadatamanager.common.protocol
+
+package org.apache.linkis.metadata.query.common.protocol
import java.util
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
index 0dbda9ab1..d8d90eca0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml
@@ -24,7 +24,7 @@
<version>1.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>linkis-metadata-manager-server</artifactId>
+ <artifactId>linkis-metadata-query-server</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -34,7 +34,7 @@
<!--Metadata common-->
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-manager-common</artifactId>
+ <artifactId>linkis-metadata-query-common</artifactId>
<version>${linkis.version}</version>
</dependency>
<!-- data source manager common dependency-->
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml
similarity index 98%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml
index 9b7bcce41..9611fd8ca 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml
@@ -20,7 +20,7 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>linkis-metadata-manager-server</id>
+ <id>linkis-metadata-query-server</id>
<formats>
<format>zip</format>
<format>dir</format>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/LinkisMetadataManagerApplication.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java
similarity index 84%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/LinkisMetadataManagerApplication.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java
index d419a0c1b..555e28e81 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/LinkisMetadataManagerApplication.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server;
+package org.apache.linkis.metadata.query.server;
import org.apache.linkis.LinkisBaseServerApp;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public class LinkisMetadataManagerApplication {
+public class LinkisMetadataQueryApplication {
- private static final Log logger = LogFactory.getLog(LinkisMetadataManagerApplication.class);
+ private static final Log logger = LogFactory.getLog(LinkisMetadataQueryApplication.class);
public static void main(String[] args) throws ReflectiveOperationException {
- logger.info("Start to running LinkisMetadataManagerApplication");
+ logger.info("Start to running LinkisMetadataQueryApplication");
LinkisBaseServerApp.main(args);
}
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
index ff808148d..c74088cc0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/loader/MetaClassLoaderManager.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.loader;
+package org.apache.linkis.metadata.query.server.loader;
import org.apache.linkis.common.conf.CommonVars;
import org.apache.linkis.common.conf.Configuration;
import org.apache.linkis.common.exception.ErrorException;
-import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
-import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
-import org.apache.linkis.metadatamanager.common.service.MetadataService;
-import org.apache.linkis.metadatamanager.server.utils.MetadataUtils;
+import org.apache.linkis.metadata.query.common.exception.MetaRuntimeException;
+import org.apache.linkis.metadata.query.common.service.AbstractMetaService;
+import org.apache.linkis.metadata.query.common.service.MetadataService;
+import org.apache.linkis.metadata.query.server.utils.MetadataUtils;
import org.apache.commons.lang.StringUtils;
@@ -53,12 +53,12 @@ public class MetaClassLoaderManager {
CommonVars.apply(
"wds.linkis.server.mdm.service.lib.dir",
Configuration.getLinkisHome()
- + "/lib/linkis-public-enhancements/linkis-ps-metadatamanager/service");
+ + "/lib/linkis-public-enhancements/linkis-ps-metadataquery/service");
public static CommonVars<Integer> INSTANCE_EXPIRE_TIME =
CommonVars.apply("wds.linkis.server.mdm.service.instance.expire-in-seconds", 60);
private static final String META_CLASS_NAME =
- "org.apache.linkis.metadatamanager.service.%sMetaService";
+ "org.apache.linkis.metadata.query.service.%sMetaService";
private static final Logger LOG = LoggerFactory.getLogger(MetaClassLoaderManager.class);
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
similarity index 95%
copy from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
copy to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
index 65d27e01a..68601be73 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.restful;
+package org.apache.linkis.metadata.query.server.restful;
import org.apache.linkis.common.exception.ErrorException;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
-import org.apache.linkis.metadatamanager.common.exception.MetaMethodInvokeException;
-import org.apache.linkis.metadatamanager.server.service.MetadataAppService;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.common.exception.MetaMethodInvokeException;
+import org.apache.linkis.metadata.query.server.service.MetadataQueryService;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
@@ -40,14 +40,13 @@ import java.util.List;
import java.util.Map;
@RestController
-@RequestMapping(
- value = "/metadatamanager",
- produces = {"application/json"})
+@RequestMapping(value = "/metadatamanager")
+@Deprecated
public class MetadataCoreRestful {
private static final Logger LOG = LoggerFactory.getLogger(MetadataCoreRestful.class);
- @Autowired private MetadataAppService metadataAppService;
+ @Autowired private MetadataQueryService metadataAppService;
@RequestMapping(value = "/dbs/{dataSourceId}", method = RequestMethod.GET)
public Message getDatabases(
@@ -141,32 +140,34 @@ public class MetadataCoreRestful {
}
}
+ // Note Result field[`props`] name is inaccurate
@RequestMapping(
- value = "/props/{dataSourceId}/db/{database}/table/{table}/partition/{partition}",
+ value = "/partitions/{dataSourceId}/db/{database}/table/{table}",
method = RequestMethod.GET)
- public Message getPartitionProps(
+ public Message getPartitions(
@PathVariable("dataSourceId") String dataSourceId,
@PathVariable("database") String database,
@PathVariable("table") String table,
- @PathVariable("partition") String partition,
@RequestParam("system") String system,
+ @RequestParam(name = "traverse", required = false, defaultValue = "false")
+ Boolean traverse,
HttpServletRequest request) {
try {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
- Map<String, String> partitionProps =
- metadataAppService.getPartitionPropsByDsId(
+ MetaPartitionInfo partitionInfo =
+ metadataAppService.getPartitionsByDsId(
dataSourceId,
database,
table,
- partition,
system,
+ traverse,
SecurityFilter.getLoginUsername(request));
- return Message.ok().data("props", partitionProps);
+ return Message.ok().data("props", partitionInfo);
} catch (Exception e) {
return errorToResponseMessage(
- "Fail to get partition properties[获取分区参数信息失败], id:["
+ "Fail to get partitions[获取表分区信息失败], id:["
+ dataSourceId
+ "]"
+ ", system:["
@@ -175,40 +176,37 @@ public class MetadataCoreRestful {
+ database
+ "], table:["
+ table
- + "], partition:["
- + partition
+ "]",
e);
}
}
@RequestMapping(
- value = "/partitions/{dataSourceId}/db/{database}/table/{table}",
+ value = "/props/{dataSourceId}/db/{database}/table/{table}/partition/{partition}",
method = RequestMethod.GET)
- public Message getPartitions(
+ public Message getPartitionProps(
@PathVariable("dataSourceId") String dataSourceId,
@PathVariable("database") String database,
@PathVariable("table") String table,
+ @PathVariable("partition") String partition,
@RequestParam("system") String system,
- @RequestParam(name = "traverse", required = false, defaultValue = "false")
- Boolean traverse,
HttpServletRequest request) {
try {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
- MetaPartitionInfo partitionInfo =
- metadataAppService.getPartitionsByDsId(
+ Map<String, String> partitionProps =
+ metadataAppService.getPartitionPropsByDsId(
dataSourceId,
database,
table,
+ partition,
system,
- traverse,
SecurityFilter.getLoginUsername(request));
- return Message.ok().data("props", partitionInfo);
+ return Message.ok().data("props", partitionProps);
} catch (Exception e) {
return errorToResponseMessage(
- "Fail to get partitions[获取表分区信息失败], id:["
+ "Fail to get partition properties[获取分区参数信息失败], id:["
+ dataSourceId
+ "]"
+ ", system:["
@@ -217,6 +215,8 @@ public class MetadataCoreRestful {
+ database
+ "], table:["
+ table
+ + "], partition:["
+ + partition
+ "]",
e);
}
@@ -236,7 +236,7 @@ public class MetadataCoreRestful {
return Message.error("'system' is missing[缺少系统名]");
}
List<MetaColumnInfo> columns =
- metadataAppService.getColumns(
+ metadataAppService.getColumnsByDsId(
dataSourceId,
database,
table,
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
similarity index 71%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
index 65d27e01a..50666df1a 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestful.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.restful;
+package org.apache.linkis.metadata.query.server.restful;
import org.apache.linkis.common.exception.ErrorException;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
-import org.apache.linkis.metadatamanager.common.exception.MetaMethodInvokeException;
-import org.apache.linkis.metadatamanager.server.service.MetadataAppService;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.common.exception.MetaMethodInvokeException;
+import org.apache.linkis.metadata.query.server.service.MetadataQueryService;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.security.SecurityFilter;
@@ -40,32 +40,31 @@ import java.util.List;
import java.util.Map;
@RestController
-@RequestMapping(
- value = "/metadatamanager",
- produces = {"application/json"})
-public class MetadataCoreRestful {
+@RequestMapping(value = "/metadataQuery")
+public class MetadataQueryRestful {
- private static final Logger LOG = LoggerFactory.getLogger(MetadataCoreRestful.class);
+ private static final Logger logger = LoggerFactory.getLogger(MetadataQueryRestful.class);
- @Autowired private MetadataAppService metadataAppService;
+ @Autowired private MetadataQueryService metadataQueryService;
- @RequestMapping(value = "/dbs/{dataSourceId}", method = RequestMethod.GET)
+ @RequestMapping(value = "/getDatabases", method = RequestMethod.GET)
public Message getDatabases(
- @PathVariable("dataSourceId") String dataSourceId,
+ @RequestParam("dataSourceName") String dataSourceName,
@RequestParam("system") String system,
HttpServletRequest request) {
try {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
+
List<String> databases =
- metadataAppService.getDatabasesByDsId(
- dataSourceId, system, SecurityFilter.getLoginUsername(request));
+ metadataQueryService.getDatabasesByDsName(
+ dataSourceName, system, SecurityFilter.getLoginUsername(request));
return Message.ok().data("dbs", databases);
} catch (Exception e) {
return errorToResponseMessage(
- "Fail to get database list[获取库信息失败], id:["
- + dataSourceId
+ "Fail to get database list[获取库信息失败], name:["
+ + dataSourceName
+ "], system:["
+ system
+ "]",
@@ -73,10 +72,10 @@ public class MetadataCoreRestful {
}
}
- @RequestMapping(value = "/tables/{dataSourceId}/db/{database}", method = RequestMethod.GET)
+ @RequestMapping(value = "/getTables", method = RequestMethod.GET)
public Message getTables(
- @PathVariable("dataSourceId") String dataSourceId,
- @PathVariable("database") String database,
+ @RequestParam("dataSourceName") String dataSourceName,
+ @RequestParam("database") String database,
@RequestParam("system") String system,
HttpServletRequest request) {
try {
@@ -84,16 +83,16 @@ public class MetadataCoreRestful {
return Message.error("'system' is missing[缺少系统名]");
}
List<String> tables =
- metadataAppService.getTablesByDsId(
- dataSourceId,
+ metadataQueryService.getTablesByDsName(
+ dataSourceName,
database,
system,
SecurityFilter.getLoginUsername(request));
return Message.ok().data("tables", tables);
} catch (Exception e) {
return errorToResponseMessage(
- "Fail to get table list[获取表信息失败], id:["
- + dataSourceId
+ "Fail to get table list[获取表信息失败], name:["
+ + dataSourceName
+ "]"
+ ", system:["
+ system
@@ -104,13 +103,11 @@ public class MetadataCoreRestful {
}
}
- @RequestMapping(
- value = "/props/{dataSourceId}/db/{database}/table/{table}",
- method = RequestMethod.GET)
+ @RequestMapping(value = "/getTableProps", method = RequestMethod.GET)
public Message getTableProps(
- @PathVariable("dataSourceId") String dataSourceId,
- @PathVariable("database") String database,
- @PathVariable("table") String table,
+ @RequestParam("dataSourceName") String dataSourceName,
+ @RequestParam("database") String database,
+ @RequestParam("table") String table,
@RequestParam("system") String system,
HttpServletRequest request) {
try {
@@ -118,8 +115,8 @@ public class MetadataCoreRestful {
return Message.error("'system' is missing[缺少系统名]");
}
Map<String, String> tableProps =
- metadataAppService.getTablePropsByDsId(
- dataSourceId,
+ metadataQueryService.getTablePropsByDsName(
+ dataSourceName,
database,
table,
system,
@@ -127,8 +124,8 @@ public class MetadataCoreRestful {
return Message.ok().data("props", tableProps);
} catch (Exception e) {
return errorToResponseMessage(
- "Fail to get table properties[获取表参数信息失败], id:["
- + dataSourceId
+ "Fail to get table properties[获取表参数信息失败], name:["
+ + dataSourceName
+ "]"
+ ", system:["
+ system
@@ -141,33 +138,32 @@ public class MetadataCoreRestful {
}
}
- @RequestMapping(
- value = "/props/{dataSourceId}/db/{database}/table/{table}/partition/{partition}",
- method = RequestMethod.GET)
- public Message getPartitionProps(
- @PathVariable("dataSourceId") String dataSourceId,
- @PathVariable("database") String database,
- @PathVariable("table") String table,
- @PathVariable("partition") String partition,
+ @RequestMapping(value = "/getPartitions", method = RequestMethod.GET)
+ public Message getPartitions(
+ @RequestParam("dataSourceName") String dataSourceName,
+ @RequestParam("database") String database,
+ @RequestParam("table") String table,
@RequestParam("system") String system,
+ @RequestParam(name = "traverse", required = false, defaultValue = "false")
+ Boolean traverse,
HttpServletRequest request) {
try {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
- Map<String, String> partitionProps =
- metadataAppService.getPartitionPropsByDsId(
- dataSourceId,
+ MetaPartitionInfo partitionInfo =
+ metadataQueryService.getPartitionsByDsName(
+ dataSourceName,
database,
table,
- partition,
system,
+ traverse,
SecurityFilter.getLoginUsername(request));
- return Message.ok().data("props", partitionProps);
+ return Message.ok().data("partitions", partitionInfo);
} catch (Exception e) {
return errorToResponseMessage(
- "Fail to get partition properties[获取分区参数信息失败], id:["
- + dataSourceId
+ "Fail to get partitions[获取表分区信息失败], name:["
+ + dataSourceName
+ "]"
+ ", system:["
+ system
@@ -175,41 +171,36 @@ public class MetadataCoreRestful {
+ database
+ "], table:["
+ table
- + "], partition:["
- + partition
+ "]",
e);
}
}
- @RequestMapping(
- value = "/partitions/{dataSourceId}/db/{database}/table/{table}",
- method = RequestMethod.GET)
- public Message getPartitions(
- @PathVariable("dataSourceId") String dataSourceId,
- @PathVariable("database") String database,
- @PathVariable("table") String table,
+ @RequestMapping(value = "getPartitionProps", method = RequestMethod.GET)
+ public Message getPartitionProps(
+ @RequestParam("dataSourceName") String dataSourceName,
+ @RequestParam("database") String database,
+ @RequestParam("table") String table,
+ @RequestParam("partition") String partition,
@RequestParam("system") String system,
- @RequestParam(name = "traverse", required = false, defaultValue = "false")
- Boolean traverse,
HttpServletRequest request) {
try {
if (StringUtils.isBlank(system)) {
return Message.error("'system' is missing[缺少系统名]");
}
- MetaPartitionInfo partitionInfo =
- metadataAppService.getPartitionsByDsId(
- dataSourceId,
+ Map<String, String> partitionProps =
+ metadataQueryService.getPartitionPropsByDsName(
+ dataSourceName,
database,
table,
+ partition,
system,
- traverse,
SecurityFilter.getLoginUsername(request));
- return Message.ok().data("props", partitionInfo);
+ return Message.ok().data("props", partitionProps);
} catch (Exception e) {
return errorToResponseMessage(
- "Fail to get partitions[获取表分区信息失败], id:["
- + dataSourceId
+ "Fail to get partition properties[获取分区参数信息失败], name:["
+ + dataSourceName
+ "]"
+ ", system:["
+ system
@@ -217,18 +208,18 @@ public class MetadataCoreRestful {
+ database
+ "], table:["
+ table
+ + "], partition:["
+ + partition
+ "]",
e);
}
}
- @RequestMapping(
- value = "/columns/{dataSourceId}/db/{database}/table/{table}",
- method = RequestMethod.GET)
+ @RequestMapping(value = "/getColumns", method = RequestMethod.GET)
public Message getColumns(
- @PathVariable("dataSourceId") String dataSourceId,
- @PathVariable("database") String database,
- @PathVariable("table") String table,
+ @RequestParam("dataSourceName") String dataSourceName,
+ @RequestParam("database") String database,
+ @RequestParam("table") String table,
@RequestParam("system") String system,
HttpServletRequest request) {
try {
@@ -236,8 +227,8 @@ public class MetadataCoreRestful {
return Message.error("'system' is missing[缺少系统名]");
}
List<MetaColumnInfo> columns =
- metadataAppService.getColumns(
- dataSourceId,
+ metadataQueryService.getColumnsByDsName(
+ dataSourceName,
database,
table,
system,
@@ -245,8 +236,8 @@ public class MetadataCoreRestful {
return Message.ok().data("columns", columns);
} catch (Exception e) {
return errorToResponseMessage(
- "Fail to get column list[获取表字段信息失败], id:["
- + dataSourceId
+ "Fail to get column list[获取表字段信息失败], name:["
+ + dataSourceName
+ "]"
+ ", system:["
+ system
@@ -262,14 +253,14 @@ public class MetadataCoreRestful {
private Message errorToResponseMessage(String uiMessage, Exception e) {
if (e instanceof MetaMethodInvokeException) {
MetaMethodInvokeException invokeException = (MetaMethodInvokeException) e;
- if (LOG.isDebugEnabled()) {
+ if (logger.isDebugEnabled()) {
String argumentJson = null;
try {
argumentJson = Json.toJson(invokeException.getArgs(), null);
} catch (Exception je) {
// Ignore
}
- LOG.trace(
+ logger.trace(
uiMessage
+ " => Method: "
+ invokeException.getMethod()
@@ -284,7 +275,7 @@ public class MetadataCoreRestful {
uiMessage += " possible reason[可能原因]: (" + e.getMessage() + ")";
}
}
- LOG.error(uiMessage, e);
+ logger.error(uiMessage, e);
return Message.error(uiMessage);
}
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/MetadataAppService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java
similarity index 55%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/MetadataAppService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java
index 4e5a5df9a..c10006184 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/MetadataAppService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.service;
+package org.apache.linkis.metadata.query.server.service;
import org.apache.linkis.common.exception.ErrorException;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
import java.util.List;
import java.util.Map;
-public interface MetadataAppService {
+public interface MetadataQueryService {
/**
* Get connection
@@ -40,6 +40,7 @@ public interface MetadataAppService {
* @param system system
* @return
*/
+ @Deprecated
List<String> getDatabasesByDsId(String dataSourceId, String system, String userName)
throws ErrorException;
@@ -49,10 +50,39 @@ public interface MetadataAppService {
* @param database database
* @return
*/
+ @Deprecated
List<String> getTablesByDsId(
String dataSourceId, String database, String system, String userName)
throws ErrorException;
+ /**
+ * @param dataSourceId data source id
+ * @param database database
+ * @param table table
+ * @param system system
+ * @return
+ */
+ @Deprecated
+ Map<String, String> getTablePropsByDsId(
+ String dataSourceId, String database, String table, String system, String userName)
+ throws ErrorException;
+ /**
+ * @param dataSourceId data source i
+ * @param database database
+ * @param table table
+ * @param system system
+ * @return
+ */
+ @Deprecated
+ MetaPartitionInfo getPartitionsByDsId(
+ String dataSourceId,
+ String database,
+ String table,
+ String system,
+ Boolean traverse,
+ String userName)
+ throws ErrorException;
+
/**
* @param dataSourceId data source id
* @param database database
@@ -63,6 +93,7 @@ public interface MetadataAppService {
* @return
* @throws ErrorException
*/
+ @Deprecated
Map<String, String> getPartitionPropsByDsId(
String dataSourceId,
String database,
@@ -79,18 +110,48 @@ public interface MetadataAppService {
* @param system system
* @return
*/
- Map<String, String> getTablePropsByDsId(
+ @Deprecated
+ List<MetaColumnInfo> getColumnsByDsId(
String dataSourceId, String database, String table, String system, String userName)
throws ErrorException;
+
/**
- * @param dataSourceId data source i
+ * @param dataSourceName data source name
+ * @param system system
+ * @return
+ */
+ List<String> getDatabasesByDsName(String dataSourceName, String system, String userName)
+ throws ErrorException;
+
+ /**
+ * @param dataSourceName data source name
+ * @param system system
+ * @param database database
+ * @return
+ */
+ List<String> getTablesByDsName(
+ String dataSourceName, String database, String system, String userName)
+ throws ErrorException;
+
+ /**
+ * @param dataSourceName data source name
* @param database database
* @param table table
* @param system system
* @return
*/
- MetaPartitionInfo getPartitionsByDsId(
- String dataSourceId,
+ Map<String, String> getTablePropsByDsName(
+ String dataSourceName, String database, String table, String system, String userName)
+ throws ErrorException;
+ /**
+ * @param dataSourceName data source name
+ * @param database database
+ * @param table table
+ * @param system system
+ * @return
+ */
+ MetaPartitionInfo getPartitionsByDsName(
+ String dataSourceName,
String database,
String table,
String system,
@@ -99,13 +160,32 @@ public interface MetadataAppService {
throws ErrorException;
/**
- * @param dataSourceId data source id
+ * @param dataSourceName data source name
* @param database database
* @param table table
+ * @param partition partition
* @param system system
+ * @param userName userName
* @return
+ * @throws ErrorException
*/
- List<MetaColumnInfo> getColumns(
- String dataSourceId, String database, String table, String system, String userName)
+ Map<String, String> getPartitionPropsByDsName(
+ String dataSourceName,
+ String database,
+ String table,
+ String partition,
+ String system,
+ String userName)
+ throws ErrorException;
+
+ /**
+ * @param dataSourceName data source id
+ * @param database database
+ * @param table table
+ * @param system system
+ * @return
+ */
+ List<MetaColumnInfo> getColumnsByDsName(
+ String dataSourceName, String database, String table, String system, String userName)
throws ErrorException;
}
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
similarity index 57%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
index 9aa9fb133..ef91fbbf5 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/service/impl/MetadataAppServiceImpl.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.service.impl;
+package org.apache.linkis.metadata.query.server.service.impl;
import org.apache.linkis.common.exception.ErrorException;
import org.apache.linkis.datasourcemanager.common.auth.AuthContext;
import org.apache.linkis.datasourcemanager.common.protocol.DsInfoQueryRequest;
import org.apache.linkis.datasourcemanager.common.protocol.DsInfoResponse;
-import org.apache.linkis.metadatamanager.common.MdmConfiguration;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
-import org.apache.linkis.metadatamanager.common.exception.MetaMethodInvokeException;
-import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
-import org.apache.linkis.metadatamanager.common.service.MetadataConnection;
-import org.apache.linkis.metadatamanager.server.loader.MetaClassLoaderManager;
-import org.apache.linkis.metadatamanager.server.service.MetadataAppService;
+import org.apache.linkis.metadata.query.common.MdmConfiguration;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.common.exception.MetaMethodInvokeException;
+import org.apache.linkis.metadata.query.common.exception.MetaRuntimeException;
+import org.apache.linkis.metadata.query.common.service.MetadataConnection;
+import org.apache.linkis.metadata.query.server.loader.MetaClassLoaderManager;
+import org.apache.linkis.metadata.query.server.service.MetadataQueryService;
import org.apache.linkis.rpc.Sender;
import org.apache.commons.lang.StringUtils;
@@ -46,10 +46,10 @@ import java.util.*;
import java.util.function.BiFunction;
@Service
-public class MetadataAppServiceImpl implements MetadataAppService {
+public class MetadataQueryServiceImpl implements MetadataQueryService {
private Sender dataSourceRpcSender;
private MetaClassLoaderManager metaClassLoaderManager;
- private static final Logger LOG = LoggerFactory.getLogger(MetadataAppServiceImpl.class);
+ private static final Logger logger = LoggerFactory.getLogger(MetadataQueryServiceImpl.class);
@PostConstruct
public void init() {
@@ -72,12 +72,13 @@ public class MetadataAppServiceImpl implements MetadataAppService {
try {
connection.close();
} catch (IOException e) {
- LOG.warn("Fail to close connection[关闭连接失败], [" + e.getMessage() + "]", e);
+ logger.warn("Fail to close connection[关闭连接失败], [" + e.getMessage() + "]", e);
}
}
}
@Override
+ @Deprecated
public List<String> getDatabasesByDsId(String dataSourceId, String system, String userName)
throws ErrorException {
DsInfoResponse dsInfoResponse = reqToGetDataSourceInfo(dataSourceId, system, userName);
@@ -92,6 +93,7 @@ public class MetadataAppServiceImpl implements MetadataAppService {
}
@Override
+ @Deprecated
public List<String> getTablesByDsId(
String dataSourceId, String database, String system, String userName)
throws ErrorException {
@@ -107,6 +109,7 @@ public class MetadataAppServiceImpl implements MetadataAppService {
}
@Override
+ @Deprecated
public Map<String, String> getPartitionPropsByDsId(
String dataSourceId,
String database,
@@ -133,6 +136,7 @@ public class MetadataAppServiceImpl implements MetadataAppService {
}
@Override
+ @Deprecated
public Map<String, String> getTablePropsByDsId(
String dataSourceId, String database, String table, String system, String userName)
throws ErrorException {
@@ -150,6 +154,7 @@ public class MetadataAppServiceImpl implements MetadataAppService {
}
@Override
+ @Deprecated
public MetaPartitionInfo getPartitionsByDsId(
String dataSourceId,
String database,
@@ -172,7 +177,8 @@ public class MetadataAppServiceImpl implements MetadataAppService {
}
@Override
- public List<MetaColumnInfo> getColumns(
+ @Deprecated
+ public List<MetaColumnInfo> getColumnsByDsId(
String dataSourceId, String database, String table, String system, String userName)
throws ErrorException {
DsInfoResponse dsInfoResponse = reqToGetDataSourceInfo(dataSourceId, system, userName);
@@ -188,6 +194,117 @@ public class MetadataAppServiceImpl implements MetadataAppService {
return new ArrayList<>();
}
+ @Override
+ public List<String> getDatabasesByDsName(String dataSourceName, String system, String userName)
+ throws ErrorException {
+ DsInfoResponse dsInfoResponse = queryDataSourceInfoByName(dataSourceName, system, userName);
+ if (StringUtils.isNotBlank(dsInfoResponse.dsType())) {
+ return invokeMetaMethod(
+ dsInfoResponse.dsType(),
+ "getDatabases",
+ new Object[] {dsInfoResponse.creator(), dsInfoResponse.params()},
+ List.class);
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ public List<String> getTablesByDsName(
+ String dataSourceName, String database, String system, String userName)
+ throws ErrorException {
+ DsInfoResponse dsInfoResponse = queryDataSourceInfoByName(dataSourceName, system, userName);
+ if (StringUtils.isNotBlank(dsInfoResponse.dsType())) {
+ return invokeMetaMethod(
+ dsInfoResponse.dsType(),
+ "getTables",
+ new Object[] {dsInfoResponse.creator(), dsInfoResponse.params(), database},
+ List.class);
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ public Map<String, String> getPartitionPropsByDsName(
+ String dataSourceName,
+ String database,
+ String table,
+ String partition,
+ String system,
+ String userName)
+ throws ErrorException {
+ DsInfoResponse dsInfoResponse = queryDataSourceInfoByName(dataSourceName, system, userName);
+ if (StringUtils.isNotBlank(dsInfoResponse.dsType())) {
+ return invokeMetaMethod(
+ dsInfoResponse.dsType(),
+ "getPartitionProps",
+ new Object[] {
+ dsInfoResponse.creator(),
+ dsInfoResponse.params(),
+ database,
+ table,
+ partition
+ },
+ Map.class);
+ }
+ return new HashMap<>();
+ }
+
+ @Override
+ public Map<String, String> getTablePropsByDsName(
+ String dataSourceName, String database, String table, String system, String userName)
+ throws ErrorException {
+ DsInfoResponse dsInfoResponse = queryDataSourceInfoByName(dataSourceName, system, userName);
+ if (StringUtils.isNotBlank(dsInfoResponse.dsType())) {
+ return invokeMetaMethod(
+ dsInfoResponse.dsType(),
+ "getTableProps",
+ new Object[] {
+ dsInfoResponse.creator(), dsInfoResponse.params(), database, table
+ },
+ Map.class);
+ }
+ return new HashMap<>();
+ }
+
+ @Override
+ public MetaPartitionInfo getPartitionsByDsName(
+ String dataSourceName,
+ String database,
+ String table,
+ String system,
+ Boolean traverse,
+ String userName)
+ throws ErrorException {
+ DsInfoResponse dsInfoResponse = queryDataSourceInfoByName(dataSourceName, system, userName);
+ if (StringUtils.isNotBlank(dsInfoResponse.dsType())) {
+ return invokeMetaMethod(
+ dsInfoResponse.dsType(),
+ "getPartitions",
+ new Object[] {
+ dsInfoResponse.creator(), dsInfoResponse.params(), database, table, traverse
+ },
+ MetaPartitionInfo.class);
+ }
+ return new MetaPartitionInfo();
+ }
+
+ @Override
+ public List<MetaColumnInfo> getColumnsByDsName(
+ String dataSourceName, String database, String table, String system, String userName)
+ throws ErrorException {
+ DsInfoResponse dsInfoResponse = queryDataSourceInfoByName(dataSourceName, system, userName);
+ if (StringUtils.isNotBlank(dsInfoResponse.dsType())) {
+ return invokeMetaMethod(
+ dsInfoResponse.dsType(),
+ "getColumns",
+ new Object[] {
+ dsInfoResponse.creator(), dsInfoResponse.params(), database, table
+ },
+ List.class);
+ }
+ return new ArrayList<>();
+ }
+
/**
* Request to get data source information (type and connection parameters)
*
@@ -196,6 +313,7 @@ public class MetadataAppServiceImpl implements MetadataAppService {
* @return
* @throws ErrorException
*/
+ @Deprecated
public DsInfoResponse reqToGetDataSourceInfo(
String dataSourceId, String system, String userName) throws ErrorException {
Object rpcResult = null;
@@ -225,6 +343,44 @@ public class MetadataAppServiceImpl implements MetadataAppService {
}
}
+ /**
+ * Request to get data source information (type and connection parameters)
+ *
+ * @param dataSourceName data source name
+ * @param system system
+ * @return
+ * @throws ErrorException
+ */
+ public DsInfoResponse queryDataSourceInfoByName(
+ String dataSourceName, String system, String userName) throws ErrorException {
+ Object rpcResult = null;
+ try {
+ rpcResult =
+ dataSourceRpcSender.ask(new DsInfoQueryRequest(null, dataSourceName, system));
+ } catch (Exception e) {
+ throw new ErrorException(-1, "Remote Service Error[远端服务出错, 联系运维处理]");
+ }
+ if (rpcResult instanceof DsInfoResponse) {
+ DsInfoResponse response = (DsInfoResponse) rpcResult;
+ if (!response.status()) {
+ throw new ErrorException(-1, "Error in Data Source Manager Server[数据源服务出错]");
+ }
+ boolean hasPermission =
+ (AuthContext.isAdministrator(userName)
+ || (StringUtils.isNotBlank(response.creator())
+ && userName.equals(response.creator())));
+ if (!hasPermission) {
+ throw new ErrorException(
+ -1, "Don't have query permission for data source [没有数据源的查询权限]");
+ } else if (response.params().isEmpty()) {
+ throw new ErrorException(-1, "Have you published the data source? [数据源未发布或者参数为空]");
+ }
+ return response;
+ } else {
+ throw new ErrorException(-1, "Remote Service Error[远端服务出错, 联系运维处理]");
+ }
+ }
+
/**
* Invoke method in meta service
*
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/utils/MetadataUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
similarity index 97%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/utils/MetadataUtils.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
index 7416511dc..1c4aae2ee 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/java/org/apache/linkis/metadatamanager/server/utils/MetadataUtils.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.utils;
+package org.apache.linkis.metadata.query.server.utils;
-import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
-import org.apache.linkis.metadatamanager.common.service.MetadataService;
+import org.apache.linkis.metadata.query.common.exception.MetaRuntimeException;
+import org.apache.linkis.metadata.query.common.service.MetadataService;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala
similarity index 78%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala
index 584a19265..83c25e450 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/main/scala/org/apache/linkis/metadatamanager/server/receiver/BaseMetaReceiver.scala
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.receiver
+package org.apache.linkis.metadata.query.server.receiver
import org.apache.linkis.common.exception.WarnException
import org.apache.linkis.common.utils.{Logging, Utils}
-import org.apache.linkis.metadatamanager.common.exception.MetaMethodInvokeException
-import org.apache.linkis.metadatamanager.common.protocol.{MetadataConnect, MetadataResponse}
-import org.apache.linkis.metadatamanager.server.service.MetadataAppService
+import org.apache.linkis.metadata.query.common.exception.MetaMethodInvokeException
+import org.apache.linkis.metadata.query.common.protocol.{MetadataConnect, MetadataResponse}
+import org.apache.linkis.metadata.query.server.service.MetadataQueryService
import org.apache.linkis.rpc.{Receiver, Sender}
import org.apache.linkis.server.BDPJettyServerHelper
import org.springframework.beans.factory.annotation.Autowired
@@ -30,19 +30,19 @@ import org.springframework.stereotype.Component
import scala.concurrent.duration.Duration
@Component
-class BaseMetaReceiver extends Receiver with Logging{
+class BaseMetaReceiver extends Receiver with Logging {
@Autowired
- private var metadataAppService: MetadataAppService = _
+ private var metadataQueryService: MetadataQueryService = _
override def receive(message: Any, sender: Sender): Unit = {}
- override def receiveAndReply(message: Any, sender: Sender): Any = invoke(metadataAppService, message)
+ override def receiveAndReply(message: Any, sender: Sender): Any = invoke(metadataQueryService, message)
- override def receiveAndReply(message: Any, duration: Duration, sender: Sender): Any = invoke(metadataAppService, message)
+ override def receiveAndReply(message: Any, duration: Duration, sender: Sender): Any = invoke(metadataQueryService, message)
- def invoke(service: MetadataAppService, message: Any): Any = Utils.tryCatch{
+ def invoke(service: MetadataQueryService, message: Any): Any = Utils.tryCatch {
val data = message match {
case MetadataConnect(dataSourceType, operator, params, version) =>
service.getConnection(dataSourceType, operator, params)
@@ -51,7 +51,7 @@ class BaseMetaReceiver extends Receiver with Logging{
case _ => new Object()
}
MetadataResponse(status = true, BDPJettyServerHelper.gson.toJson(data))
- }{
+ } {
case e: WarnException => val errorMsg = e.getMessage
trace(s"Fail to invoke meta service: [$errorMsg]")
MetadataResponse(status = false, errorMsg)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/WebApplicationServer.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java
similarity index 95%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/WebApplicationServer.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java
index 83f20442d..665a4f779 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/WebApplicationServer.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server;
+package org.apache.linkis.metadata.query.server;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.web.servlet.ServletComponentScan;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestfulTest.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java
similarity index 70%
copy from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestfulTest.java
copy to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java
index a68523744..cb9df1095 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestfulTest.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.restful;
+package org.apache.linkis.metadata.query.server.restful;
import org.apache.linkis.common.exception.ErrorException;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
-import org.apache.linkis.metadatamanager.server.WebApplicationServer;
-import org.apache.linkis.metadatamanager.server.service.MetadataAppService;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.server.WebApplicationServer;
+import org.apache.linkis.metadata.query.server.service.MetadataQueryService;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.MessageStatus;
import org.apache.linkis.server.security.SecurityFilter;
@@ -52,10 +52,12 @@ class MetadataCoreRestfulTest {
@Autowired protected MockMvc mockMvc;
- @MockBean private MetadataAppService metadataAppService;
+ @MockBean private MetadataQueryService metadataQueryService;
private static MockedStatic<SecurityFilter> securityFilter;
+ private static String system = "linkis";
+
@BeforeAll
private static void init() {
securityFilter = Mockito.mockStatic(SecurityFilter.class);
@@ -72,21 +74,21 @@ class MetadataCoreRestfulTest {
String dataSourceId = "1l";
String url = String.format("/metadatamanager/dbs/%s", dataSourceId);
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("system", "");
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
- Mockito.when(metadataAppService.getDatabasesByDsId(dataSourceId, ",hive", null))
+ params.set("system", system);
+ Mockito.when(metadataQueryService.getDatabasesByDsId(dataSourceId, system, null))
.thenReturn(new ArrayList<>());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getDatabasesByDsId(dataSourceId, ",hive", null);
+ .when(metadataQueryService)
+ .getDatabasesByDsId(dataSourceId, system, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
@@ -100,24 +102,25 @@ class MetadataCoreRestfulTest {
void testGetTables() throws Exception {
String dataSourceId = "1l";
String database = "hivedb";
+
String url = String.format("/metadatamanager/tables/%s/db/%s", dataSourceId, database);
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("system", "");
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
- Mockito.when(metadataAppService.getTablesByDsId(dataSourceId, database, ",hive", null))
+ params.set("system", system);
+ Mockito.when(metadataQueryService.getTablesByDsId(dataSourceId, database, system, null))
.thenReturn(new ArrayList<>());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getTablesByDsId(dataSourceId, database, ",hive", null);
+ .when(metadataQueryService)
+ .getTablesByDsId(dataSourceId, database, system, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
@@ -135,24 +138,24 @@ class MetadataCoreRestfulTest {
"/metadatamanager/props/%s/db/%s/table/%s",
dataSourceId, database, table);
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("system", "");
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
+ params.set("system", system);
Mockito.when(
- metadataAppService.getTablePropsByDsId(
- dataSourceId, database, table, ",hive", null))
+ metadataQueryService.getTablePropsByDsId(
+ dataSourceId, database, table, system, null))
.thenReturn(new HashMap<>());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getTablePropsByDsId(dataSourceId, database, table, ",hive", null);
+ .when(metadataQueryService)
+ .getTablePropsByDsId(dataSourceId, database, table, system, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
@@ -173,24 +176,24 @@ class MetadataCoreRestfulTest {
"/metadatamanager/partitions/%s/db/%s/table/%s",
dataSourceId, database, table);
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("system", "");
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
+ params.set("system", system);
Mockito.when(
- metadataAppService.getPartitionsByDsId(
- dataSourceId, database, table, ",hive", false, null))
+ metadataQueryService.getPartitionsByDsId(
+ dataSourceId, database, table, system, false, null))
.thenReturn(new MetaPartitionInfo());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getPartitionsByDsId(dataSourceId, database, table, ",hive", false, null);
+ .when(metadataQueryService)
+ .getPartitionsByDsId(dataSourceId, database, table, system, false, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
@@ -200,6 +203,49 @@ class MetadataCoreRestfulTest {
}
}
+ @Test
+ void testGetPartitionProps() {
+ try {
+ String dataSourceId = "1l";
+ String database = "hivedb";
+ String table = "testtab";
+ String partition = "ds";
+ String url =
+ String.format(
+ "/metadatamanager/props/{dataSourceId}/db/{database}/table/{table}/partition/{partition}",
+ dataSourceId,
+ database,
+ table,
+ partition);
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ params.set("system", "");
+ MvcUtils mvcUtils = new MvcUtils(mockMvc);
+ Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
+ Assertions.assertTrue(
+ MessageStatus.ERROR() == res.getStatus()
+ && res.getMessage().contains("'system' is missing"));
+
+ params.set("system", system);
+ Mockito.when(
+ metadataQueryService.getPartitionPropsByDsId(
+ dataSourceId, database, table, partition, system, null))
+ .thenReturn(new HashMap<>());
+ res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
+ Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
+
+ Mockito.doThrow(new ErrorException(1, ""))
+ .when(metadataQueryService)
+ .getPartitionPropsByDsId(
+ dataSourceId, database, table, partition, system, null);
+ res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
+ Assertions.assertTrue(
+ MessageStatus.ERROR() == res.getStatus()
+ && res.getMessage().contains("Fail to get partition properties"));
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+
@Test
void testGetColumns() {
try {
@@ -211,24 +257,24 @@ class MetadataCoreRestfulTest {
"/metadatamanager/columns/%s/db/%s/table/%s",
dataSourceId, database, table);
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("system", "");
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
+ params.set("system", system);
Mockito.when(
- metadataAppService.getColumns(
- dataSourceId, database, table, ",hive", null))
+ metadataQueryService.getColumnsByDsId(
+ dataSourceId, database, table, system, null))
.thenReturn(new ArrayList<>());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getColumns(dataSourceId, database, table, ",hive", null);
+ .when(metadataQueryService)
+ .getColumnsByDsId(dataSourceId, database, table, system, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestfulTest.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java
similarity index 60%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestfulTest.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java
index a68523744..f2bc04232 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MetadataCoreRestfulTest.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.restful;
+package org.apache.linkis.metadata.query.server.restful;
import org.apache.linkis.common.exception.ErrorException;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
-import org.apache.linkis.metadatamanager.server.WebApplicationServer;
-import org.apache.linkis.metadatamanager.server.service.MetadataAppService;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.server.WebApplicationServer;
+import org.apache.linkis.metadata.query.server.service.MetadataQueryService;
import org.apache.linkis.server.Message;
import org.apache.linkis.server.MessageStatus;
import org.apache.linkis.server.security.SecurityFilter;
@@ -48,11 +48,11 @@ import java.util.HashMap;
@ExtendWith({SpringExtension.class})
@AutoConfigureMockMvc
@SpringBootTest(classes = {WebApplicationServer.class})
-class MetadataCoreRestfulTest {
+class MetadataQueryRestfulTest {
@Autowired protected MockMvc mockMvc;
- @MockBean private MetadataAppService metadataAppService;
+ @MockBean private MetadataQueryService metadataQueryService;
private static MockedStatic<SecurityFilter> securityFilter;
@@ -66,27 +66,34 @@ class MetadataCoreRestfulTest {
securityFilter.close();
}
+ String dataSourceName = "test";
+ String database = "hivedb";
+ String table = "testtab";
+ String system = "linkis";
+
@Test
void testGetDatabases() {
try {
- String dataSourceId = "1l";
- String url = String.format("/metadatamanager/dbs/%s", dataSourceId);
+ String url = "/metadataQuery/getDatabases";
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("system", "");
+ params.set("dataSourceName", dataSourceName);
+
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
- Mockito.when(metadataAppService.getDatabasesByDsId(dataSourceId, ",hive", null))
+ params.set("system", system);
+ Mockito.when(metadataQueryService.getDatabasesByDsName(dataSourceName, system, null))
.thenReturn(new ArrayList<>());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getDatabasesByDsId(dataSourceId, ",hive", null);
+ .when(metadataQueryService)
+ .getDatabasesByDsName(dataSourceName, system, null);
+
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
@@ -98,26 +105,28 @@ class MetadataCoreRestfulTest {
@Test
void testGetTables() throws Exception {
- String dataSourceId = "1l";
- String database = "hivedb";
- String url = String.format("/metadatamanager/tables/%s/db/%s", dataSourceId, database);
+
+ String url = "/metadataQuery/getTables";
+
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("system", "");
+ params.set("dataSourceName", dataSourceName);
+ params.set("database", database);
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
- Mockito.when(metadataAppService.getTablesByDsId(dataSourceId, database, ",hive", null))
+ params.set("system", system);
+ Mockito.when(metadataQueryService.getTablesByDsName(dataSourceName, database, system, null))
.thenReturn(new ArrayList<>());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getTablesByDsId(dataSourceId, database, ",hive", null);
+ .when(metadataQueryService)
+ .getTablesByDsName(dataSourceName, database, system, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
@@ -127,32 +136,31 @@ class MetadataCoreRestfulTest {
@Test
void testGetTableProps() {
try {
- String dataSourceId = "1l";
- String database = "hivedb";
- String table = "testtab";
- String url =
- String.format(
- "/metadatamanager/props/%s/db/%s/table/%s",
- dataSourceId, database, table);
+ String url = "/metadataQuery/getTableProps";
+
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("dataSourceName", dataSourceName);
+ params.set("database", database);
+ params.set("table", table);
+ params.set("system", "");
+
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
+ params.set("system", system);
Mockito.when(
- metadataAppService.getTablePropsByDsId(
- dataSourceId, database, table, ",hive", null))
+ metadataQueryService.getTablePropsByDsName(
+ dataSourceName, database, table, system, null))
.thenReturn(new HashMap<>());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getTablePropsByDsId(dataSourceId, database, table, ",hive", null);
+ .when(metadataQueryService)
+ .getTablePropsByDsName(dataSourceName, database, table, system, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
@@ -165,32 +173,30 @@ class MetadataCoreRestfulTest {
@Test
void testGetPartitions() {
try {
- String dataSourceId = "1l";
- String database = "hivedb";
- String table = "testtab";
- String url =
- String.format(
- "/metadatamanager/partitions/%s/db/%s/table/%s",
- dataSourceId, database, table);
+
+ String url = "/metadataQuery/getPartitions";
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("dataSourceName", dataSourceName);
+ params.set("database", database);
+ params.set("table", table);
+ params.set("system", "");
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
+ params.set("system", system);
Mockito.when(
- metadataAppService.getPartitionsByDsId(
- dataSourceId, database, table, ",hive", false, null))
+ metadataQueryService.getPartitionsByDsName(
+ dataSourceName, database, table, system, false, null))
.thenReturn(new MetaPartitionInfo());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getPartitionsByDsId(dataSourceId, database, table, ",hive", false, null);
+ .when(metadataQueryService)
+ .getPartitionsByDsName(dataSourceName, database, table, system, false, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
@@ -200,35 +206,73 @@ class MetadataCoreRestfulTest {
}
}
+ @Test
+ void testGetPartitionProps() {
+ try {
+
+ String partition = "ds";
+
+ String url = "/metadataQuery/getPartitionProps";
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ params.set("dataSourceName", dataSourceName);
+ params.set("database", database);
+ params.set("table", table);
+ params.set("partition", partition);
+ params.set("system", "");
+ MvcUtils mvcUtils = new MvcUtils(mockMvc);
+ Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
+ Assertions.assertTrue(
+ MessageStatus.ERROR() == res.getStatus()
+ && res.getMessage().contains("'system' is missing"));
+
+ params.set("system", system);
+ Mockito.when(
+ metadataQueryService.getPartitionPropsByDsName(
+ dataSourceName, database, table, partition, system, null))
+ .thenReturn(new HashMap<>());
+ res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
+ Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
+
+ Mockito.doThrow(new ErrorException(1, ""))
+ .when(metadataQueryService)
+ .getPartitionPropsByDsName(
+ dataSourceName, database, table, partition, system, null);
+ res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
+ Assertions.assertTrue(
+ MessageStatus.ERROR() == res.getStatus()
+ && res.getMessage().contains("Fail to get partition properties"));
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+
@Test
void testGetColumns() {
try {
- String dataSourceId = "1l";
- String database = "hivedb";
- String table = "testtab";
- String url =
- String.format(
- "/metadatamanager/columns/%s/db/%s/table/%s",
- dataSourceId, database, table);
+ String url = "/metadataQuery/getColumns";
+
MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.add("system", "");
+ params.set("dataSourceName", dataSourceName);
+ params.set("database", database);
+ params.set("table", table);
+ params.set("system", "");
MvcUtils mvcUtils = new MvcUtils(mockMvc);
Message res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
&& res.getMessage().contains("'system' is missing"));
- params.add("system", "hive");
+ params.set("system", system);
Mockito.when(
- metadataAppService.getColumns(
- dataSourceId, database, table, ",hive", null))
+ metadataQueryService.getColumnsByDsName(
+ dataSourceName, database, table, system, null))
.thenReturn(new ArrayList<>());
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(MessageStatus.SUCCESS() == res.getStatus());
Mockito.doThrow(new ErrorException(1, ""))
- .when(metadataAppService)
- .getColumns(dataSourceId, database, table, ",hive", null);
+ .when(metadataQueryService)
+ .getColumnsByDsName(dataSourceName, database, table, system, null);
res = mvcUtils.getMessage(mvcUtils.buildMvcResultGet(url, params));
Assertions.assertTrue(
MessageStatus.ERROR() == res.getStatus()
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MvcUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java
similarity index 98%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MvcUtils.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java
index e45a298b8..0590233a3 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/java/org/apache/linkis/metadatamanager/server/restful/MvcUtils.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.server.restful;
+package org.apache.linkis.metadata.query.server.restful;
import org.apache.linkis.common.utils.JsonUtils;
import org.apache.linkis.server.Message;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties
similarity index 100%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/server/src/test/resources/application.properties
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
index 1f9afd389..d00488f84 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml
@@ -26,7 +26,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>linkis-metadata-manager-service-es</artifactId>
+ <artifactId>linkis-metadata-query-service-es</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-manager-common</artifactId>
+ <artifactId>linkis-metadata-query-common</artifactId>
<version>${linkis.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/assembly/distribution.xml
similarity index 95%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/assembly/distribution.xml
index b972b01d4..b5f688dab 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/assembly/distribution.xml
@@ -20,13 +20,13 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>linkis-metadata-manager-service-es</id>
+ <id>linkis-metadata-query-service-es</id>
<formats>
<format>zip</format>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>linkis-metadata-manager-service-es</baseDirectory>
+ <baseDirectory>linkis-metadata-query-service-es</baseDirectory>
<dependencySets>
<dependencySet>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/ElasticConnection.java
similarity index 99%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/ElasticConnection.java
index f8da934c7..24f5ab28a 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticConnection.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/ElasticConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/ElasticParamsMapper.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/ElasticParamsMapper.java
index fd64cb2dd..d836a3468 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/ElasticParamsMapper.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/ElasticParamsMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.common.conf.CommonVars;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/EsMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/EsMetaService.java
similarity index 93%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/EsMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/EsMetaService.java
index ba093f684..5632f5bf7 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/elasticsearch/src/main/java/org/apache/linkis/metadatamanager/service/EsMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/src/main/java/org/apache/linkis/metadat/query/service/EsMetaService.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
-import org.apache.linkis.metadatamanager.common.service.MetadataConnection;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.service.AbstractMetaService;
+import org.apache.linkis.metadata.query.common.service.MetadataConnection;
import java.util.List;
import java.util.Map;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
similarity index 98%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
index bc095aac4..3575dc5f4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml
@@ -24,7 +24,7 @@
<version>1.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>linkis-metadata-manager-service-hive</artifactId>
+ <artifactId>linkis-metadata-query-service-hive</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-manager-common</artifactId>
+ <artifactId>linkis-metadata-query-common</artifactId>
<version>${linkis.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/assembly/distribution.xml
similarity index 99%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/assembly/distribution.xml
index 29c49e08d..54693f8f8 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/assembly/distribution.xml
@@ -20,13 +20,13 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>linkis-metadata-manager-service-hive</id>
+ <id>linkis-metadata-query-service-hive</id>
<formats>
<format>zip</format>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>linkis-metadata-manager-service-hive</baseDirectory>
+ <baseDirectory>linkis-metadata-query-service-hive</baseDirectory>
<dependencySets>
<dependencySet>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveConnection.java
similarity index 99%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveConnection.java
index 94b96ce7b..10e90c9bd 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveConnection.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.common.conf.CommonVars;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveMetaService.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveMetaService.java
index 3ff01c93a..7ca23df29 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveMetaService.java
@@ -15,18 +15,18 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.bml.client.BmlClient;
import org.apache.linkis.bml.client.BmlClientFactory;
import org.apache.linkis.bml.protocol.BmlDownloadResponse;
import org.apache.linkis.common.conf.CommonVars;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.domain.MetaPartitionInfo;
-import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
-import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
-import org.apache.linkis.metadatamanager.common.service.MetadataConnection;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaPartitionInfo;
+import org.apache.linkis.metadata.query.common.exception.MetaRuntimeException;
+import org.apache.linkis.metadata.query.common.service.AbstractMetaService;
+import org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveParamsMapper.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveParamsMapper.java
index fd3a4c8a0..047a318ea 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/src/main/java/org/apache/linkis/metadatamanager/service/HiveParamsMapper.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/src/main/java/org/apache/linkis/metadat/query/service/HiveParamsMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.common.conf.CommonVars;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
similarity index 97%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
index 4bf6ac254..c2112bbbb 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml
@@ -24,7 +24,7 @@
<version>1.1.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>linkis-metadata-manager-service-kafka</artifactId>
+ <artifactId>linkis-metadata-query-service-kafka</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-manager-common</artifactId>
+ <artifactId>linkis-metadata-query-common</artifactId>
<version>${linkis.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/assembly/distribution.xml
similarity index 94%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/assembly/distribution.xml
index c63e5039f..997518b48 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/assembly/distribution.xml
@@ -20,13 +20,13 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>linkis-metadata-manager-service-kafka</id>
+ <id>linkis-metadata-query-service-kafka</id>
<formats>
<format>zip</format>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>linkis-metadata-manager-service-kafka</baseDirectory>
+ <baseDirectory>linkis-metadata-query-service-kafka</baseDirectory>
<dependencySets>
<dependencySet>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaConnection.java
similarity index 97%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaConnection.java
index 990fddc55..441579ce8 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaConnection.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.kafka.clients.admin.AdminClient;
import org.apache.kafka.clients.admin.KafkaAdminClient;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaMetaService.java
similarity index 95%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaMetaService.java
index 710b77a25..d92d95a26 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaMetaService.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.bml.client.BmlClient;
import org.apache.linkis.bml.client.BmlClientFactory;
import org.apache.linkis.bml.protocol.BmlDownloadResponse;
import org.apache.linkis.common.conf.CommonVars;
-import org.apache.linkis.metadatamanager.common.exception.MetaRuntimeException;
-import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
-import org.apache.linkis.metadatamanager.common.service.MetadataConnection;
+import org.apache.linkis.metadata.query.common.exception.MetaRuntimeException;
+import org.apache.linkis.metadata.query.common.service.AbstractMetaService;
+import org.apache.linkis.metadata.query.common.service.MetadataConnection;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaParamsMapper.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaParamsMapper.java
index df6b461c8..ede4a45d4 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/kafka/src/main/java/org/apache/linkis/metadatamanager/service/KafkaParamsMapper.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/src/main/java/org/apache/linkis/metadat/query/service/KafkaParamsMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.common.conf.CommonVars;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/pom.xml
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/pom.xml
index effa4c28c..02ba56ea6 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/pom.xml
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>linkis-metadata-manager-service-mysql</artifactId>
+ <artifactId>linkis-metadata-query-service-mysql</artifactId>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -35,7 +35,7 @@
<dependencies>
<dependency>
<groupId>org.apache.linkis</groupId>
- <artifactId>linkis-metadata-manager-common</artifactId>
+ <artifactId>linkis-metadata-query-common</artifactId>
<version>${linkis.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/assembly/distribution.xml
similarity index 94%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/assembly/distribution.xml
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/assembly/distribution.xml
index 8382a361a..dab81a366 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/assembly/distribution.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/assembly/distribution.xml
@@ -20,13 +20,13 @@
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.3 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
- <id>linkis-metadata-manager-service-mysql</id>
+ <id>linkis-metadata-query-service-mysql</id>
<formats>
<format>zip</format>
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <baseDirectory>linkis-metadata-manager-service-mysql</baseDirectory>
+ <baseDirectory>linkis-metadata-query-service-mysql</baseDirectory>
<dependencySets>
<dependencySet>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/MysqlMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/MysqlMetaService.java
similarity index 92%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/MysqlMetaService.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/MysqlMetaService.java
index 5754a7084..28f544647 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/MysqlMetaService.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/MysqlMetaService.java
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.datasourcemanager.common.util.json.Json;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
-import org.apache.linkis.metadatamanager.common.service.AbstractMetaService;
-import org.apache.linkis.metadatamanager.common.service.MetadataConnection;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.service.AbstractMetaService;
+import org.apache.linkis.metadata.query.common.service.MetadataConnection;
import java.sql.SQLException;
import java.util.HashMap;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/SqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/SqlConnection.java
similarity index 98%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/SqlConnection.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/SqlConnection.java
index 03e258f8a..e8212609d 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/SqlConnection.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/SqlConnection.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.common.conf.CommonVars;
-import org.apache.linkis.metadatamanager.common.domain.MetaColumnInfo;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/SqlParamsMapper.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/SqlParamsMapper.java
similarity index 96%
rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/SqlParamsMapper.java
rename to linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/SqlParamsMapper.java
index 6935ad6af..4ed5d4cfc 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/src/main/java/org/apache/linkis/metadatamanager/service/SqlParamsMapper.java
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadat/query/service/SqlParamsMapper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.metadatamanager.service;
+package org.apache.linkis.metadat.query.service;
import org.apache.linkis.common.conf.CommonVars;
diff --git a/linkis-public-enhancements/linkis-datasource/pom.xml b/linkis-public-enhancements/linkis-datasource/pom.xml
index 520274349..98a355de5 100644
--- a/linkis-public-enhancements/linkis-datasource/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/pom.xml
@@ -32,12 +32,12 @@
<modules>
<module>linkis-datasource-manager/common</module>
<module>linkis-datasource-manager/server</module>
- <module>linkis-metadata-manager/common</module>
- <module>linkis-metadata-manager/service/elasticsearch</module>
- <module>linkis-metadata-manager/service/hive</module>
- <module>linkis-metadata-manager/service/kafka</module>
- <module>linkis-metadata-manager/service/mysql</module>
- <module>linkis-metadata-manager/server</module>
+ <module>linkis-metadata-query/common</module>
+ <module>linkis-metadata-query/service/elasticsearch</module>
+ <module>linkis-metadata-query/service/hive</module>
+ <module>linkis-metadata-query/service/kafka</module>
+ <module>linkis-metadata-query/service/mysql</module>
+ <module>linkis-metadata-query/server</module>
<module>linkis-datasource-client</module>
</modules>
</project>
\ No newline at end of file
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala
index b11a3f4bd..24bec41ef 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/parser/GatewayParser.scala
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
package org.apache.linkis.gateway.parser
+import org.apache.commons.lang.StringUtils
import org.apache.linkis.DataWorkCloudApplication
import org.apache.linkis.common.ServiceInstance
import org.apache.linkis.common.utils.Logging
@@ -25,7 +26,6 @@ import org.apache.linkis.rpc.conf.RPCConfiguration
import org.apache.linkis.rpc.interceptor.ServiceInstanceUtils
import org.apache.linkis.server.Message
import org.apache.linkis.server.conf.ServerConfiguration
-import org.apache.commons.lang.StringUtils
trait GatewayParser {
@@ -34,9 +34,10 @@ trait GatewayParser {
def parse(gatewayContext: GatewayContext): Unit
}
+
abstract class AbstractGatewayParser extends GatewayParser with Logging {
- protected def sendResponseWhenNotMatchVersion(gatewayContext: GatewayContext, version: String): Boolean = if(version != ServerConfiguration.BDP_SERVER_VERSION) {
+ protected def sendResponseWhenNotMatchVersion(gatewayContext: GatewayContext, version: String): Boolean = if (version != ServerConfiguration.BDP_SERVER_VERSION) {
warn(s"Version not match. The gateway(${ServerConfiguration.BDP_SERVER_VERSION}) not support requestUri ${gatewayContext.getRequest.getRequestURI} from remoteAddress ${gatewayContext.getRequest.getRemoteAddress.getAddress.getHostAddress}.")
sendErrorResponse(s"The gateway${ServerConfiguration.BDP_SERVER_VERSION} not support version $version.", gatewayContext)
true
@@ -48,24 +49,26 @@ abstract class AbstractGatewayParser extends GatewayParser with Logging {
gatewayContext.setGatewayRoute(new GatewayRoute)
gatewayContext.getGatewayRoute.setRequestURI(gatewayContext.getRequest.getRequestURI)
dataMsg << gatewayContext.getRequest.getRequestURI
- if(dataMsg.getStatus != 0) warn(dataMsg.getMessage)
- if(gatewayContext.isWebSocketRequest) gatewayContext.getResponse.writeWebSocket(dataMsg)
+ if (dataMsg.getStatus != 0) warn(dataMsg.getMessage)
+ if (gatewayContext.isWebSocketRequest) gatewayContext.getResponse.writeWebSocket(dataMsg)
else gatewayContext.getResponse.write(dataMsg)
gatewayContext.getResponse.sendResponse()
}
/**
- * Return to the gateway list information(返回gateway列表信息)
- */
+ * Return to the gateway list information(返回gateway列表信息)
+ */
protected def responseHeartbeat(gatewayContext: GatewayContext): Unit = {
val gatewayServiceInstances = ServiceInstanceUtils.getRPCServerLoader.getServiceInstances(DataWorkCloudApplication.getApplicationName)
val msg = Message.ok("Gateway heartbeat ok!").data("gatewayList", gatewayServiceInstances.map(_.getInstance)).data("isHealthy", true)
sendMessageResponse(msg, gatewayContext)
}
}
+
object AbstractGatewayParser {
val GATEWAY_HEART_BEAT_URL = Array("gateway", "heartbeat")
}
+
class DefaultGatewayParser(gatewayParsers: Array[GatewayParser]) extends AbstractGatewayParser {
private val COMMON_REGEX = "/api/rest_[a-zA-Z]+/(v\\d+)/([^/]+)/.+".r
@@ -73,33 +76,40 @@ class DefaultGatewayParser(gatewayParsers: Array[GatewayParser]) extends Abstrac
override def shouldContainRequestBody(gatewayContext: GatewayContext): Boolean = gatewayContext.getRequest.getMethod.toUpperCase != "GET" &&
(gatewayContext.getRequest.getRequestURI match {
- case uri if uri.startsWith(ServerConfiguration.BDP_SERVER_USER_URI.getValue) => true
- case _ => gatewayParsers.exists(_.shouldContainRequestBody(gatewayContext))
- })
+ case uri if uri.startsWith(ServerConfiguration.BDP_SERVER_USER_URI.getValue) => true
+ case _ => gatewayParsers.exists(_.shouldContainRequestBody(gatewayContext))
+ })
override def parse(gatewayContext: GatewayContext): Unit = {
val path = gatewayContext.getRequest.getRequestURI
- if(gatewayContext.getGatewayRoute == null) {
+ if (gatewayContext.getGatewayRoute == null) {
gatewayContext.setGatewayRoute(new GatewayRoute)
gatewayContext.getGatewayRoute.setRequestURI(path)
}
gatewayParsers.foreach(_.parse(gatewayContext))
- if(gatewayContext.getGatewayRoute.getServiceInstance == null) path match {
+ if (gatewayContext.getGatewayRoute.getServiceInstance == null) path match {
case CLIENT_HEARTBEAT_REGEX(version) =>
- if(sendResponseWhenNotMatchVersion(gatewayContext, version)) return
+ if (sendResponseWhenNotMatchVersion(gatewayContext, version)) return
info(gatewayContext.getRequest.getRemoteAddress + " try to heartbeat.")
responseHeartbeat(gatewayContext)
case COMMON_REGEX(version, serviceId) =>
- if(sendResponseWhenNotMatchVersion(gatewayContext, version)) return
- val applicationName = if(RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue && RPCConfiguration.PUBLIC_SERVICE_LIST.contains(serviceId))
- RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue else serviceId
+ if (sendResponseWhenNotMatchVersion(gatewayContext, version)) return
+ val applicationName = if (RPCConfiguration.ENABLE_PUBLIC_SERVICE.getValue && RPCConfiguration.PUBLIC_SERVICE_LIST.contains(serviceId)) {
+ RPCConfiguration.PUBLIC_SERVICE_APPLICATION_NAME.getValue
+ // In order to be compatible with metadata module name refactoring,this logic will be removed in subsequent versions
+ } else if (RPCConfiguration.METADATAQUERY_SERVICE_LIST.contains(serviceId)) {
+ RPCConfiguration.METADATAQUERY_SERVICE_APPLICATION_NAME.getValue
+ } else {
+ serviceId
+ }
+
gatewayContext.getGatewayRoute.setServiceInstance(ServiceInstance(applicationName, null))
case p if p.startsWith("/dws/") =>
//TODO add version support
val params = gatewayContext.getGatewayRoute.getParams
params.put("proxyId", "dws")
val secondaryProxyId = StringUtils.substringBetween(p, "/dws/", "/")
- if(StringUtils.isNotBlank(secondaryProxyId)){
+ if (StringUtils.isNotBlank(secondaryProxyId)) {
params.put("proxyId", "dws/" + secondaryProxyId)
}
gatewayContext.getGatewayRoute.setParams(params)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org