[carbondata] branch master updated: [ISSUE-4305] Optimize the magic number

[ch...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

chenliang613 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/carbondata.git


The following commit(s) were added to refs/heads/master by this push:
     new 3cc0367713 [ISSUE-4305] Optimize the magic number
     new cba9a8a0d7 Merge pull request #4307 from xubo245/ISSUE-4305-magicNumber
3cc0367713 is described below

commit 3cc03677133b14fa2128b8f7eb166b54da33e19d
Author: xubo245 <60...@qq.com>
AuthorDate: Sun Apr 9 15:03:50 2023 +0800

    [ISSUE-4305] Optimize the magic number
---
 .gitignore                                                |  1 +
 .../apache/carbondata/examples/sdk/SDKS3ReadExample.java  | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41d6f18d20..363455e06c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ target/
 store/CSDK/cmake-build-debug/*
 .project
 .classpath
+.DS_Store
 metastore_db/
 derby.log
 python/.idea/
diff --git a/examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3ReadExample.java b/examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3ReadExample.java
index 60aaaa7c37..2621aea836 100644
--- a/examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3ReadExample.java
+++ b/examples/spark/src/main/java/org/apache/carbondata/examples/sdk/SDKS3ReadExample.java
@@ -27,11 +27,10 @@ import org.apache.carbondata.core.scan.expression.conditional.EqualToExpression;
 import org.apache.carbondata.core.util.path.CarbonTablePath;
 import org.apache.carbondata.sdk.file.CarbonReader;
 
-import static org.apache.carbondata.sdk.file.utils.SDKUtil.listFiles;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.log4j.Logger;
 
+import static org.apache.carbondata.sdk.file.utils.SDKUtil.listFiles;
 import static org.apache.hadoop.fs.s3a.Constants.ACCESS_KEY;
 import static org.apache.hadoop.fs.s3a.Constants.ENDPOINT;
 import static org.apache.hadoop.fs.s3a.Constants.SECRET_KEY;
@@ -44,12 +43,13 @@ public class SDKS3ReadExample {
     Logger logger = LogServiceFactory.getLogService(SDKS3ReadExample.class.getName());
     if (args == null || args.length < 3) {
       logger.error("Usage: java CarbonS3Example: <access-key> <secret-key>"
-          + "<s3-endpoint> [table-path-on-s3]");
+        + "<s3-endpoint> [table-path-on-s3]");
       System.exit(0);
     }
 
-    String path = "s3a://sdk/WriterOutput/carbondata5";
-    if (args.length > 3) {
+    String path = "s3a://obs-xubo4/sdkdata/test";
+    int parameterLength = 3;
+    if (args.length > parameterLength) {
       path = args[3];
     }
 
@@ -78,7 +78,8 @@ public class SDKS3ReadExample {
 
     System.out.println("\nData:");
     int i = 0;
-    while (i < 20 && reader.hasNext()) {
+    int count = 20;
+    while (i < count && reader.hasNext()) {
       Object[] row = (Object[]) reader.readNextRow();
       System.out.println(row[0] + " " + row[1]);
       i++;
@@ -97,7 +98,7 @@ public class SDKS3ReadExample {
 
     System.out.println("\nData:");
     i = 0;
-    while (i < 20 && reader2.hasNext()) {
+    while (i < count && reader2.hasNext()) {
       Object[] row = (Object[]) reader2.readNextRow();
       System.out.println(row[0] + " " + row[1]);
       i++;