Skip to content

Commit

Permalink
remove flink shade class
Browse files Browse the repository at this point in the history
  • Loading branch information
@todd5167
todd5167 committed Nov 11, 2019
1 parent 236312b commit 7ffe70b
Show file tree
Hide file tree
Showing 88 changed files with 144 additions and 206 deletions.
4 changes: 2 additions & 2 deletions ...andra-all-side/src/main/java/com/dtstack/flink/sql/side/cassandra/CassandraAllReqRow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
import org.apache.calcite.sql.JoinType;
import org.apache.commons.collections.CollectionUtils;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.flink.table.typeutils.TimeIndicatorTypeInfo;
import org.apache.flink.types.Row;
import org.apache.flink.util.Collector;
Expand Down
4 changes: 1 addition & 3 deletions ...dra-all-side/src/main/java/com/dtstack/flink/sql/side/cassandra/CassandraAllSideInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@
import com.dtstack.flink.sql.side.SideTableInfo;
import com.dtstack.flink.sql.side.cassandra.table.CassandraSideTableInfo;
import com.dtstack.flink.sql.util.ParseUtils;
import org.apache.calcite.sql.SqlBasicCall;
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.SqlNode;
import org.apache.commons.collections.CollectionUtils;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import com.google.common.collect.Lists;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...a-async-side/src/main/java/com/dtstack/flink/sql/side/cassandra/CassandraAsyncReqRow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import io.vertx.core.json.JsonArray;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.shaded.guava18.com.google.common.collect.Lists;
import com.google.common.collect.Lists;
import org.apache.flink.streaming.api.functions.async.ResultFuture;
import org.apache.flink.table.typeutils.TimeIndicatorTypeInfo;
import org.apache.flink.types.Row;
Expand Down
2 changes: 1 addition & 1 deletion ...async-side/src/main/java/com/dtstack/flink/sql/side/cassandra/CassandraAsyncSideInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.SqlNode;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import com.google.common.collect.Lists;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...core/src/main/java/com/dtstack/flink/sql/side/cassandra/table/CassandraSideTableInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package com.dtstack.flink.sql.side.cassandra.table;

import com.dtstack.flink.sql.side.SideTableInfo;
import org.apache.flink.calcite.shaded.com.google.common.base.Preconditions;
import com.google.common.base.Preconditions;

