Skip to content

Feat metadata query api 1.1 compatible #4169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
casionone merged 3 commits into from
Feb 13, 2023
Merged

Feat metadata query api 1.1 compatible #4169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fd7ab7
feat(linkis-datasource): compatible with datasource client 1.1.x
jackxu2011 Feb 1, 2023
41e5660
fix: compatible with the result of get partitionInfo
jackxu2011 Feb 3, 2023
c233e87
style: format code
jackxu2011 Feb 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...nt/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ object DatasourceClientConfig {
var METADATA_SERVICE_MODULE: CommonVars[String] =
CommonVars.apply("linkis.server.mdq.module.name", "metadataQuery")

var METADATA_OLD_SERVICE_MODULE: CommonVars[String] =
CommonVars.apply("linkis.server.mdq.module.name", "metadatamanager")

var DATA_SOURCE_SERVICE_MODULE: CommonVars[String] =
CommonVars.apply("linkis.server.dsm.module.name", "data-source-manager")

Expand Down
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ object DataSourceTestConnectAction {
}

def build(): DataSourceTestConnectAction = {
if (dataSourceId == null) {
if (dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
}
if (version == null) throw new DataSourceClientBuilderException(VERSION_NEEDED.getErrorDesc)
Expand Down
2 changes: 1 addition & 1 deletion ...t/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ object DeleteDataSourceAction {

def builder(): DeleteDataSourceAction = {
if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
if (dataSourceId == null) {
if (dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
}

Expand Down
2 changes: 1 addition & 1 deletion ...t/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ object ExpireDataSourceAction {
}

def build(): ExpireDataSourceAction = {
if (dataSourceId == null) {
if (dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
}
if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
Expand Down
2 changes: 1 addition & 1 deletion ...la/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ object GetConnectParamsByDataSourceIdAction {
}

def build(): GetConnectParamsByDataSourceIdAction = {
if (dataSourceId == null) {
if (dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
}
if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
Expand Down
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ object GetDataSourceVersionsAction {
}

def build(): GetDataSourceVersionsAction = {
if (dataSourceId == null) {
if (dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
}
if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)
Expand Down
2 changes: 1 addition & 1 deletion .../main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ object GetInfoByDataSourceIdAction {
}

def build(): GetInfoByDataSourceIdAction = {
if (dataSourceId == null) {
if (dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCEID_NEEDED.getErrorDesc)
}
if (system == null) throw new DataSourceClientBuilderException(SYSTEM_NEEDED.getErrorDesc)
Expand Down
41 changes: 37 additions & 4 deletions ...src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,36 @@

package org.apache.linkis.datasource.client.request

import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
METADATA_OLD_SERVICE_MODULE,
METADATA_SERVICE_MODULE
}
import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
import org.apache.linkis.httpclient.request.GetAction

class MetadataGetColumnsAction extends GetAction with DataSourceAction {
import org.apache.commons.lang3.StringUtils

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, "getColumns")
override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
Array(METADATA_SERVICE_MODULE.getValue, "getColumns")
} else {
Array(
METADATA_OLD_SERVICE_MODULE.getValue,
"columns",
dataSourceId.toString,
"db",
database,
"table",
table
)
}

private var user: String = _

Expand All @@ -42,6 +59,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 = _
Expand All @@ -53,6 +71,20 @@ object MetadataGetColumnsAction {
this
}

/**
* get value form dataSourceId is deprecated, suggest to use dataSourceName
*
* @param dataSourceId
* datasourceId
* @return
* builder
*/
@deprecated
def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}

def setDataSourceName(dataSourceName: String): Builder = {
this.dataSourceName = dataSourceName
this
Expand All @@ -74,7 +106,7 @@ object MetadataGetColumnsAction {
}

def build(): MetadataGetColumnsAction = {
if (dataSourceName == null) {
if (dataSourceName == null && dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
}
if (database == null) throw new DataSourceClientBuilderException(DATABASE_NEEDED.getErrorDesc)
Expand All @@ -83,6 +115,7 @@ object MetadataGetColumnsAction {
if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)

val metadataGetColumnsAction = new MetadataGetColumnsAction
metadataGetColumnsAction.dataSourceId = this.dataSourceId
metadataGetColumnsAction.dataSourceName = this.dataSourceName
metadataGetColumnsAction.database = this.database
metadataGetColumnsAction.table = this.table
Expand Down
32 changes: 29 additions & 3 deletions ...c/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,26 @@

package org.apache.linkis.datasource.client.request

import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
METADATA_OLD_SERVICE_MODULE,
METADATA_SERVICE_MODULE
}
import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
import org.apache.linkis.httpclient.request.GetAction

import org.apache.commons.lang3.StringUtils

class MetadataGetDatabasesAction extends GetAction with DataSourceAction {

private var dataSourceId: Long = _
private var dataSourceName: String = _

override def suffixURLs: Array[String] = Array(METADATA_SERVICE_MODULE.getValue, "getDatabases")
override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
Array(METADATA_SERVICE_MODULE.getValue, "getDatabases")
} else {
Array(METADATA_OLD_SERVICE_MODULE.getValue, "dbs", dataSourceId.toString)
}

private var user: String = _

Expand All @@ -39,6 +49,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 = _
Expand All @@ -48,6 +59,20 @@ object MetadataGetDatabasesAction {
this
}

/**
* get value form dataSourceId is deprecated, suggest to use dataSourceName
*
* @param dataSourceId
* datasourceId
* @return
* builder
*/
@deprecated
def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}

def setDataSourceName(dataSourceName: String): Builder = {
this.dataSourceName = dataSourceName
this
Expand All @@ -59,13 +84,14 @@ object MetadataGetDatabasesAction {
}

def build(): MetadataGetDatabasesAction = {
if (dataSourceName == null) {
if (dataSourceName == null && dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
}
if (system == null) throw new DataSourceClientBuilderException(SYSTEM_NEEDED.getErrorDesc)
if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)

val metadataGetDatabasesAction = new MetadataGetDatabasesAction
metadataGetDatabasesAction.dataSourceId = this.dataSourceId
metadataGetDatabasesAction.dataSourceName = this.dataSourceName
metadataGetDatabasesAction.setParameter("system", system)
metadataGetDatabasesAction.setUser(user)
Expand Down
40 changes: 37 additions & 3 deletions .../main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,36 @@

package org.apache.linkis.datasource.client.request

import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
METADATA_OLD_SERVICE_MODULE,
METADATA_SERVICE_MODULE
}
import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
import org.apache.linkis.httpclient.request.GetAction

import org.apache.commons.lang3.StringUtils

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] =
override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
Array(METADATA_SERVICE_MODULE.getValue, "getPartitions")
} else {
Array(
METADATA_OLD_SERVICE_MODULE.getValue,
"partitions",
dataSourceId.toString,
"db",
database,
"table",
table
)
}

private var user: String = _

Expand All @@ -42,6 +59,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 = _
Expand All @@ -54,6 +72,20 @@ object MetadataGetPartitionsAction {
this
}

/**
* get value form dataSourceId is deprecated, suggest to use dataSourceName
*
* @param dataSourceId
* datasourceId
* @return
* builder
*/
@deprecated
def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}

def setDataSourceName(dataSourceName: String): Builder = {
this.dataSourceName = dataSourceName
this
Expand All @@ -80,14 +112,16 @@ object MetadataGetPartitionsAction {
}

def build(): MetadataGetPartitionsAction = {
if (dataSourceName == null) {
if (dataSourceName == null && dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
}
if (database == null) throw new DataSourceClientBuilderException(DATABASE_NEEDED.getErrorDesc)
if (table == null) throw new DataSourceClientBuilderException(TABLE_NEEDED.getErrorDesc)
if (system == null) throw new DataSourceClientBuilderException(SYSTEM_NEEDED.getErrorDesc)

val metadataGetPartitionsAction = new MetadataGetPartitionsAction

metadataGetPartitionsAction.dataSourceId = this.dataSourceId
metadataGetPartitionsAction.dataSourceName = this.dataSourceName
metadataGetPartitionsAction.database = this.database
metadataGetPartitionsAction.table = this.table
Expand Down
39 changes: 36 additions & 3 deletions .../main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,37 @@

package org.apache.linkis.datasource.client.request

import org.apache.linkis.datasource.client.config.DatasourceClientConfig.METADATA_SERVICE_MODULE
import org.apache.linkis.datasource.client.config.DatasourceClientConfig.{
METADATA_OLD_SERVICE_MODULE,
METADATA_SERVICE_MODULE
}
import org.apache.linkis.datasource.client.errorcode.DatasourceClientErrorCodeSummary._
import org.apache.linkis.datasource.client.exception.DataSourceClientBuilderException
import org.apache.linkis.httpclient.request.GetAction

import org.apache.commons.lang3.StringUtils

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] =
override def suffixURLs: Array[String] = if (StringUtils.isNotBlank(dataSourceName)) {
Array(METADATA_SERVICE_MODULE.getValue, "getTableProps")
} else {
Array(
METADATA_OLD_SERVICE_MODULE.getValue,
"props",
dataSourceId.toString,
"db",
database,
"table",
table
)
}

private var user: String = _

Expand All @@ -42,6 +60,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 = _
Expand All @@ -53,6 +72,19 @@ object MetadataGetTablePropsAction {
this
}

/**
* get value form dataSourceId is deprecated, suggest to use dataSourceName
* @param dataSourceId
* datasourceId
* @return
* builder
*/
@deprecated
def setDataSourceId(dataSourceId: Long): Builder = {
this.dataSourceId = dataSourceId
this
}

def setDataSourceName(dataSourceName: String): Builder = {
this.dataSourceName = dataSourceName
this
Expand All @@ -74,7 +106,7 @@ object MetadataGetTablePropsAction {
}

def build(): MetadataGetTablePropsAction = {
if (dataSourceName == null) {
if (dataSourceName == null && dataSourceId <= 0) {
throw new DataSourceClientBuilderException(DATASOURCENAME_NEEDED.getErrorDesc)
}
if (database == null) throw new DataSourceClientBuilderException(DATABASE_NEEDED.getErrorDesc)
Expand All @@ -83,6 +115,7 @@ object MetadataGetTablePropsAction {
if (user == null) throw new DataSourceClientBuilderException(USER_NEEDED.getErrorDesc)

val metadataGetTablePropsAction = new MetadataGetTablePropsAction
metadataGetTablePropsAction.dataSourceId = this.dataSourceId
metadataGetTablePropsAction.dataSourceName = this.dataSourceName
metadataGetTablePropsAction.database = this.database
metadataGetTablePropsAction.table = this.table
Expand Down
Loading