Skip to content

Commit 5a8422e

Browse files
a49aa49a
committed
remove useless dealOneEqualCon method
1 parent cb738ac commit 5a8422e

6 files changed

Lines changed: 15 additions & 282 deletions

File tree

‎cassandra/cassandra-side/cassandra-async-side/src/main/java/com/dtstack/flink/sql/side/cassandra/CassandraAsyncSideInfo.java‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -72,57 +72,4 @@ public void buildEqualInfo(JoinInfo joinInfo, AbstractSideTableInfo sideTableInf
7272
LOG.info("---------side_exe_sql-----\n{}" + sqlCondition);
7373
}
7474

75-
76-
@Override
77-
public void dealOneEqualCon(SqlNode sqlNode, String sideTableName) {
78-
if (sqlNode.getKind() != SqlKind.EQUALS) {
79-
throw new RuntimeException("not equal operator.");
80-
}
81-
82-
SqlIdentifier left = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[0];
83-
SqlIdentifier right = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[1];
84-
85-
String leftTableName = left.getComponent(0).getSimple();
86-
String leftField = left.getComponent(1).getSimple();
87-
88-
String rightTableName = right.getComponent(0).getSimple();
89-
String rightField = right.getComponent(1).getSimple();
90-
91-
if (leftTableName.equalsIgnoreCase(sideTableName)) {
92-
equalFieldList.add(leftField);
93-
int equalFieldIndex = -1;
94-
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
95-
String fieldName = rowTypeInfo.getFieldNames()[i];
96-
if (fieldName.equalsIgnoreCase(rightField)) {
97-
equalFieldIndex = i;
98-
}
99-
}
100-
if (equalFieldIndex == -1) {
101-
throw new RuntimeException("can't deal equal field: " + sqlNode);
102-
}
103-
104-
equalValIndex.add(equalFieldIndex);
105-
106-
} else if (rightTableName.equalsIgnoreCase(sideTableName)) {
107-
108-
equalFieldList.add(rightField);
109-
int equalFieldIndex = -1;
110-
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
111-
String fieldName = rowTypeInfo.getFieldNames()[i];
112-
if (fieldName.equalsIgnoreCase(leftField)) {
113-
equalFieldIndex = i;
114-
}
115-
}
116-
if (equalFieldIndex == -1) {
117-
throw new RuntimeException("can't deal equal field: " + sqlNode.toString());
118-
}
119-
120-
equalValIndex.add(equalFieldIndex);
121-
122-
} else {
123-
throw new RuntimeException("resolve equalFieldList error:" + sqlNode.toString());
124-
}
125-
126-
}
127-
12875
}

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

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -121,53 +121,52 @@ public String getTargetFieldType(String fieldName){
121121
return sideTableInfo.getFieldTypes()[fieldIndex];
122122
}
123123

124-
125-
public void dealOneEqualCon(SqlNode sqlNode, String sideTableName){
126-
if(!SqlKind.COMPARISON.contains(sqlNode.getKind())){
124+
public void dealOneEqualCon(SqlNode sqlNode, String sideTableName) {
125+
if (!SqlKind.COMPARISON.contains(sqlNode.getKind())) {
127126
throw new RuntimeException("not compare operator.");
128127
}
129128

130-
SqlIdentifier left = (SqlIdentifier)((SqlBasicCall)sqlNode).getOperands()[0];
131-
SqlIdentifier right = (SqlIdentifier)((SqlBasicCall)sqlNode).getOperands()[1];
129+
SqlIdentifier left = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[0];
130+
SqlIdentifier right = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[1];
132131

133132
String leftTableName = left.getComponent(0).getSimple();
134133
String leftField = left.getComponent(1).getSimple();
135134

136135
String rightTableName = right.getComponent(0).getSimple();
137136
String rightField = right.getComponent(1).getSimple();
138137

139-
if(leftTableName.equalsIgnoreCase(sideTableName)){
138+
if (leftTableName.equalsIgnoreCase(sideTableName)) {
140139
equalFieldList.add(leftField);
141140
int equalFieldIndex = -1;
142-
for(int i=0; i<rowTypeInfo.getFieldNames().length; i++){
141+
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
143142
String fieldName = rowTypeInfo.getFieldNames()[i];
144-
if(fieldName.equalsIgnoreCase(rightField)){
143+
if (fieldName.equalsIgnoreCase(rightField)) {
145144
equalFieldIndex = i;
146145
}
147146
}
148-
if(equalFieldIndex == -1){
149-
throw new RuntimeException("can't find equal field " + rightField);
147+
if (equalFieldIndex == -1) {
148+
throw new RuntimeException("can't deal equal field: " + sqlNode);
150149
}
151150

152151
equalValIndex.add(equalFieldIndex);
153152

154-
}else if(rightTableName.equalsIgnoreCase(sideTableName)){
153+
} else if (rightTableName.equalsIgnoreCase(sideTableName)) {
155154

156155
equalFieldList.add(rightField);
157156
int equalFieldIndex = -1;
158-
for(int i=0; i<rowTypeInfo.getFieldNames().length; i++){
157+
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
159158
String fieldName = rowTypeInfo.getFieldNames()[i];
160-
if(fieldName.equalsIgnoreCase(leftField)){
159+
if (fieldName.equalsIgnoreCase(leftField)) {
161160
equalFieldIndex = i;
162161
}
163162
}
164-
if(equalFieldIndex == -1){
165-
throw new RuntimeException("can't find equal field " + rightField);
163+
if (equalFieldIndex == -1) {
164+
throw new RuntimeException("can't deal equal field: " + sqlNode.toString());
166165
}
167166

168167
equalValIndex.add(equalFieldIndex);
169168

170-
}else{
169+
} else {
171170
throw new RuntimeException("resolve equalFieldList error:" + sqlNode.toString());
172171
}
173172
}

‎elasticsearch6/elasticsearch6-side/elasticsearch6-async-side/src/main/java/com/dtstack/flink/sql/side/elasticsearch6/Elasticsearch6AsyncSideInfo.java‎

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
*/
3939
public class Elasticsearch6AsyncSideInfo extends BaseSideInfo {
4040

41-
4241
public Elasticsearch6AsyncSideInfo(RowTypeInfo rowTypeInfo, JoinInfo joinInfo, List<FieldInfo> outFieldInfoList, AbstractSideTableInfo sideTableInfo) {
4342
super(rowTypeInfo, joinInfo, outFieldInfoList, sideTableInfo);
4443
}
@@ -54,59 +53,5 @@ public void buildEqualInfo(JoinInfo joinInfo, AbstractSideTableInfo sideTableInf
5453
for (SqlNode sqlNode : sqlNodeList) {
5554
dealOneEqualCon(sqlNode, sideTableName);
5655
}
57-
58-
}
59-
60-
@Override
61-
public void dealOneEqualCon(SqlNode sqlNode, String sideTableName) {
62-
if (!SqlKind.COMPARISON.contains(sqlNode.getKind())) {
63-
throw new RuntimeException("not compare operator.");
64-
}
65-
66-
SqlIdentifier left = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[0];
67-
SqlIdentifier right = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[1];
68-
69-
String leftTableName = left.getComponent(0).getSimple();
70-
String leftField = left.getComponent(1).getSimple();
71-
72-
String rightTableName = right.getComponent(0).getSimple();
73-
String rightField = right.getComponent(1).getSimple();
74-
75-
if (leftTableName.equalsIgnoreCase(sideTableName)) {
76-
equalFieldList.add(leftField);
77-
int equalFieldIndex = -1;
78-
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
79-
String fieldName = rowTypeInfo.getFieldNames()[i];
80-
if (fieldName.equalsIgnoreCase(rightField)) {
81-
equalFieldIndex = i;
82-
}
83-
}
84-
if (equalFieldIndex == -1) {
85-
throw new RuntimeException("can't deal equal field: " + sqlNode);
86-
}
87-
88-
equalValIndex.add(equalFieldIndex);
89-
90-
} else if (rightTableName.equalsIgnoreCase(sideTableName)) {
91-
92-
equalFieldList.add(rightField);
93-
int equalFieldIndex = -1;
94-
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
95-
String fieldName = rowTypeInfo.getFieldNames()[i];
96-
if (fieldName.equalsIgnoreCase(leftField)) {
97-
equalFieldIndex = i;
98-
}
99-
}
100-
if (equalFieldIndex == -1) {
101-
throw new RuntimeException("can't deal equal field: " + sqlNode.toString());
102-
}
103-
104-
equalValIndex.add(equalFieldIndex);
105-
106-
} else {
107-
throw new RuntimeException("resolve equalFieldList error:" + sqlNode.toString());
108-
}
109-
11056
}
111-
11257
}

‎kudu/kudu-side/kudu-async-side/src/main/java/com/dtstack/flink/sql/side/kudu/KuduAsyncSideInfo.java‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -42,55 +42,4 @@ public void buildEqualInfo(JoinInfo joinInfo, AbstractSideTableInfo sideTableInf
4242
System.out.println("---------side_exe_sql-----\n" + sqlCondition);
4343
}
4444

45-
@Override
46-
public void dealOneEqualCon(SqlNode sqlNode, String sideTableName) {
47-
if (sqlNode.getKind() != SqlKind.EQUALS) {
48-
throw new RuntimeException("not equal operator.");
49-
}
50-
51-
SqlIdentifier left = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[0];
52-
SqlIdentifier right = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[1];
53-
54-
String leftTableName = left.getComponent(0).getSimple();
55-
String leftField = left.getComponent(1).getSimple();
56-
57-
String rightTableName = right.getComponent(0).getSimple();
58-
String rightField = right.getComponent(1).getSimple();
59-
60-
if (leftTableName.equalsIgnoreCase(sideTableName)) {
61-
equalFieldList.add(leftField);
62-
int equalFieldIndex = -1;
63-
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
64-
String fieldName = rowTypeInfo.getFieldNames()[i];
65-
if (fieldName.equalsIgnoreCase(rightField)) {
66-
equalFieldIndex = i;
67-
}
68-
}
69-
if (equalFieldIndex == -1) {
70-
throw new RuntimeException("can't deal equal field: " + sqlNode);
71-
}
72-
73-
equalValIndex.add(equalFieldIndex);
74-
75-
} else if (rightTableName.equalsIgnoreCase(sideTableName)) {
76-
77-
equalFieldList.add(rightField);
78-
int equalFieldIndex = -1;
79-
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
80-
String fieldName = rowTypeInfo.getFieldNames()[i];
81-
if (fieldName.equalsIgnoreCase(leftField)) {
82-
equalFieldIndex = i;
83-
}
84-
}
85-
if (equalFieldIndex == -1) {
86-
throw new RuntimeException("can't deal equal field: " + sqlNode.toString());
87-
}
88-
89-
equalValIndex.add(equalFieldIndex);
90-
91-
} else {
92-
throw new RuntimeException("resolve equalFieldList error:" + sqlNode.toString());
93-
}
94-
95-
}
9645
}

‎mongo/mongo-side/mongo-async-side/src/main/java/com/dtstack/flink/sql/side/mongo/MongoAsyncSideInfo.java‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -60,57 +60,4 @@ public void buildEqualInfo(JoinInfo joinInfo, AbstractSideTableInfo sideTableInf
6060
}
6161
}
6262

63-
64-
@Override
65-
public void dealOneEqualCon(SqlNode sqlNode, String sideTableName){
66-
if(sqlNode.getKind() != SqlKind.EQUALS){
67-
throw new RuntimeException("not equal operator.");
68-
}
69-
70-
SqlIdentifier left = (SqlIdentifier)((SqlBasicCall)sqlNode).getOperands()[0];
71-
SqlIdentifier right = (SqlIdentifier)((SqlBasicCall)sqlNode).getOperands()[1];
72-
73-
String leftTableName = left.getComponent(0).getSimple();
74-
String leftField = left.getComponent(1).getSimple();
75-
76-
String rightTableName = right.getComponent(0).getSimple();
77-
String rightField = right.getComponent(1).getSimple();
78-
79-
if(leftTableName.equalsIgnoreCase(sideTableName)){
80-
equalFieldList.add(leftField);
81-
int equalFieldIndex = -1;
82-
for(int i=0; i<rowTypeInfo.getFieldNames().length; i++){
83-
String fieldName = rowTypeInfo.getFieldNames()[i];
84-
if(fieldName.equalsIgnoreCase(rightField)){
85-
equalFieldIndex = i;
86-
}
87-
}
88-
if(equalFieldIndex == -1){
89-
throw new RuntimeException("can't deal equal field: " + sqlNode);
90-
}
91-
92-
equalValIndex.add(equalFieldIndex);
93-
94-
}else if(rightTableName.equalsIgnoreCase(sideTableName)){
95-
96-
equalFieldList.add(rightField);
97-
int equalFieldIndex = -1;
98-
for(int i=0; i<rowTypeInfo.getFieldNames().length; i++){
99-
String fieldName = rowTypeInfo.getFieldNames()[i];
100-
if(fieldName.equalsIgnoreCase(leftField)){
101-
equalFieldIndex = i;
102-
}
103-
}
104-
if(equalFieldIndex == -1){
105-
throw new RuntimeException("can't deal equal field: " + sqlNode.toString());
106-
}
107-
108-
equalValIndex.add(equalFieldIndex);
109-
110-
}else{
111-
throw new RuntimeException("resolve equalFieldList error:" + sqlNode.toString());
112-
}
113-
114-
}
115-
11663
}

