Merge branch 'main' into parquet-cos

Conflicts: dagger-common/build.gradle dagger-functions/src/main/java/com/gotocompany/dagger/functions/udfs/scalar/dart/store/DartDataStoreClientProvider.java
goto · Jan 23, 2025 · a67b35c · a67b35c
2 parents f814e4e + a9e00e8
commit a67b35c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/dagger-common/build.gradle b/dagger-common/build.gradle
@@ -66,8 +66,11 @@ dependencies {
     }
     dependenciesCommonJar group: 'com.google.cloud.bigdataoss', name: 'gcs-connector', version: 'hadoop2-2.2.16'
     dependenciesCommonJar group: 'com.qcloud.cos', name: 'flink-cos-fs-hadoop', version: '1.10.0-0.1.10'
+
     dependenciesCommonJar group: 'org.apache.hadoop', name: 'hadoop-aliyun', version: '3.4.1'
     dependenciesCommonJar group: 'org.apache.hadoop', name: 'hadoop-cos', version: '3.3.5'
+    dependenciesCommonJar group: 'org.apache.hadoop', name: 'hadoop-aliyun', version: '3.4.1'
+
     dependenciesCommonJar 'org.apache.flink:flink-metrics-dropwizard:' + flinkVersion
     dependenciesCommonJar 'org.apache.flink:flink-json:' + flinkVersion
     dependenciesCommonJar 'com.jayway.jsonpath:json-path:2.4.0'

diff --git a/.../com/gotocompany/dagger/functions/udfs/scalar/dart/store/DartDataStoreClientProvider.java b/.../com/gotocompany/dagger/functions/udfs/scalar/dart/store/DartDataStoreClientProvider.java
@@ -33,11 +33,9 @@ public DartDataStoreClient getDartDataStoreClient() {
                 dartDataStoreClient = new GcsDartClient(projectID);
                 break;
             case Constants.UDF_STORE_PROVIDER_OSS:
-                // TODO Check if OSS SDK supports projectID selection
                 dartDataStoreClient = new OssDartClient();
                 break;
             case Constants.UDF_STORE_PROVIDER_COS:
-                // TODO Check if COS SDK supports projectID selection
                 dartDataStoreClient = new CosDartClient();
                 break;
             default: