Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ private static String formatDType(DType dtype) {
case DType.Utf8(var nullable) -> "utf8" + (nullable ? "?" : "");
case DType.Binary(var nullable) -> "binary" + (nullable ? "?" : "");
case DType.Bool(var nullable) -> "bool" + (nullable ? "?" : "");
case DType.Null ignored -> "null";
case DType.Null _ -> "null";
case DType.Decimal(var p, var s, var nullable) -> "decimal(" + p + "," + s + ")" + (nullable ? "?" : "");
case DType.List(var elem, var nullable) -> "list<" + formatDType(elem) + ">" + (nullable ? "?" : "");
case DType.FixedSizeList(var elem, var size, var nullable) ->
"list<" + formatDType(elem) + ">[" + size + "]" + (nullable ? "?" : "");
case DType.Extension(var id, var storage, var meta, var nullable) ->
case DType.Extension(var id, var _, var _, var nullable) ->
"ext<" + id + ">" + (nullable ? "?" : "");
case DType.Variant(var nullable) -> "variant" + (nullable ? "?" : "");
};
Expand Down
6 changes: 3 additions & 3 deletions cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ static int run(String[] args) {
private static String formatDType(DType dtype) {
return switch (dtype) {
case DType.Primitive p -> p.ptype().name().toLowerCase();
case DType.Bool ignored -> "bool";
case DType.Utf8 ignored -> "utf8";
case DType.Struct ignored -> "struct";
case DType.Bool _ -> "bool";
case DType.Utf8 _ -> "utf8";
case DType.Struct _ -> "struct";
default -> dtype.getClass().getSimpleName().toLowerCase();
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,19 +276,19 @@ void run() throws IOException {

private void handleKey(Key key, List<Item> items) {
switch (key) {
case Key.ArrowDown ignored -> selected = Math.min(selected + 1, items.size() - 1);
case Key.ArrowUp ignored -> selected = Math.max(selected - 1, 0);
case Key.ArrowRight ignored -> expandSelected(items);
case Key.Enter ignored -> toggleSelected(items);
case Key.ArrowLeft ignored -> {
case Key.ArrowDown _ -> selected = Math.min(selected + 1, items.size() - 1);
case Key.ArrowUp _ -> selected = Math.max(selected - 1, 0);
case Key.ArrowRight _ -> expandSelected(items);
case Key.Enter _ -> toggleSelected(items);
case Key.ArrowLeft _ -> {
if (selected < items.size()) {
expanded.remove(items.get(selected).node());
}
}
case Key.PageDown ignored -> selected = Math.min(selected + 10, items.size() - 1);
case Key.PageUp ignored -> selected = Math.max(selected - 10, 0);
case Key.Home ignored -> selected = 0;
case Key.End ignored -> selected = items.size() - 1;
case Key.PageDown _ -> selected = Math.min(selected + 10, items.size() - 1);
case Key.PageUp _ -> selected = Math.max(selected - 10, 0);
case Key.Home _ -> selected = 0;
case Key.End _ -> selected = items.size() - 1;
default -> {
}
}
Expand Down Expand Up @@ -504,7 +504,7 @@ private List<String> detailLines(InspectorTree.Node node) {
DataState dictState = loadDictPreview(node);
lines.add("");
switch (dictState) {
case DataState.Pending ignored ->
case DataState.Pending _ ->
lines.add("Dictionary: " + SPINNER[(int) (tick % SPINNER.length)] + " loading...");
case DataState.Failed(String msg) ->
lines.add("Dictionary: ! " + msg);
Expand All @@ -524,7 +524,7 @@ private List<String> detailLines(InspectorTree.Node node) {
DataState zoneState = loadStatsPreview(zoneAnchor);
lines.add("");
switch (zoneState) {
case DataState.Pending ignored ->
case DataState.Pending _ ->
lines.add("Per-chunk stats: "
+ SPINNER[(int) (tick % SPINNER.length)] + " loading...");
case DataState.Failed(String msg) ->
Expand All @@ -541,7 +541,7 @@ private List<String> detailLines(InspectorTree.Node node) {
DataState state = loadDataPreview(col);
lines.add("");
switch (state) {
case DataState.Pending ignored ->
case DataState.Pending _ ->
lines.add("Data (column '" + col + "'): "
+ SPINNER[(int) (tick % SPINNER.length)] + " loading...");
case DataState.Failed(String msg) ->
Expand Down
4 changes: 2 additions & 2 deletions csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,14 @@ private static Object buildColumn(DType dtype, List<String[]> rows, int colIdx,
}
yield arr;
}
case DType.Bool ignored -> {
case DType.Bool _ -> {
boolean[] arr = new boolean[n];
for (int i = 0; i < n; i++) {
arr[i] = Boolean.parseBoolean(safeGet(rows.get(i), colIdx));
}
yield arr;
}
case DType.Utf8 ignored -> {
case DType.Utf8 _ -> {
String[] arr = new String[n];
for (int i = 0; i < n; i++) {
arr[i] = safeGet(rows.get(i), colIdx);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ private static String formatDType(DType dtype) {
case DType.Utf8(var nullable) -> "utf8" + (nullable ? "?" : "");
case DType.Binary(var nullable) -> "binary" + (nullable ? "?" : "");
case DType.Bool(var nullable) -> "bool" + (nullable ? "?" : "");
case DType.Null ignored -> "null";
case DType.Null _ -> "null";
case DType.Decimal(var p, var s, var nullable) -> "decimal(" + p + "," + s + ")" + (nullable ? "?" : "");
case DType.Struct ignored -> "struct";
case DType.Struct _ -> "struct";
case DType.List(var elem, var nullable) -> "list<" + formatDType(elem) + ">" + (nullable ? "?" : "");
case DType.FixedSizeList(var elem, var size, var nullable) ->
"list<" + formatDType(elem) + ">[" + size + "]" + (nullable ? "?" : "");
case DType.Extension(var id, var storage, var meta, var nullable) ->
case DType.Extension(var id, var _, var _, var nullable) ->
"ext<" + id + ">" + (nullable ? "?" : "");
case DType.Variant(var nullable) -> "variant" + (nullable ? "?" : "");
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,11 @@ private static Object allocateBuffer(DType dtype, int size) {
case DType.Primitive p when p.ptype() == PType.I8 -> new byte[size];
case DType.Primitive p when p.ptype() == PType.F64 -> new double[size];
case DType.Primitive p when p.ptype() == PType.F32 -> new float[size];
case DType.Bool ignored -> new boolean[size];
case DType.Utf8 ignored -> new String[size];
case DType.Bool _ -> new boolean[size];
case DType.Utf8 _ -> new String[size];
// Extension columns buffer as domain-typed lists; VortexWriter.writeChunk
// auto-routes Collection<DomainT> through the matching extension impl.
case DType.Extension ext -> new ArrayList<>(size);
case DType.Extension _ -> new ArrayList<>(size);
default -> throw new UnsupportedOperationException("unsupported dtype: " + dtype);
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@ private List<Field> flattenFields(Ast.MessageDecl msg) {
out.add(toField(new Ast.FieldDecl(Ast.Rule.OPTIONAL, f.type(), f.name(), f.number(), f.packed())));
}
}
case Ast.MessageDecl ignored -> { /* nested, emitted separately */ }
case Ast.EnumDecl ignored -> { /* nested, emitted separately */ }
case Ast.MessageDecl _ -> { /* nested, emitted separately */ }
case Ast.EnumDecl _ -> { /* nested, emitted separately */ }
}
}
return out;
Expand Down Expand Up @@ -395,7 +395,7 @@ private static Field ofRef(Ast.FieldDecl decl, Ast.Ref ref, TypeRegistry reg) {
case REPEATED -> new Field(name, decl.number(), "java.util.List<" + javaName + ">",
"new java.util.ArrayList<>()", new EnumRepeatedEmitter(javaName));
};
case TypeRegistry.ResolvedType.Message msg -> switch (decl.rule()) {
case TypeRegistry.ResolvedType.Message _ -> switch (decl.rule()) {
// Singular and Optional message refs are both nullable (proto3 message presence semantics).
case SINGLE, OPTIONAL -> new Field(name, decl.number(), javaName, "null",
new MessageOptionalEmitter(javaName));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ private void indexNested(Ast.MessageDecl parent, String parentFqn, String javaPa
String fqn = parentFqn + "." + e.name();
byFqn.put(fqn, new ResolvedType.Enum(e, fqn, javaPackage));
}
case Ast.FieldDecl ignored -> { }
case Ast.OneOfDecl ignored -> { }
case Ast.FieldDecl _ -> { }
case Ast.OneOfDecl _ -> { }
}
}
}
Expand Down