-
Notifications
You must be signed in to change notification settings - Fork 1.5k
PARQUET-1212: Column indexes: Show indexes in tools #479
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3a615da
PARQUET-1212: Column indexes: Show indexes in tools
505b047
PARQUET-1212: Fix rebase conflicts
gszadovszky 202f350
PARQUET-1212: Updates according to review comments
gszadovszky 04e3cba
PARQUET-1212: renaming tool name
gszadovszky f83f060
PARQUET-1212: Refactor block indexing
gszadovszky 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
166 changes: 166 additions & 0 deletions
166
parquet-cli/src/main/java/org/apache/parquet/cli/commands/ShowColumnIndexCommand.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,166 @@ | ||
| /* | ||
| * 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.parquet.cli.commands; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.AbstractMap; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.parquet.cli.BaseCommand; | ||
| import org.apache.parquet.hadoop.ParquetFileReader; | ||
| import org.apache.parquet.hadoop.metadata.BlockMetaData; | ||
| import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; | ||
| import org.apache.parquet.hadoop.metadata.ParquetMetadata; | ||
| import org.apache.parquet.hadoop.util.HadoopInputFile; | ||
| import org.apache.parquet.internal.column.columnindex.ColumnIndex; | ||
| import org.apache.parquet.internal.column.columnindex.OffsetIndex; | ||
| import org.apache.parquet.io.InputFile; | ||
| import org.slf4j.Logger; | ||
|
|
||
| import com.beust.jcommander.Parameter; | ||
| import com.beust.jcommander.Parameters; | ||
| import com.google.common.base.Preconditions; | ||
| import com.google.common.collect.Lists; | ||
|
|
||
| /** | ||
| * parquet-cli command to print column and offset indexes. | ||
| */ | ||
| @Parameters(commandDescription = "Prints the column and offset indexes of a Parquet file") | ||
| public class ShowColumnIndexCommand extends BaseCommand { | ||
| public ShowColumnIndexCommand(Logger console) { | ||
| super(console); | ||
| } | ||
|
|
||
| @Parameter(description = "<parquet path>") | ||
| List<String> files; | ||
|
|
||
| @Parameter(names = { "-c", "--column" }, description = "Shows the column/offset indexes for the given column only") | ||
| List<String> ColumnPaths; | ||
|
|
||
| @Parameter(names = { "-b", | ||
| "--block" }, description = "Shows the column/offset indexes for the given block (row-group) only; " | ||
| + "blocks are referenced by their indexes from 0") | ||
| List<String> blockIndexes; | ||
|
|
||
| @Parameter(names = { "-i", "--column-index" }, description = "Shows the column indexes; " | ||
| + "active by default unless -o is used") | ||
| boolean showColumnIndex; | ||
|
|
||
| @Parameter(names = { "-o", "--offset-index" }, description = "Shows the offset indexes; " | ||
| + "active by default unless -i is used") | ||
| boolean showOffsetIndex; | ||
|
|
||
| @Override | ||
| public List<String> getExamples() { | ||
| return Lists.newArrayList( | ||
| "# Show only column indexes for column 'col' from a Parquet file", | ||
| "-c col -i sample.parquet"); | ||
| } | ||
|
|
||
| @Override | ||
| public int run() throws IOException { | ||
| Preconditions.checkArgument(files != null && files.size() >= 1, | ||
| "A Parquet file is required."); | ||
| Preconditions.checkArgument(files.size() == 1, | ||
| "Cannot process multiple Parquet files."); | ||
|
|
||
| InputFile in = HadoopInputFile.fromPath(new Path(files.get(0)), new Configuration()); | ||
| if (!showColumnIndex && !showOffsetIndex) { | ||
| showColumnIndex = showOffsetIndex = true; | ||
| } | ||
|
|
||
| try (ParquetFileReader reader = ParquetFileReader.open(in)) { | ||
| boolean firstBlock = true; | ||
| for (Entry<Integer, BlockMetaData> entry : getBlocks(reader.getFooter())) { | ||
| if (!firstBlock) { | ||
| console.info(""); | ||
| } | ||
| firstBlock = false; | ||
| console.info("row group {}:", entry.getKey()); | ||
| for (ColumnChunkMetaData column : getColumns(entry.getValue())) { | ||
| String path = column.getPath().toDotString(); | ||
| if (showColumnIndex) { | ||
| console.info("column index for column {}:", path); | ||
| ColumnIndex columnIndex = reader.readColumnIndex(column); | ||
| if (columnIndex == null) { | ||
| console.info("NONE"); | ||
| } else { | ||
| console.info(columnIndex.toString()); | ||
| } | ||
| } | ||
| if (showOffsetIndex) { | ||
| console.info("offset index for column {}:", path); | ||
| OffsetIndex offsetIndex = reader.readOffsetIndex(column); | ||
| if (offsetIndex == null) { | ||
| console.info("NONE"); | ||
| } else { | ||
| console.info(offsetIndex.toString()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| // Returns the index-block pairs based on the arguments of --block | ||
| private List<Entry<Integer, BlockMetaData>> getBlocks(ParquetMetadata meta) { | ||
| List<BlockMetaData> blocks = meta.getBlocks(); | ||
| List<Entry<Integer, BlockMetaData>> pairs = new ArrayList<>(); | ||
| if (blockIndexes == null || blockIndexes.isEmpty()) { | ||
| int index = 0; | ||
| for (BlockMetaData block : blocks) { | ||
| pairs.add(new AbstractMap.SimpleImmutableEntry<>(index++, block)); | ||
| } | ||
| } else { | ||
| for (String indexStr : blockIndexes) { | ||
| int index = Integer.parseInt(indexStr); | ||
| pairs.add(new AbstractMap.SimpleImmutableEntry<>(index, blocks.get(index))); | ||
| } | ||
| } | ||
| return pairs; | ||
| } | ||
|
|
||
| private List<ColumnChunkMetaData> getColumns(BlockMetaData block) { | ||
| List<ColumnChunkMetaData> columns = block.getColumns(); | ||
| if (ColumnPaths == null || ColumnPaths.isEmpty()) { | ||
| return columns; | ||
| } | ||
| Map<String, ColumnChunkMetaData> pathMap = new HashMap<>(); | ||
| for (ColumnChunkMetaData column : columns) { | ||
| pathMap.put(column.getPath().toDotString(), column); | ||
| } | ||
|
|
||
| List<ColumnChunkMetaData> filtered = new ArrayList<>(); | ||
| for (String path : ColumnPaths) { | ||
| ColumnChunkMetaData column = pathMap.get(path); | ||
| if (column != null) { | ||
| filtered.add(column); | ||
| } | ||
| } | ||
| return filtered; | ||
| } | ||
|
|
||
| } | ||
190 changes: 190 additions & 0 deletions
190
parquet-tools/src/main/java/org/apache/parquet/tools/command/ColumnIndexCommand.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,190 @@ | ||
| /* | ||
| * 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.parquet.tools.command; | ||
|
|
||
| import java.io.PrintWriter; | ||
| import java.util.AbstractMap; | ||
| import java.util.ArrayList; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
|
|
||
| import org.apache.commons.cli.CommandLine; | ||
| import org.apache.commons.cli.Option; | ||
| import org.apache.commons.cli.Options; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.parquet.internal.column.columnindex.ColumnIndex; | ||
| import org.apache.parquet.internal.column.columnindex.OffsetIndex; | ||
| import org.apache.parquet.hadoop.ParquetFileReader; | ||
| import org.apache.parquet.hadoop.metadata.BlockMetaData; | ||
| import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; | ||
| import org.apache.parquet.hadoop.metadata.ParquetMetadata; | ||
| import org.apache.parquet.hadoop.util.HadoopInputFile; | ||
| import org.apache.parquet.io.InputFile; | ||
| import org.apache.parquet.tools.Main; | ||
|
|
||
| /** | ||
| * parquet-tools command to print column and offset indexes. | ||
| */ | ||
| public class ColumnIndexCommand extends ArgsOnlyCommand { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same comments as for the CLI command. |
||
| public static final String[] USAGE = new String[] { | ||
| "<input>", | ||
| "where <input> is the parquet file to print the column and offset indexes for" | ||
| }; | ||
|
|
||
| public static final Options OPTIONS; | ||
| static { | ||
| OPTIONS = new Options(); | ||
| OPTIONS.addOption(Option.builder("c") | ||
| .longOpt("column") | ||
| .desc("Shows the column/offset indexes for the given column only; " | ||
| + "multiple columns shall be separated by commas") | ||
| .hasArg() | ||
| .build()); | ||
| OPTIONS.addOption(Option.builder("b") | ||
| .longOpt("block") | ||
| .desc("Shows the column/offset indexes for the given block (row-group) only; " | ||
| + "multiple blocks shall be speparated by commas; " | ||
| + "blocks are referenced by their indexes from 0") | ||
| .hasArg() | ||
| .build()); | ||
| OPTIONS.addOption(Option.builder("i") | ||
| .longOpt("column-index") | ||
| .desc("Shows the column indexes; " | ||
| + "active by default unless -o is used") | ||
| .hasArg(false) | ||
| .build()); | ||
| OPTIONS.addOption(Option.builder("o") | ||
| .longOpt("offset-index") | ||
| .desc("Shows the offset indexes; " | ||
| + "active by default unless -i is used") | ||
| .hasArg(false) | ||
| .build()); | ||
| } | ||
|
|
||
| public ColumnIndexCommand() { | ||
| super(1, 1); | ||
| } | ||
|
|
||
| @Override | ||
| public String[] getUsageDescription() { | ||
| return USAGE; | ||
| } | ||
|
|
||
| @Override | ||
| public String getCommandDescription() { | ||
| return "Prints the column and offset indexes of a Parquet file."; | ||
| } | ||
|
|
||
| @Override | ||
| public Options getOptions() { | ||
| return OPTIONS; | ||
| } | ||
|
|
||
| @Override | ||
| public void execute(CommandLine options) throws Exception { | ||
| super.execute(options); | ||
|
|
||
| String[] args = options.getArgs(); | ||
| InputFile in = HadoopInputFile.fromPath(new Path(args[0]), new Configuration()); | ||
| PrintWriter out = new PrintWriter(Main.out, true); | ||
| String blockValue = options.getOptionValue("b"); | ||
| String[] indexes = blockValue == null ? null : blockValue.split("\\s*,\\s*"); | ||
| boolean showColumnIndex = options.hasOption("i"); | ||
| boolean showOffsetIndex = options.hasOption("o"); | ||
| if (!showColumnIndex && !showOffsetIndex) { | ||
| showColumnIndex = showOffsetIndex = true; | ||
| } | ||
|
|
||
| try (ParquetFileReader reader = ParquetFileReader.open(in)) { | ||
| boolean firstBlock = true; | ||
| for (Entry<Integer, BlockMetaData> entry : getBlocks(reader.getFooter(), indexes)) { | ||
| if (!firstBlock) { | ||
| out.println(); | ||
| } | ||
| firstBlock = false; | ||
| out.format("row group %d:%n", entry.getKey()); | ||
| for (ColumnChunkMetaData column : getColumns(entry.getValue(), options)) { | ||
| String path = column.getPath().toDotString(); | ||
| if (showColumnIndex) { | ||
| out.format("column index for column %s:%n", path); | ||
| ColumnIndex columnIndex = reader.readColumnIndex(column); | ||
| if (columnIndex == null) { | ||
| out.println("NONE"); | ||
| } else { | ||
| out.println(columnIndex); | ||
| } | ||
| } | ||
| if (showOffsetIndex) { | ||
| out.format("offset index for column %s:%n", path); | ||
| OffsetIndex offsetIndex = reader.readOffsetIndex(column); | ||
| if (offsetIndex == null) { | ||
| out.println("NONE"); | ||
| } else { | ||
| out.println(offsetIndex); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Returns the index-block pairs based on the arguments of --block | ||
| private static List<Entry<Integer, BlockMetaData>> getBlocks(ParquetMetadata meta, String[] indexes) { | ||
| List<BlockMetaData> blocks = meta.getBlocks(); | ||
| List<Entry<Integer, BlockMetaData>> pairs = new ArrayList<>(); | ||
| if (indexes == null) { | ||
| int index = 0; | ||
| for (BlockMetaData block : blocks) { | ||
| pairs.add(new AbstractMap.SimpleImmutableEntry<>(index++, block)); | ||
| } | ||
| } else { | ||
| for (String indexStr : indexes) { | ||
| int index = Integer.parseInt(indexStr); | ||
| pairs.add(new AbstractMap.SimpleImmutableEntry<>(index, blocks.get(index))); | ||
| } | ||
| } | ||
| return pairs; | ||
| } | ||
|
|
||
| private static List<ColumnChunkMetaData> getColumns(BlockMetaData block, CommandLine options) { | ||
| List<ColumnChunkMetaData> columns = block.getColumns(); | ||
| String pathValue = options.getOptionValue("c"); | ||
| if (pathValue == null) { | ||
| return columns; | ||
| } | ||
| String[] paths = pathValue.split("\\s*,\\s*"); | ||
| Map<String, ColumnChunkMetaData> pathMap = new HashMap<>(); | ||
| for (ColumnChunkMetaData column : columns) { | ||
| pathMap.put(column.getPath().toDotString(), column); | ||
| } | ||
|
|
||
| List<ColumnChunkMetaData> filtered = new ArrayList<>(); | ||
| for (String path : paths) { | ||
| ColumnChunkMetaData column = pathMap.get(path); | ||
| if (column != null) { | ||
| filtered.add(column); | ||
| } | ||
| } | ||
| return filtered; | ||
| } | ||
|
|
||
| } | ||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(subjective, optional) I find -i very counter-intuitive. Could this be -c and --column something else? For example -f/--field? Alternatively, -k/--column? Or -p/--column-path?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
--column -cis used in other commands. I think, it is better to keep this option as is to be common between the different commands.