Skip to content

Commit 8e4196a

Browse files
todd5167todd5167
committed
fix conflict
1 parent b43aec0 commit 8e4196a

File tree

7 files changed

+27
-45
lines changed

7 files changed

+27
-45
lines changed

‎core/src/main/java/com/dtstack/flink/sql/exec/ExecuteProcessHelper.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@
2020

2121
import com.aiweiergou.tool.logger.api.ChangeLogLevelProcess;
2222
import com.dtstack.flink.sql.parser.CreateFuncParser;
23+
import com.dtstack.flink.sql.parser.CreateTmpTableParser;
24+
import com.dtstack.flink.sql.parser.FlinkPlanner;
25+
import com.dtstack.flink.sql.parser.InsertSqlParser;
26+
import com.dtstack.flink.sql.parser.SqlParser;
27+
import com.dtstack.flink.sql.parser.SqlTree;
2328
import org.apache.flink.api.common.typeinfo.TypeInformation;
2429
import org.apache.flink.api.java.tuple.Tuple2;
2530
import org.apache.flink.api.java.typeutils.RowTypeInfo;
@@ -63,17 +68,6 @@
6368
import org.apache.calcite.sql.SqlNode;
6469
import org.apache.commons.io.Charsets;
6570
import org.apache.commons.lang3.StringUtils;
66-
import org.apache.flink.api.common.typeinfo.TypeInformation;
67-
import org.apache.flink.api.java.tuple.Tuple2;
68-
import org.apache.flink.api.java.typeutils.RowTypeInfo;
69-
import org.apache.flink.streaming.api.datastream.DataStream;
70-
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
71-
import org.apache.flink.table.api.StreamQueryConfig;
72-
import org.apache.flink.table.api.Table;
73-
import org.apache.flink.table.api.TableEnvironment;
74-
import org.apache.flink.table.api.java.StreamTableEnvironment;
75-
import org.apache.flink.table.sinks.TableSink;
76-
import org.apache.flink.types.Row;
7771
import org.slf4j.Logger;
7872
import org.slf4j.LoggerFactory;
7973

‎core/src/main/java/com/dtstack/flink/sql/side/SideSQLParser.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import java.util.Set;
4949

5050
import static org.apache.calcite.sql.SqlKind.IDENTIFIER;
51+
import static org.apache.calcite.sql.SqlKind.LITERAL;
5152

