update version to 0.48.0-public

aliyun · Jul 22, 2024 · 6cd575f · 6cd575f
1 parent 241aff5
commit 6cd575f
Show file tree

Hide file tree

Showing 19 changed files with 64 additions and 44 deletions.
diff --git 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
@@ -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
@@ -6,11 +6,11 @@
 	<parent>
 		<groupId>com.aliyun.openservices.odps</groupId>
 		<artifactId>odps-console</artifactId>
-		<version>0.47.1-public</version>
+		<version>0.48.0-public</version>
 	</parent>
 	<groupId>com.aliyun.openservices.odps</groupId>
 	<artifactId>odps-console-auth</artifactId>
-	<version>0.47.1-public</version>
+	<version>0.48.0-public</version>
 	<name>odps-console-auth</name>
 
 	<properties>

diff --git a/odps-console-basic/pom.xml b/odps-console-basic/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
   </parent>
   <groupId>com.aliyun.openservices.odps</groupId>
   <artifactId>odps-console-basic</artifactId>
-  <version>0.47.1-public</version>
+  <version>0.48.0-public</version>
   <name>odps-console-basic</name>
   <url>http://odps.aliyun.com</url>
 

diff --git a/odps-console-cupid-public/pom.xml b/odps-console-cupid-public/pom.xml
@@ -33,11 +33,11 @@
   <parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
   </parent>
   <groupId>com.aliyun.openservices.odps</groupId>
   <artifactId>odps-console-cupid-public</artifactId>
-  <version>0.47.1-public</version>
+  <version>0.48.0-public</version>
   <name>odps-console-cupid-public</name>
 
   <dependencies>

diff --git a/odps-console-dist-public/pom.xml b/odps-console-dist-public/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>odps-console</artifactId>
     <groupId>com.aliyun.openservices.odps</groupId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/odps-console-dship/pom.xml b/odps-console-dship/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.aliyun.openservices.odps</groupId>
         <artifactId>odps-console</artifactId>
-        <version>0.47.1-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console-dship</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
     <name>odps-console-dship</name>
 
     <dependencies>

diff --git a/odps-console-mr/pom.xml b/odps-console-mr/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.aliyun.openservices.odps</groupId>
         <artifactId>odps-console</artifactId>
-        <version>0.47.1-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console-mr</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
     <name>odps-console-mr</name>
 
     <properties>

diff --git a/odps-console-public/pom.xml b/odps-console-public/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.aliyun.openservices.odps</groupId>
         <artifactId>odps-console</artifactId>
-        <version>0.47.1-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console-public</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
     <name>odps-console-public</name>
 
     <dependencies>

diff --git a/...e-public/src/main/java/com/aliyun/openservices/odps/console/pub/DescribeTableCommand.java b/...e-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<Table.ColumnMaskInfo> 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<String> 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/...blic/src/test/java/com/aliyun/openservices/odps/console/pub/ShowInstancesCommandTest.java b/...blic/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
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.aliyun.openservices.odps</groupId>
         <artifactId>odps-console</artifactId>
-        <version>0.47.1-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console-resource</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
     <name>odps-console-resource</name>
 
     <dependencies>

diff --git a/...e/src/test/java/com/aliyun/openservices/odps/console/resource/AddResourceCommandTest.java b/...e/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
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.aliyun.openservices.odps</groupId>
         <artifactId>odps-console</artifactId>
-        <version>0.47.1-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console-sql</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
     <name>odps-console-sql</name>
 
     <dependencies>

diff --git a/...nsole-sql/src/main/java/com/aliyun/openservices/odps/console/InteractiveQueryCommand.java b/...nsole-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
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.aliyun.openservices.odps</groupId>
         <artifactId>odps-console</artifactId>
-        <version>0.47.1-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console-tunnel</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
     <name>odps-console-tunnel</name>
 
     <properties>

diff --git a/odps-console-volume2/pom.xml b/odps-console-volume2/pom.xml
@@ -5,11 +5,11 @@
     <parent>
         <groupId>com.aliyun.openservices.odps</groupId>
         <artifactId>odps-console</artifactId>
-        <version>0.47.1-public</version>
+        <version>0.48.0-public</version>
     </parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console-volume2</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
     <name>odps-console-volume2</name>
 
     <dependencies>

diff --git a/odps-console-xflow/pom.xml b/odps-console-xflow/pom.xml
@@ -6,11 +6,11 @@
   <parent>
     <groupId>com.aliyun.openservices.odps</groupId>
     <artifactId>odps-console</artifactId>
-    <version>0.47.1-public</version>
+    <version>0.48.0-public</version>
   </parent>
   <groupId>com.aliyun.openservices.odps</groupId>
   <artifactId>odps-console-xflow</artifactId>
-  <version>0.47.1-public</version>
+  <version>0.48.0-public</version>
   <name>odps-console-xflow</name>
   <url>http://maven.apache.org</url>
   <properties>

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>com.aliyun.openservices.odps</groupId>
   <artifactId>odps-console</artifactId>
-  <version>0.47.1-public</version>
+  <version>0.48.0-public</version>
   <packaging>pom</packaging>
 
   <name>odps-console</name>
@@ -35,7 +35,7 @@
   </licenses>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <odps.sdk.version>0.47.0-public</odps.sdk.version>
+    <odps.sdk.version>0.48.6-public</odps.sdk.version>
     <hadoop.version>3.3.3</hadoop.version>
   </properties>