Skip to content

Commit

Permalink
fix comment
Browse files Browse the repository at this point in the history
  • Loading branch information
@hubgeter
hubgeter committed Sep 11, 2024
1 parent 349544f commit 9d37687
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 22 deletions.
4 changes: 2 additions & 2 deletions fe/be-java-extensions/max-compute-scanner/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>com.aliyun.odps</groupId>
<artifactId>odps-sdk-core</artifactId>
<version>0.48.8-public</version>
<version>${maxcompute.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
Expand All @@ -58,7 +58,7 @@ under the License.
<dependency>
<groupId>com.aliyun.odps</groupId>
<artifactId>odps-sdk-table-api</artifactId>
<version>0.48.8-public</version>
<version>${maxcompute.version}</version>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
Expand Down
4 changes: 2 additions & 2 deletions fe/fe-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ under the License.
<dependency>
<groupId>com.aliyun.odps</groupId>
<artifactId>odps-sdk-core</artifactId>
<version>0.48.8-public</version>
<version>${maxcompute.version}</version>
<exclusions>
<exclusion>
<artifactId>antlr-runtime</artifactId>
Expand All @@ -457,7 +457,7 @@ under the License.
<dependency>
<groupId>com.aliyun.odps</groupId>
<artifactId>odps-sdk-table-api</artifactId>
<version>0.48.8-public</version>
<version>${maxcompute.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web -->
<dependency>
Expand Down
2 changes: 0 additions & 2 deletions ...-core/src/main/java/org/apache/doris/datasource/maxcompute/source/MaxComputeScanNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,8 +345,6 @@ private String convertLiteralToOdpsValues(OdpsType odpsType, Expr expr) throws A
}
LiteralExpr literalExpr = (LiteralExpr) expr;

literalExpr.toString();

switch (odpsType) {
case BOOLEAN:
case TINYINT:
Expand Down
2 changes: 1 addition & 1 deletion fe/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ under the License.
<!-- Please modify iceberg.version and avro.version together,
you can find avro version info in iceberg mvn repository -->
<iceberg.version>1.4.3</iceberg.version>
<maxcompute.version>0.45.2-public</maxcompute.version>
<maxcompute.version>0.48.8-public</maxcompute.version>
<avro.version>1.11.3</avro.version>
<arrow.version>17.0.0</arrow.version>
<!-- hudi -->
Expand Down
49 changes: 43 additions & 6 deletions regression-test/data/external_table_p2/maxcompute/test_external_catalog_maxcompute.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,38 +10,56 @@
-- !q3 --
false -1 -1 -1
false 0 0 0
false 10 1000 10000
false 127 32767 9223372036854775807
false 2 200 2000
false 4 400 4000
false 6 600 6000
false 8 800 8000
true -128 -32768 -9223372036854775807
true 0 0 0
true 1 1 1
true 1 100 1000
true 3 300 3000
true 5 500 5000
true 7 700 7000
true 9 900 9000

-- !q3_1 --
false -1 -1 -1
false 0 0 0
false 0 0 0
false 10 1000 10000
false 127 32767 9223372036854775807
false 127 32767 9223372036854775807
false 2 200 2000
false 4 400 4000
false 6 600 6000
false 8 800 8000
true -128 -32768 -9223372036854775807
true 0 0 0
true 1 1 1
true 1 100 1000
true 3 300 3000
true 5 500 5000
true 7 700 7000
true 9 900 9000

-- !q3_2 --
false -1 -1 -1
false -1 -1 -1
false 0 0 0
false 0 0 0
false 10 1000 10000
false 127 32767 9223372036854775807
false 2 200 2000
false 4 400 4000
false 6 600 6000
false 8 800 8000
true -128 -32768 -9223372036854775807
true 0 0 0
true 0 0 0
true 1 1 1
true 1 1 1
true 1 100 1000
true 3 300 3000
true 5 500 5000
true 7 700 7000
true 9 900 9000

-- !q4 --
1003 Sample data 3 2023-08-03
Expand All @@ -65,19 +83,35 @@ true 1 100 1000
1005 Sample data 5 2023-08-05

-- !multi_partition_q1 --
yy=2023/mm=08/dd=01/pt=1
yy=2023/mm=08/dd=02/pt=2
yy=2023/mm=08/dd=03/pt=3
yy=2023/mm=08/dd=04/pt=4
yy=2023/mm=08/dd=05/pt=5

-- !multi_partition_q2 --
1 2023-08-01T10:30 2023 08 01
1 2023-08-01T12:00 2023 08 01
2 2023-08-02T08:15 2023 08 02
2 2023-08-02T14:45 2023 08 02
3 2023-08-03T09:00 2023 08 03
3 2023-08-03T11:30 2023 08 03
4 2023-08-04T07:00 2023 08 04
4 2023-08-04T10:00 2023 08 04
5 2023-08-05T13:00 2023 08 05
5 2023-08-05T15:30 2023 08 05

-- !multi_partition_q3 --
1 2023-08-01T10:30 2023 08 01
1 2023-08-01T12:00 2023 08 01
2 2023-08-02T08:15 2023 08 02
2 2023-08-02T14:45 2023 08 02
3 2023-08-03T09:00 2023 08 03
3 2023-08-03T11:30 2023 08 03
4 2023-08-04T07:00 2023 08 04
4 2023-08-04T10:00 2023 08 04
5 2023-08-05T13:00 2023 08 05
5 2023-08-05T15:30 2023 08 05

-- !multi_partition_q4 --
10
Expand All @@ -101,4 +135,7 @@ yy=2023/mm=08/dd=05/pt=5
3 2023 08 03
3 2023 08 03
4 2023 08 04
4 2023 08 04
5 2023 08 05
5 2023 08 05

14 changes: 7 additions & 7 deletions regression-test/suites/external_table_p2/maxcompute/test_external_catalog_maxcompute.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
);
*/
suite("test_external_catalog_maxcompute", "p2,external,doris,external_docker,external_docker_doris") {
suite("test_external_catalog_maxcompute", "p2,external,maxcompute,external_remote,external_remote_maxcompute") {
String enabled = context.config.otherConfigs.get("enableMaxComputeTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String ak = context.config.otherConfigs.get("aliYunAk")
Expand All @@ -307,8 +307,8 @@ suite("test_external_catalog_maxcompute", "p2,external,doris,external_docker,ext
def q02 = {
order_qt_q2 """ select * from web_site where web_site_id>='WS0003' order by web_site_id; """ // test char,date,varchar,double,decimal
order_qt_q3 """ select * from int_types """ // test bool,tinyint,int,bigint
order_qt_q3_1 """ select * from int_types order by mc_boolean limit 10 """
order_qt_q3_2 """ select * from int_types order by mc_int limit 10 """
order_qt_q3_1 """ select * from int_types order by mc_boolean """
order_qt_q3_2 """ select * from int_types order by mc_int"""
}
// test partition table filter
def q03 = {
Expand Down Expand Up @@ -344,14 +344,14 @@ suite("test_external_catalog_maxcompute", "p2,external,doris,external_docker,ext
sql """ switch `${mc_catalog_name}`; """
sql """ use `${mc_db}`; """
order_qt_multi_partition_q1 """ show partitions from multi_partitions; """
order_qt_multi_partition_q2 """ select pt, create_time, yy, mm, dd from multi_partitions where pt>-1 and yy > '' and mm > '' and dd >'' order by pt , dd limit 3; """
order_qt_multi_partition_q3 """ select sum(pt), create_time, yy, mm, dd from multi_partitions where yy > '' and mm > '' and dd >'' group by create_time, yy, mm, dd order by create_time,dd limit 3; """
order_qt_multi_partition_q2 """ select pt, create_time, yy, mm, dd from multi_partitions where pt>-1 and yy > '' and mm > '' and dd >'' order by pt , dd; """
order_qt_multi_partition_q3 """ select sum(pt), create_time, yy, mm, dd from multi_partitions where yy > '' and mm > '' and dd >'' group by create_time, yy, mm, dd order by create_time,dd ; """
order_qt_multi_partition_q4 """ select count(*) from multi_partitions where pt>-1 and yy > '' and mm > '' and dd <= '30'; """
order_qt_multi_partition_q5 """ select create_time, yy, mm, dd from multi_partitions where yy = '2023' and mm='08' and dd='04' order by pt limit 3; """
order_qt_multi_partition_q5 """ select create_time, yy, mm, dd from multi_partitions where yy = '2023' and mm='08' and dd='04' order by pt ; """
order_qt_multi_partition_q6 """ select max(pt), yy, mm from multi_partitions where yy = '2023' and mm='08' group by yy, mm order by yy, mm; """
order_qt_multi_partition_q7 """ select count(*) from multi_partitions where yy < '2023' or dd < '03'; """
order_qt_multi_partition_q8 """ select count(*) from multi_partitions where pt>=3; """
order_qt_multi_partition_q9 """ select city,mnt,gender,finished_time,order_rate,cut_date,create_time,pt, yy, mm, dd from multi_partitions where pt >= 2 and pt < 4 and finished_time is not null; """
order_qt_multi_partition_q10 """ select pt, yy, mm, dd from multi_partitions where pt >= 2 and create_time > '2023-08-03 03:11:00' order by pt, yy, mm, dd limit 3; """
order_qt_multi_partition_q10 """ select pt, yy, mm, dd from multi_partitions where pt >= 2 and create_time > '2023-08-03 03:11:00' order by pt, yy, mm, dd; """
}
}
2 changes: 1 addition & 1 deletion regression-test/suites/external_table_p2/maxcompute/test_max_compute_all_type.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ ALTER TABLE mc_all_types MERGE SMALLFILES;
select * from mc_all_types;
*/
suite("test_max_compute_all_type", "p2,external,doris,external_docker,external_docker_doris") {
suite("test_max_compute_all_type", "p2,external,maxcompute,external_remote,external_remote_maxcompute") {
String enabled = context.config.otherConfigs.get("enableMaxComputeTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String ak = context.config.otherConfigs.get("aliYunAk")
Expand Down
2 changes: 1 addition & 1 deletion regression-test/suites/external_table_p2/maxcompute/test_max_compute_complex_type.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
)
);
*/
suite("test_max_compute_complex_type", "p2,external,doris,external_docker,external_docker_doris") {
suite("test_max_compute_complex_type", "p2,external,maxcompute,external_remote,external_remote_maxcompute") {
String enabled = context.config.otherConfigs.get("enableMaxComputeTest")
if (enabled != null && enabled.equalsIgnoreCase("true")) {
String ak = context.config.otherConfigs.get("aliYunAk")
Expand Down

0 comments on commit 9d37687

Please sign in to comment.