5253
/**
5354
* Parsing sql, obtain execution information dimension table

‎core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -47,31 +47,20 @@
4747
import com.google.common.collect.Lists;
4848
import com.google.common.collect.Maps;
4949
import com.google.common.collect.Sets;
50-
import org.apache.calcite.sql.SqlAsOperator;
5150
import org.apache.calcite.sql.SqlBasicCall;
52-
import org.apache.calcite.sql.SqlDataTypeSpec;
5351
import org.apache.calcite.sql.SqlIdentifier;
54-
import org.apache.calcite.sql.SqlInsert;
55-
import org.apache.calcite.sql.SqlJoin;
5652
import org.apache.calcite.sql.SqlKind;
57-
import org.apache.calcite.sql.SqlLiteral;
5853
import org.apache.calcite.sql.SqlNode;
59-
import org.apache.calcite.sql.SqlNodeList;
60-
import org.apache.calcite.sql.SqlOperator;
61-
import org.apache.calcite.sql.SqlOrderBy;
6254
import org.apache.calcite.sql.SqlSelect;
6355
import org.apache.calcite.sql.SqlWithItem;
64-
import org.apache.calcite.sql.fun.SqlCase;
6556
import org.apache.calcite.sql.parser.SqlParseException;
66-
import org.apache.calcite.sql.parser.SqlParserPos;
6757
import org.apache.commons.collections.CollectionUtils;
6858
import org.apache.commons.lang3.StringUtils;
6959
import org.slf4j.Logger;
7060
import org.slf4j.LoggerFactory;
7161

7262
import java.sql.Timestamp;
7363
import java.util.Arrays;
74-
import java.util.Collection;
7564
import java.util.LinkedList;
7665
import java.util.List;
7766
import java.util.Map;
@@ -168,8 +157,7 @@ public void exec(String sql,
168157

169158
}else if (pollObj instanceof JoinInfo){
170159
LOG.info("----------exec join info----------\n{}", pollObj.toString());
171-
preIsSideJoin = true;
172-
joinFun(pollObj, localTableCache, sideTableMap, tableEnv, replaceInfoList);
160+
joinFun(pollObj, localTableCache, sideTableMap, tableEnv);
173161
}
174162
}
175163

@@ -295,23 +283,23 @@ private Table getTableFromCache(Map<String, Table> localTableCache, String table
295283
*
296284
* @return
297285
*/
298-
private boolean checkJoinCondition(SqlNode conditionNode, String sideTableAlias, SideTableInfo sideTableInfo) {
286+
private boolean checkJoinCondition(SqlNode conditionNode, String sideTableAlias, AbstractSideTableInfo sideTableInfo) {
299287
List<String> conditionFields = getConditionFields(conditionNode, sideTableAlias, sideTableInfo);
300288
if(CollectionUtils.isEqualCollection(conditionFields, convertPrimaryAlias(sideTableInfo))){
301289
return true;
302290
}
303291
return false;
304292
}
305293

306-
private List<String> convertPrimaryAlias(SideTableInfo sideTableInfo) {
294+
private List<String> convertPrimaryAlias(AbstractSideTableInfo sideTableInfo) {
307295
List<String> res = Lists.newArrayList();
308296
sideTableInfo.getPrimaryKeys().forEach(field -> {
309297
res.add(sideTableInfo.getPhysicalFields().getOrDefault(field, field));
310298
});
311299
return res;
312300
}
313301

314-
public List<String> getConditionFields(SqlNode conditionNode, String specifyTableName, SideTableInfo sideTableInfo){
302+
public List<String> getConditionFields(SqlNode conditionNode, String specifyTableName, AbstractSideTableInfo sideTableInfo){
315303
List<SqlNode> sqlNodeList = Lists.newArrayList();
316304
ParseUtils.parseAnd(conditionNode, sqlNodeList);
317305
List<String> conditionFields = Lists.newArrayList();
@@ -370,7 +358,7 @@ protected void dealAsSourceTable(StreamTableEnvironment tableEnv,
370358

371359
private void joinFun(Object pollObj,
372360
Map<String, Table> localTableCache,
373-
Map<String, SideTableInfo> sideTableMap,
361+
Map<String, AbstractSideTableInfo> sideTableMap,
374362
StreamTableEnvironment tableEnv) throws Exception{
375363
JoinInfo joinInfo = (JoinInfo) pollObj;
376364

@@ -386,7 +374,7 @@ private void joinFun(Object pollObj,
386374
JoinScope.ScopeChild rightScopeChild = new JoinScope.ScopeChild();
387375
rightScopeChild.setAlias(joinInfo.getRightTableAlias());
388376
rightScopeChild.setTableName(joinInfo.getRightTableName());
389-
SideTableInfo sideTableInfo = sideTableMap.get(joinInfo.getRightTableName());
377+
AbstractSideTableInfo sideTableInfo = sideTableMap.get(joinInfo.getRightTableName());
390378
if(sideTableInfo == null){
391379
sideTableInfo = sideTableMap.get(joinInfo.getRightTableAlias());
392380
}
@@ -395,9 +383,9 @@ private void joinFun(Object pollObj,
395383
throw new RuntimeException("can't not find side table:" + joinInfo.getRightTableName());
396384
}
397385

398-
// if(!checkJoinCondition(joinInfo.getCondition(), joinInfo.getRightTableAlias(), sideTableInfo)){
399-
// throw new RuntimeException("ON condition must contain all equal fields!!!");
400-
// }
386+
if(!checkJoinCondition(joinInfo.getCondition(), joinInfo.getRightTableAlias(), sideTableInfo)){
387+
throw new RuntimeException("ON condition must contain all equal fields!!!");
388+
}
401389

402390
rightScopeChild.setRowTypeInfo(sideTableInfo.getRowTypeInfo());
403391

‎core/src/main/java/com/dtstack/flink/sql/table/AbstractTableParser.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ public void parseFieldsInfo(String fieldsInfo, AbstractTableInfo tableInfo){
112112

113113

114114
Class fieldClass = null;
115-
TableInfo.FieldExtraInfo fieldExtraInfo = null;
115+
AbstractTableInfo.FieldExtraInfo fieldExtraInfo = null;
116116

117117
Matcher matcher = charTypePattern.matcher(fieldType);
118118
if (matcher.find()) {
119119
fieldClass = dbTypeConvertToJavaType(CHAR_TYPE_NO_LENGTH);
120-
fieldExtraInfo = new TableInfo.FieldExtraInfo();
120+
fieldExtraInfo = new AbstractTableInfo.FieldExtraInfo();
121121
fieldExtraInfo.setLength(Integer.valueOf(matcher.group(1)));
122122
} else {
123123
fieldClass = dbTypeConvertToJavaType(fieldType);

‎oracle/oracle-side/oracle-async-side/src/main/java/com/dtstack/flink/sql/side/oracle/OracleAsyncSideInfo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.dtstack.flink.sql.side.AbstractSideTableInfo;
2424
import com.dtstack.flink.sql.side.rdb.async.RdbAsyncSideInfo;
2525
import com.dtstack.flink.sql.side.rdb.table.RdbSideTableInfo;
26-
import com.dtstack.flink.sql.table.TableInfo;
26+
import com.dtstack.flink.sql.table.AbstractTableInfo;
2727
import com.dtstack.flink.sql.util.DtStringUtil;
2828
import org.apache.commons.lang3.StringUtils;
2929
import org.apache.flink.api.java.typeutils.RowTypeInfo;
@@ -56,7 +56,7 @@ public String wrapperPlaceholder(String fieldName) {
5656
String rpadFormat = "rpad(?, %d, ' ')";
5757

5858
if (StringUtils.contains(type.toLowerCase(), "char")) {
59-
TableInfo.FieldExtraInfo fieldExtraInfo = sideTableInfo.getFieldExtraInfoList().get(pos);
59+
AbstractTableInfo.FieldExtraInfo fieldExtraInfo = sideTableInfo.getFieldExtraInfoList().get(pos);
6060
int charLength = fieldExtraInfo == null ? 0 : fieldExtraInfo.getLength();
6161
if (charLength > 0) {
6262
return String.format(rpadFormat, charLength);

‎oracle/oracle-sink/src/main/java/com/dtstack/flink/sql/sink/oracle/OracleDialect.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package com.dtstack.flink.sql.sink.oracle;
2020

2121
import com.dtstack.flink.sql.sink.rdb.dialect.JDBCDialect;
22-
import com.dtstack.flink.sql.table.TableInfo;
22+
import com.dtstack.flink.sql.table.AbstractTableInfo;
2323
import com.dtstack.flink.sql.util.DtStringUtil;
2424
import org.apache.commons.lang3.StringUtils;
2525

@@ -41,7 +41,7 @@ public class OracleDialect implements JDBCDialect {
4141

4242
private List<String> fieldList;
4343
private List<String> fieldTypeList;
44-
private List<TableInfo.FieldExtraInfo> fieldExtraInfoList;
44+
private List<AbstractTableInfo.FieldExtraInfo> fieldExtraInfoList;
4545

4646
@Override
4747
public boolean canHandle(String url) {
@@ -133,7 +133,7 @@ public String wrapperPlaceholder(String fieldName) {
133133
String type = fieldTypeList.get(pos);
134134

135135
if (StringUtils.contains(type.toLowerCase(), DEAL_CHAR_KEY)) {
136-
TableInfo.FieldExtraInfo fieldExtraInfo = fieldExtraInfoList.get(pos);
136+
AbstractTableInfo.FieldExtraInfo fieldExtraInfo = fieldExtraInfoList.get(pos);
137137
int charLength = fieldExtraInfo == null ? 0 : fieldExtraInfo.getLength();
138138
if (charLength > 0) {
139139
return String.format(RPAD_FORMAT, charLength);
@@ -151,7 +151,7 @@ public void setFieldTypeList(List<String> fieldTypeList) {
151151
this.fieldTypeList = fieldTypeList;
152152
}
153153

154-
public void setFieldExtraInfoList(List<TableInfo.FieldExtraInfo> fieldExtraInfoList) {
154+
public void setFieldExtraInfoList(List<AbstractTableInfo.FieldExtraInfo> fieldExtraInfoList) {
155155
this.fieldExtraInfoList = fieldExtraInfoList;
156156
}
157157
}

‎rdb/rdb-sink/src/main/java/com/dtstack/flink/sql/sink/rdb/AbstractRdbSink.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
import com.dtstack.flink.sql.sink.IStreamSinkGener;
2121
import com.dtstack.flink.sql.sink.rdb.format.JDBCUpsertOutputFormat;
2222
import com.dtstack.flink.sql.sink.rdb.table.RdbTableInfo;
23+
import com.dtstack.flink.sql.table.AbstractTableInfo;
2324
import com.dtstack.flink.sql.table.AbstractTargetTableInfo;
24-
import com.dtstack.flink.sql.table.TableInfo;
25-
import com.dtstack.flink.sql.table.TargetTableInfo;
2625
import org.apache.flink.api.common.typeinfo.TypeInformation;
2726
import org.apache.flink.api.java.tuple.Tuple2;
2827
import org.apache.flink.api.java.typeutils.RowTypeInfo;
@@ -84,20 +83,20 @@ public abstract class AbstractRdbSink implements RetractStreamTableSink<Row>, Se
8483

8584
public List<String> fieldList;
8685
public List<String> fieldTypeList;
87-
public List<TableInfo.FieldExtraInfo> fieldExtraInfoList;
86+
public List<AbstractTableInfo.FieldExtraInfo> fieldExtraInfoList;
8887

8988
public AbstractRdbSink(JDBCDialect jdbcDialect) {
9089
this.jdbcDialect = jdbcDialect;
9190
}
9291

9392
@Override
94-
public RdbSink genStreamSink(TargetTableInfo targetTableInfo) {
93+
public AbstractRdbSink genStreamSink(AbstractTargetTableInfo targetTableInfo) {
9594
RdbTableInfo rdbTableInfo = (RdbTableInfo) targetTableInfo;
9695
this.batchNum = rdbTableInfo.getBatchSize() == null ? batchNum : rdbTableInfo.getBatchSize();
9796
this.batchWaitInterval = rdbTableInfo.getBatchWaitInterval() == null ?
9897
batchWaitInterval : rdbTableInfo.getBatchWaitInterval();
9998
this.parallelism = rdbTableInfo.getParallelism() == null ? parallelism : rdbTableInfo.getParallelism();
100-
this.dbURL = rdbTableInfo.getUrl();
99+
this.dbUrl = rdbTableInfo.getUrl();
101100
this.userName = rdbTableInfo.getUserName();
102101
this.password = rdbTableInfo.getPassword();
103102
this.tableName = rdbTableInfo.getTableName();

0 commit comments

Comments
 (0)