‎rdb/rdb-side/src/main/java/com/dtstack/flink/sql/side/rdb/async/RdbAsyncSideInfo.java‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -82,64 +82,10 @@ public void buildEqualInfo(JoinInfo joinInfo, AbstractSideTableInfo sideTableInf
8282
LOG.info("----------dimension sql query-----------\n{}", sqlCondition);
8383
}
8484

85-
86-
@Override
87-
public void dealOneEqualCon(SqlNode sqlNode, String sideTableName) {
88-
if (!SqlKind.COMPARISON.contains(sqlNode.getKind())) {
89-
throw new RuntimeException("not compare operator.");
90-
}
91-
92-
SqlIdentifier left = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[0];
93-
SqlIdentifier right = (SqlIdentifier) ((SqlBasicCall) sqlNode).getOperands()[1];
94-
95-
String leftTableName = left.getComponent(0).getSimple();
96-
String leftField = left.getComponent(1).getSimple();
97-
98-
String rightTableName = right.getComponent(0).getSimple();
99-
String rightField = right.getComponent(1).getSimple();
100-
101-
if (leftTableName.equalsIgnoreCase(sideTableName)) {
102-
equalFieldList.add(leftField);
103-
int equalFieldIndex = -1;
104-
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
105-
String fieldName = rowTypeInfo.getFieldNames()[i];
106-
if (fieldName.equalsIgnoreCase(rightField)) {
107-
equalFieldIndex = i;
108-
}
109-
}
110-
if (equalFieldIndex == -1) {
111-
throw new RuntimeException("can't deal equal field: " + sqlNode);
112-
}
113-
114-
equalValIndex.add(equalFieldIndex);
115-
116-
} else if (rightTableName.equalsIgnoreCase(sideTableName)) {
117-
118-
equalFieldList.add(rightField);
119-
int equalFieldIndex = -1;
120-
for (int i = 0; i < rowTypeInfo.getFieldNames().length; i++) {
121-
String fieldName = rowTypeInfo.getFieldNames()[i];
122-
if (fieldName.equalsIgnoreCase(leftField)) {
123-
equalFieldIndex = i;
124-
}
125-
}
126-
if (equalFieldIndex == -1) {
127-
throw new RuntimeException("can't deal equal field: " + sqlNode.toString());
128-
}
129-
130-
equalValIndex.add(equalFieldIndex);
131-
132-
} else {
133-
throw new RuntimeException("resolve equalFieldList error:" + sqlNode.toString());
134-
}
135-
136-
}
137-
13885
public String getAdditionalWhereClause() {
13986
return "";
14087
}
14188

142-
14389
public String getSelectFromStatement(String tableName, List<String> selectFields, List<String> conditionFields, List<String> sqlJoinCompareOperate,
14490
List<PredicateInfo> predicateInfoes) {
14591
String fromClause = selectFields.stream()

0 commit comments

Comments
 (0)