diff --git a/CHANGELOG.md b/CHANGELOG.md index 541f0f2..2ea5631 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# 0.48.0-public [2024-07-22] +### Features +- The odps-sdk version has been upgraded from `0.47.0-public` to `0.48.6-public`. For the enhancements and fixes included, please refer to [odps-sdk change log](https://github.com/aliyun/aliyun-odps-java-sdk/blob/release/0.48.x/CHANGELOG.md) +### Fixes +- MCQA mode can more accurately identify fallback behavior and avoid repeated display of logview + + # 0.47.1-public [2024-05-23] ### Features - Add new config params `network_read_timeout` and `network_connect_timeout` to configure network timeout diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md index 43aa82f..1b63751 100644 --- a/CHANGELOG_CN.md +++ b/CHANGELOG_CN.md @@ -1,4 +1,10 @@ # 更新日志 +# 0.48.0-public [2024-07-22] +### 新功能 +- odps-sdk 版本从 `0.47.0-public` 升级至 `0.48.6-public`, 包含的增强和修复参阅 [odps-sdk 变更日志](https://github.com/aliyun/aliyun-odps-java-sdk/blob/release/0.48.x/CHANGELOG_CN.md) +### 修复 +- MCQA 模式能够更准确的识别 fallback 行为,避免对 logview 的重复展示 + # 0.47.1-public [2024-05-23] ### 新功能 diff --git a/odps-console-auth/pom.xml b/odps-console-auth/pom.xml index c35274b..51bdcab 100644 --- a/odps-console-auth/pom.xml +++ b/odps-console-auth/pom.xml @@ -6,11 +6,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-auth - 0.47.1-public + 0.48.0-public odps-console-auth diff --git a/odps-console-basic/pom.xml b/odps-console-basic/pom.xml index 70bbcff..d999b55 100644 --- a/odps-console-basic/pom.xml +++ b/odps-console-basic/pom.xml @@ -6,11 +6,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-basic - 0.47.1-public + 0.48.0-public odps-console-basic http://odps.aliyun.com diff --git a/odps-console-cupid-public/pom.xml b/odps-console-cupid-public/pom.xml index 0315dd6..106490e 100644 --- a/odps-console-cupid-public/pom.xml +++ b/odps-console-cupid-public/pom.xml @@ -33,11 +33,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-cupid-public - 0.47.1-public + 0.48.0-public odps-console-cupid-public diff --git a/odps-console-dist-public/pom.xml b/odps-console-dist-public/pom.xml index 46cc869..715adf6 100644 --- a/odps-console-dist-public/pom.xml +++ b/odps-console-dist-public/pom.xml @@ -5,7 +5,7 @@ odps-console com.aliyun.openservices.odps - 0.47.1-public + 0.48.0-public 4.0.0 diff --git a/odps-console-dship/pom.xml b/odps-console-dship/pom.xml index b55d708..f42aeab 100644 --- a/odps-console-dship/pom.xml +++ b/odps-console-dship/pom.xml @@ -6,11 +6,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-dship - 0.47.1-public + 0.48.0-public odps-console-dship diff --git a/odps-console-mr/pom.xml b/odps-console-mr/pom.xml index 4441d03..ac600a0 100644 --- a/odps-console-mr/pom.xml +++ b/odps-console-mr/pom.xml @@ -5,11 +5,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-mr - 0.47.1-public + 0.48.0-public odps-console-mr diff --git a/odps-console-public/pom.xml b/odps-console-public/pom.xml index 86732fc..bfcb21d 100644 --- a/odps-console-public/pom.xml +++ b/odps-console-public/pom.xml @@ -5,11 +5,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-public - 0.47.1-public + 0.48.0-public odps-console-public diff --git a/odps-console-public/src/main/java/com/aliyun/openservices/odps/console/pub/DescribeTableCommand.java b/odps-console-public/src/main/java/com/aliyun/openservices/odps/console/pub/DescribeTableCommand.java index e920d8d..84ba4d8 100644 --- a/odps-console-public/src/main/java/com/aliyun/openservices/odps/console/pub/DescribeTableCommand.java +++ b/odps-console-public/src/main/java/com/aliyun/openservices/odps/console/pub/DescribeTableCommand.java @@ -453,20 +453,8 @@ private String getExtendedScreenDisplay(Table t, Partition pt) throws ODPSConsol if (isAcid2Table) { appendAcidInfo(t, t.getClusterInfo(), w); } - // storageTier 需要区分是分区表还是非分区表 - if (t.isPartitioned()) { //分区表显示汇总 - StorageTierInfo storageTierInfo = t.getStorageTierInfo(); - if (storageTierInfo != null) { - for (StorageTier tier : StorageTier.values()) { - if (storageTierInfo.getStorageSize(tier) != null) { - w.printf("| %s:%s %-56d |\n", tier.getSizeName(), - getSpace(24 - tier.getSizeName().length()), - storageTierInfo.getStorageSize(tier)); - } - } - } - } else { //非分区表只显示类型和修改时间 - if (t.getStorageTierInfo() != null) { + // storageTier 仅支持非分区表 + if (!t.isPartitioned() && (t.getStorageTierInfo() != null)) { if (t.getStorageTierInfo().getStorageTier() != null) { w.printf("| StorageTier: %-56s |\n", t.getStorageTierInfo().getStorageTier().getName()); @@ -475,7 +463,7 @@ private String getExtendedScreenDisplay(Table t, Partition pt) throws ODPSConsol if (lastModifiedTime != null) { w.printf("| StorageTierLastModifiedTime: %-52s |\n", df.format(lastModifiedTime)); } - } + } w.println( @@ -511,6 +499,27 @@ private String getExtendedScreenDisplay(Table t, Partition pt) throws ODPSConsol "+------------------------------------------------------------------------------------+"); } } + + List columnMaskInfo = t.getColumnMaskInfo(); + if (columnMaskInfo != null) { + w.println("| Data Masking Policy Detail: |"); + w.println("+------------------------------------------------------------------------------------+"); + w.println("| Column Name | Policy Name List |"); + w.println("+------------------------------------------------------------------------------------+"); + for (Table.ColumnMaskInfo columnMaskInfoItem : columnMaskInfo) { + String name = columnMaskInfoItem.getName(); + List policyNames = columnMaskInfoItem.getPolicyNameList(); + for (int i = 0; i < policyNames.size(); i++) { + if (i == 0) { + w.printf("| %-25s | %-54s |\n", name, policyNames.get(i)); + } else { + w.printf("| %-25s | %-54s |\n", "", policyNames.get(i)); + } + } + w.println("+------------------------------------------------------------------------------------+"); + } + + } } catch (Exception e) { throw new ODPSConsoleException(ErrorCode.INVALID_RESPONSE + ": Invalid table schema.", e); } diff --git a/odps-console-public/src/test/java/com/aliyun/openservices/odps/console/pub/ShowInstancesCommandTest.java b/odps-console-public/src/test/java/com/aliyun/openservices/odps/console/pub/ShowInstancesCommandTest.java index de65c62..16c11cf 100644 --- a/odps-console-public/src/test/java/com/aliyun/openservices/odps/console/pub/ShowInstancesCommandTest.java +++ b/odps-console-public/src/test/java/com/aliyun/openservices/odps/console/pub/ShowInstancesCommandTest.java @@ -59,7 +59,6 @@ public void testMatchPositive() throws OdpsException, ODPSConsoleException { for (String cmd : positives) { test = ShowInstanceCommand.parse(cmd, ctx); Assert.assertNotNull(test); - test.run(); } } diff --git a/odps-console-resource/pom.xml b/odps-console-resource/pom.xml index 0466238..1116c76 100644 --- a/odps-console-resource/pom.xml +++ b/odps-console-resource/pom.xml @@ -5,11 +5,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-resource - 0.47.1-public + 0.48.0-public odps-console-resource diff --git a/odps-console-resource/src/test/java/com/aliyun/openservices/odps/console/resource/AddResourceCommandTest.java b/odps-console-resource/src/test/java/com/aliyun/openservices/odps/console/resource/AddResourceCommandTest.java index d5781cf..35b05b2 100644 --- a/odps-console-resource/src/test/java/com/aliyun/openservices/odps/console/resource/AddResourceCommandTest.java +++ b/odps-console-resource/src/test/java/com/aliyun/openservices/odps/console/resource/AddResourceCommandTest.java @@ -247,8 +247,6 @@ public void testAddVolumeArchiveExecute() throws ODPSConsoleException, OdpsExcep assertNotNull(command); command.execute(); - command = ListResourcesCommand.parse("list resources", context); - command.execute(); command = DescribeResourceCommand.parse("desc resource volumearchive.zip", context); command.execute(); diff --git a/odps-console-sql/pom.xml b/odps-console-sql/pom.xml index 7845f5e..51f1648 100644 --- a/odps-console-sql/pom.xml +++ b/odps-console-sql/pom.xml @@ -5,11 +5,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-sql - 0.47.1-public + 0.48.0-public odps-console-sql diff --git a/odps-console-sql/src/main/java/com/aliyun/openservices/odps/console/InteractiveQueryCommand.java b/odps-console-sql/src/main/java/com/aliyun/openservices/odps/console/InteractiveQueryCommand.java index 5f70e17..60fe4d8 100644 --- a/odps-console-sql/src/main/java/com/aliyun/openservices/odps/console/InteractiveQueryCommand.java +++ b/odps-console-sql/src/main/java/com/aliyun/openservices/odps/console/InteractiveQueryCommand.java @@ -78,6 +78,7 @@ public class InteractiveQueryCommand extends MultiClusterCommandBase { private static String showVarsRegex = "show\\s+variables"; private static String fallbackMessage = "Query failed"; private static String rerunInteractiveMode = "Will rerun in interactive mode"; + private static String runOfflineMode = "Running in offline mode"; private Lock waitLogviewLock = new ReentrantLock(); private Condition waitLogviewCond = waitLogviewLock.newCondition(); @@ -134,7 +135,7 @@ private void checkQueryStatus() { needAppendLogview = true; break; } - if (log.contains(fallbackMessage)) { + if (log.contains(fallbackMessage) || log.contains(runOfflineMode)) { needAppendLogview = false; } } diff --git a/odps-console-tunnel/pom.xml b/odps-console-tunnel/pom.xml index 9708c12..6b5f94f 100644 --- a/odps-console-tunnel/pom.xml +++ b/odps-console-tunnel/pom.xml @@ -5,11 +5,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-tunnel - 0.47.1-public + 0.48.0-public odps-console-tunnel diff --git a/odps-console-volume2/pom.xml b/odps-console-volume2/pom.xml index ca1fb97..403fb82 100644 --- a/odps-console-volume2/pom.xml +++ b/odps-console-volume2/pom.xml @@ -5,11 +5,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-volume2 - 0.47.1-public + 0.48.0-public odps-console-volume2 diff --git a/odps-console-xflow/pom.xml b/odps-console-xflow/pom.xml index 78108ce..64da4ad 100644 --- a/odps-console-xflow/pom.xml +++ b/odps-console-xflow/pom.xml @@ -6,11 +6,11 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public com.aliyun.openservices.odps odps-console-xflow - 0.47.1-public + 0.48.0-public odps-console-xflow http://maven.apache.org diff --git a/pom.xml b/pom.xml index b923eab..9f4803c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ com.aliyun.openservices.odps odps-console - 0.47.1-public + 0.48.0-public pom odps-console @@ -35,7 +35,7 @@ UTF-8 - 0.47.0-public + 0.48.6-public 3.3.3