Compare commits

...

3 Commits

Author SHA1 Message Date
Chao MENG
90e09aa5a0 chore: support to export item 2022-09-19 00:42:07 +08:00
zshen-talend
732c9f7ba3 fix(TDQ-19700): fix the bug about second time switch change original value(#5597) 2022-09-15 12:19:06 +08:00
AlixMetivier
e7d7296d1d feat(TBD-13647): allow switch from transient to interactive cluster (#5424) (#5586)
Co-authored-by: unknown <ametivier@talend.com>

Co-authored-by: AlixMetivier-zz <50327620+AlixMetivier-zz@users.noreply.github.com>
2022-09-13 08:38:38 +02:00
5 changed files with 26 additions and 8 deletions

View File

@@ -349,7 +349,7 @@ public class XmiResourceManager {
return itemResource;
}
private Resource createItemResource(boolean byteArrayResource, URI itemResourceURI) {
public Resource createItemResource(boolean byteArrayResource, URI itemResourceURI) {
Resource itemResource;
itemResource = getResourceSet().getResource(itemResourceURI, false);
if (itemResource != null) {

View File

@@ -351,11 +351,19 @@ public class ConnParameterKeys {
public static final String CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER = "CONN_PARA_KEY_DATABRICKS_CLOUD_PROVIDER";
public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_TYPE = "CONN_PARA_KEY_DATABRICKS_CLUSTER_TYPE";
public static final String CONN_PARA_KEY_DATABRICKS_RUN_MODE = "CONN_PARA_KEY_DATABRICKS_RUN_MODE";
public static final String CONN_PARA_KEY_DATABRICKS_CLUSTER_ID="CONN_PARA_KEY_DATABRICKS_CLUSTER_ID";
public static final String CONN_PARA_KEY_DATABRICKS_TOKEN="CONN_PARA_KEY_DATABRICKS_TOKEN";
public static final String CONN_PARA_KEY_DATABRICKS_NODE_TYPE="CONN_PARA_KEY_DATABRICKS_NODE_TYPE";
public static final String CONN_PARA_KEY_DATABRICKS_DRIVER_NODE_TYPE="CONN_PARA_KEY_DATABRICKS_DRIVER_NODE_TYPE";
public static final String CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION="CONN_PARA_KEY_DATABRICKS_RUNTIME_VERSION";
public static final String CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER="CONN_PARA_KEY_DATABRICKS_DBFS_DEP_FOLDER";

View File

@@ -154,6 +154,14 @@ public enum EHadoopProperties {
DATABRICKS_DBFS_DEP_FOLDER,
DATABRICKS_NODE_TYPE,
DATABRICKS_DRIVER_NODE_TYPE,
DATABRICKS_RUNTIME_VERSION,
DATABRICKS_CLUSTER_TYPE,
UNIV_STANDALONE_MASTER,
UNIV_STANDALONE_EXEC_MEMORY,

View File

@@ -141,14 +141,12 @@ public class SwitchContextWithTaggedValue extends AbstractSwitchContextStrategy
}
// case2 original value is in the context group then do nothing
// case3 original value is not in the context group clear original record and save new original
// record(switch more than more than
// two times .e.g. DQ->DQ2->DQ3 the second time switch will change original value to DQ2
// two times .e.g. DQ->DQ2->DQ the second time switch will keep original value to DQ and switch target value as
// case3 originalContext same with selectedContext(
// .e.g. DQ->DQ2->DQ2 the second time switch will change original value to DQ2
// DQ->DQ2->DQ the second time switch will keep original value to DQ and switch target value as
// DQ
if (extractorInstance.hasCatalog() && !StringUtils.isEmpty(taggedOriSid) && !taggedOriSid.equals(originalSid)
&& !taggedOriSid.equals(targetSid)) {
if (extractorInstance.hasCatalog() && !StringUtils.isEmpty(taggedOriSid) && originalContext.equals(selectedContext)) {
// change original catalog need to judge schema is not empty with same time
if (!StringUtils.isEmpty(originalSid)
&& (!extractorInstance.hasSchema() || !StringUtils.isEmpty(originalUiSchema))) {
@@ -157,7 +155,7 @@ public class SwitchContextWithTaggedValue extends AbstractSwitchContextStrategy
}
}
if (extractorInstance.hasSchema() && !StringUtils.isEmpty(taggedOriUiShchema)
&& !taggedOriUiShchema.equals(originalUiSchema) && !taggedOriUiShchema.equals(targetUiSchema)) {
&& originalContext.equals(selectedContext)) {
// change original schema need to judge catalog is not empty with same time
if (!StringUtils.isEmpty(originalUiSchema)
&& (!extractorInstance.hasCatalog()

View File

@@ -162,6 +162,10 @@ public class ExtendedNodeConnectionContextUtils {
DataBricksClusterId,
DataBricksToken,
DataBricksDBFSDepFolder,
DataBricksClusterType,
DataBricksRuntimeVersion,
DataBricksDriverNodeType,
DataBricksNodeType,
//Knox
SparkMode,