/**
* Reason:
Expand Down
2 changes: 1 addition & 1 deletion ...dra-sink/src/main/java/com/dtstack/flink/sql/sink/cassandra/table/CassandraTableInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
package com.dtstack.flink.sql.sink.cassandra.table;

import com.dtstack.flink.sql.table.TargetTableInfo;
import org.apache.flink.calcite.shaded.com.google.common.base.Preconditions;
import com.google.common.base.Preconditions;

/**
* Reason:
Expand Down
6 changes: 0 additions & 6 deletions core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,6 @@
<version>${flink.version}</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-hadoop2</artifactId>
<version>1.7.2</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-yarn_2.11</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/java/com/dtstack/flink/sql/Main.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.client.program.ContextEnvironment;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.shaded.guava18.com.google.common.base.Strings;
import org.apache.flink.shaded.guava18.com.google.common.collect.Lists;
import org.apache.flink.shaded.guava18.com.google.common.collect.Maps;
import org.apache.flink.shaded.guava18.com.google.common.collect.Sets;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.environment.StreamContextEnvironment;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/dtstack/flink/sql/option/OptionParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

package com.dtstack.flink.sql.option;

import avro.shaded.com.google.common.collect.Lists;
import com.google.common.collect.Lists;
import com.dtstack.flink.sql.util.PluginUtil;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/dtstack/flink/sql/parser/CreateTableParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package com.dtstack.flink.sql.parser;

import com.dtstack.flink.sql.util.DtStringUtil;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import com.google.common.collect.Maps;

import java.util.List;
import java.util.Map;
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/java/com/dtstack/flink/sql/parser/CreateTmpTableParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
import org.apache.calcite.sql.*;
import org.apache.calcite.sql.parser.SqlParseException;
import org.apache.calcite.sql.parser.SqlParser;
import org.apache.flink.shaded.guava18.com.google.common.collect.Lists;

import com.google.common.collect.Lists;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/dtstack/flink/sql/parser/InsertSqlParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.calcite.sql.parser.SqlParseException;
import org.apache.calcite.sql.parser.SqlParser;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.shaded.guava18.com.google.common.collect.Lists;
import com.google.common.collect.Lists;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/dtstack/flink/sql/parser/SqlParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import com.dtstack.flink.sql.table.TableInfoParser;
import com.dtstack.flink.sql.util.DtStringUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.shaded.curator.org.apache.curator.shaded.com.google.common.collect.Lists;
import org.apache.flink.shaded.guava18.com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.base.Strings;

import java.util.List;
import java.util.Set;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/dtstack/flink/sql/parser/SqlTree.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@


import com.dtstack.flink.sql.table.TableInfo;
import org.apache.flink.shaded.curator.org.apache.curator.shaded.com.google.common.collect.Maps;
import org.apache.flink.shaded.guava18.com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Lists;

import java.util.List;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/dtstack/flink/sql/side/FieldReplaceInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

package com.dtstack.flink.sql.side;

import org.apache.flink.calcite.shaded.com.google.common.collect.HashBasedTable;
import com.google.common.collect.HashBasedTable;

/**
* Reason:
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/dtstack/flink/sql/side/JoinInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import org.apache.calcite.sql.JoinType;
import org.apache.calcite.sql.SqlNode;
import org.apache.flink.calcite.shaded.com.google.common.base.Strings;
import com.google.common.base.Strings;

import java.io.Serializable;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/dtstack/flink/sql/side/JoinScope.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;

import java.util.List;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/com/dtstack/flink/sql/side/ParserJoinField.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.calcite.sql.SqlSelect;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import com.google.common.collect.Lists;

import java.util.Iterator;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/dtstack/flink/sql/side/SideInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import org.apache.calcite.sql.SqlKind;
import org.apache.calcite.sql.SqlNode;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;

import java.io.Serializable;
import java.util.List;
Expand Down
9 changes: 4 additions & 5 deletions core/src/main/java/com/dtstack/flink/sql/side/SideSQLParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,13 @@
import org.apache.calcite.sql.parser.SqlParserPos;
import org.apache.commons.collections.CollectionUtils;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.calcite.shaded.com.google.common.base.Strings;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import org.apache.flink.calcite.shaded.com.google.common.collect.Queues;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Queues;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Queue;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/com/dtstack/flink/sql/side/SideSqlExec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.calcite.shaded.com.google.common.collect.HashBasedTable;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import com.google.common.collect.HashBasedTable;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.table.api.Table;
import org.apache.flink.table.api.java.StreamTableEnvironment;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/dtstack/flink/sql/side/cache/LRUSideCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
package com.dtstack.flink.sql.side.cache;

import com.dtstack.flink.sql.side.SideTableInfo;
import org.apache.flink.calcite.shaded.com.google.common.cache.Cache;
import org.apache.flink.calcite.shaded.com.google.common.cache.CacheBuilder;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;

import java.util.concurrent.TimeUnit;

Expand Down
2 changes: 0 additions & 2 deletions core/src/main/java/com/dtstack/flink/sql/table/AbsSideTableParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import com.dtstack.flink.sql.enums.ECacheType;
import com.dtstack.flink.sql.side.SideTableInfo;
import com.dtstack.flink.sql.util.MathUtil;
import org.apache.commons.lang3.StringUtils;

import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down
5 changes: 2 additions & 3 deletions core/src/main/java/com/dtstack/flink/sql/table/AbsTableParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@

import com.dtstack.flink.sql.util.ClassUtil;
import com.dtstack.flink.sql.util.DtStringUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import org.apache.flink.shaded.curator.org.apache.curator.shaded.com.google.common.collect.Maps;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;

import java.util.List;
import java.util.Map;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/com/dtstack/flink/sql/table/SourceTableInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

package com.dtstack.flink.sql.table;

import org.apache.flink.calcite.shaded.com.google.common.base.Strings;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.flink.util.StringUtils;

import java.util.ArrayList;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/dtstack/flink/sql/table/TableInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

package com.dtstack.flink.sql.table;

import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import org.apache.flink.shaded.guava18.com.google.common.collect.Maps;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;

import java.io.Serializable;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/com/dtstack/flink/sql/table/TableInfoParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import com.dtstack.flink.sql.sink.StreamSinkFactory;
import com.dtstack.flink.sql.source.StreamSourceFactory;
import com.dtstack.flink.sql.util.MathUtil;
import org.apache.flink.calcite.shaded.com.google.common.base.Strings;
import org.apache.flink.shaded.curator.org.apache.curator.shaded.com.google.common.collect.Maps;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;

import java.util.Map;
import java.util.regex.Matcher;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/com/dtstack/flink/sql/util/DtStringUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

import com.dtstack.flink.sql.enums.ColumnType;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.calcite.shaded.com.google.common.base.Strings;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Strings;
import com.google.common.collect.Maps;
import com.fasterxml.jackson.databind.ObjectMapper;
import java.sql.Timestamp;
import java.math.BigDecimal;
import java.util.ArrayList;
Expand Down
1 change: 0 additions & 1 deletion core/src/main/java/com/dtstack/flink/sql/util/ParseUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.sql.fun.SqlCase;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.calcite.shaded.com.google.common.collect.HashBasedTable;

import java.util.List;
import java.util.Map;
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/com/dtstack/flink/sql/util/PluginUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@

import com.dtstack.flink.sql.classloader.DtClassLoader;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerationException;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonParseException;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonMappingException;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonGenerationException;
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.io.ByteArrayInputStream;
import java.io.File;
Expand Down
5 changes: 1 addition & 4 deletions core/src/main/java/com/dtstack/flink/sql/watermarker/WaterMarkerAssigner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@
package com.dtstack.flink.sql.watermarker;

import com.dtstack.flink.sql.table.SourceTableInfo;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.apache.flink.api.common.typeinfo.TypeInformation;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.shaded.guava18.com.google.common.base.Strings;
import com.google.common.base.Strings;
import org.apache.flink.streaming.api.datastream.DataStream;
import org.apache.flink.streaming.api.functions.timestamps.BoundedOutOfOrdernessTimestampExtractor;
import org.apache.flink.streaming.api.windowing.time.Time;
import org.apache.flink.types.Row;
import org.apache.flink.util.Preconditions;
Expand Down
6 changes: 2 additions & 4 deletions core/src/test/java/com/dtstack/flink/sql/side/SideSqlExecTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,10 @@
import com.dtstack.flink.sql.Main;
import com.dtstack.flink.sql.parser.SqlParser;
import com.dtstack.flink.sql.parser.SqlTree;
import org.apache.flink.calcite.shaded.com.google.common.base.Charsets;
import org.apache.flink.calcite.shaded.com.google.common.collect.Lists;
import com.google.common.base.Charsets;
import com.google.common.collect.Lists;
import org.junit.Test;

import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion core/src/test/java/com/dtstack/flink/sql/side/TestSideSqlParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
package com.dtstack.flink.sql.side;

import org.apache.calcite.sql.parser.SqlParseException;
import org.apache.flink.calcite.shaded.com.google.common.collect.Sets;
import com.google.common.collect.Sets;
import org.junit.Test;

import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/com/dtstack/flink/sql/sink/elasticsearch/table/ElasticsearchTableInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@


import com.dtstack.flink.sql.table.TargetTableInfo;
import org.apache.flink.calcite.shaded.com.google.common.base.Preconditions;
import com.google.common.base.Preconditions;

/**
* @date 2018/09/12
Expand Down
2 changes: 1 addition & 1 deletion ...se-side/hbase-all-side/src/main/java/com/dtstack/flink/sql/side/hbase/HbaseAllReqRow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import com.dtstack.flink.sql.side.hbase.table.HbaseSideTableInfo;
import org.apache.commons.collections.map.HashedMap;
import org.apache.flink.api.java.typeutils.RowTypeInfo;
import org.apache.flink.calcite.shaded.com.google.common.collect.Maps;
import com.google.common.collect.Maps;
import org.apache.flink.table.typeutils.TimeIndicatorTypeInfo;
import org.apache.flink.types.Row;
import org.apache.flink.util.Collector;
Expand Down
Loading

0 comments on commit 7ffe70b

Please sign in to comment.