diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java b/cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java index c40b10ab..c4bf30fb 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/SchemaCommand.java @@ -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 ? "?" : ""); }; diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java b/cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java index e0704aa0..531f6d08 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/StatsCommand.java @@ -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(); }; } diff --git a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java index ba49cd21..e4f0374a 100644 --- a/cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java +++ b/cli/src/main/java/io/github/dfa1/vortex/cli/tui/VortexInspectorTui.java @@ -276,19 +276,19 @@ void run() throws IOException { private void handleKey(Key key, List 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 -> { } } @@ -504,7 +504,7 @@ private List 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); @@ -524,7 +524,7 @@ private List 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) -> @@ -541,7 +541,7 @@ private List 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) -> diff --git a/csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java b/csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java index 247a7499..e529b453 100644 --- a/csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java +++ b/csv/src/main/java/io/github/dfa1/vortex/csv/CsvImporter.java @@ -235,14 +235,14 @@ private static Object buildColumn(DType dtype, List 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); diff --git a/inspector/src/main/java/io/github/dfa1/vortex/inspect/VortexInspector.java b/inspector/src/main/java/io/github/dfa1/vortex/inspect/VortexInspector.java index 74b7dc58..f575f538 100644 --- a/inspector/src/main/java/io/github/dfa1/vortex/inspect/VortexInspector.java +++ b/inspector/src/main/java/io/github/dfa1/vortex/inspect/VortexInspector.java @@ -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 ? "?" : ""); }; diff --git a/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/JdbcImporter.java b/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/JdbcImporter.java index d9253905..286488ef 100644 --- a/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/JdbcImporter.java +++ b/jdbc/src/main/java/io/github/dfa1/vortex/jdbc/JdbcImporter.java @@ -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 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); }; } diff --git a/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/CodeGen.java b/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/CodeGen.java index 94e1f125..e71e80bb 100644 --- a/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/CodeGen.java +++ b/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/CodeGen.java @@ -308,8 +308,8 @@ private List 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; @@ -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)); diff --git a/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/TypeRegistry.java b/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/TypeRegistry.java index db2e39a3..5cca538f 100644 --- a/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/TypeRegistry.java +++ b/proto-gen/src/main/java/io/github/dfa1/vortex/protogen/TypeRegistry.java @@ -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 _ -> { } } } }