-
Notifications
You must be signed in to change notification settings - Fork 517
Add V2 batch format with statistics collection #2886
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
platinumhamburg
wants to merge
1
commit into
apache:main
Choose a base branch
from
platinumhamburg:filter-v2-batch-format
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+4,319
−66
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
fluss-common/src/main/java/org/apache/fluss/config/StatisticsConfigUtils.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.fluss.config; | ||
|
|
||
| import org.apache.fluss.annotation.Internal; | ||
| import org.apache.fluss.exception.InvalidConfigException; | ||
| import org.apache.fluss.metadata.TableDescriptor; | ||
| import org.apache.fluss.types.DataField; | ||
| import org.apache.fluss.types.DataType; | ||
| import org.apache.fluss.types.DataTypeChecks; | ||
| import org.apache.fluss.types.RowType; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** | ||
| * Utility class for validating table statistics configuration. | ||
| * | ||
| * <p>This provides simple validation methods that can be called during CREATE TABLE operations to | ||
| * ensure statistics configuration is valid and compatible with the table schema. | ||
| */ | ||
| @Internal | ||
| public class StatisticsConfigUtils { | ||
|
|
||
| private StatisticsConfigUtils() {} | ||
|
|
||
| /** | ||
| * Validates statistics configuration for a table descriptor. | ||
| * | ||
| * @param tableDescriptor the table descriptor to validate | ||
| * @throws InvalidConfigException if the statistics configuration is invalid | ||
| */ | ||
| public static void validateStatisticsConfig(TableDescriptor tableDescriptor) { | ||
| Map<String, String> properties = tableDescriptor.getProperties(); | ||
| String statisticsColumns = | ||
| properties.getOrDefault(ConfigOptions.TABLE_STATISTICS_COLUMNS.key(), "*"); | ||
|
|
||
| // Empty string means statistics disabled - no validation needed | ||
| if (statisticsColumns.isEmpty()) { | ||
| return; | ||
| } | ||
|
|
||
| RowType rowType = tableDescriptor.getSchema().getRowType(); | ||
|
|
||
| // Wildcard means all non-binary columns - no validation needed | ||
| if ("*".equals(statisticsColumns.trim())) { | ||
| return; | ||
| } | ||
|
|
||
| // Parse and validate specific column names | ||
| List<String> columnNames = parseColumnNames(statisticsColumns); | ||
| if (columnNames.isEmpty()) { | ||
| throw new InvalidConfigException( | ||
| "Statistics columns configuration cannot be empty. " | ||
| + "Use '*' to collect statistics for all non-binary columns, " | ||
| + "or use empty string '' to disable statistics collection."); | ||
| } | ||
|
|
||
| validateColumns(rowType, columnNames); | ||
| } | ||
|
|
||
| /** | ||
| * Parses comma-separated column names from the configuration string. | ||
| * | ||
| * @param columnsConfig the configuration string | ||
| * @return list of parsed column names | ||
| */ | ||
| private static List<String> parseColumnNames(String columnsConfig) { | ||
| return Arrays.stream(columnsConfig.split(",")) | ||
| .map(String::trim) | ||
| .filter(s -> !s.isEmpty()) | ||
| .collect(Collectors.toList()); | ||
| } | ||
|
|
||
| /** | ||
| * Validates that the specified columns exist in the schema and are of supported types. | ||
| * | ||
| * @param rowType the table schema | ||
| * @param statisticsColumns the list of column names to validate | ||
| * @throws InvalidConfigException if validation fails | ||
| */ | ||
| private static void validateColumns(RowType rowType, List<String> statisticsColumns) { | ||
| Map<String, DataType> columnTypeMap = buildColumnTypeMap(rowType); | ||
|
|
||
| for (String columnName : statisticsColumns) { | ||
| // Check if column exists | ||
| if (!columnTypeMap.containsKey(columnName)) { | ||
| throw new InvalidConfigException( | ||
| String.format( | ||
| "Column '%s' specified in statistics collection does not exist in table schema", | ||
| columnName)); | ||
| } | ||
|
|
||
| // Check if column type is supported | ||
| DataType dataType = columnTypeMap.get(columnName); | ||
| if (DataTypeChecks.isBinaryType(dataType)) { | ||
| throw new InvalidConfigException( | ||
| String.format( | ||
| "Binary column '%s' cannot be included in statistics collection. " | ||
| + "Binary and bytes columns are not supported for statistics collection.", | ||
| columnName)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Builds a map from column name to data type for quick lookup. | ||
| * | ||
| * @param rowType the table schema | ||
| * @return map of column name to data type | ||
| */ | ||
| private static Map<String, DataType> buildColumnTypeMap(RowType rowType) { | ||
| return rowType.getFields().stream() | ||
| .collect(Collectors.toMap(DataField::getName, DataField::getType)); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.