Skip to content

Commit 0662aa6

Browse files
committed
fixed
1 parent 6e53785 commit 0662aa6

File tree

3 files changed

+12
-16
lines changed

3 files changed

+12
-16
lines changed

api/src/main/java/org/apache/gravitino/rel/expressions/distributions/Distributions.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
/** Helper methods to create distributions to pass into Apache Gravitino. */
2727
public class Distributions {
2828

29+
public static final int AUTO = -1;
30+
2931
/** NONE is used to indicate that there is no distribution. */
3032
public static final Distribution NONE =
3133
new DistributionImpl(Strategy.NONE, 0, Expression.EMPTY_EXPRESSION);
@@ -82,7 +84,7 @@ public static Distribution of(Strategy strategy, int number, Expression... expre
8284
* @return The created distribution
8385
*/
8486
public static Distribution auto(Strategy strategy, Expression... expressions) {
85-
return new DistributionImpl(strategy, -1, expressions);
87+
return new DistributionImpl(strategy, AUTO, expressions);
8688
}
8789

8890
/**

catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/operation/DorisTableOperations.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,7 @@ protected String generateCreateTableSql(
134134
}
135135

136136
if (distribution.number() != 0) {
137-
sqlBuilder
138-
.append(" BUCKETS ")
139-
.append(DorisUtils.revertDistributionBucket(distribution.number()));
137+
sqlBuilder.append(" BUCKETS ").append(DorisUtils.toBucketNumberString(distribution.number()));
140138
}
141139

142140
properties = appendNecessaryProperties(properties);

catalogs/catalog-jdbc-doris/src/main/java/org/apache/gravitino/catalog/doris/utils/DorisUtils.java

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.util.stream.Collectors;
3030
import org.apache.gravitino.rel.expressions.NamedReference;
3131
import org.apache.gravitino.rel.expressions.distributions.Distribution;
32+
import org.apache.gravitino.rel.expressions.distributions.Distributions;
3233
import org.apache.gravitino.rel.expressions.distributions.Distributions.DistributionImpl;
3334
import org.apache.gravitino.rel.expressions.distributions.Strategy;
3435
import org.apache.gravitino.rel.expressions.literals.Literal;
@@ -222,21 +223,16 @@ private static int extractBucketNum(Matcher matcher) {
222223
int bucketNum = 1;
223224
if (matcher.find(5)) {
224225
String bucketValue = matcher.group(5);
225-
if (bucketValue.trim().toUpperCase().equals("AUTO")) {
226-
// Use -1 to indicate auto bucket.
227-
bucketNum = -1;
228-
} else {
229-
bucketNum = Integer.valueOf(matcher.group(5));
230-
}
226+
// Use -1 to indicate auto bucket.
227+
bucketNum =
228+
bucketValue.trim().toUpperCase().equals("AUTO")
229+
? Distributions.AUTO
230+
: Integer.valueOf(bucketValue);
231231
}
232232
return bucketNum;
233233
}
234234

235-
public static String revertDistributionBucket(int number) {
236-
if (number == -1) {
237-
return "AUTO";
238-
} else {
239-
return String.valueOf(number);
240-
}
235+
public static String toBucketNumberString(int number) {
236+
return number == Distributions.AUTO ? "AUTO" : String.valueOf(number);
241237
}
242238
}

0 commit comments

Comments
 (0)