From 470d83f73792be7f3d21c59a4984ec64401a2377 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 28 Jan 2026 23:22:31 +0300 Subject: [PATCH 01/18] wip --- ...SystemViewRowAttributeWalkerGenerator.java | 399 ------------------ .../managers/systemview/walker/Filtrable.java | 5 +- .../managers/systemview/walker/Order.java | 6 +- ...SystemViewRowAttributeWalkerGenerator.java | 301 +++++++++++++ ...SystemViewRowAttributeWalkerProcessor.java | 73 ++++ .../javax.annotation.processing.Processor | 3 +- modules/core/pom.xml | 1 + .../discovery/GridDiscoveryManager.java | 2 +- .../systemview/SystemViewDescriptor.java | 33 ++ .../walker/ClusterNodeViewWalker.java | 59 --- .../spi/systemview/view/ClusterNodeView.java | 3 +- 11 files changed, 415 insertions(+), 470 deletions(-) delete mode 100644 modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java rename modules/{core => codegen2}/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java (84%) rename modules/{core => codegen2}/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java (85%) create mode 100644 modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java create mode 100644 modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java create mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/SystemViewDescriptor.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClusterNodeViewWalker.java diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java deleted file mode 100644 index f5c5a7d3e16ed..0000000000000 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/SystemViewRowAttributeWalkerGenerator.java +++ /dev/null @@ -1,399 +0,0 @@ -/* - * 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.ignite.codegen; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.TreeSet; -import java.util.function.ObjIntConsumer; -import org.apache.ignite.internal.managers.systemview.SystemViewMBean; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; -import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnConfigurationView; -import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnGlobalDataView; -import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnLocalDataView; -import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnPartitionDataView; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.spi.systemview.view.BaselineNodeAttributeView; -import org.apache.ignite.spi.systemview.view.BaselineNodeView; -import org.apache.ignite.spi.systemview.view.BinaryMetadataView; -import org.apache.ignite.spi.systemview.view.CacheGroupIoView; -import org.apache.ignite.spi.systemview.view.CacheGroupView; -import org.apache.ignite.spi.systemview.view.CachePagesListView; -import org.apache.ignite.spi.systemview.view.CacheView; -import org.apache.ignite.spi.systemview.view.ClientConnectionAttributeView; -import org.apache.ignite.spi.systemview.view.ClientConnectionView; -import org.apache.ignite.spi.systemview.view.ClusterNodeView; -import org.apache.ignite.spi.systemview.view.ComputeJobView; -import org.apache.ignite.spi.systemview.view.ComputeTaskView; -import org.apache.ignite.spi.systemview.view.ConfigurationView; -import org.apache.ignite.spi.systemview.view.ContinuousQueryView; -import org.apache.ignite.spi.systemview.view.MetastorageView; -import org.apache.ignite.spi.systemview.view.MetricsView; -import org.apache.ignite.spi.systemview.view.NodeAttributeView; -import org.apache.ignite.spi.systemview.view.NodeMetricsView; -import org.apache.ignite.spi.systemview.view.PagesListView; -import org.apache.ignite.spi.systemview.view.PagesTimestampHistogramView; -import org.apache.ignite.spi.systemview.view.PartitionStateView; -import org.apache.ignite.spi.systemview.view.ScanQueryView; -import org.apache.ignite.spi.systemview.view.ServiceView; -import org.apache.ignite.spi.systemview.view.SnapshotView; -import org.apache.ignite.spi.systemview.view.SqlPlanHistoryView; -import org.apache.ignite.spi.systemview.view.SqlQueryHistoryView; -import org.apache.ignite.spi.systemview.view.SqlQueryView; -import org.apache.ignite.spi.systemview.view.StripedExecutorTaskView; -import org.apache.ignite.spi.systemview.view.SystemView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.TransactionView; -import org.apache.ignite.spi.systemview.view.datastructures.AtomicLongView; -import org.apache.ignite.spi.systemview.view.datastructures.AtomicReferenceView; -import org.apache.ignite.spi.systemview.view.datastructures.AtomicSequenceView; -import org.apache.ignite.spi.systemview.view.datastructures.AtomicStampedView; -import org.apache.ignite.spi.systemview.view.datastructures.CountDownLatchView; -import org.apache.ignite.spi.systemview.view.datastructures.QueueView; -import org.apache.ignite.spi.systemview.view.datastructures.ReentrantLockView; -import org.apache.ignite.spi.systemview.view.datastructures.SemaphoreView; -import org.apache.ignite.spi.systemview.view.datastructures.SetView; -import org.apache.ignite.spi.systemview.view.sql.SqlIndexView; -import org.apache.ignite.spi.systemview.view.sql.SqlSchemaView; -import org.apache.ignite.spi.systemview.view.sql.SqlTableColumnView; -import org.apache.ignite.spi.systemview.view.sql.SqlTableView; -import org.apache.ignite.spi.systemview.view.sql.SqlViewColumnView; -import org.apache.ignite.spi.systemview.view.sql.SqlViewView; - -/** - * Application for code generation of {@link SystemViewRowAttributeWalker}. - * Usage: simply run main method from Ignite source folder(using IDE or other way). - * Generated code used in {@link SystemView}. - * - * @see SystemViewMBean - */ -public class SystemViewRowAttributeWalkerGenerator { - /** */ - private static final String DFLT_SRC_DIR = U.getIgniteHome() + "/modules/core/src/main/java"; - - /** Methods that should be excluded from specific {@link SystemViewRowAttributeWalker}. */ - private static final Set SYS_METHODS = new HashSet<>(Arrays.asList("equals", "hashCode", "toString", - "getClass")); - - /** Package for {@link SystemViewRowAttributeWalker} implementations. */ - public static final String WALKER_PACKAGE = "org.apache.ignite.internal.managers.systemview.walker"; - - /** */ - public static final String TAB = " "; - - /** - * @param args Command line arguments. - * @throws Exception If generation failed. - */ - public static void main(String[] args) throws Exception { - SystemViewRowAttributeWalkerGenerator gen = new SystemViewRowAttributeWalkerGenerator(); - - gen.generateAndWrite(CacheGroupView.class, DFLT_SRC_DIR); - gen.generateAndWrite(CacheView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ServiceView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ComputeTaskView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ComputeJobView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ClientConnectionView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ClientConnectionAttributeView.class, DFLT_SRC_DIR); - gen.generateAndWrite(TransactionView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ContinuousQueryView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ClusterNodeView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ScanQueryView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SqlQueryView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SqlQueryHistoryView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SqlPlanHistoryView.class, DFLT_SRC_DIR); - gen.generateAndWrite(StripedExecutorTaskView.class, DFLT_SRC_DIR); - gen.generateAndWrite(PagesListView.class, DFLT_SRC_DIR); - gen.generateAndWrite(CachePagesListView.class, DFLT_SRC_DIR); - gen.generateAndWrite(PartitionStateView.class, DFLT_SRC_DIR); - gen.generateAndWrite(BinaryMetadataView.class, DFLT_SRC_DIR); - gen.generateAndWrite(MetastorageView.class, DFLT_SRC_DIR); - gen.generateAndWrite(QueueView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SetView.class, DFLT_SRC_DIR); - gen.generateAndWrite(AtomicLongView.class, DFLT_SRC_DIR); - gen.generateAndWrite(AtomicReferenceView.class, DFLT_SRC_DIR); - gen.generateAndWrite(AtomicSequenceView.class, DFLT_SRC_DIR); - gen.generateAndWrite(AtomicStampedView.class, DFLT_SRC_DIR); - gen.generateAndWrite(CountDownLatchView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ReentrantLockView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SemaphoreView.class, DFLT_SRC_DIR); - gen.generateAndWrite(BaselineNodeAttributeView.class, DFLT_SRC_DIR); - gen.generateAndWrite(BaselineNodeView.class, DFLT_SRC_DIR); - gen.generateAndWrite(NodeAttributeView.class, DFLT_SRC_DIR); - gen.generateAndWrite(NodeMetricsView.class, DFLT_SRC_DIR); - gen.generateAndWrite(CacheGroupIoView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SnapshotView.class, DFLT_SRC_DIR); - gen.generateAndWrite(MetricsView.class, DFLT_SRC_DIR); - gen.generateAndWrite(PagesTimestampHistogramView.class, DFLT_SRC_DIR); - gen.generateAndWrite(ConfigurationView.class, DFLT_SRC_DIR); - - gen.generateAndWrite(SqlSchemaView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SqlTableView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SqlViewView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SqlIndexView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SqlTableColumnView.class, DFLT_SRC_DIR); - gen.generateAndWrite(SqlViewColumnView.class, DFLT_SRC_DIR); - - gen.generateAndWrite(StatisticsColumnConfigurationView.class, DFLT_SRC_DIR); - gen.generateAndWrite(StatisticsColumnLocalDataView.class, DFLT_SRC_DIR); - gen.generateAndWrite(StatisticsColumnGlobalDataView.class, DFLT_SRC_DIR); - gen.generateAndWrite(StatisticsColumnPartitionDataView.class, DFLT_SRC_DIR); - } - - /** - * Generates {@link SystemViewRowAttributeWalker} implementation and write it to the file. - * - * @param clazz Class to geneare {@link SystemViewRowAttributeWalker} for. - * @param srcRoot Source root folder. - * @param type of the row. - * @throws IOException If generation failed. - */ - private void generateAndWrite(Class clazz, String srcRoot) throws IOException { - File walkerCls = new File(srcRoot + '/' + WALKER_PACKAGE.replaceAll("\\.", "/") + '/' + - clazz.getSimpleName() + "Walker.java"); - - Collection code = generate(clazz); - - walkerCls.createNewFile(); - - try (FileWriter writer = new FileWriter(walkerCls)) { - for (String line : code) { - writer.write(line); - writer.write('\n'); - } - } - } - - /** - * Generates {@link SystemViewRowAttributeWalker} implementation. - * - * @param clazz Class to geneare {@link SystemViewRowAttributeWalker} for. - * @param type of the row. - * @return Java source code of the {@link SystemViewRowAttributeWalker} implementation. - */ - private Collection generate(Class clazz) { - final List code = new ArrayList<>(); - final Set imports = new TreeSet<>(Comparator.comparing(s -> s.replace(";", ""))); - - addImport(imports, SystemViewRowAttributeWalker.class); - addImport(imports, clazz); - - String simpleName = clazz.getSimpleName(); - - code.add("package " + WALKER_PACKAGE + ";"); - code.add(""); - code.add(""); - code.add("/**"); - code.add(" * Generated by {@code " + SystemViewRowAttributeWalkerGenerator.class.getName() + "}."); - code.add(" * {@link " + simpleName + "} attributes walker."); - code.add(" * "); - code.add(" * @see " + simpleName); - code.add(" */"); - code.add("public class " + simpleName + "Walker implements SystemViewRowAttributeWalker<" + simpleName + "> {"); - - List filtrableAttrs = new ArrayList<>(); - - forEachMethod(clazz, (m, i) -> { - if (m.getAnnotation(Filtrable.class) != null) { - code.add(TAB + "/** Filter key for attribute \"" + m.getName() + "\" */"); - code.add(TAB + "public static final String " + m.getName() - .replaceAll("(\\p{Upper})", "_$1") - .toUpperCase() + "_FILTER = \"" + m.getName() + "\";"); - code.add(""); - - filtrableAttrs.add(m.getName()); - } - }); - - if (!filtrableAttrs.isEmpty()) { - addImport(imports, F.class); - addImport(imports, List.class); - addImport(imports, Collections.class); - - code.add(TAB + "/** List of filtrable attributes. */"); - code.add(TAB + "private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList("); - code.add(TAB + TAB + '\"' + String.join("\", \"", filtrableAttrs) + '\"'); - code.add(TAB + "));"); - code.add(""); - code.add(TAB + "/** {@inheritDoc} */"); - code.add(TAB + "@Override public List filtrableAttributes() {"); - code.add(TAB + TAB + "return FILTRABLE_ATTRS;"); - code.add(TAB + "}"); - code.add(""); - } - - code.add(TAB + "/** {@inheritDoc} */"); - code.add(TAB + "@Override public void visitAll(AttributeVisitor v) {"); - - forEachMethod(clazz, (m, i) -> { - String name = m.getName(); - - Class retClazz = m.getReturnType(); - - String line = TAB + TAB; - - if (!retClazz.isPrimitive() && !retClazz.getName().startsWith("java.lang")) - addImport(imports, retClazz); - - line += "v.accept(" + i + ", \"" + name + "\", " + retClazz.getSimpleName() + ".class);"; - - code.add(line); - }); - - code.add(TAB + "}"); - code.add(""); - code.add(TAB + "/** {@inheritDoc} */"); - code.add(TAB + "@Override public void visitAll(" + simpleName + " row, AttributeWithValueVisitor v) {"); - - forEachMethod(clazz, (m, i) -> { - String name = m.getName(); - - Class retClazz = m.getReturnType(); - - String line = TAB + TAB; - - if (!retClazz.isPrimitive()) { - line += "v.accept(" + i + ", \"" + name + "\", " + retClazz.getSimpleName() + ".class, row." + m.getName() + "());"; - } - else if (retClazz == boolean.class) - line += "v.acceptBoolean(" + i + ", \"" + name + "\", row." + m.getName() + "());"; - else if (retClazz == char.class) - line += "v.acceptChar(" + i + ", \"" + name + "\", row." + m.getName() + "());"; - else if (retClazz == byte.class) - line += "v.acceptByte(" + i + ", \"" + name + "\", row." + m.getName() + "());"; - else if (retClazz == short.class) - line += "v.acceptShort(" + i + ", \"" + name + "\", row." + m.getName() + "());"; - else if (retClazz == int.class) - line += "v.acceptInt(" + i + ", \"" + name + "\", row." + m.getName() + "());"; - else if (retClazz == long.class) - line += "v.acceptLong(" + i + ", \"" + name + "\", row." + m.getName() + "());"; - else if (retClazz == float.class) - line += "v.acceptFloat(" + i + ", \"" + name + "\", row." + m.getName() + "());"; - else if (retClazz == double.class) - line += "v.acceptDouble(" + i + ", \"" + name + "\", row." + m.getName() + "());"; - - code.add(line); - }); - - code.add(TAB + "}"); - code.add(""); - - final int[] cnt = {0}; - forEachMethod(clazz, (m, i) -> cnt[0]++); - - code.add(TAB + "/** {@inheritDoc} */"); - code.add(TAB + "@Override public int count() {"); - code.add(TAB + TAB + "return " + cnt[0] + ';'); - code.add(TAB + "}"); - code.add("}"); - - code.addAll(2, imports); - - addLicenseHeader(code); - - return code; - } - - /** Adds import to set imports set. */ - private void addImport(Set imports, Class cls) { - imports.add("import " + cls.getName().replaceAll("\\$", ".") + ';'); - } - - /** - * Adds Apache License Header to the source code. - * - * @param code Source code. - */ - private void addLicenseHeader(List code) { - List lic = new ArrayList<>(); - - lic.add("/*"); - lic.add(" * Licensed to the Apache Software Foundation (ASF) under one or more"); - lic.add(" * contributor license agreements. See the NOTICE file distributed with"); - lic.add(" * this work for additional information regarding copyright ownership."); - lic.add(" * The ASF licenses this file to You under the Apache License, Version 2.0"); - lic.add(" * (the \"License\"); you may not use this file except in compliance with"); - lic.add(" * the License. You may obtain a copy of the License at"); - lic.add(" *"); - lic.add(" * http://www.apache.org/licenses/LICENSE-2.0"); - lic.add(" *"); - lic.add(" * Unless required by applicable law or agreed to in writing, software"); - lic.add(" * distributed under the License is distributed on an \"AS IS\" BASIS,"); - lic.add(" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied."); - lic.add(" * See the License for the specific language governing permissions and"); - lic.add(" * limitations under the License."); - lic.add(" */"); - lic.add(""); - - code.addAll(0, lic); - } - - /** - * Iterates each method of the {@code clazz} and call consume {@code c} for it. - * - * @param c Method consumer. - */ - private void forEachMethod(Class clazz, ObjIntConsumer c) { - Method[] methods = clazz.getMethods(); - - List notOrdered = new ArrayList<>(); - List ordered = new ArrayList<>(); - - for (int i = 0; i < methods.length; i++) { - Method m = methods[i]; - - if (Modifier.isStatic(m.getModifiers())) - continue; - - if (SYS_METHODS.contains(m.getName())) - continue; - - Class retClazz = m.getReturnType(); - - if (retClazz == void.class) - continue; - - if (m.getAnnotation(Order.class) != null) - ordered.add(m); - else - notOrdered.add(m); - } - - Collections.sort(ordered, Comparator.comparingInt(m -> m.getAnnotation(Order.class).value())); - Collections.sort(notOrdered, Comparator.comparing(Method::getName)); - - for (int i = 0; i < ordered.size(); i++) - c.accept(ordered.get(i), i); - - for (int i = 0; i < notOrdered.size(); i++) - c.accept(notOrdered.get(i), i + ordered.size()); - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java similarity index 84% rename from modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java rename to modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java index 4093996ebc62b..9e66e8ccca551 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java @@ -21,12 +21,9 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; /** - * Annotation to mark view row attribute for a {@link SystemViewRowAttributeWalker} as filtrable. - * - * @see SystemViewRowAttributeWalker + * Annotation to mark view row attribute for a {@code SystemViewRowAttributeWalker} as filterable. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java similarity index 85% rename from modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java rename to modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java index e64a50143056f..ed747f087e7ec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java @@ -21,14 +21,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; /** - * Annotation to set walk order for a {@link SystemViewRowAttributeWalker}. + * Annotation to set walk order for a {@code SystemViewRowAttributeWalker}. * Walker traverse attributes from low to high value. - * - * @see SystemViewRowAttributeWalker - * @see CacheViewWalker */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java new file mode 100644 index 0000000000000..3e293857c1895 --- /dev/null +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java @@ -0,0 +1,301 @@ +/* + * 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.ignite.internal.managers.systemview.walker; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; +import java.util.function.ObjIntConsumer; +import javax.annotation.processing.ProcessingEnvironment; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.DeclaredType; +import javax.lang.model.type.TypeKind; +import javax.lang.model.type.TypeMirror; +import javax.tools.JavaFileObject; +import org.apache.ignite.internal.util.typedef.F; + +/** + * Generator for {@code SystemViewRowAttributeWalker} implementations. + * Used by {@link SystemViewRowAttributeWalkerProcessor} to generate walker classes during compilation. + */ +public class SystemViewRowAttributeWalkerGenerator { + /** Methods that should be excluded from specific {@code SystemViewRowAttributeWalker}. */ + private static final Set SYS_METHODS = new HashSet<>(Arrays.asList("equals", "hashCode", "toString", + "getClass")); + + /** Package for {@code SystemViewRowAttributeWalker} implementations. */ + public static final String WALKER_PACKAGE = "org.apache.ignite.internal.managers.systemview.walker.codegen"; + + /** */ + public static final String TAB = " "; + + /** Processing environment. */ + private final ProcessingEnvironment env; + + /** + * Constructor. + * + * @param env Processing environment. + */ + public SystemViewRowAttributeWalkerGenerator(ProcessingEnvironment env) { + this.env = env; + } + + /** + * Generates the walker class for the given view row class and its ordered getter methods. + * + * @param cls View row class element. + * @throws IOException If file creation fails. + */ + public void generate(TypeElement cls) throws IOException { + String clsSimple = cls.getSimpleName().toString(); + String walkerClsName = clsSimple + "Walker"; + String walkerQualified = WALKER_PACKAGE + "." + walkerClsName; + + JavaFileObject file = env.getFiler().createSourceFile(walkerQualified); + + try (PrintWriter w = new PrintWriter(file.openWriter())) { + for (String s : generate0(cls)) { + w.println(s); + } + } + } + + /** + * Generates {@code SystemViewRowAttributeWalker} implementation. + * + * @param clazz Class to generate {@code SystemViewRowAttributeWalker} for. + * @return Java source code of the {@code SystemViewRowAttributeWalker} implementation. + */ + private Collection generate0(TypeElement clazz) { + final List code = new ArrayList<>(); + final Set imports = new TreeSet<>(Comparator.comparing(s -> s.replace(";", ""))); + + imports.add("import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker;"); + imports.add("import " + clazz.getQualifiedName().toString() + ';'); + + String simpleName = clazz.getSimpleName().toString(); + + code.add("package " + WALKER_PACKAGE + ";"); + code.add(""); + code.add(""); + code.add("/**"); + code.add(" * This class is generated automatically."); + code.add(" * "); + code.add(" * @see org.apache.ignite.internal.managers.systemview.walker.SystemViewRowAttributeWalkerProcessor"); + code.add(" */"); + code.add("public class " + simpleName + "Walker implements SystemViewRowAttributeWalker<" + simpleName + "> {"); + + List filtrableAttrs = new ArrayList<>(); + + forEachMethod(clazz, (m, i) -> { + if (m.getAnnotation(Filtrable.class) != null) { + code.add(TAB + "/** Filter key for attribute \"" + m.getSimpleName().toString() + "\" */"); + code.add(TAB + "public static final String " + m.getSimpleName().toString() + .replaceAll("(\\p{Upper})", "_$1") + .toUpperCase() + "_FILTER = \"" + m.getSimpleName().toString() + "\";"); + code.add(""); + + filtrableAttrs.add(m.getSimpleName().toString()); + } + }); + + if (!filtrableAttrs.isEmpty()) { + addImport(imports, F.class); + addImport(imports, List.class); + addImport(imports, Collections.class); + + code.add(TAB + "/** List of filtrable attributes. */"); + code.add(TAB + "private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList("); + code.add(TAB + TAB + '\"' + String.join("\", \"", filtrableAttrs) + '\"'); + code.add(TAB + "));"); + code.add(""); + code.add(TAB + "/** {@inheritDoc} */"); + code.add(TAB + "@Override public List filtrableAttributes() {"); + code.add(TAB + TAB + "return FILTRABLE_ATTRS;"); + code.add(TAB + "}"); + code.add(""); + } + + code.add(TAB + "/** {@inheritDoc} */"); + code.add(TAB + "@Override public void visitAll(AttributeVisitor v) {"); + + forEachMethod(clazz, (m, i) -> { + String name = m.getSimpleName().toString(); + + TypeMirror retClazz = m.getReturnType(); + + String line = TAB + TAB; + + if (!retClazz.getKind().isPrimitive() && !retClazz.toString().startsWith("java.lang")) + imports.add("import " + retClazz + ";"); + + line += "v.accept(" + i + ", \"" + name + "\", " + simpleName(retClazz) + ".class);"; + + code.add(line); + }); + + code.add(TAB + "}"); + code.add(""); + code.add(TAB + "/** {@inheritDoc} */"); + code.add(TAB + "@Override public void visitAll(" + simpleName + " row, AttributeWithValueVisitor v) {"); + + forEachMethod(clazz, (m, i) -> { + String name = m.getSimpleName().toString(); + + TypeMirror retClazz = m.getReturnType(); + + String line = TAB + TAB; + + if (!retClazz.getKind().isPrimitive()) + line += "v.accept(" + i + ", \"" + name + "\", " + simpleName(retClazz) + ".class, row." + m.getSimpleName().toString() + "());"; + else if (retClazz.getKind() == TypeKind.BOOLEAN) + line += "v.acceptBoolean(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + else if (retClazz.getKind() == TypeKind.CHAR) + line += "v.acceptChar(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + else if (retClazz.getKind() == TypeKind.BYTE) + line += "v.acceptByte(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + else if (retClazz.getKind() == TypeKind.SHORT) + line += "v.acceptShort(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + else if (retClazz.getKind() == TypeKind.INT) + line += "v.acceptInt(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + else if (retClazz.getKind() == TypeKind.LONG) + line += "v.acceptLong(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + else if (retClazz.getKind() == TypeKind.FLOAT) + line += "v.acceptFloat(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + else if (retClazz.getKind() == TypeKind.DOUBLE) + line += "v.acceptDouble(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + + code.add(line); + }); + + code.add(TAB + "}"); + code.add(""); + + final int[] cnt = {0}; + forEachMethod(clazz, (m, i) -> cnt[0]++); + + code.add(TAB + "/** {@inheritDoc} */"); + code.add(TAB + "@Override public int count() {"); + code.add(TAB + TAB + "return " + cnt[0] + ';'); + code.add(TAB + "}"); + code.add("}"); + + code.addAll(2, imports); + + addLicenseHeader(code); + + return code; + } + + /** Adds import to set imports set. */ + private void addImport(Set imports, Class cls) { + imports.add("import " + cls.getName().replaceAll("\\$", ".") + ';'); + } + + /** + * Adds Apache License Header to the source code. + * + * @param code Source code. + */ + private void addLicenseHeader(List code) { + List lic = new ArrayList<>(); + + lic.add("/*"); + lic.add(" * Licensed to the Apache Software Foundation (ASF) under one or more"); + lic.add(" * contributor license agreements. See the NOTICE file distributed with"); + lic.add(" * this work for additional information regarding copyright ownership."); + lic.add(" * The ASF licenses this file to You under the Apache License, Version 2.0"); + lic.add(" * (the \"License\"); you may not use this file except in compliance with"); + lic.add(" * the License. You may obtain a copy of the License at"); + lic.add(" *"); + lic.add(" * http://www.apache.org/licenses/LICENSE-2.0"); + lic.add(" *"); + lic.add(" * Unless required by applicable law or agreed to in writing, software"); + lic.add(" * distributed under the License is distributed on an \"AS IS\" BASIS,"); + lic.add(" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied."); + lic.add(" * See the License for the specific language governing permissions and"); + lic.add(" * limitations under the License."); + lic.add(" */"); + lic.add(""); + + code.addAll(0, lic); + } + + /** + * Iterates each method of the {@code clazz} and call consume {@code c} for it. + * + * @param c Method consumer. + */ + private void forEachMethod(TypeElement clazz, ObjIntConsumer c) { + List notOrdered = new ArrayList<>(); + List ordered = new ArrayList<>(); + + for (Element el : clazz.getEnclosedElements()) { + if (el.getKind() != ElementKind.METHOD) + continue; + + ExecutableElement m = (ExecutableElement)el; + + if (m.getModifiers().contains(Modifier.STATIC) + || !m.getModifiers().contains(Modifier.PUBLIC) + || m.getReturnType().getKind() == TypeKind.VOID) + continue; + + if (SYS_METHODS.contains(m.getSimpleName().toString())) + continue; + + if (el.getAnnotation(Order.class) != null) + ordered.add(m); + else + notOrdered.add(m); + } + + ordered.sort(Comparator.comparingInt(m -> m.getAnnotation(Order.class).value())); + notOrdered.sort(Comparator.comparing(m -> m.getSimpleName().toString())); + + for (int i = 0; i < ordered.size(); i++) + c.accept(ordered.get(i), i); + + for (int i = 0; i < notOrdered.size(); i++) + c.accept(notOrdered.get(i), i + ordered.size()); + } + + /** */ + private String simpleName(TypeMirror type) { + if (type.getKind() == TypeKind.DECLARED) { + DeclaredType declaredType = (DeclaredType)type; + + return declaredType.asElement().getSimpleName().toString(); + } + + return type.toString(); + } +} diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java new file mode 100644 index 0000000000000..7c6c76047f713 --- /dev/null +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java @@ -0,0 +1,73 @@ +/* + * 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.ignite.internal.managers.systemview.walker; + +import java.util.Set; +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.annotation.processing.SupportedSourceVersion; +import javax.lang.model.SourceVersion; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.TypeElement; +import javax.lang.model.type.TypeMirror; +import javax.tools.Diagnostic; + +/** + * Generates {@code SystemViewRowAttributeWalker} implementations + * for view classes marked by {@code SystemViewDescriptor} interface. + * + * The generated walker follows the naming convention: + * {@code org.apache.ignite.internal.managers.systemview.walker.codegen.[ViewClassName]Walker}. + */ +@SupportedAnnotationTypes("org.apache.ignite.internal.managers.systemview.walker.Order") +@SupportedSourceVersion(SourceVersion.RELEASE_11) +public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { + /** Base interface that every message must implement. */ + static final String VIEW_INTERFACE = "org.apache.ignite.internal.managers.systemview.SystemViewDescriptor"; + + /** + * Processes all classes implementing the {@code SystemViewDescriptor} interface and generates corresponding walker code. + */ + @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { + TypeMirror viewType = processingEnv.getElementUtils().getTypeElement(VIEW_INTERFACE).asType(); + + for (Element el : roundEnv.getRootElements()) { + if (el.getKind() != ElementKind.CLASS) + continue; + + TypeElement clazz = (TypeElement)el; + + if (!processingEnv.getTypeUtils().isAssignable(clazz.asType(), viewType)) + continue; + + try { + new SystemViewRowAttributeWalkerGenerator(processingEnv).generate(clazz); + } + catch (Exception e) { + processingEnv.getMessager().printMessage( + Diagnostic.Kind.ERROR, + "Failed to generate a message serializer:" + e.getMessage(), + clazz); + } + } + + return true; + } +} diff --git a/modules/codegen2/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/modules/codegen2/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 5c89eacfb8359..4e8aead412551 100644 --- a/modules/codegen2/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/modules/codegen2/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1 +1,2 @@ -org.apache.ignite.internal.MessageProcessor \ No newline at end of file +org.apache.ignite.internal.MessageProcessor +org.apache.ignite.internal.managers.systemview.walker.SystemViewRowAttributeWalkerProcessor diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 536bfb760197d..aeeed82c6606e 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -386,6 +386,7 @@ ${ignite.generated.source.path} org.apache.ignite.internal.MessageProcessor + org.apache.ignite.internal.managers.systemview.walker.SystemViewRowAttributeWalkerProcessor -Xmaxerrs diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 7334cfc16c9a9..88115da629fb4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -76,9 +76,9 @@ import org.apache.ignite.internal.events.DiscoveryCustomEvent; import org.apache.ignite.internal.managers.GridManagerAdapter; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.ClusterNodeViewWalker; import org.apache.ignite.internal.managers.systemview.walker.NodeAttributeViewWalker; import org.apache.ignite.internal.managers.systemview.walker.NodeMetricsViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ClusterNodeViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; import org.apache.ignite.internal.processors.cache.ClientCacheChangeDummyDiscoveryMessage; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/SystemViewDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/SystemViewDescriptor.java new file mode 100644 index 0000000000000..5e1ff33ac4f19 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/SystemViewDescriptor.java @@ -0,0 +1,33 @@ +/* + * 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.ignite.internal.managers.systemview; + +import org.apache.ignite.internal.managers.systemview.walker.Filtrable; +import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.managers.systemview.walker.SystemViewRowAttributeWalkerProcessor; +import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; + +/** + * Marker of system view descriptor. Processed by {@link SystemViewRowAttributeWalkerProcessor} to generate + * {@link SystemViewRowAttributeWalker} implementations. + * + * @see Order + * @see Filtrable + */ +public interface SystemViewDescriptor { +} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClusterNodeViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClusterNodeViewWalker.java deleted file mode 100644 index 10d0dbd576f6c..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClusterNodeViewWalker.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.UUID; -import org.apache.ignite.spi.systemview.view.ClusterNodeView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ClusterNodeView} attributes walker. - * - * @see ClusterNodeView - */ -public class ClusterNodeViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "nodeId", UUID.class); - v.accept(1, "consistentId", String.class); - v.accept(2, "version", String.class); - v.accept(3, "isClient", boolean.class); - v.accept(4, "nodeOrder", long.class); - v.accept(5, "addresses", String.class); - v.accept(6, "hostnames", String.class); - v.accept(7, "isLocal", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ClusterNodeView row, AttributeWithValueVisitor v) { - v.accept(0, "nodeId", UUID.class, row.nodeId()); - v.accept(1, "consistentId", String.class, row.consistentId()); - v.accept(2, "version", String.class, row.version()); - v.acceptBoolean(3, "isClient", row.isClient()); - v.acceptLong(4, "nodeOrder", row.nodeOrder()); - v.accept(5, "addresses", String.class, row.addresses()); - v.accept(6, "hostnames", String.class, row.hostnames()); - v.acceptBoolean(7, "isLocal", row.isLocal()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 8; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java index b668a22fd2bfe..723365c29396d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java @@ -19,6 +19,7 @@ import java.util.UUID; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; @@ -26,7 +27,7 @@ /** * Cluster node representation for a {@link SystemView}. */ -public class ClusterNodeView { +public class ClusterNodeView implements SystemViewDescriptor { /** Cluster node. */ private final ClusterNode n; From a38a262158e8ed72cc6b0377e9146d259c3551fb Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Thu, 29 Jan 2026 00:08:07 +0300 Subject: [PATCH 02/18] wip --- ...SystemViewRowAttributeWalkerGenerator.java | 65 ++++--- ...SystemViewRowAttributeWalkerProcessor.java | 6 +- modules/core/pom.xml | 2 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../discovery/GridDiscoveryManager.java | 4 +- .../systemview/ScanQuerySystemView.java | 2 +- .../walker/AtomicLongViewWalker.java | 52 ------ .../walker/AtomicReferenceViewWalker.java | 52 ------ .../walker/AtomicSequenceViewWalker.java | 54 ------ .../walker/AtomicStampedViewWalker.java | 54 ------ .../BaselineNodeAttributeViewWalker.java | 67 ------- .../walker/BaselineNodeViewWalker.java | 46 ----- .../walker/BinaryMetadataViewWalker.java | 56 ------ .../walker/CacheGroupIoViewWalker.java | 50 ----- .../walker/CacheGroupViewWalker.java | 78 -------- .../walker/CachePagesListViewWalker.java | 80 -------- .../systemview/walker/CacheViewWalker.java | 174 ------------------ .../ClientConnectionAttributeViewWalker.java | 67 ------- .../walker/ClientConnectionViewWalker.java | 55 ------ .../walker/ComputeJobViewWalker.java | 77 -------- .../walker/ComputeTaskViewWalker.java | 70 ------- .../walker/ConfigurationViewWalker.java | 46 ----- .../walker/ContinuousQueryViewWalker.java | 81 -------- .../walker/CountDownLatchViewWalker.java | 56 ------ .../walker/MetastorageViewWalker.java | 46 ----- .../systemview/walker/MetricsViewWalker.java | 48 ----- .../walker/NodeAttributeViewWalker.java | 68 ------- .../walker/NodeMetricsViewWalker.java | 158 ---------------- .../walker/PagesListViewWalker.java | 70 ------- .../PagesTimestampHistogramViewWalker.java | 51 ----- .../walker/PartitionStateViewWalker.java | 75 -------- .../systemview/walker/QueueViewWalker.java | 61 ------ .../walker/ReentrantLockViewWalker.java | 60 ------ .../walker/ScanQueryViewWalker.java | 79 -------- .../walker/SemaphoreViewWalker.java | 60 ------ .../systemview/walker/ServiceViewWalker.java | 67 ------- .../systemview/walker/SetViewWalker.java | 57 ------ .../systemview/walker/SnapshotViewWalker.java | 58 ------ .../systemview/walker/SqlIndexViewWalker.java | 66 ------- .../walker/SqlPlanHistoryViewWalker.java | 55 ------ .../walker/SqlQueryHistoryViewWalker.java | 63 ------- .../systemview/walker/SqlQueryViewWalker.java | 62 ------- .../walker/SqlSchemaViewWalker.java | 46 ----- .../walker/SqlTableColumnViewWalker.java | 64 ------- .../systemview/walker/SqlTableViewWalker.java | 66 ------- .../walker/SqlViewColumnViewWalker.java | 58 ------ .../systemview/walker/SqlViewViewWalker.java | 50 ----- ...atisticsColumnConfigurationViewWalker.java | 87 --------- .../StatisticsColumnGlobalDataViewWalker.java | 90 --------- .../StatisticsColumnLocalDataViewWalker.java | 90 --------- ...atisticsColumnPartitionDataViewWalker.java | 96 ---------- .../walker/StripedExecutorTaskViewWalker.java | 50 ----- .../walker/TransactionViewWalker.java | 97 ---------- .../processors/cache/ClusterCachesInfo.java | 4 +- .../processors/cache/GridCacheProcessor.java | 6 +- .../CacheObjectBinaryProcessorImpl.java | 2 +- .../GridCacheDatabaseSharedManager.java | 2 +- .../IgniteCacheDatabaseSharedManager.java | 4 +- .../snapshot/IgniteSnapshotManager.java | 2 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../cluster/GridClusterStateProcessor.java | 4 +- .../continuous/GridContinuousProcessor.java | 2 +- .../DataStructuresProcessor.java | 18 +- .../processors/job/GridJobProcessor.java | 2 +- .../DistributedMetaStorageImpl.java | 2 +- .../metric/SqlViewMetricExporterSpi.java | 2 +- .../odbc/ClientListenerProcessor.java | 4 +- .../processors/pool/PoolProcessor.java | 2 +- .../query/running/RunningQueryManager.java | 6 +- .../schema/management/SchemaManager.java | 12 +- .../stat/IgniteGlobalStatisticsManager.java | 6 +- .../IgniteStatisticsConfigurationManager.java | 2 +- .../stat/IgniteStatisticsRepository.java | 4 +- .../view/ColumnConfigurationViewSupplier.java | 2 +- .../view/ColumnLocalDataViewSupplier.java | 4 +- .../view/ColumnPartitionDataViewSupplier.java | 2 +- .../StatisticsColumnConfigurationView.java | 3 +- .../view/StatisticsColumnGlobalDataView.java | 3 +- .../view/StatisticsColumnLocalDataView.java | 4 +- .../StatisticsColumnPartitionDataView.java | 3 +- .../service/IgniteServiceProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 2 +- .../view/BaselineNodeAttributeView.java | 3 +- .../spi/systemview/view/BaselineNodeView.java | 3 +- .../systemview/view/BinaryMetadataView.java | 3 +- .../spi/systemview/view/CacheGroupIoView.java | 3 +- .../spi/systemview/view/CacheGroupView.java | 3 +- .../ignite/spi/systemview/view/CacheView.java | 3 +- .../view/ClientConnectionAttributeView.java | 3 +- .../systemview/view/ClientConnectionView.java | 4 +- .../spi/systemview/view/ComputeJobView.java | 3 +- .../spi/systemview/view/ComputeTaskView.java | 3 +- .../systemview/view/ConfigurationView.java | 3 +- .../systemview/view/ContinuousQueryView.java | 3 +- .../spi/systemview/view/MetastorageView.java | 3 +- .../spi/systemview/view/MetricsView.java | 3 +- .../systemview/view/NodeAttributeView.java | 3 +- .../spi/systemview/view/NodeMetricsView.java | 3 +- .../spi/systemview/view/PagesListView.java | 3 +- .../view/PagesTimestampHistogramView.java | 3 +- .../systemview/view/PartitionStateView.java | 3 +- .../spi/systemview/view/ScanQueryView.java | 3 +- .../spi/systemview/view/ServiceView.java | 3 +- .../spi/systemview/view/SnapshotView.java | 3 +- .../systemview/view/SqlPlanHistoryView.java | 3 +- .../systemview/view/SqlQueryHistoryView.java | 3 +- .../spi/systemview/view/SqlQueryView.java | 3 +- .../view/StripedExecutorTaskView.java | 3 +- .../spi/systemview/view/TransactionView.java | 3 +- .../AbstractDataStructureView.java | 3 +- .../view/datastructures/QueueView.java | 3 +- .../view/datastructures/SetView.java | 3 +- .../spi/systemview/view/sql/SqlIndexView.java | 3 +- .../systemview/view/sql/SqlSchemaView.java | 3 +- .../view/sql/SqlTableColumnView.java | 3 +- .../spi/systemview/view/sql/SqlTableView.java | 3 +- .../view/sql/SqlViewColumnView.java | 3 +- .../spi/systemview/view/sql/SqlViewView.java | 3 +- .../internal/metric/JmxExporterSpiTest.java | 2 +- .../internal/metric/SystemViewSelfTest.java | 8 +- .../PerformanceStatisticsSystemViewTest.java | 2 +- 121 files changed, 185 insertions(+), 3343 deletions(-) delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicLongViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicReferenceViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicSequenceViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicStampedViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BaselineNodeAttributeViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BaselineNodeViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BinaryMetadataViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheGroupIoViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheGroupViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CachePagesListViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionAttributeViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ComputeJobViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ComputeTaskViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ConfigurationViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ContinuousQueryViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CountDownLatchViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/MetastorageViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/MetricsViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/NodeAttributeViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/NodeMetricsViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PagesListViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PagesTimestampHistogramViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PartitionStateViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/QueueViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ReentrantLockViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ScanQueryViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SemaphoreViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ServiceViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SetViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SnapshotViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlIndexViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlPlanHistoryViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlQueryHistoryViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlQueryViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlSchemaViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableColumnViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlViewColumnViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlViewViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnConfigurationViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnGlobalDataViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnLocalDataViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnPartitionDataViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StripedExecutorTaskViewWalker.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/TransactionViewWalker.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java index 3e293857c1895..21911154b6287 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java @@ -59,11 +59,7 @@ public class SystemViewRowAttributeWalkerGenerator { /** Processing environment. */ private final ProcessingEnvironment env; - /** - * Constructor. - * - * @param env Processing environment. - */ + /** @param env Processing environment. */ public SystemViewRowAttributeWalkerGenerator(ProcessingEnvironment env) { this.env = env; } @@ -82,19 +78,18 @@ public void generate(TypeElement cls) throws IOException { JavaFileObject file = env.getFiler().createSourceFile(walkerQualified); try (PrintWriter w = new PrintWriter(file.openWriter())) { - for (String s : generate0(cls)) { - w.println(s); - } + for (String ln : generateWalker(cls)) + w.println(ln); } } /** * Generates {@code SystemViewRowAttributeWalker} implementation. * - * @param clazz Class to generate {@code SystemViewRowAttributeWalker} for. + * @param clazz Class type to generate {@code SystemViewRowAttributeWalker} for. * @return Java source code of the {@code SystemViewRowAttributeWalker} implementation. */ - private Collection generate0(TypeElement clazz) { + private Collection generateWalker(TypeElement clazz) { final List code = new ArrayList<>(); final Set imports = new TreeSet<>(Comparator.comparing(s -> s.replace(";", ""))); @@ -154,8 +149,8 @@ private Collection generate0(TypeElement clazz) { String line = TAB + TAB; - if (!retClazz.getKind().isPrimitive() && !retClazz.toString().startsWith("java.lang")) - imports.add("import " + retClazz + ";"); + if (!retClazz.getKind().isPrimitive() && !qualifiedName(retClazz).startsWith("java.lang")) + imports.add("import " + qualifiedName(retClazz) + ";"); line += "v.accept(" + i + ", \"" + name + "\", " + simpleName(retClazz) + ".class);"; @@ -258,24 +253,30 @@ private void forEachMethod(TypeElement clazz, ObjIntConsumer List notOrdered = new ArrayList<>(); List ordered = new ArrayList<>(); - for (Element el : clazz.getEnclosedElements()) { - if (el.getKind() != ElementKind.METHOD) - continue; + while (clazz != null) { + for (Element el : clazz.getEnclosedElements()) { + if (el.getKind() != ElementKind.METHOD) + continue; - ExecutableElement m = (ExecutableElement)el; + ExecutableElement m = (ExecutableElement)el; - if (m.getModifiers().contains(Modifier.STATIC) - || !m.getModifiers().contains(Modifier.PUBLIC) - || m.getReturnType().getKind() == TypeKind.VOID) - continue; + if (m.getModifiers().contains(Modifier.STATIC) + || !m.getModifiers().contains(Modifier.PUBLIC) + || m.getReturnType().getKind() == TypeKind.VOID) + continue; - if (SYS_METHODS.contains(m.getSimpleName().toString())) - continue; + if (SYS_METHODS.contains(m.getSimpleName().toString())) + continue; - if (el.getAnnotation(Order.class) != null) - ordered.add(m); - else - notOrdered.add(m); + if (el.getAnnotation(Order.class) != null) + ordered.add(m); + else + notOrdered.add(m); + } + + Element superType = env.getTypeUtils().asElement(clazz.getSuperclass()); + + clazz = (TypeElement)superType; } ordered.sort(Comparator.comparingInt(m -> m.getAnnotation(Order.class).value())); @@ -298,4 +299,16 @@ private String simpleName(TypeMirror type) { return type.toString(); } + + /** */ + private String qualifiedName(TypeMirror type) { + if (type.getKind() == TypeKind.DECLARED) { + DeclaredType declaredType = (DeclaredType)type; + TypeElement el = (TypeElement) declaredType.asElement(); + + return el.getQualifiedName().toString(); + } + + return type.toString(); + } } diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java index 7c6c76047f713..0a3a183fd2c32 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java +++ b/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java @@ -25,6 +25,7 @@ import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; +import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; @@ -32,7 +33,7 @@ /** * Generates {@code SystemViewRowAttributeWalker} implementations * for view classes marked by {@code SystemViewDescriptor} interface. - * + *

* The generated walker follows the naming convention: * {@code org.apache.ignite.internal.managers.systemview.walker.codegen.[ViewClassName]Walker}. */ @@ -57,6 +58,9 @@ public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { if (!processingEnv.getTypeUtils().isAssignable(clazz.asType(), viewType)) continue; + if (clazz.getModifiers().contains(Modifier.ABSTRACT)) + continue; + try { new SystemViewRowAttributeWalkerGenerator(processingEnv).generate(clazz); } diff --git a/modules/core/pom.xml b/modules/core/pom.xml index aeeed82c6606e..62c40492b30dd 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -34,7 +34,7 @@ apache-ignite - ${project.build.directory}/generated-sources/communication + ${project.build.directory}/generated-sources/codegen diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 56191e68d9ebd..d99e7d3d7786b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -110,7 +110,7 @@ import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; import org.apache.ignite.internal.managers.systemview.IgniteConfigurationIterable; -import org.apache.ignite.internal.managers.systemview.walker.ConfigurationViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ConfigurationViewWalker; import org.apache.ignite.internal.managers.tracing.GridTracingManager; import org.apache.ignite.internal.plugin.IgniteLogInfoProvider; import org.apache.ignite.internal.plugin.IgniteLogInfoProviderImpl; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 88115da629fb4..344803d82db34 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -76,9 +76,9 @@ import org.apache.ignite.internal.events.DiscoveryCustomEvent; import org.apache.ignite.internal.managers.GridManagerAdapter; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.NodeAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.NodeMetricsViewWalker; import org.apache.ignite.internal.managers.systemview.walker.codegen.ClusterNodeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.NodeAttributeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.NodeMetricsViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; import org.apache.ignite.internal.processors.cache.ClientCacheChangeDummyDiscoveryMessage; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/ScanQuerySystemView.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/ScanQuerySystemView.java index 5beb99372ee7c..1d417b3b93450 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/ScanQuerySystemView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/ScanQuerySystemView.java @@ -25,7 +25,7 @@ import java.util.UUID; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; -import org.apache.ignite.internal.managers.systemview.walker.ScanQueryViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ScanQueryViewWalker; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager; import org.apache.ignite.internal.processors.cache.query.ScanQueryIterator; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicLongViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicLongViewWalker.java deleted file mode 100644 index 793c2eb8ff3fe..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicLongViewWalker.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.AtomicLongView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link AtomicLongView} attributes walker. - * - * @see AtomicLongView - */ -public class AtomicLongViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "value", long.class); - v.accept(2, "groupName", String.class); - v.accept(3, "groupId", int.class); - v.accept(4, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(AtomicLongView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.acceptLong(1, "value", row.value()); - v.accept(2, "groupName", String.class, row.groupName()); - v.acceptInt(3, "groupId", row.groupId()); - v.acceptBoolean(4, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 5; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicReferenceViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicReferenceViewWalker.java deleted file mode 100644 index aa5ce55ddc23d..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicReferenceViewWalker.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.AtomicReferenceView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link AtomicReferenceView} attributes walker. - * - * @see AtomicReferenceView - */ -public class AtomicReferenceViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "value", String.class); - v.accept(2, "groupName", String.class); - v.accept(3, "groupId", int.class); - v.accept(4, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(AtomicReferenceView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.accept(1, "value", String.class, row.value()); - v.accept(2, "groupName", String.class, row.groupName()); - v.acceptInt(3, "groupId", row.groupId()); - v.acceptBoolean(4, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 5; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicSequenceViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicSequenceViewWalker.java deleted file mode 100644 index 33f159ebfa081..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicSequenceViewWalker.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.AtomicSequenceView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link AtomicSequenceView} attributes walker. - * - * @see AtomicSequenceView - */ -public class AtomicSequenceViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "value", long.class); - v.accept(2, "batchSize", long.class); - v.accept(3, "groupName", String.class); - v.accept(4, "groupId", int.class); - v.accept(5, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(AtomicSequenceView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.acceptLong(1, "value", row.value()); - v.acceptLong(2, "batchSize", row.batchSize()); - v.accept(3, "groupName", String.class, row.groupName()); - v.acceptInt(4, "groupId", row.groupId()); - v.acceptBoolean(5, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 6; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicStampedViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicStampedViewWalker.java deleted file mode 100644 index 00132b28748d2..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/AtomicStampedViewWalker.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.AtomicStampedView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link AtomicStampedView} attributes walker. - * - * @see AtomicStampedView - */ -public class AtomicStampedViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "value", String.class); - v.accept(2, "stamp", String.class); - v.accept(3, "groupName", String.class); - v.accept(4, "groupId", int.class); - v.accept(5, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(AtomicStampedView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.accept(1, "value", String.class, row.value()); - v.accept(2, "stamp", String.class, row.stamp()); - v.accept(3, "groupName", String.class, row.groupName()); - v.acceptInt(4, "groupId", row.groupId()); - v.acceptBoolean(5, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 6; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BaselineNodeAttributeViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BaselineNodeAttributeViewWalker.java deleted file mode 100644 index d4996dec1b34f..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BaselineNodeAttributeViewWalker.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Collections; -import java.util.List; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.BaselineNodeAttributeView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link BaselineNodeAttributeView} attributes walker. - * - * @see BaselineNodeAttributeView - */ -public class BaselineNodeAttributeViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "nodeConsistentId" */ - public static final String NODE_CONSISTENT_ID_FILTER = "nodeConsistentId"; - - /** Filter key for attribute "name" */ - public static final String NAME_FILTER = "name"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "nodeConsistentId", "name" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "nodeConsistentId", String.class); - v.accept(1, "name", String.class); - v.accept(2, "value", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(BaselineNodeAttributeView row, AttributeWithValueVisitor v) { - v.accept(0, "nodeConsistentId", String.class, row.nodeConsistentId()); - v.accept(1, "name", String.class, row.name()); - v.accept(2, "value", String.class, row.value()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 3; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BaselineNodeViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BaselineNodeViewWalker.java deleted file mode 100644 index 63bf053f9dd85..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BaselineNodeViewWalker.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.BaselineNodeView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link BaselineNodeView} attributes walker. - * - * @see BaselineNodeView - */ -public class BaselineNodeViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "consistentId", String.class); - v.accept(1, "online", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(BaselineNodeView row, AttributeWithValueVisitor v) { - v.accept(0, "consistentId", String.class, row.consistentId()); - v.acceptBoolean(1, "online", row.online()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 2; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BinaryMetadataViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BinaryMetadataViewWalker.java deleted file mode 100644 index b770dd705fa62..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/BinaryMetadataViewWalker.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.BinaryMetadataView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link BinaryMetadataView} attributes walker. - * - * @see BinaryMetadataView - */ -public class BinaryMetadataViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "typeId", int.class); - v.accept(1, "typeName", String.class); - v.accept(2, "affKeyFieldName", String.class); - v.accept(3, "fieldsCount", int.class); - v.accept(4, "fields", String.class); - v.accept(5, "schemasIds", String.class); - v.accept(6, "isEnum", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(BinaryMetadataView row, AttributeWithValueVisitor v) { - v.acceptInt(0, "typeId", row.typeId()); - v.accept(1, "typeName", String.class, row.typeName()); - v.accept(2, "affKeyFieldName", String.class, row.affKeyFieldName()); - v.acceptInt(3, "fieldsCount", row.fieldsCount()); - v.accept(4, "fields", String.class, row.fields()); - v.accept(5, "schemasIds", String.class, row.schemasIds()); - v.acceptBoolean(6, "isEnum", row.isEnum()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 7; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheGroupIoViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheGroupIoViewWalker.java deleted file mode 100644 index 40173c70a365b..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheGroupIoViewWalker.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.CacheGroupIoView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link CacheGroupIoView} attributes walker. - * - * @see CacheGroupIoView - */ -public class CacheGroupIoViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "cacheGroupId", int.class); - v.accept(1, "cacheGroupName", String.class); - v.accept(2, "physicalReads", long.class); - v.accept(3, "logicalReads", long.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(CacheGroupIoView row, AttributeWithValueVisitor v) { - v.acceptInt(0, "cacheGroupId", row.cacheGroupId()); - v.accept(1, "cacheGroupName", String.class, row.cacheGroupName()); - v.acceptLong(2, "physicalReads", row.physicalReads()); - v.acceptLong(3, "logicalReads", row.logicalReads()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 4; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheGroupViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheGroupViewWalker.java deleted file mode 100644 index a4b64112475b4..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheGroupViewWalker.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.cache.CacheRebalanceMode; -import org.apache.ignite.cache.PartitionLossPolicy; -import org.apache.ignite.spi.systemview.view.CacheGroupView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link CacheGroupView} attributes walker. - * - * @see CacheGroupView - */ -public class CacheGroupViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "cacheGroupName", String.class); - v.accept(1, "cacheCount", int.class); - v.accept(2, "dataRegionName", String.class); - v.accept(3, "cacheMode", CacheMode.class); - v.accept(4, "atomicityMode", CacheAtomicityMode.class); - v.accept(5, "affinity", String.class); - v.accept(6, "backups", int.class); - v.accept(7, "cacheGroupId", int.class); - v.accept(8, "isShared", boolean.class); - v.accept(9, "nodeFilter", String.class); - v.accept(10, "partitionLossPolicy", PartitionLossPolicy.class); - v.accept(11, "partitionsCount", int.class); - v.accept(12, "rebalanceDelay", long.class); - v.accept(13, "rebalanceMode", CacheRebalanceMode.class); - v.accept(14, "rebalanceOrder", int.class); - v.accept(15, "topologyValidator", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(CacheGroupView row, AttributeWithValueVisitor v) { - v.accept(0, "cacheGroupName", String.class, row.cacheGroupName()); - v.acceptInt(1, "cacheCount", row.cacheCount()); - v.accept(2, "dataRegionName", String.class, row.dataRegionName()); - v.accept(3, "cacheMode", CacheMode.class, row.cacheMode()); - v.accept(4, "atomicityMode", CacheAtomicityMode.class, row.atomicityMode()); - v.accept(5, "affinity", String.class, row.affinity()); - v.acceptInt(6, "backups", row.backups()); - v.acceptInt(7, "cacheGroupId", row.cacheGroupId()); - v.acceptBoolean(8, "isShared", row.isShared()); - v.accept(9, "nodeFilter", String.class, row.nodeFilter()); - v.accept(10, "partitionLossPolicy", PartitionLossPolicy.class, row.partitionLossPolicy()); - v.acceptInt(11, "partitionsCount", row.partitionsCount()); - v.acceptLong(12, "rebalanceDelay", row.rebalanceDelay()); - v.accept(13, "rebalanceMode", CacheRebalanceMode.class, row.rebalanceMode()); - v.acceptInt(14, "rebalanceOrder", row.rebalanceOrder()); - v.accept(15, "topologyValidator", String.class, row.topologyValidator()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 16; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CachePagesListViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CachePagesListViewWalker.java deleted file mode 100644 index f2e277b7129e6..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CachePagesListViewWalker.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Collections; -import java.util.List; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.CachePagesListView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link CachePagesListView} attributes walker. - * - * @see CachePagesListView - */ -public class CachePagesListViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "cacheGroupId" */ - public static final String CACHE_GROUP_ID_FILTER = "cacheGroupId"; - - /** Filter key for attribute "partitionId" */ - public static final String PARTITION_ID_FILTER = "partitionId"; - - /** Filter key for attribute "bucketNumber" */ - public static final String BUCKET_NUMBER_FILTER = "bucketNumber"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "cacheGroupId", "partitionId", "bucketNumber" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "cacheGroupId", int.class); - v.accept(1, "partitionId", int.class); - v.accept(2, "name", String.class); - v.accept(3, "bucketNumber", int.class); - v.accept(4, "bucketSize", long.class); - v.accept(5, "stripesCount", int.class); - v.accept(6, "cachedPagesCount", int.class); - v.accept(7, "pageFreeSpace", int.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(CachePagesListView row, AttributeWithValueVisitor v) { - v.acceptInt(0, "cacheGroupId", row.cacheGroupId()); - v.acceptInt(1, "partitionId", row.partitionId()); - v.accept(2, "name", String.class, row.name()); - v.acceptInt(3, "bucketNumber", row.bucketNumber()); - v.acceptLong(4, "bucketSize", row.bucketSize()); - v.acceptInt(5, "stripesCount", row.stripesCount()); - v.acceptInt(6, "cachedPagesCount", row.cachedPagesCount()); - v.acceptInt(7, "pageFreeSpace", row.pageFreeSpace()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 8; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheViewWalker.java deleted file mode 100644 index c59e8f96b743e..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CacheViewWalker.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMode; -import org.apache.ignite.cache.CacheRebalanceMode; -import org.apache.ignite.cache.CacheWriteSynchronizationMode; -import org.apache.ignite.cache.PartitionLossPolicy; -import org.apache.ignite.internal.processors.cache.CacheType; -import org.apache.ignite.spi.systemview.view.CacheView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link CacheView} attributes walker. - * - * @see CacheView - */ -public class CacheViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "cacheName", String.class); - v.accept(1, "cacheId", int.class); - v.accept(2, "cacheType", CacheType.class); - v.accept(3, "cacheMode", CacheMode.class); - v.accept(4, "atomicityMode", CacheAtomicityMode.class); - v.accept(5, "cacheGroupName", String.class); - v.accept(6, "affinity", String.class); - v.accept(7, "affinityMapper", String.class); - v.accept(8, "backups", int.class); - v.accept(9, "cacheGroupId", int.class); - v.accept(10, "cacheLoaderFactory", String.class); - v.accept(11, "cacheStoreFactory", String.class); - v.accept(12, "cacheWriterFactory", String.class); - v.accept(13, "conflictResolver", String.class); - v.accept(14, "dataRegionName", String.class); - v.accept(15, "defaultLockTimeout", long.class); - v.accept(16, "evictionFilter", String.class); - v.accept(17, "evictionPolicyFactory", String.class); - v.accept(18, "expiryPolicyFactory", String.class); - v.accept(19, "hasExpiringEntries", String.class); - v.accept(20, "interceptor", String.class); - v.accept(21, "isCopyOnRead", boolean.class); - v.accept(22, "isEagerTtl", boolean.class); - v.accept(23, "isEncryptionEnabled", boolean.class); - v.accept(24, "isEventsDisabled", boolean.class); - v.accept(25, "isInvalidate", boolean.class); - v.accept(26, "isLoadPreviousValue", boolean.class); - v.accept(27, "isManagementEnabled", boolean.class); - v.accept(28, "isNearCacheEnabled", boolean.class); - v.accept(29, "isOnheapCacheEnabled", boolean.class); - v.accept(30, "isReadFromBackup", boolean.class); - v.accept(31, "isReadThrough", boolean.class); - v.accept(32, "isSqlEscapeAll", boolean.class); - v.accept(33, "isSqlOnheapCacheEnabled", boolean.class); - v.accept(34, "isStatisticsEnabled", boolean.class); - v.accept(35, "isStoreKeepBinary", boolean.class); - v.accept(36, "isWriteBehindEnabled", boolean.class); - v.accept(37, "isWriteThrough", boolean.class); - v.accept(38, "maxConcurrentAsyncOperations", int.class); - v.accept(39, "maxQueryIteratorsCount", int.class); - v.accept(40, "nearCacheEvictionPolicyFactory", String.class); - v.accept(41, "nearCacheStartSize", int.class); - v.accept(42, "nodeFilter", String.class); - v.accept(43, "partitionLossPolicy", PartitionLossPolicy.class); - v.accept(44, "queryDetailMetricsSize", int.class); - v.accept(45, "queryParallelism", int.class); - v.accept(46, "rebalanceBatchSize", int.class); - v.accept(47, "rebalanceBatchesPrefetchCount", long.class); - v.accept(48, "rebalanceDelay", long.class); - v.accept(49, "rebalanceMode", CacheRebalanceMode.class); - v.accept(50, "rebalanceOrder", int.class); - v.accept(51, "rebalanceThrottle", long.class); - v.accept(52, "rebalanceTimeout", long.class); - v.accept(53, "sqlIndexMaxInlineSize", int.class); - v.accept(54, "sqlOnheapCacheMaxSize", int.class); - v.accept(55, "sqlSchema", String.class); - v.accept(56, "topologyValidator", String.class); - v.accept(57, "writeBehindBatchSize", int.class); - v.accept(58, "writeBehindCoalescing", boolean.class); - v.accept(59, "writeBehindFlushFrequency", long.class); - v.accept(60, "writeBehindFlushSize", int.class); - v.accept(61, "writeBehindFlushThreadCount", int.class); - v.accept(62, "writeSynchronizationMode", CacheWriteSynchronizationMode.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(CacheView row, AttributeWithValueVisitor v) { - v.accept(0, "cacheName", String.class, row.cacheName()); - v.acceptInt(1, "cacheId", row.cacheId()); - v.accept(2, "cacheType", CacheType.class, row.cacheType()); - v.accept(3, "cacheMode", CacheMode.class, row.cacheMode()); - v.accept(4, "atomicityMode", CacheAtomicityMode.class, row.atomicityMode()); - v.accept(5, "cacheGroupName", String.class, row.cacheGroupName()); - v.accept(6, "affinity", String.class, row.affinity()); - v.accept(7, "affinityMapper", String.class, row.affinityMapper()); - v.acceptInt(8, "backups", row.backups()); - v.acceptInt(9, "cacheGroupId", row.cacheGroupId()); - v.accept(10, "cacheLoaderFactory", String.class, row.cacheLoaderFactory()); - v.accept(11, "cacheStoreFactory", String.class, row.cacheStoreFactory()); - v.accept(12, "cacheWriterFactory", String.class, row.cacheWriterFactory()); - v.accept(13, "conflictResolver", String.class, row.conflictResolver()); - v.accept(14, "dataRegionName", String.class, row.dataRegionName()); - v.acceptLong(15, "defaultLockTimeout", row.defaultLockTimeout()); - v.accept(16, "evictionFilter", String.class, row.evictionFilter()); - v.accept(17, "evictionPolicyFactory", String.class, row.evictionPolicyFactory()); - v.accept(18, "expiryPolicyFactory", String.class, row.expiryPolicyFactory()); - v.accept(19, "hasExpiringEntries", String.class, row.hasExpiringEntries()); - v.accept(20, "interceptor", String.class, row.interceptor()); - v.acceptBoolean(21, "isCopyOnRead", row.isCopyOnRead()); - v.acceptBoolean(22, "isEagerTtl", row.isEagerTtl()); - v.acceptBoolean(23, "isEncryptionEnabled", row.isEncryptionEnabled()); - v.acceptBoolean(24, "isEventsDisabled", row.isEventsDisabled()); - v.acceptBoolean(25, "isInvalidate", row.isInvalidate()); - v.acceptBoolean(26, "isLoadPreviousValue", row.isLoadPreviousValue()); - v.acceptBoolean(27, "isManagementEnabled", row.isManagementEnabled()); - v.acceptBoolean(28, "isNearCacheEnabled", row.isNearCacheEnabled()); - v.acceptBoolean(29, "isOnheapCacheEnabled", row.isOnheapCacheEnabled()); - v.acceptBoolean(30, "isReadFromBackup", row.isReadFromBackup()); - v.acceptBoolean(31, "isReadThrough", row.isReadThrough()); - v.acceptBoolean(32, "isSqlEscapeAll", row.isSqlEscapeAll()); - v.acceptBoolean(33, "isSqlOnheapCacheEnabled", row.isSqlOnheapCacheEnabled()); - v.acceptBoolean(34, "isStatisticsEnabled", row.isStatisticsEnabled()); - v.acceptBoolean(35, "isStoreKeepBinary", row.isStoreKeepBinary()); - v.acceptBoolean(36, "isWriteBehindEnabled", row.isWriteBehindEnabled()); - v.acceptBoolean(37, "isWriteThrough", row.isWriteThrough()); - v.acceptInt(38, "maxConcurrentAsyncOperations", row.maxConcurrentAsyncOperations()); - v.acceptInt(39, "maxQueryIteratorsCount", row.maxQueryIteratorsCount()); - v.accept(40, "nearCacheEvictionPolicyFactory", String.class, row.nearCacheEvictionPolicyFactory()); - v.acceptInt(41, "nearCacheStartSize", row.nearCacheStartSize()); - v.accept(42, "nodeFilter", String.class, row.nodeFilter()); - v.accept(43, "partitionLossPolicy", PartitionLossPolicy.class, row.partitionLossPolicy()); - v.acceptInt(44, "queryDetailMetricsSize", row.queryDetailMetricsSize()); - v.acceptInt(45, "queryParallelism", row.queryParallelism()); - v.acceptInt(46, "rebalanceBatchSize", row.rebalanceBatchSize()); - v.acceptLong(47, "rebalanceBatchesPrefetchCount", row.rebalanceBatchesPrefetchCount()); - v.acceptLong(48, "rebalanceDelay", row.rebalanceDelay()); - v.accept(49, "rebalanceMode", CacheRebalanceMode.class, row.rebalanceMode()); - v.acceptInt(50, "rebalanceOrder", row.rebalanceOrder()); - v.acceptLong(51, "rebalanceThrottle", row.rebalanceThrottle()); - v.acceptLong(52, "rebalanceTimeout", row.rebalanceTimeout()); - v.acceptInt(53, "sqlIndexMaxInlineSize", row.sqlIndexMaxInlineSize()); - v.acceptInt(54, "sqlOnheapCacheMaxSize", row.sqlOnheapCacheMaxSize()); - v.accept(55, "sqlSchema", String.class, row.sqlSchema()); - v.accept(56, "topologyValidator", String.class, row.topologyValidator()); - v.acceptInt(57, "writeBehindBatchSize", row.writeBehindBatchSize()); - v.acceptBoolean(58, "writeBehindCoalescing", row.writeBehindCoalescing()); - v.acceptLong(59, "writeBehindFlushFrequency", row.writeBehindFlushFrequency()); - v.acceptInt(60, "writeBehindFlushSize", row.writeBehindFlushSize()); - v.acceptInt(61, "writeBehindFlushThreadCount", row.writeBehindFlushThreadCount()); - v.accept(62, "writeSynchronizationMode", CacheWriteSynchronizationMode.class, row.writeSynchronizationMode()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 63; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionAttributeViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionAttributeViewWalker.java deleted file mode 100644 index eeb528a82d60c..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionAttributeViewWalker.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Collections; -import java.util.List; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.ClientConnectionAttributeView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ClientConnectionAttributeView} attributes walker. - * - * @see ClientConnectionAttributeView - */ -public class ClientConnectionAttributeViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "connectionId" */ - public static final String CONNECTION_ID_FILTER = "connectionId"; - - /** Filter key for attribute "name" */ - public static final String NAME_FILTER = "name"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "connectionId", "name" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "connectionId", long.class); - v.accept(1, "name", String.class); - v.accept(2, "value", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ClientConnectionAttributeView row, AttributeWithValueVisitor v) { - v.acceptLong(0, "connectionId", row.connectionId()); - v.accept(1, "name", String.class, row.name()); - v.accept(2, "value", String.class, row.value()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 3; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionViewWalker.java deleted file mode 100644 index b8b26444063f7..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ClientConnectionViewWalker.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.net.InetSocketAddress; -import org.apache.ignite.spi.systemview.view.ClientConnectionView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ClientConnectionView} attributes walker. - * - * @see ClientConnectionView - */ -public class ClientConnectionViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "connectionId", long.class); - v.accept(1, "localAddress", InetSocketAddress.class); - v.accept(2, "remoteAddress", InetSocketAddress.class); - v.accept(3, "type", String.class); - v.accept(4, "user", String.class); - v.accept(5, "version", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ClientConnectionView row, AttributeWithValueVisitor v) { - v.acceptLong(0, "connectionId", row.connectionId()); - v.accept(1, "localAddress", InetSocketAddress.class, row.localAddress()); - v.accept(2, "remoteAddress", InetSocketAddress.class, row.remoteAddress()); - v.accept(3, "type", String.class, row.type()); - v.accept(4, "user", String.class, row.user()); - v.accept(5, "version", String.class, row.version()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 6; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ComputeJobViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ComputeJobViewWalker.java deleted file mode 100644 index 51750f26d909c..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ComputeJobViewWalker.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.UUID; -import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.spi.systemview.view.ComputeJobView; -import org.apache.ignite.spi.systemview.view.ComputeJobView.ComputeJobState; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ComputeJobView} attributes walker. - * - * @see ComputeJobView - */ -public class ComputeJobViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "id", IgniteUuid.class); - v.accept(1, "sessionId", IgniteUuid.class); - v.accept(2, "originNodeId", UUID.class); - v.accept(3, "taskName", String.class); - v.accept(4, "taskClassName", String.class); - v.accept(5, "affinityCacheIds", String.class); - v.accept(6, "affinityPartitionId", int.class); - v.accept(7, "createTime", long.class); - v.accept(8, "startTime", long.class); - v.accept(9, "finishTime", long.class); - v.accept(10, "executorName", String.class); - v.accept(11, "isFinishing", boolean.class); - v.accept(12, "isInternal", boolean.class); - v.accept(13, "isStarted", boolean.class); - v.accept(14, "isTimedOut", boolean.class); - v.accept(15, "state", ComputeJobState.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ComputeJobView row, AttributeWithValueVisitor v) { - v.accept(0, "id", IgniteUuid.class, row.id()); - v.accept(1, "sessionId", IgniteUuid.class, row.sessionId()); - v.accept(2, "originNodeId", UUID.class, row.originNodeId()); - v.accept(3, "taskName", String.class, row.taskName()); - v.accept(4, "taskClassName", String.class, row.taskClassName()); - v.accept(5, "affinityCacheIds", String.class, row.affinityCacheIds()); - v.acceptInt(6, "affinityPartitionId", row.affinityPartitionId()); - v.acceptLong(7, "createTime", row.createTime()); - v.acceptLong(8, "startTime", row.startTime()); - v.acceptLong(9, "finishTime", row.finishTime()); - v.accept(10, "executorName", String.class, row.executorName()); - v.acceptBoolean(11, "isFinishing", row.isFinishing()); - v.acceptBoolean(12, "isInternal", row.isInternal()); - v.acceptBoolean(13, "isStarted", row.isStarted()); - v.acceptBoolean(14, "isTimedOut", row.isTimedOut()); - v.accept(15, "state", ComputeJobState.class, row.state()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 16; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ComputeTaskViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ComputeTaskViewWalker.java deleted file mode 100644 index 3d2691e869444..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ComputeTaskViewWalker.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.UUID; -import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.spi.systemview.view.ComputeTaskView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ComputeTaskView} attributes walker. - * - * @see ComputeTaskView - */ -public class ComputeTaskViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "id", IgniteUuid.class); - v.accept(1, "sessionId", IgniteUuid.class); - v.accept(2, "taskNodeId", UUID.class); - v.accept(3, "taskName", String.class); - v.accept(4, "taskClassName", String.class); - v.accept(5, "affinityPartitionId", int.class); - v.accept(6, "affinityCacheName", String.class); - v.accept(7, "startTime", long.class); - v.accept(8, "endTime", long.class); - v.accept(9, "execName", String.class); - v.accept(10, "internal", boolean.class); - v.accept(11, "jobId", IgniteUuid.class); - v.accept(12, "userVersion", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ComputeTaskView row, AttributeWithValueVisitor v) { - v.accept(0, "id", IgniteUuid.class, row.id()); - v.accept(1, "sessionId", IgniteUuid.class, row.sessionId()); - v.accept(2, "taskNodeId", UUID.class, row.taskNodeId()); - v.accept(3, "taskName", String.class, row.taskName()); - v.accept(4, "taskClassName", String.class, row.taskClassName()); - v.acceptInt(5, "affinityPartitionId", row.affinityPartitionId()); - v.accept(6, "affinityCacheName", String.class, row.affinityCacheName()); - v.acceptLong(7, "startTime", row.startTime()); - v.acceptLong(8, "endTime", row.endTime()); - v.accept(9, "execName", String.class, row.execName()); - v.acceptBoolean(10, "internal", row.internal()); - v.accept(11, "jobId", IgniteUuid.class, row.jobId()); - v.accept(12, "userVersion", String.class, row.userVersion()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 13; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ConfigurationViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ConfigurationViewWalker.java deleted file mode 100644 index 2e98fc95f19c1..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ConfigurationViewWalker.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.ConfigurationView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ConfigurationView} attributes walker. - * - * @see ConfigurationView - */ -public class ConfigurationViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "value", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ConfigurationView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.accept(1, "value", String.class, row.value()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 2; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ContinuousQueryViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ContinuousQueryViewWalker.java deleted file mode 100644 index c65245da5c6fc..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ContinuousQueryViewWalker.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.UUID; -import org.apache.ignite.spi.systemview.view.ContinuousQueryView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ContinuousQueryView} attributes walker. - * - * @see ContinuousQueryView - */ -public class ContinuousQueryViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "cacheName", String.class); - v.accept(1, "localListener", String.class); - v.accept(2, "remoteFilter", String.class); - v.accept(3, "remoteTransformer", String.class); - v.accept(4, "localTransformedListener", String.class); - v.accept(5, "lastSendTime", long.class); - v.accept(6, "autoUnsubscribe", boolean.class); - v.accept(7, "bufferSize", int.class); - v.accept(8, "delayedRegister", boolean.class); - v.accept(9, "interval", long.class); - v.accept(10, "isEvents", boolean.class); - v.accept(11, "isMessaging", boolean.class); - v.accept(12, "isQuery", boolean.class); - v.accept(13, "keepBinary", boolean.class); - v.accept(14, "nodeId", UUID.class); - v.accept(15, "notifyExisting", boolean.class); - v.accept(16, "oldValueRequired", boolean.class); - v.accept(17, "routineId", UUID.class); - v.accept(18, "topic", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ContinuousQueryView row, AttributeWithValueVisitor v) { - v.accept(0, "cacheName", String.class, row.cacheName()); - v.accept(1, "localListener", String.class, row.localListener()); - v.accept(2, "remoteFilter", String.class, row.remoteFilter()); - v.accept(3, "remoteTransformer", String.class, row.remoteTransformer()); - v.accept(4, "localTransformedListener", String.class, row.localTransformedListener()); - v.acceptLong(5, "lastSendTime", row.lastSendTime()); - v.acceptBoolean(6, "autoUnsubscribe", row.autoUnsubscribe()); - v.acceptInt(7, "bufferSize", row.bufferSize()); - v.acceptBoolean(8, "delayedRegister", row.delayedRegister()); - v.acceptLong(9, "interval", row.interval()); - v.acceptBoolean(10, "isEvents", row.isEvents()); - v.acceptBoolean(11, "isMessaging", row.isMessaging()); - v.acceptBoolean(12, "isQuery", row.isQuery()); - v.acceptBoolean(13, "keepBinary", row.keepBinary()); - v.accept(14, "nodeId", UUID.class, row.nodeId()); - v.acceptBoolean(15, "notifyExisting", row.notifyExisting()); - v.acceptBoolean(16, "oldValueRequired", row.oldValueRequired()); - v.accept(17, "routineId", UUID.class, row.routineId()); - v.accept(18, "topic", String.class, row.topic()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 19; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CountDownLatchViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CountDownLatchViewWalker.java deleted file mode 100644 index 41af7210c72b2..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/CountDownLatchViewWalker.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.CountDownLatchView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link CountDownLatchView} attributes walker. - * - * @see CountDownLatchView - */ -public class CountDownLatchViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "count", int.class); - v.accept(2, "initialCount", int.class); - v.accept(3, "autoDelete", boolean.class); - v.accept(4, "groupName", String.class); - v.accept(5, "groupId", int.class); - v.accept(6, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(CountDownLatchView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.acceptInt(1, "count", row.count()); - v.acceptInt(2, "initialCount", row.initialCount()); - v.acceptBoolean(3, "autoDelete", row.autoDelete()); - v.accept(4, "groupName", String.class, row.groupName()); - v.acceptInt(5, "groupId", row.groupId()); - v.acceptBoolean(6, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 7; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/MetastorageViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/MetastorageViewWalker.java deleted file mode 100644 index d6a6563d78fe6..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/MetastorageViewWalker.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.MetastorageView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link MetastorageView} attributes walker. - * - * @see MetastorageView - */ -public class MetastorageViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "value", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(MetastorageView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.accept(1, "value", String.class, row.value()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 2; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/MetricsViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/MetricsViewWalker.java deleted file mode 100644 index 883286ad63e22..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/MetricsViewWalker.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.MetricsView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link MetricsView} attributes walker. - * - * @see MetricsView - */ -public class MetricsViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "value", String.class); - v.accept(2, "description", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(MetricsView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.accept(1, "value", String.class, row.value()); - v.accept(2, "description", String.class, row.description()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 3; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/NodeAttributeViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/NodeAttributeViewWalker.java deleted file mode 100644 index 9df2e06f8f2b0..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/NodeAttributeViewWalker.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.NodeAttributeView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link NodeAttributeView} attributes walker. - * - * @see NodeAttributeView - */ -public class NodeAttributeViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "nodeId" */ - public static final String NODE_ID_FILTER = "nodeId"; - - /** Filter key for attribute "name" */ - public static final String NAME_FILTER = "name"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "nodeId", "name" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "nodeId", UUID.class); - v.accept(1, "name", String.class); - v.accept(2, "value", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(NodeAttributeView row, AttributeWithValueVisitor v) { - v.accept(0, "nodeId", UUID.class, row.nodeId()); - v.accept(1, "name", String.class, row.name()); - v.accept(2, "value", String.class, row.value()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 3; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/NodeMetricsViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/NodeMetricsViewWalker.java deleted file mode 100644 index f1bcc8b8f99dc..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/NodeMetricsViewWalker.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Date; -import java.util.UUID; -import org.apache.ignite.spi.systemview.view.NodeMetricsView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link NodeMetricsView} attributes walker. - * - * @see NodeMetricsView - */ -public class NodeMetricsViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "nodeId", UUID.class); - v.accept(1, "lastUpdateTime", Date.class); - v.accept(2, "maxActiveJobs", int.class); - v.accept(3, "curActiveJobs", int.class); - v.accept(4, "avgActiveJobs", float.class); - v.accept(5, "maxWaitingJobs", int.class); - v.accept(6, "curWaitingJobs", int.class); - v.accept(7, "avgWaitingJobs", float.class); - v.accept(8, "maxRejectedJobs", int.class); - v.accept(9, "curRejectedJobs", int.class); - v.accept(10, "avgRejectedJobs", float.class); - v.accept(11, "totalRejectedJobs", int.class); - v.accept(12, "maxCanceledJobs", int.class); - v.accept(13, "curCanceledJobs", int.class); - v.accept(14, "avgCanceledJobs", float.class); - v.accept(15, "totalCanceledJobs", int.class); - v.accept(16, "maxJobsWaitTime", long.class); - v.accept(17, "curJobsWaitTime", long.class); - v.accept(18, "avgJobsWaitTime", long.class); - v.accept(19, "maxJobsExecuteTime", long.class); - v.accept(20, "curJobsExecuteTime", long.class); - v.accept(21, "avgJobsExecuteTime", long.class); - v.accept(22, "totalJobsExecuteTime", long.class); - v.accept(23, "totalExecutedJobs", int.class); - v.accept(24, "totalExecutedTasks", int.class); - v.accept(25, "totalBusyTime", long.class); - v.accept(26, "totalIdleTime", long.class); - v.accept(27, "curIdleTime", long.class); - v.accept(28, "busyTimePercentage", float.class); - v.accept(29, "idleTimePercentage", float.class); - v.accept(30, "totalCpu", int.class); - v.accept(31, "curCpuLoad", double.class); - v.accept(32, "avgCpuLoad", double.class); - v.accept(33, "curGcCpuLoad", double.class); - v.accept(34, "heapMemoryInit", long.class); - v.accept(35, "heapMemoryUsed", long.class); - v.accept(36, "heapMemoryCommited", long.class); - v.accept(37, "heapMemoryMax", long.class); - v.accept(38, "heapMemoryTotal", long.class); - v.accept(39, "nonheapMemoryInit", long.class); - v.accept(40, "nonheapMemoryUsed", long.class); - v.accept(41, "nonheapMemoryCommited", long.class); - v.accept(42, "nonheapMemoryMax", long.class); - v.accept(43, "nonheapMemoryTotal", long.class); - v.accept(44, "uptime", long.class); - v.accept(45, "jvmStartTime", Date.class); - v.accept(46, "nodeStartTime", Date.class); - v.accept(47, "lastDataVersion", long.class); - v.accept(48, "curThreadCount", int.class); - v.accept(49, "maxThreadCount", int.class); - v.accept(50, "totalThreadCount", long.class); - v.accept(51, "curDaemonThreadCount", int.class); - v.accept(52, "sentMessagesCount", int.class); - v.accept(53, "sentBytesCount", long.class); - v.accept(54, "receivedMessagesCount", int.class); - v.accept(55, "receivedBytesCount", long.class); - v.accept(56, "outboundMessagesQueue", int.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(NodeMetricsView row, AttributeWithValueVisitor v) { - v.accept(0, "nodeId", UUID.class, row.nodeId()); - v.accept(1, "lastUpdateTime", Date.class, row.lastUpdateTime()); - v.acceptInt(2, "maxActiveJobs", row.maxActiveJobs()); - v.acceptInt(3, "curActiveJobs", row.curActiveJobs()); - v.acceptFloat(4, "avgActiveJobs", row.avgActiveJobs()); - v.acceptInt(5, "maxWaitingJobs", row.maxWaitingJobs()); - v.acceptInt(6, "curWaitingJobs", row.curWaitingJobs()); - v.acceptFloat(7, "avgWaitingJobs", row.avgWaitingJobs()); - v.acceptInt(8, "maxRejectedJobs", row.maxRejectedJobs()); - v.acceptInt(9, "curRejectedJobs", row.curRejectedJobs()); - v.acceptFloat(10, "avgRejectedJobs", row.avgRejectedJobs()); - v.acceptInt(11, "totalRejectedJobs", row.totalRejectedJobs()); - v.acceptInt(12, "maxCanceledJobs", row.maxCanceledJobs()); - v.acceptInt(13, "curCanceledJobs", row.curCanceledJobs()); - v.acceptFloat(14, "avgCanceledJobs", row.avgCanceledJobs()); - v.acceptInt(15, "totalCanceledJobs", row.totalCanceledJobs()); - v.acceptLong(16, "maxJobsWaitTime", row.maxJobsWaitTime()); - v.acceptLong(17, "curJobsWaitTime", row.curJobsWaitTime()); - v.acceptLong(18, "avgJobsWaitTime", row.avgJobsWaitTime()); - v.acceptLong(19, "maxJobsExecuteTime", row.maxJobsExecuteTime()); - v.acceptLong(20, "curJobsExecuteTime", row.curJobsExecuteTime()); - v.acceptLong(21, "avgJobsExecuteTime", row.avgJobsExecuteTime()); - v.acceptLong(22, "totalJobsExecuteTime", row.totalJobsExecuteTime()); - v.acceptInt(23, "totalExecutedJobs", row.totalExecutedJobs()); - v.acceptInt(24, "totalExecutedTasks", row.totalExecutedTasks()); - v.acceptLong(25, "totalBusyTime", row.totalBusyTime()); - v.acceptLong(26, "totalIdleTime", row.totalIdleTime()); - v.acceptLong(27, "curIdleTime", row.curIdleTime()); - v.acceptFloat(28, "busyTimePercentage", row.busyTimePercentage()); - v.acceptFloat(29, "idleTimePercentage", row.idleTimePercentage()); - v.acceptInt(30, "totalCpu", row.totalCpu()); - v.acceptDouble(31, "curCpuLoad", row.curCpuLoad()); - v.acceptDouble(32, "avgCpuLoad", row.avgCpuLoad()); - v.acceptDouble(33, "curGcCpuLoad", row.curGcCpuLoad()); - v.acceptLong(34, "heapMemoryInit", row.heapMemoryInit()); - v.acceptLong(35, "heapMemoryUsed", row.heapMemoryUsed()); - v.acceptLong(36, "heapMemoryCommited", row.heapMemoryCommited()); - v.acceptLong(37, "heapMemoryMax", row.heapMemoryMax()); - v.acceptLong(38, "heapMemoryTotal", row.heapMemoryTotal()); - v.acceptLong(39, "nonheapMemoryInit", row.nonheapMemoryInit()); - v.acceptLong(40, "nonheapMemoryUsed", row.nonheapMemoryUsed()); - v.acceptLong(41, "nonheapMemoryCommited", row.nonheapMemoryCommited()); - v.acceptLong(42, "nonheapMemoryMax", row.nonheapMemoryMax()); - v.acceptLong(43, "nonheapMemoryTotal", row.nonheapMemoryTotal()); - v.acceptLong(44, "uptime", row.uptime()); - v.accept(45, "jvmStartTime", Date.class, row.jvmStartTime()); - v.accept(46, "nodeStartTime", Date.class, row.nodeStartTime()); - v.acceptLong(47, "lastDataVersion", row.lastDataVersion()); - v.acceptInt(48, "curThreadCount", row.curThreadCount()); - v.acceptInt(49, "maxThreadCount", row.maxThreadCount()); - v.acceptLong(50, "totalThreadCount", row.totalThreadCount()); - v.acceptInt(51, "curDaemonThreadCount", row.curDaemonThreadCount()); - v.acceptInt(52, "sentMessagesCount", row.sentMessagesCount()); - v.acceptLong(53, "sentBytesCount", row.sentBytesCount()); - v.acceptInt(54, "receivedMessagesCount", row.receivedMessagesCount()); - v.acceptLong(55, "receivedBytesCount", row.receivedBytesCount()); - v.acceptInt(56, "outboundMessagesQueue", row.outboundMessagesQueue()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 57; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PagesListViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PagesListViewWalker.java deleted file mode 100644 index 4815003047087..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PagesListViewWalker.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Collections; -import java.util.List; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.PagesListView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link PagesListView} attributes walker. - * - * @see PagesListView - */ -public class PagesListViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "bucketNumber" */ - public static final String BUCKET_NUMBER_FILTER = "bucketNumber"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "bucketNumber" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "bucketNumber", int.class); - v.accept(2, "bucketSize", long.class); - v.accept(3, "stripesCount", int.class); - v.accept(4, "cachedPagesCount", int.class); - v.accept(5, "pageFreeSpace", int.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(PagesListView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.acceptInt(1, "bucketNumber", row.bucketNumber()); - v.acceptLong(2, "bucketSize", row.bucketSize()); - v.acceptInt(3, "stripesCount", row.stripesCount()); - v.acceptInt(4, "cachedPagesCount", row.cachedPagesCount()); - v.acceptInt(5, "pageFreeSpace", row.pageFreeSpace()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 6; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PagesTimestampHistogramViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PagesTimestampHistogramViewWalker.java deleted file mode 100644 index 85d32c7800dcd..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PagesTimestampHistogramViewWalker.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Date; -import org.apache.ignite.spi.systemview.view.PagesTimestampHistogramView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link PagesTimestampHistogramView} attributes walker. - * - * @see PagesTimestampHistogramView - */ -public class PagesTimestampHistogramViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "dataRegionName", String.class); - v.accept(1, "intervalStart", Date.class); - v.accept(2, "intervalEnd", Date.class); - v.accept(3, "pagesCount", long.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(PagesTimestampHistogramView row, AttributeWithValueVisitor v) { - v.accept(0, "dataRegionName", String.class, row.dataRegionName()); - v.accept(1, "intervalStart", Date.class, row.intervalStart()); - v.accept(2, "intervalEnd", Date.class, row.intervalEnd()); - v.acceptLong(3, "pagesCount", row.pagesCount()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 4; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PartitionStateViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PartitionStateViewWalker.java deleted file mode 100644 index c2a9c5cbb0a15..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/PartitionStateViewWalker.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.PartitionStateView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link PartitionStateView} attributes walker. - * - * @see PartitionStateView - */ -public class PartitionStateViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "cacheGroupId" */ - public static final String CACHE_GROUP_ID_FILTER = "cacheGroupId"; - - /** Filter key for attribute "nodeId" */ - public static final String NODE_ID_FILTER = "nodeId"; - - /** Filter key for attribute "partitionId" */ - public static final String PARTITION_ID_FILTER = "partitionId"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "cacheGroupId", "nodeId", "partitionId" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "cacheGroupId", int.class); - v.accept(1, "nodeId", UUID.class); - v.accept(2, "partitionId", int.class); - v.accept(3, "state", String.class); - v.accept(4, "isPrimary", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(PartitionStateView row, AttributeWithValueVisitor v) { - v.acceptInt(0, "cacheGroupId", row.cacheGroupId()); - v.accept(1, "nodeId", UUID.class, row.nodeId()); - v.acceptInt(2, "partitionId", row.partitionId()); - v.accept(3, "state", String.class, row.state()); - v.acceptBoolean(4, "isPrimary", row.isPrimary()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 5; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/QueueViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/QueueViewWalker.java deleted file mode 100644 index 521e75c74ac1b..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/QueueViewWalker.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.QueueView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link QueueView} attributes walker. - * - * @see QueueView - */ -public class QueueViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "id", IgniteUuid.class); - v.accept(1, "name", String.class); - v.accept(2, "capacity", int.class); - v.accept(3, "size", int.class); - v.accept(4, "groupName", String.class); - v.accept(5, "groupId", int.class); - v.accept(6, "bounded", boolean.class); - v.accept(7, "collocated", boolean.class); - v.accept(8, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(QueueView row, AttributeWithValueVisitor v) { - v.accept(0, "id", IgniteUuid.class, row.id()); - v.accept(1, "name", String.class, row.name()); - v.acceptInt(2, "capacity", row.capacity()); - v.acceptInt(3, "size", row.size()); - v.accept(4, "groupName", String.class, row.groupName()); - v.acceptInt(5, "groupId", row.groupId()); - v.acceptBoolean(6, "bounded", row.bounded()); - v.acceptBoolean(7, "collocated", row.collocated()); - v.acceptBoolean(8, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 9; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ReentrantLockViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ReentrantLockViewWalker.java deleted file mode 100644 index 34257f3cab11b..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ReentrantLockViewWalker.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.ReentrantLockView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ReentrantLockView} attributes walker. - * - * @see ReentrantLockView - */ -public class ReentrantLockViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "locked", boolean.class); - v.accept(2, "hasQueuedThreads", boolean.class); - v.accept(3, "failoverSafe", boolean.class); - v.accept(4, "fair", boolean.class); - v.accept(5, "broken", boolean.class); - v.accept(6, "groupName", String.class); - v.accept(7, "groupId", int.class); - v.accept(8, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ReentrantLockView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.acceptBoolean(1, "locked", row.locked()); - v.acceptBoolean(2, "hasQueuedThreads", row.hasQueuedThreads()); - v.acceptBoolean(3, "failoverSafe", row.failoverSafe()); - v.acceptBoolean(4, "fair", row.fair()); - v.acceptBoolean(5, "broken", row.broken()); - v.accept(6, "groupName", String.class, row.groupName()); - v.acceptInt(7, "groupId", row.groupId()); - v.acceptBoolean(8, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 9; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ScanQueryViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ScanQueryViewWalker.java deleted file mode 100644 index d3c0d46ed45aa..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ScanQueryViewWalker.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.UUID; -import org.apache.ignite.spi.systemview.view.ScanQueryView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ScanQueryView} attributes walker. - * - * @see ScanQueryView - */ -public class ScanQueryViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "originNodeId", UUID.class); - v.accept(1, "queryId", long.class); - v.accept(2, "cacheName", String.class); - v.accept(3, "cacheId", int.class); - v.accept(4, "cacheGroupId", int.class); - v.accept(5, "cacheGroupName", String.class); - v.accept(6, "startTime", long.class); - v.accept(7, "duration", long.class); - v.accept(8, "canceled", boolean.class); - v.accept(9, "filter", String.class); - v.accept(10, "keepBinary", boolean.class); - v.accept(11, "local", boolean.class); - v.accept(12, "pageSize", int.class); - v.accept(13, "partition", int.class); - v.accept(14, "subjectId", UUID.class); - v.accept(15, "taskName", String.class); - v.accept(16, "topology", String.class); - v.accept(17, "transformer", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ScanQueryView row, AttributeWithValueVisitor v) { - v.accept(0, "originNodeId", UUID.class, row.originNodeId()); - v.acceptLong(1, "queryId", row.queryId()); - v.accept(2, "cacheName", String.class, row.cacheName()); - v.acceptInt(3, "cacheId", row.cacheId()); - v.acceptInt(4, "cacheGroupId", row.cacheGroupId()); - v.accept(5, "cacheGroupName", String.class, row.cacheGroupName()); - v.acceptLong(6, "startTime", row.startTime()); - v.acceptLong(7, "duration", row.duration()); - v.acceptBoolean(8, "canceled", row.canceled()); - v.accept(9, "filter", String.class, row.filter()); - v.acceptBoolean(10, "keepBinary", row.keepBinary()); - v.acceptBoolean(11, "local", row.local()); - v.acceptInt(12, "pageSize", row.pageSize()); - v.acceptInt(13, "partition", row.partition()); - v.accept(14, "subjectId", UUID.class, row.subjectId()); - v.accept(15, "taskName", String.class, row.taskName()); - v.accept(16, "topology", String.class, row.topology()); - v.accept(17, "transformer", String.class, row.transformer()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 18; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SemaphoreViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SemaphoreViewWalker.java deleted file mode 100644 index 7260804b67604..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SemaphoreViewWalker.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.SemaphoreView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SemaphoreView} attributes walker. - * - * @see SemaphoreView - */ -public class SemaphoreViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "availablePermits", long.class); - v.accept(2, "hasQueuedThreads", boolean.class); - v.accept(3, "queueLength", int.class); - v.accept(4, "failoverSafe", boolean.class); - v.accept(5, "broken", boolean.class); - v.accept(6, "groupName", String.class); - v.accept(7, "groupId", int.class); - v.accept(8, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SemaphoreView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.acceptLong(1, "availablePermits", row.availablePermits()); - v.acceptBoolean(2, "hasQueuedThreads", row.hasQueuedThreads()); - v.acceptInt(3, "queueLength", row.queueLength()); - v.acceptBoolean(4, "failoverSafe", row.failoverSafe()); - v.acceptBoolean(5, "broken", row.broken()); - v.accept(6, "groupName", String.class, row.groupName()); - v.acceptInt(7, "groupId", row.groupId()); - v.acceptBoolean(8, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 9; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ServiceViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ServiceViewWalker.java deleted file mode 100644 index 6dfdfaa8821d2..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/ServiceViewWalker.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Map; -import java.util.UUID; -import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.spi.systemview.view.ServiceView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link ServiceView} attributes walker. - * - * @see ServiceView - */ -public class ServiceViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "serviceId", IgniteUuid.class); - v.accept(1, "name", String.class); - v.accept(2, "serviceClass", Class.class); - v.accept(3, "cacheName", String.class); - v.accept(4, "originNodeId", UUID.class); - v.accept(5, "totalCount", int.class); - v.accept(6, "maxPerNodeCount", int.class); - v.accept(7, "affinityKey", String.class); - v.accept(8, "nodeFilter", Class.class); - v.accept(9, "staticallyConfigured", boolean.class); - v.accept(10, "topologySnapshot", Map.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(ServiceView row, AttributeWithValueVisitor v) { - v.accept(0, "serviceId", IgniteUuid.class, row.serviceId()); - v.accept(1, "name", String.class, row.name()); - v.accept(2, "serviceClass", Class.class, row.serviceClass()); - v.accept(3, "cacheName", String.class, row.cacheName()); - v.accept(4, "originNodeId", UUID.class, row.originNodeId()); - v.acceptInt(5, "totalCount", row.totalCount()); - v.acceptInt(6, "maxPerNodeCount", row.maxPerNodeCount()); - v.accept(7, "affinityKey", String.class, row.affinityKey()); - v.accept(8, "nodeFilter", Class.class, row.nodeFilter()); - v.acceptBoolean(9, "staticallyConfigured", row.staticallyConfigured()); - v.accept(10, "topologySnapshot", Map.class, row.topologySnapshot()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 11; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SetViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SetViewWalker.java deleted file mode 100644 index 402bcd462eed8..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SetViewWalker.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.datastructures.SetView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SetView} attributes walker. - * - * @see SetView - */ -public class SetViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "id", IgniteUuid.class); - v.accept(1, "name", String.class); - v.accept(2, "size", int.class); - v.accept(3, "groupName", String.class); - v.accept(4, "groupId", int.class); - v.accept(5, "collocated", boolean.class); - v.accept(6, "removed", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SetView row, AttributeWithValueVisitor v) { - v.accept(0, "id", IgniteUuid.class, row.id()); - v.accept(1, "name", String.class, row.name()); - v.acceptInt(2, "size", row.size()); - v.accept(3, "groupName", String.class, row.groupName()); - v.acceptInt(4, "groupId", row.groupId()); - v.acceptBoolean(5, "collocated", row.collocated()); - v.acceptBoolean(6, "removed", row.removed()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 7; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SnapshotViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SnapshotViewWalker.java deleted file mode 100644 index 8b5e505caa59f..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SnapshotViewWalker.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SnapshotView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SnapshotView} attributes walker. - * - * @see SnapshotView - */ -public class SnapshotViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "name", String.class); - v.accept(1, "consistentId", String.class); - v.accept(2, "baselineNodes", String.class); - v.accept(3, "cacheGroups", String.class); - v.accept(4, "snapshotRecordSegment", Long.class); - v.accept(5, "incrementIndex", Integer.class); - v.accept(6, "type", String.class); - v.accept(7, "snapshotTime", Long.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SnapshotView row, AttributeWithValueVisitor v) { - v.accept(0, "name", String.class, row.name()); - v.accept(1, "consistentId", String.class, row.consistentId()); - v.accept(2, "baselineNodes", String.class, row.baselineNodes()); - v.accept(3, "cacheGroups", String.class, row.cacheGroups()); - v.accept(4, "snapshotRecordSegment", Long.class, row.snapshotRecordSegment()); - v.accept(5, "incrementIndex", Integer.class, row.incrementIndex()); - v.accept(6, "type", String.class, row.type()); - v.accept(7, "snapshotTime", Long.class, row.snapshotTime()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 8; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlIndexViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlIndexViewWalker.java deleted file mode 100644 index db48ccc4e3633..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlIndexViewWalker.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.sql.SqlIndexView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlIndexView} attributes walker. - * - * @see SqlIndexView - */ -public class SqlIndexViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "cacheGroupId", int.class); - v.accept(1, "cacheGroupName", String.class); - v.accept(2, "cacheId", int.class); - v.accept(3, "cacheName", String.class); - v.accept(4, "schemaName", String.class); - v.accept(5, "tableName", String.class); - v.accept(6, "indexName", String.class); - v.accept(7, "indexType", String.class); - v.accept(8, "columns", String.class); - v.accept(9, "isPk", boolean.class); - v.accept(10, "isUnique", boolean.class); - v.accept(11, "inlineSize", Integer.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlIndexView row, AttributeWithValueVisitor v) { - v.acceptInt(0, "cacheGroupId", row.cacheGroupId()); - v.accept(1, "cacheGroupName", String.class, row.cacheGroupName()); - v.acceptInt(2, "cacheId", row.cacheId()); - v.accept(3, "cacheName", String.class, row.cacheName()); - v.accept(4, "schemaName", String.class, row.schemaName()); - v.accept(5, "tableName", String.class, row.tableName()); - v.accept(6, "indexName", String.class, row.indexName()); - v.accept(7, "indexType", String.class, row.indexType()); - v.accept(8, "columns", String.class, row.columns()); - v.acceptBoolean(9, "isPk", row.isPk()); - v.acceptBoolean(10, "isUnique", row.isUnique()); - v.accept(11, "inlineSize", Integer.class, row.inlineSize()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 12; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlPlanHistoryViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlPlanHistoryViewWalker.java deleted file mode 100644 index 2bf49f90b627b..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlPlanHistoryViewWalker.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Date; -import org.apache.ignite.spi.systemview.view.SqlPlanHistoryView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlPlanHistoryView} attributes walker. - * - * @see SqlPlanHistoryView - */ -public class SqlPlanHistoryViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "schemaName", String.class); - v.accept(1, "sql", String.class); - v.accept(2, "plan", String.class); - v.accept(3, "local", boolean.class); - v.accept(4, "engine", String.class); - v.accept(5, "lastStartTime", Date.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlPlanHistoryView row, AttributeWithValueVisitor v) { - v.accept(0, "schemaName", String.class, row.schemaName()); - v.accept(1, "sql", String.class, row.sql()); - v.accept(2, "plan", String.class, row.plan()); - v.acceptBoolean(3, "local", row.local()); - v.accept(4, "engine", String.class, row.engine()); - v.accept(5, "lastStartTime", Date.class, row.lastStartTime()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 6; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlQueryHistoryViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlQueryHistoryViewWalker.java deleted file mode 100644 index 5384928f31557..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlQueryHistoryViewWalker.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Date; -import org.apache.ignite.spi.systemview.view.SqlQueryHistoryView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlQueryHistoryView} attributes walker. - * - * @see SqlQueryHistoryView - */ -public class SqlQueryHistoryViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "schemaName", String.class); - v.accept(1, "sql", String.class); - v.accept(2, "local", boolean.class); - v.accept(3, "initiatorId", String.class); - v.accept(4, "executions", long.class); - v.accept(5, "failures", long.class); - v.accept(6, "durationMin", long.class); - v.accept(7, "durationMax", long.class); - v.accept(8, "durationTotal", long.class); - v.accept(9, "lastStartTime", Date.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlQueryHistoryView row, AttributeWithValueVisitor v) { - v.accept(0, "schemaName", String.class, row.schemaName()); - v.accept(1, "sql", String.class, row.sql()); - v.acceptBoolean(2, "local", row.local()); - v.accept(3, "initiatorId", String.class, row.initiatorId()); - v.acceptLong(4, "executions", row.executions()); - v.acceptLong(5, "failures", row.failures()); - v.acceptLong(6, "durationMin", row.durationMin()); - v.acceptLong(7, "durationMax", row.durationMax()); - v.acceptLong(8, "durationTotal", row.durationTotal()); - v.accept(9, "lastStartTime", Date.class, row.lastStartTime()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 10; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlQueryViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlQueryViewWalker.java deleted file mode 100644 index 216645608e1db..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlQueryViewWalker.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Date; -import java.util.UUID; -import org.apache.ignite.spi.systemview.view.SqlQueryView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlQueryView} attributes walker. - * - * @see SqlQueryView - */ -public class SqlQueryViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "queryId", String.class); - v.accept(1, "sql", String.class); - v.accept(2, "originNodeId", UUID.class); - v.accept(3, "startTime", Date.class); - v.accept(4, "duration", long.class); - v.accept(5, "initiatorId", String.class); - v.accept(6, "local", boolean.class); - v.accept(7, "schemaName", String.class); - v.accept(8, "subjectId", UUID.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlQueryView row, AttributeWithValueVisitor v) { - v.accept(0, "queryId", String.class, row.queryId()); - v.accept(1, "sql", String.class, row.sql()); - v.accept(2, "originNodeId", UUID.class, row.originNodeId()); - v.accept(3, "startTime", Date.class, row.startTime()); - v.acceptLong(4, "duration", row.duration()); - v.accept(5, "initiatorId", String.class, row.initiatorId()); - v.acceptBoolean(6, "local", row.local()); - v.accept(7, "schemaName", String.class, row.schemaName()); - v.accept(8, "subjectId", UUID.class, row.subjectId()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 9; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlSchemaViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlSchemaViewWalker.java deleted file mode 100644 index 09dad8a4298f3..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlSchemaViewWalker.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.sql.SqlSchemaView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlSchemaView} attributes walker. - * - * @see SqlSchemaView - */ -public class SqlSchemaViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "schemaName", String.class); - v.accept(1, "predefined", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlSchemaView row, AttributeWithValueVisitor v) { - v.accept(0, "schemaName", String.class, row.schemaName()); - v.acceptBoolean(1, "predefined", row.predefined()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 2; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableColumnViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableColumnViewWalker.java deleted file mode 100644 index 99e8127b28d0a..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableColumnViewWalker.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.sql.SqlTableColumnView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlTableColumnView} attributes walker. - * - * @see SqlTableColumnView - */ -public class SqlTableColumnViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "columnName", String.class); - v.accept(1, "tableName", String.class); - v.accept(2, "schemaName", String.class); - v.accept(3, "affinityColumn", boolean.class); - v.accept(4, "autoIncrement", boolean.class); - v.accept(5, "defaultValue", String.class); - v.accept(6, "nullable", boolean.class); - v.accept(7, "pk", boolean.class); - v.accept(8, "precision", int.class); - v.accept(9, "scale", int.class); - v.accept(10, "type", Class.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlTableColumnView row, AttributeWithValueVisitor v) { - v.accept(0, "columnName", String.class, row.columnName()); - v.accept(1, "tableName", String.class, row.tableName()); - v.accept(2, "schemaName", String.class, row.schemaName()); - v.acceptBoolean(3, "affinityColumn", row.affinityColumn()); - v.acceptBoolean(4, "autoIncrement", row.autoIncrement()); - v.accept(5, "defaultValue", String.class, row.defaultValue()); - v.acceptBoolean(6, "nullable", row.nullable()); - v.acceptBoolean(7, "pk", row.pk()); - v.acceptInt(8, "precision", row.precision()); - v.acceptInt(9, "scale", row.scale()); - v.accept(10, "type", Class.class, row.type()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 11; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableViewWalker.java deleted file mode 100644 index 54cca4875672b..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlTableViewWalker.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.sql.SqlTableView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlTableView} attributes walker. - * - * @see SqlTableView - */ -public class SqlTableViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "cacheGroupId", int.class); - v.accept(1, "cacheGroupName", String.class); - v.accept(2, "cacheId", int.class); - v.accept(3, "cacheName", String.class); - v.accept(4, "schemaName", String.class); - v.accept(5, "tableName", String.class); - v.accept(6, "affinityKeyColumn", String.class); - v.accept(7, "keyAlias", String.class); - v.accept(8, "valueAlias", String.class); - v.accept(9, "keyTypeName", String.class); - v.accept(10, "valueTypeName", String.class); - v.accept(11, "isIndexRebuildInProgress", boolean.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlTableView row, AttributeWithValueVisitor v) { - v.acceptInt(0, "cacheGroupId", row.cacheGroupId()); - v.accept(1, "cacheGroupName", String.class, row.cacheGroupName()); - v.acceptInt(2, "cacheId", row.cacheId()); - v.accept(3, "cacheName", String.class, row.cacheName()); - v.accept(4, "schemaName", String.class, row.schemaName()); - v.accept(5, "tableName", String.class, row.tableName()); - v.accept(6, "affinityKeyColumn", String.class, row.affinityKeyColumn()); - v.accept(7, "keyAlias", String.class, row.keyAlias()); - v.accept(8, "valueAlias", String.class, row.valueAlias()); - v.accept(9, "keyTypeName", String.class, row.keyTypeName()); - v.accept(10, "valueTypeName", String.class, row.valueTypeName()); - v.acceptBoolean(11, "isIndexRebuildInProgress", row.isIndexRebuildInProgress()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 12; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlViewColumnViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlViewColumnViewWalker.java deleted file mode 100644 index 43c72927f8b2f..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlViewColumnViewWalker.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.sql.SqlViewColumnView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlViewColumnView} attributes walker. - * - * @see SqlViewColumnView - */ -public class SqlViewColumnViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "columnName", String.class); - v.accept(1, "viewName", String.class); - v.accept(2, "schemaName", String.class); - v.accept(3, "defaultValue", String.class); - v.accept(4, "nullable", boolean.class); - v.accept(5, "precision", int.class); - v.accept(6, "scale", int.class); - v.accept(7, "type", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlViewColumnView row, AttributeWithValueVisitor v) { - v.accept(0, "columnName", String.class, row.columnName()); - v.accept(1, "viewName", String.class, row.viewName()); - v.accept(2, "schemaName", String.class, row.schemaName()); - v.accept(3, "defaultValue", String.class, row.defaultValue()); - v.acceptBoolean(4, "nullable", row.nullable()); - v.acceptInt(5, "precision", row.precision()); - v.acceptInt(6, "scale", row.scale()); - v.accept(7, "type", String.class, row.type()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 8; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlViewViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlViewViewWalker.java deleted file mode 100644 index 060e6cc4e2a17..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SqlViewViewWalker.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.sql.SqlViewView; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link SqlViewView} attributes walker. - * - * @see SqlViewView - */ -public class SqlViewViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "schema", String.class); - v.accept(1, "name", String.class); - v.accept(2, "sql", String.class); - v.accept(3, "description", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(SqlViewView row, AttributeWithValueVisitor v) { - v.accept(0, "schema", String.class, row.schema()); - v.accept(1, "name", String.class, row.name()); - v.accept(2, "sql", String.class, row.sql()); - v.accept(3, "description", String.class, row.description()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 4; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnConfigurationViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnConfigurationViewWalker.java deleted file mode 100644 index 8b05fcfdf4242..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnConfigurationViewWalker.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Collections; -import java.util.List; -import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnConfigurationView; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link StatisticsColumnConfigurationView} attributes walker. - * - * @see StatisticsColumnConfigurationView - */ -public class StatisticsColumnConfigurationViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "schema" */ - public static final String SCHEMA_FILTER = "schema"; - - /** Filter key for attribute "type" */ - public static final String TYPE_FILTER = "type"; - - /** Filter key for attribute "name" */ - public static final String NAME_FILTER = "name"; - - /** Filter key for attribute "column" */ - public static final String COLUMN_FILTER = "column"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "schema", "type", "name", "column" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "schema", String.class); - v.accept(1, "type", String.class); - v.accept(2, "name", String.class); - v.accept(3, "column", String.class); - v.accept(4, "maxPartitionObsolescencePercent", byte.class); - v.accept(5, "manualNulls", Long.class); - v.accept(6, "manualDistinct", Long.class); - v.accept(7, "manualTotal", Long.class); - v.accept(8, "manualSize", Integer.class); - v.accept(9, "version", long.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(StatisticsColumnConfigurationView row, AttributeWithValueVisitor v) { - v.accept(0, "schema", String.class, row.schema()); - v.accept(1, "type", String.class, row.type()); - v.accept(2, "name", String.class, row.name()); - v.accept(3, "column", String.class, row.column()); - v.acceptByte(4, "maxPartitionObsolescencePercent", row.maxPartitionObsolescencePercent()); - v.accept(5, "manualNulls", Long.class, row.manualNulls()); - v.accept(6, "manualDistinct", Long.class, row.manualDistinct()); - v.accept(7, "manualTotal", Long.class, row.manualTotal()); - v.accept(8, "manualSize", Integer.class, row.manualSize()); - v.acceptLong(9, "version", row.version()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 10; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnGlobalDataViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnGlobalDataViewWalker.java deleted file mode 100644 index c5d9cce86f72d..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnGlobalDataViewWalker.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.sql.Timestamp; -import java.util.Collections; -import java.util.List; -import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnGlobalDataView; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link StatisticsColumnGlobalDataView} attributes walker. - * - * @see StatisticsColumnGlobalDataView - */ -public class StatisticsColumnGlobalDataViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "schema" */ - public static final String SCHEMA_FILTER = "schema"; - - /** Filter key for attribute "type" */ - public static final String TYPE_FILTER = "type"; - - /** Filter key for attribute "name" */ - public static final String NAME_FILTER = "name"; - - /** Filter key for attribute "column" */ - public static final String COLUMN_FILTER = "column"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "schema", "type", "name", "column" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "schema", String.class); - v.accept(1, "type", String.class); - v.accept(2, "name", String.class); - v.accept(3, "column", String.class); - v.accept(4, "rowsCount", long.class); - v.accept(5, "distinct", long.class); - v.accept(6, "nulls", long.class); - v.accept(7, "total", long.class); - v.accept(8, "size", int.class); - v.accept(9, "version", long.class); - v.accept(10, "lastUpdateTime", Timestamp.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(StatisticsColumnGlobalDataView row, AttributeWithValueVisitor v) { - v.accept(0, "schema", String.class, row.schema()); - v.accept(1, "type", String.class, row.type()); - v.accept(2, "name", String.class, row.name()); - v.accept(3, "column", String.class, row.column()); - v.acceptLong(4, "rowsCount", row.rowsCount()); - v.acceptLong(5, "distinct", row.distinct()); - v.acceptLong(6, "nulls", row.nulls()); - v.acceptLong(7, "total", row.total()); - v.acceptInt(8, "size", row.size()); - v.acceptLong(9, "version", row.version()); - v.accept(10, "lastUpdateTime", Timestamp.class, row.lastUpdateTime()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 11; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnLocalDataViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnLocalDataViewWalker.java deleted file mode 100644 index f789bab153ab3..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnLocalDataViewWalker.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.sql.Timestamp; -import java.util.Collections; -import java.util.List; -import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnLocalDataView; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link StatisticsColumnLocalDataView} attributes walker. - * - * @see StatisticsColumnLocalDataView - */ -public class StatisticsColumnLocalDataViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "schema" */ - public static final String SCHEMA_FILTER = "schema"; - - /** Filter key for attribute "type" */ - public static final String TYPE_FILTER = "type"; - - /** Filter key for attribute "name" */ - public static final String NAME_FILTER = "name"; - - /** Filter key for attribute "column" */ - public static final String COLUMN_FILTER = "column"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "schema", "type", "name", "column" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "schema", String.class); - v.accept(1, "type", String.class); - v.accept(2, "name", String.class); - v.accept(3, "column", String.class); - v.accept(4, "rowsCount", long.class); - v.accept(5, "distinct", long.class); - v.accept(6, "nulls", long.class); - v.accept(7, "total", long.class); - v.accept(8, "size", int.class); - v.accept(9, "version", long.class); - v.accept(10, "lastUpdateTime", Timestamp.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(StatisticsColumnLocalDataView row, AttributeWithValueVisitor v) { - v.accept(0, "schema", String.class, row.schema()); - v.accept(1, "type", String.class, row.type()); - v.accept(2, "name", String.class, row.name()); - v.accept(3, "column", String.class, row.column()); - v.acceptLong(4, "rowsCount", row.rowsCount()); - v.acceptLong(5, "distinct", row.distinct()); - v.acceptLong(6, "nulls", row.nulls()); - v.acceptLong(7, "total", row.total()); - v.acceptInt(8, "size", row.size()); - v.acceptLong(9, "version", row.version()); - v.accept(10, "lastUpdateTime", Timestamp.class, row.lastUpdateTime()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 11; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnPartitionDataViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnPartitionDataViewWalker.java deleted file mode 100644 index 18fc99e88ea16..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StatisticsColumnPartitionDataViewWalker.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.Collections; -import java.util.List; -import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnPartitionDataView; -import org.apache.ignite.internal.util.typedef.F; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link StatisticsColumnPartitionDataView} attributes walker. - * - * @see StatisticsColumnPartitionDataView - */ -public class StatisticsColumnPartitionDataViewWalker implements SystemViewRowAttributeWalker { - /** Filter key for attribute "schema" */ - public static final String SCHEMA_FILTER = "schema"; - - /** Filter key for attribute "type" */ - public static final String TYPE_FILTER = "type"; - - /** Filter key for attribute "name" */ - public static final String NAME_FILTER = "name"; - - /** Filter key for attribute "column" */ - public static final String COLUMN_FILTER = "column"; - - /** Filter key for attribute "partition" */ - public static final String PARTITION_FILTER = "partition"; - - /** List of filtrable attributes. */ - private static final List FILTRABLE_ATTRS = Collections.unmodifiableList(F.asList( - "schema", "type", "name", "column", "partition" - )); - - /** {@inheritDoc} */ - @Override public List filtrableAttributes() { - return FILTRABLE_ATTRS; - } - - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "schema", String.class); - v.accept(1, "type", String.class); - v.accept(2, "name", String.class); - v.accept(3, "column", String.class); - v.accept(4, "partition", int.class); - v.accept(5, "rowsCount", long.class); - v.accept(6, "updateCounter", long.class); - v.accept(7, "distinct", long.class); - v.accept(8, "nulls", long.class); - v.accept(9, "total", long.class); - v.accept(10, "size", int.class); - v.accept(11, "version", long.class); - v.accept(12, "lastUpdateTime", long.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(StatisticsColumnPartitionDataView row, AttributeWithValueVisitor v) { - v.accept(0, "schema", String.class, row.schema()); - v.accept(1, "type", String.class, row.type()); - v.accept(2, "name", String.class, row.name()); - v.accept(3, "column", String.class, row.column()); - v.acceptInt(4, "partition", row.partition()); - v.acceptLong(5, "rowsCount", row.rowsCount()); - v.acceptLong(6, "updateCounter", row.updateCounter()); - v.acceptLong(7, "distinct", row.distinct()); - v.acceptLong(8, "nulls", row.nulls()); - v.acceptLong(9, "total", row.total()); - v.acceptInt(10, "size", row.size()); - v.acceptLong(11, "version", row.version()); - v.acceptLong(12, "lastUpdateTime", row.lastUpdateTime()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 13; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StripedExecutorTaskViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StripedExecutorTaskViewWalker.java deleted file mode 100644 index 03d1eebc4d59a..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/StripedExecutorTaskViewWalker.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import org.apache.ignite.spi.systemview.view.StripedExecutorTaskView; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link StripedExecutorTaskView} attributes walker. - * - * @see StripedExecutorTaskView - */ -public class StripedExecutorTaskViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "stripeIndex", int.class); - v.accept(1, "description", String.class); - v.accept(2, "threadName", String.class); - v.accept(3, "taskName", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(StripedExecutorTaskView row, AttributeWithValueVisitor v) { - v.acceptInt(0, "stripeIndex", row.stripeIndex()); - v.accept(1, "description", String.class, row.description()); - v.accept(2, "threadName", String.class, row.threadName()); - v.accept(3, "taskName", String.class, row.taskName()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 4; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/TransactionViewWalker.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/TransactionViewWalker.java deleted file mode 100644 index bc6970e341e46..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/walker/TransactionViewWalker.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * 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.ignite.internal.managers.systemview.walker; - -import java.util.UUID; -import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; -import org.apache.ignite.spi.systemview.view.TransactionView; -import org.apache.ignite.transactions.TransactionConcurrency; -import org.apache.ignite.transactions.TransactionIsolation; -import org.apache.ignite.transactions.TransactionState; - -/** - * Generated by {@code org.apache.ignite.codegen.SystemViewRowAttributeWalkerGenerator}. - * {@link TransactionView} attributes walker. - * - * @see TransactionView - */ -public class TransactionViewWalker implements SystemViewRowAttributeWalker { - /** {@inheritDoc} */ - @Override public void visitAll(AttributeVisitor v) { - v.accept(0, "originatingNodeId", UUID.class); - v.accept(1, "state", TransactionState.class); - v.accept(2, "xid", IgniteUuid.class); - v.accept(3, "label", String.class); - v.accept(4, "startTime", long.class); - v.accept(5, "isolation", TransactionIsolation.class); - v.accept(6, "concurrency", TransactionConcurrency.class); - v.accept(7, "keysCount", int.class); - v.accept(8, "cacheIds", String.class); - v.accept(9, "colocated", boolean.class); - v.accept(10, "dht", boolean.class); - v.accept(11, "duration", long.class); - v.accept(12, "implicit", boolean.class); - v.accept(13, "implicitSingle", boolean.class); - v.accept(14, "internal", boolean.class); - v.accept(15, "local", boolean.class); - v.accept(16, "localNodeId", UUID.class); - v.accept(17, "near", boolean.class); - v.accept(18, "onePhaseCommit", boolean.class); - v.accept(19, "otherNodeId", UUID.class); - v.accept(20, "subjectId", UUID.class); - v.accept(21, "system", boolean.class); - v.accept(22, "threadId", long.class); - v.accept(23, "timeout", long.class); - v.accept(24, "topVer", String.class); - } - - /** {@inheritDoc} */ - @Override public void visitAll(TransactionView row, AttributeWithValueVisitor v) { - v.accept(0, "originatingNodeId", UUID.class, row.originatingNodeId()); - v.accept(1, "state", TransactionState.class, row.state()); - v.accept(2, "xid", IgniteUuid.class, row.xid()); - v.accept(3, "label", String.class, row.label()); - v.acceptLong(4, "startTime", row.startTime()); - v.accept(5, "isolation", TransactionIsolation.class, row.isolation()); - v.accept(6, "concurrency", TransactionConcurrency.class, row.concurrency()); - v.acceptInt(7, "keysCount", row.keysCount()); - v.accept(8, "cacheIds", String.class, row.cacheIds()); - v.acceptBoolean(9, "colocated", row.colocated()); - v.acceptBoolean(10, "dht", row.dht()); - v.acceptLong(11, "duration", row.duration()); - v.acceptBoolean(12, "implicit", row.implicit()); - v.acceptBoolean(13, "implicitSingle", row.implicitSingle()); - v.acceptBoolean(14, "internal", row.internal()); - v.acceptBoolean(15, "local", row.local()); - v.accept(16, "localNodeId", UUID.class, row.localNodeId()); - v.acceptBoolean(17, "near", row.near()); - v.acceptBoolean(18, "onePhaseCommit", row.onePhaseCommit()); - v.accept(19, "otherNodeId", UUID.class, row.otherNodeId()); - v.accept(20, "subjectId", UUID.class, row.subjectId()); - v.acceptBoolean(21, "system", row.system()); - v.acceptLong(22, "threadId", row.threadId()); - v.acceptLong(23, "timeout", row.timeout()); - v.accept(24, "topVer", String.class, row.topVer()); - } - - /** {@inheritDoc} */ - @Override public int count() { - return 25; - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java index 4d4fb35575d31..092c720e7defe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java @@ -58,8 +58,8 @@ import org.apache.ignite.internal.managers.encryption.GridEncryptionManager; import org.apache.ignite.internal.managers.encryption.GroupKey; import org.apache.ignite.internal.managers.encryption.GroupKeyEncrypted; -import org.apache.ignite.internal.managers.systemview.walker.CacheGroupViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.CacheViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.CacheGroupViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.CacheViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteClusterReadOnlyException; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index d220c6b620748..5710d1a82ed73 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -85,9 +85,9 @@ import org.apache.ignite.internal.managers.communication.GridIoPolicy; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.encryption.GroupKeyEncrypted; -import org.apache.ignite.internal.managers.systemview.walker.CacheGroupIoViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.CachePagesListViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.PartitionStateViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.CacheGroupIoViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.CachePagesListViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.PartitionStateViewWalker; import org.apache.ignite.internal.metric.IoStatisticsType; import org.apache.ignite.internal.pagemem.store.IgnitePageStoreManager; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index aa5322faac3bb..4e2e09c915f8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -65,7 +65,7 @@ import org.apache.ignite.internal.binary.builder.BinaryObjectBuilders; import org.apache.ignite.internal.binary.streams.BinaryInputStream; import org.apache.ignite.internal.binary.streams.BinaryStreams; -import org.apache.ignite.internal.managers.systemview.walker.BinaryMetadataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.BinaryMetadataViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.cache.CacheDefaultBinaryAffinityKeyMapper; import org.apache.ignite.internal.processors.cache.CacheObject; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 23fcaddfb604d..a708e4e94670e 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -62,7 +62,7 @@ import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.managers.systemview.walker.MetastorageViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.MetastorageViewWalker; import org.apache.ignite.internal.mem.DirectMemoryProvider; import org.apache.ignite.internal.mem.DirectMemoryRegion; import org.apache.ignite.internal.metric.IoStatisticsHolderNoOp; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java index cae8612736541..a9b007eedc881 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java @@ -45,8 +45,8 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.managers.systemview.walker.PagesListViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.PagesTimestampHistogramViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.PagesListViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.PagesTimestampHistogramViewWalker; import org.apache.ignite.internal.mem.DirectMemoryProvider; import org.apache.ignite.internal.mem.DirectMemoryRegion; import org.apache.ignite.internal.mem.IgniteOutOfMemoryException; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java index 25624fe878c24..2c44502c7ca27 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java @@ -104,7 +104,7 @@ import org.apache.ignite.internal.managers.encryption.GroupKey; import org.apache.ignite.internal.managers.encryption.GroupKeyEncrypted; import org.apache.ignite.internal.managers.eventstorage.DiscoveryEventListener; -import org.apache.ignite.internal.managers.systemview.walker.SnapshotViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SnapshotViewWalker; import org.apache.ignite.internal.pagemem.PageIdUtils; import org.apache.ignite.internal.pagemem.store.PageStore; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index 6f814705de480..1ea083eed521a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -56,7 +56,7 @@ import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.eventstorage.DiscoveryEventListener; import org.apache.ignite.internal.managers.eventstorage.HighPriorityListener; -import org.apache.ignite.internal.managers.systemview.walker.TransactionViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.TransactionViewWalker; import org.apache.ignite.internal.pagemem.wal.record.DataEntry; import org.apache.ignite.internal.pagemem.wal.record.TxRecord; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index 51419ab5ecc2f..2f6a733e8aa9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -59,8 +59,8 @@ import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.BaselineNodeAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.BaselineNodeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.BaselineNodeAttributeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.BaselineNodeViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index df98fc299d4c8..f46be6ea66a95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -65,7 +65,7 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryMessageResultsCollector; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; import org.apache.ignite.internal.managers.eventstorage.HighPriorityListener; -import org.apache.ignite.internal.managers.systemview.walker.ContinuousQueryViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ContinuousQueryViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 854d2176e8937..ca2365cbf7f40 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -56,15 +56,15 @@ import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.AtomicLongViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.AtomicReferenceViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.AtomicSequenceViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.AtomicStampedViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.CountDownLatchViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.QueueViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.ReentrantLockViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SemaphoreViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SetViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.AtomicLongViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.AtomicReferenceViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.AtomicSequenceViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.AtomicStampedViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.CountDownLatchViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.QueueViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ReentrantLockViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SemaphoreViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SetViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.cache.CacheType; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java index c65d739518b8d..4547ea2001f1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java @@ -67,7 +67,7 @@ import org.apache.ignite.internal.managers.communication.GridMessageListener; import org.apache.ignite.internal.managers.deployment.GridDeployment; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.ComputeJobViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ComputeJobViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheContext; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java index 65952d22e405c..5593e9401a1cc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java @@ -47,7 +47,7 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryLocalJoinData; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.managers.systemview.walker.MetastorageViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.MetastorageViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/SqlViewMetricExporterSpi.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/SqlViewMetricExporterSpi.java index 226023ab93f0c..610f39b733946 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/SqlViewMetricExporterSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/SqlViewMetricExporterSpi.java @@ -20,7 +20,7 @@ import java.util.function.Predicate; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.managers.systemview.walker.MetricsViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.MetricsViewWalker; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiContext; import org.apache.ignite.spi.IgniteSpiException; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java index 4bb2f61314b39..8dd689cc7cf33 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java @@ -41,8 +41,8 @@ import org.apache.ignite.configuration.OdbcConfiguration; import org.apache.ignite.configuration.SqlConnectorConfiguration; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.managers.systemview.walker.ClientConnectionAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.ClientConnectionViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ClientConnectionAttributeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ClientConnectionViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.configuration.distributed.DistributedBooleanProperty; import org.apache.ignite.internal.processors.configuration.distributed.DistributedThinClientConfiguration; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java index 9073f8e89c992..d3c14f4946024 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java @@ -40,7 +40,7 @@ import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteComponentType; import org.apache.ignite.internal.managers.communication.GridIoPolicy; -import org.apache.ignite.internal.managers.systemview.walker.StripedExecutorTaskViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StripedExecutorTaskViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor; import org.apache.ignite.internal.processors.security.IgniteSecurity; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/running/RunningQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/running/RunningQueryManager.java index 9fde5568cb543..204fb649941fe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/running/RunningQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/running/RunningQueryManager.java @@ -43,9 +43,9 @@ import org.apache.ignite.internal.GridTopic; import org.apache.ignite.internal.managers.communication.GridIoPolicy; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.SqlPlanHistoryViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SqlQueryHistoryViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SqlQueryViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlPlanHistoryViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlQueryHistoryViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlQueryViewWalker; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType; import org.apache.ignite.internal.processors.closure.GridClosureProcessor; import org.apache.ignite.internal.processors.metric.MetricRegistryImpl; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/management/SchemaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/management/SchemaManager.java index 0f92d56910bf7..51f5ca6496eff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/management/SchemaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/management/SchemaManager.java @@ -47,12 +47,12 @@ import org.apache.ignite.internal.cache.query.index.IndexName; import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition; import org.apache.ignite.internal.jdbc2.JdbcUtils; -import org.apache.ignite.internal.managers.systemview.walker.SqlIndexViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SqlSchemaViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SqlTableColumnViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SqlTableViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SqlViewColumnViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.SqlViewViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlIndexViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlSchemaViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlTableColumnViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlTableViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlViewColumnViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlViewViewWalker; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheContextInfo; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java index 2c67c172e6164..d8e7a56fb1f09 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java @@ -41,9 +41,9 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnGlobalDataViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnLocalDataViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnPartitionDataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnGlobalDataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnLocalDataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch; import org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java index 2ad221bea92bd..b02e598cf3672 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java @@ -37,7 +37,7 @@ import org.apache.ignite.internal.events.DiscoveryCustomEvent; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnConfigurationViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnConfigurationViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch; import org.apache.ignite.internal.processors.cache.GridCacheContext; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepository.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepository.java index fbec5fb6b2a8f..724c5df765eb1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepository.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepository.java @@ -28,8 +28,8 @@ import java.util.function.Function; import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnLocalDataViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnPartitionDataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnLocalDataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.query.stat.config.StatisticsObjectConfiguration; import org.apache.ignite.internal.processors.query.stat.view.ColumnLocalDataViewSupplier; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnConfigurationViewSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnConfigurationViewSupplier.java index 374d5552f3227..82a7c027b2b77 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnConfigurationViewSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnConfigurationViewSupplier.java @@ -25,7 +25,7 @@ import java.util.function.Function; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnConfigurationViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnConfigurationViewWalker; import org.apache.ignite.internal.processors.query.stat.IgniteStatisticsConfigurationManager; import org.apache.ignite.internal.processors.query.stat.StatisticsKey; import org.apache.ignite.internal.processors.query.stat.config.StatisticsColumnConfiguration; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnLocalDataViewSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnLocalDataViewSupplier.java index 0eb298dbeee86..66d7c604bc0f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnLocalDataViewSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnLocalDataViewSupplier.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnLocalDataViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnPartitionDataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnLocalDataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.processors.query.stat.ColumnStatistics; import org.apache.ignite.internal.processors.query.stat.IgniteStatisticsRepository; import org.apache.ignite.internal.processors.query.stat.ObjectStatisticsImpl; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnPartitionDataViewSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnPartitionDataViewSupplier.java index 056610fa8e8f7..f2320318288c5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnPartitionDataViewSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnPartitionDataViewSupplier.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.ignite.internal.managers.systemview.walker.StatisticsColumnPartitionDataViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.processors.query.stat.ColumnStatistics; import org.apache.ignite.internal.processors.query.stat.IgniteStatisticsStore; import org.apache.ignite.internal.processors.query.stat.ObjectPartitionStatisticsImpl; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java index 4e16dd5d47ad2..a981f64b45e77 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.query.stat.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.stat.config.StatisticsColumnConfiguration; @@ -26,7 +27,7 @@ /** * Statistics column configuration representation for a {@link SystemView}. */ -public class StatisticsColumnConfigurationView { +public class StatisticsColumnConfigurationView implements SystemViewDescriptor { /** Table object type. */ public static final String TABLE_TYPE = "TABLE"; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java index 81e1a6a6ac093..2966eb3e9e4d4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.query.stat.view; import java.sql.Timestamp; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.stat.ObjectStatisticsImpl; @@ -26,7 +27,7 @@ /** * Statistics global data view. */ -public class StatisticsColumnGlobalDataView { +public class StatisticsColumnGlobalDataView implements SystemViewDescriptor { /** Statistics key */ private final StatisticsKey key; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java index 8db18885c0588..86b31f4040f75 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.processors.query.stat.view; import java.sql.Timestamp; - +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.stat.ObjectStatisticsImpl; @@ -27,7 +27,7 @@ /** * Statistics local data view. */ -public class StatisticsColumnLocalDataView { +public class StatisticsColumnLocalDataView implements SystemViewDescriptor { /** Statistics key */ private final StatisticsKey key; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java index c651642325fb5..d6dd2e01ceb46 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java @@ -17,6 +17,7 @@ package org.apache.ignite.internal.processors.query.stat.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.stat.ObjectPartitionStatisticsImpl; @@ -25,7 +26,7 @@ /** * Statistics partition data view. */ -public class StatisticsColumnPartitionDataView { +public class StatisticsColumnPartitionDataView implements SystemViewDescriptor { /** Statistics key */ private final StatisticsKey key; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java index d1b458b94e2eb..9e30fbe11d2cf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java @@ -59,7 +59,7 @@ import org.apache.ignite.internal.managers.deployment.GridDeployment; import org.apache.ignite.internal.managers.discovery.CustomEventListener; import org.apache.ignite.internal.managers.discovery.DiscoCache; -import org.apache.ignite.internal.managers.systemview.walker.ServiceViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ServiceViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index b33d2907ebc27..80d3413ee929d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -65,7 +65,7 @@ import org.apache.ignite.internal.managers.communication.GridMessageListener; import org.apache.ignite.internal.managers.deployment.GridDeployment; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.ComputeTaskViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ComputeTaskViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java index cd76079641d31..81ddce7c13f93 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; @@ -25,7 +26,7 @@ /** * Baseline node attribute representation for a {@link SystemView}. */ -public class BaselineNodeAttributeView { +public class BaselineNodeAttributeView implements SystemViewDescriptor { /** Node consistent id. */ private final Object consistentId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java index d48c1d5c9fb58..44f0faa37c80d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; @@ -24,7 +25,7 @@ /** * Baseline topology node representation for a {@link SystemView}. */ -public class BaselineNodeView { +public class BaselineNodeView implements SystemViewDescriptor { /** Consistent id. */ private final Object consistentId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java index e5745f3951c0e..9089dd0e0b595 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java @@ -18,13 +18,14 @@ package org.apache.ignite.spi.systemview.view; import org.apache.ignite.internal.binary.BinaryMetadata; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.util.typedef.internal.U; /** * {@link BinaryMetadata} representation for the {@link SystemView}. */ -public class BinaryMetadataView { +public class BinaryMetadataView implements SystemViewDescriptor { /** Meta. */ private final BinaryMetadata meta; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java index 328d956bb1e2d..dca93770a94c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.metric.MetricRegistry; @@ -28,7 +29,7 @@ /** * Cache group IO statistics representation for a {@link SystemView}. */ -public class CacheGroupIoView { +public class CacheGroupIoView implements SystemViewDescriptor { /** Cache group. */ private final CacheGroupContext grpCtx; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java index 6e123548faea7..5cc9e9a93df5f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java @@ -25,6 +25,7 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.TopologyValidator; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; import org.apache.ignite.lang.IgnitePredicate; @@ -34,7 +35,7 @@ /** * Cache group representation for the {@link SystemView}. */ -public class CacheGroupView { +public class CacheGroupView implements SystemViewDescriptor { /** Cache group. */ private final CacheGroupDescriptor grp; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java index 2cc1ca8d65547..8475500ae2b62 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java @@ -33,6 +33,7 @@ import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.configuration.TopologyValidator; import org.apache.ignite.internal.GridKernalContext; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; @@ -47,7 +48,7 @@ /** * Cache representation for a {@link SystemView}. */ -public class CacheView { +public class CacheView implements SystemViewDescriptor { /** Cache descriptor. */ private final DynamicCacheDescriptor cache; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java index 3cb8b820a30eb..a402e5d18d32f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java @@ -17,13 +17,14 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; /** * Client connection attribute system view row. */ -public class ClientConnectionAttributeView { +public class ClientConnectionAttributeView implements SystemViewDescriptor { /** Connection id. */ private final long connId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java index 3caf4647f93f9..3705e831ebb4e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view; import java.net.InetSocketAddress; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.processors.odbc.ClientListenerConnectionContext; import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.processors.odbc.ClientListenerRequestHandler; @@ -33,7 +34,7 @@ /** * Client connection system view row. */ -public class ClientConnectionView { +public class ClientConnectionView implements SystemViewDescriptor { /** Nio session. */ private final GridNioSession ses; @@ -104,4 +105,3 @@ public String version() { return ver == null ? null : ver.asString(); } } - diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java index 111c16704b5fc..3f6385258e2e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java @@ -20,6 +20,7 @@ import java.util.StringJoiner; import java.util.UUID; import org.apache.ignite.internal.managers.collision.GridCollisionManager; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.distributed.dht.GridReservable; import org.apache.ignite.internal.processors.job.GridJobProcessor; @@ -31,7 +32,7 @@ /** * Compute job representation for a {@link SystemView}. */ -public class ComputeJobView { +public class ComputeJobView implements SystemViewDescriptor { /** Compute job state. */ public enum ComputeJobState { /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java index f89dddb94dd8f..df330f001f0a0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view; import java.util.UUID; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.task.GridTaskWorker; import org.apache.ignite.lang.IgniteUuid; @@ -26,7 +27,7 @@ /** * Compute task representation for a {@link SystemView}. */ -public class ComputeTaskView { +public class ComputeTaskView implements SystemViewDescriptor { /** Worker for task. */ private final GridTaskWorker worker; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java index b78bd5290859b..2a10fa0a52c26 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java @@ -17,12 +17,13 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; /** * Configuration value representation for a {@link SystemView}. */ -public class ConfigurationView { +public class ConfigurationView implements SystemViewDescriptor { /** Name of the configuration property. */ private final String name; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java index c955071a783e5..155b4cd0a24e7 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java @@ -25,6 +25,7 @@ import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cache.query.ContinuousQueryWithTransformer; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; @@ -35,7 +36,7 @@ /** * Continuous query representation for a {@link SystemView}. */ -public class ContinuousQueryView { +public class ContinuousQueryView implements SystemViewDescriptor { /** Routine info. */ private final RoutineInfo qry; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java index 1d8d89c7a91c3..b2cd9da031881 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java @@ -17,12 +17,13 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; /** * Metastorage key representation for a {@link SystemView}. */ -public class MetastorageView { +public class MetastorageView implements SystemViewDescriptor { /** */ private final String name; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java index 39830758f9c0b..fb8b56e8a3e2a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java @@ -17,13 +17,14 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.spi.metric.Metric; /** * Metrics representation for a {@link SystemView}. */ -public class MetricsView { +public class MetricsView implements SystemViewDescriptor { /** Metric. */ private final Metric metric; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java index 8203000e076a2..3c65b7a0dfab5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view; import java.util.UUID; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; @@ -26,7 +27,7 @@ /** * Node attribute representation for a {@link SystemView}. */ -public class NodeAttributeView { +public class NodeAttributeView implements SystemViewDescriptor { /** Node id. */ private final UUID nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java index ccfbbb0db3081..266ad81a0f317 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java @@ -21,12 +21,13 @@ import java.util.UUID; import org.apache.ignite.cluster.ClusterMetrics; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; /** * Node metrics representation for a {@link SystemView}. */ -public class NodeMetricsView { +public class NodeMetricsView implements SystemViewDescriptor { /** Cluster node. */ private final ClusterNode node; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java index 4efe24844140c..fab190f4bd681 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.persistence.freelist.PagesList; @@ -24,7 +25,7 @@ /** * Pages-list representation for a {@link SystemView}. */ -public class PagesListView { +public class PagesListView implements SystemViewDescriptor { /** Pages list. */ PagesList pagesList; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java index 83c52b918c7bb..b91b26d838315 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java @@ -18,12 +18,13 @@ package org.apache.ignite.spi.systemview.view; import java.util.Date; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; /** * Pages timestamp histogramm representation for a {@link SystemView}. */ -public class PagesTimestampHistogramView { +public class PagesTimestampHistogramView implements SystemViewDescriptor { /** Data region name. */ private final String dataRegionName; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java index ac5726fe35016..ad54c783b645c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view; import java.util.UUID; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Filtrable; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState; @@ -25,7 +26,7 @@ /** * Partition state representation for a {@link SystemView}. */ -public class PartitionStateView { +public class PartitionStateView implements SystemViewDescriptor { /** Cache group id. */ private final int cacheGrpId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java index 35adca4dae8ad..d92cf3ce12b71 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view; import java.util.UUID; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition; import org.apache.ignite.internal.processors.cache.query.ScanQueryIterator; @@ -32,7 +33,7 @@ /** * Scan query iterator representation for a {@link SystemView}. */ -public class ScanQueryView { +public class ScanQueryView implements SystemViewDescriptor { /** Origin node id. */ private final UUID nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java index ec3033407492b..c95c1b9d451c9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java @@ -20,6 +20,7 @@ import java.util.Map; import java.util.UUID; import org.apache.ignite.cluster.ClusterNode; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.service.ServiceInfo; import org.apache.ignite.lang.IgnitePredicate; @@ -31,7 +32,7 @@ * * @see ServiceDescriptor */ -public class ServiceView { +public class ServiceView implements SystemViewDescriptor { /** Service descriptor. */ private final ServiceInfo serviceInfo; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java index 4b826e378e703..9c20682e18b4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view; import java.util.Collection; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.pagemem.wal.record.delta.ClusterSnapshotRecord; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotMetadata; @@ -27,7 +28,7 @@ /** * Snapshot representation for a {@link SystemView}. */ -public class SnapshotView { +public class SnapshotView implements SystemViewDescriptor { /** Snapshot system view name. */ public static final String SNAPSHOT_SYS_VIEW = "snapshot"; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java index 1666fbb8679cc..c519067f88df5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java @@ -19,11 +19,12 @@ import java.util.Date; import java.util.Map; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.running.SqlPlan; /** */ -public class SqlPlanHistoryView { +public class SqlPlanHistoryView implements SystemViewDescriptor { /** SQL plan. */ private final Map.Entry plan; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java index ce5cea4fdfaf2..75b2841a70c9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java @@ -18,13 +18,14 @@ package org.apache.ignite.spi.systemview.view; import java.util.Date; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.running.QueryHistory; /** * SQL query history representation for a {@link SystemView}. */ -public class SqlQueryHistoryView { +public class SqlQueryHistoryView implements SystemViewDescriptor { /** Query history item. */ private final QueryHistory qry; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java index df7190ec81f06..6e589935fcddc 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java @@ -19,6 +19,7 @@ import java.util.Date; import java.util.UUID; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.running.GridRunningQueryInfo; import org.apache.ignite.internal.util.typedef.internal.U; @@ -27,7 +28,7 @@ /** * SQL query representation for a {@link SystemView}. */ -public class SqlQueryView { +public class SqlQueryView implements SystemViewDescriptor { /** Query. */ private final GridRunningQueryInfo qry; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java index 51f3979fc2258..dc9570bd35412 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.systemview.view; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.util.StripedExecutor; import org.apache.ignite.internal.util.StripedExecutor.Stripe; @@ -26,7 +27,7 @@ /** * {@link StripedExecutor} task representation for a {@link SystemView}. */ -public class StripedExecutorTaskView { +public class StripedExecutorTaskView implements SystemViewDescriptor { /** Stripe. */ private final Stripe stripe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java index 400f8128a8412..7692e60244e52 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.Objects; import java.util.UUID; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry; @@ -35,7 +36,7 @@ /** * Transaction representation for a {@link SystemView}. */ -public class TransactionView { +public class TransactionView implements SystemViewDescriptor { /** Transaction. */ private final IgniteInternalTx tx; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java index 252d0877ae3e1..38b6e12126b07 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java @@ -17,13 +17,14 @@ package org.apache.ignite.spi.systemview.view.datastructures; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.AtomicDataStructureProxy; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.spi.systemview.view.SystemView; /** Abstract class for a {@link SystemView} representation of data structures. */ -abstract class AbstractDataStructureView { +abstract class AbstractDataStructureView implements SystemViewDescriptor { /** Data structure instance. */ protected final T ds; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java index 709cccd9831f3..98ef79401caf5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.systemview.view.datastructures; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheQueueProxy; import org.apache.ignite.lang.IgniteUuid; @@ -25,7 +26,7 @@ /** * Queue representation for a {@link SystemView}. */ -public class QueueView { +public class QueueView implements SystemViewDescriptor { /** Queue. */ private final GridCacheQueueProxy queue; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java index 48414a89408bd..eb233480dfb95 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.systemview.view.datastructures; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheSetProxy; import org.apache.ignite.lang.IgniteUuid; @@ -25,7 +26,7 @@ /** * Set representation for a {@link SystemView}. */ -public class SetView { +public class SetView implements SystemViewDescriptor { /** Set. */ private final GridCacheSetProxy set; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java index d6802d87450af..5a72f054f0d00 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view.sql; import java.util.stream.Collectors; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.schema.management.IndexDescriptor; import org.apache.ignite.internal.processors.query.schema.management.TableDescriptor; @@ -26,7 +27,7 @@ /** * Sql index representation for a {@link SystemView}. */ -public class SqlIndexView { +public class SqlIndexView implements SystemViewDescriptor { /** Table. */ private final TableDescriptor tbl; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java index b1ca9e6715fca..ee1dc1b719212 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java @@ -17,13 +17,14 @@ package org.apache.ignite.spi.systemview.view.sql; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.schema.management.SchemaDescriptor; /** * Sql schema system view representation. */ -public class SqlSchemaView { +public class SqlSchemaView implements SystemViewDescriptor { /** Schema. */ private final SchemaDescriptor schema; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java index c245d82097c92..81a3c7ee2de46 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view.sql; import java.util.Objects; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.GridQueryProperty; import org.apache.ignite.internal.processors.query.schema.management.TableDescriptor; @@ -27,7 +28,7 @@ /** * Sql table column representation for a {@link SystemView}. */ -public class SqlTableColumnView { +public class SqlTableColumnView implements SystemViewDescriptor { /** Table. */ private final TableDescriptor tbl; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java index 5177b8aa46167..775fbfa40b33f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view.sql; import java.util.Objects; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.schema.management.TableDescriptor; import org.apache.ignite.spi.systemview.view.SystemView; @@ -25,7 +26,7 @@ /** * Sql table representation for a {@link SystemView}. */ -public class SqlTableView { +public class SqlTableView implements SystemViewDescriptor { /** Table. */ private final TableDescriptor tbl; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java index be8a78d0f378f..9a3f0d297553e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java @@ -18,6 +18,7 @@ package org.apache.ignite.spi.systemview.view.sql; import java.util.Map; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.metric.impl.MetricUtils; import org.apache.ignite.internal.processors.query.QueryUtils; @@ -26,7 +27,7 @@ /** * Sql view column representation for a {@link SystemView}. */ -public class SqlViewColumnView { +public class SqlViewColumnView implements SystemViewDescriptor { /** System view. */ private final SystemView view; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java index d660982dcbd7a..d5ed46f3e68f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java @@ -17,6 +17,7 @@ package org.apache.ignite.spi.systemview.view.sql; +import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.schema.management.SchemaDescriptor; import org.apache.ignite.internal.processors.query.schema.management.ViewDescriptor; @@ -24,7 +25,7 @@ /** * Sql view representation for a {@link ViewDescriptor}. */ -public class SqlViewView { +public class SqlViewView implements SystemViewDescriptor { /** Schema descriptor. */ private final SchemaDescriptor schema; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java index d01649ea29a28..de897dcf93e2c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java @@ -65,7 +65,7 @@ import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectAllTypes; import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectEnum; import org.apache.ignite.internal.client.thin.ProtocolVersion; -import org.apache.ignite.internal.managers.systemview.walker.CachePagesListViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.CachePagesListViewWalker; import org.apache.ignite.internal.metric.SystemViewSelfTest.TestPredicate; import org.apache.ignite.internal.metric.SystemViewSelfTest.TestRunnable; import org.apache.ignite.internal.metric.SystemViewSelfTest.TestTransformer; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java index 84b68d8eb7ccc..28ef589523154 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java @@ -82,10 +82,10 @@ import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectAllTypes; import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectEnum; import org.apache.ignite.internal.client.thin.ProtocolVersion; -import org.apache.ignite.internal.managers.systemview.walker.BaselineNodeAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.CachePagesListViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.ClientConnectionAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.NodeAttributeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.BaselineNodeAttributeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.CachePagesListViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.ClientConnectionAttributeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.NodeAttributeViewWalker; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.freelist.PagesList; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java index 82663419bdc99..90ca23d3758d3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; -import org.apache.ignite.internal.managers.systemview.walker.MetastorageViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.MetastorageViewWalker; import org.apache.ignite.internal.processors.cache.persistence.file.FileIO; import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory; import org.apache.ignite.internal.util.typedef.internal.U; From 20bf989b0f5996afa9c6f842ad69bf533616e865 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Thu, 29 Jan 2026 00:14:12 +0300 Subject: [PATCH 03/18] remove old module --- assembly/dependencies-apache-ignite.xml | 1 - modules/bom/pom.xml | 2 +- modules/calcite/pom.xml | 2 +- modules/{codegen2 => codegen}/README.md | 0 modules/codegen/pom.xml | 30 +++++--- .../apache/ignite/internal/CustomMapper.java | 0 .../ignite/internal/MessageProcessor.java | 2 - .../internal/MessageSerializerGenerator.java | 0 .../org/apache/ignite/internal/Order.java | 0 .../managers/systemview/walker/Filtrable.java | 0 .../managers/systemview/walker/Order.java | 0 ...SystemViewRowAttributeWalkerGenerator.java | 0 ...SystemViewRowAttributeWalkerProcessor.java | 0 .../javax.annotation.processing.Processor | 0 .../src/main/resources/license.txt | 0 modules/codegen2/pom.xml | 74 ------------------- modules/core/pom.xml | 2 +- pom.xml | 1 - 18 files changed, 22 insertions(+), 92 deletions(-) rename modules/{codegen2 => codegen}/README.md (100%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/CustomMapper.java (100%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/MessageProcessor.java (99%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java (100%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/Order.java (100%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java (100%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java (100%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java (100%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java (100%) rename modules/{codegen2 => codegen}/src/main/resources/META-INF/services/javax.annotation.processing.Processor (100%) rename modules/{codegen2 => codegen}/src/main/resources/license.txt (100%) delete mode 100644 modules/codegen2/pom.xml diff --git a/assembly/dependencies-apache-ignite.xml b/assembly/dependencies-apache-ignite.xml index 54a200fb5066e..2ed7861597401 100644 --- a/assembly/dependencies-apache-ignite.xml +++ b/assembly/dependencies-apache-ignite.xml @@ -129,7 +129,6 @@ ${project.groupId}:ignite-examples ${project.groupId}:ignite-indexing ${project.groupId}:ignite-codegen - ${project.groupId}:ignite-codegen2 ${project.groupId}:ignite-schedule ${project.groupId}:ignite-appserver-test ${project.groupId}:ignite-websphere-test diff --git a/modules/bom/pom.xml b/modules/bom/pom.xml index db4ee73a175d0..25f8124d03fc0 100644 --- a/modules/bom/pom.xml +++ b/modules/bom/pom.xml @@ -183,7 +183,7 @@ ${project.groupId} - ignite-codegen2 + ignite-codegen ${revision} diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml index 366ca77711ed9..4e5201048da6d 100644 --- a/modules/calcite/pom.xml +++ b/modules/calcite/pom.xml @@ -74,7 +74,7 @@ ${project.groupId} - ignite-codegen2 + ignite-codegen provided diff --git a/modules/codegen2/README.md b/modules/codegen/README.md similarity index 100% rename from modules/codegen2/README.md rename to modules/codegen/README.md diff --git a/modules/codegen/pom.xml b/modules/codegen/pom.xml index 0a082d55945f5..1c40f6f53c28c 100644 --- a/modules/codegen/pom.xml +++ b/modules/codegen/pom.xml @@ -38,17 +38,7 @@ ${project.groupId} - ignite-core - - - - ${project.groupId} - ignite-indexing - - - - org.apache.ignite - ignite-calcite + ignite-commons @@ -61,6 +51,24 @@ true + + + + org.apache.maven.plugins + maven-compiler-plugin + + + default-compile + + -proc:none + + + + diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/CustomMapper.java b/modules/codegen/src/main/java/org/apache/ignite/internal/CustomMapper.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/CustomMapper.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/CustomMapper.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java similarity index 99% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/MessageProcessor.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java index 460a0631b07a5..933ee9cffa77a 100644 --- a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageProcessor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageProcessor.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import javax.annotation.processing.AbstractProcessor; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; @@ -37,7 +36,6 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; import javax.tools.Diagnostic; - import org.apache.ignite.lang.IgniteBiTuple; import static org.apache.ignite.internal.MessageSerializerGenerator.DLFT_ENUM_MAPPER_CLS; diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/MessageSerializerGenerator.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/Order.java b/modules/codegen/src/main/java/org/apache/ignite/internal/Order.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/Order.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/Order.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java diff --git a/modules/codegen2/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/modules/codegen/src/main/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from modules/codegen2/src/main/resources/META-INF/services/javax.annotation.processing.Processor rename to modules/codegen/src/main/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/modules/codegen2/src/main/resources/license.txt b/modules/codegen/src/main/resources/license.txt similarity index 100% rename from modules/codegen2/src/main/resources/license.txt rename to modules/codegen/src/main/resources/license.txt diff --git a/modules/codegen2/pom.xml b/modules/codegen2/pom.xml deleted file mode 100644 index 7e6e2959b0609..0000000000000 --- a/modules/codegen2/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - 4.0.0 - - - org.apache.ignite - ignite-parent-internal - ${revision} - ../../parent-internal/pom.xml - - - ignite-codegen2 - - http://ignite.apache.org - - - - ${project.groupId} - ignite-commons - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - default-compile - - -proc:none - - - - - - - diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 62c40492b30dd..4aa3ca78355d4 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -76,7 +76,7 @@ ${project.groupId} - ignite-codegen2 + ignite-codegen provided diff --git a/pom.xml b/pom.xml index 9c722ad15aac7..b7babc3d8033f 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,6 @@ modules/slf4j modules/jcl modules/codegen - modules/codegen2 modules/zookeeper modules/web/ignite-appserver-test modules/web/ignite-websphere-test From 0db1913bb18e333fc3b90ee1e221d6fa120a5b88 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Thu, 29 Jan 2026 00:21:27 +0300 Subject: [PATCH 04/18] fix codestyle --- .../walker/SystemViewRowAttributeWalkerGenerator.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java index 21911154b6287..5ff5bc5293dec 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java @@ -169,8 +169,10 @@ private Collection generateWalker(TypeElement clazz) { String line = TAB + TAB; - if (!retClazz.getKind().isPrimitive()) - line += "v.accept(" + i + ", \"" + name + "\", " + simpleName(retClazz) + ".class, row." + m.getSimpleName().toString() + "());"; + if (!retClazz.getKind().isPrimitive()) { + line += "v.accept(" + i + ", \"" + name + "\", " + simpleName(retClazz) + ".class, row." + + m.getSimpleName().toString() + "());"; + } else if (retClazz.getKind() == TypeKind.BOOLEAN) line += "v.acceptBoolean(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; else if (retClazz.getKind() == TypeKind.CHAR) @@ -304,7 +306,7 @@ private String simpleName(TypeMirror type) { private String qualifiedName(TypeMirror type) { if (type.getKind() == TypeKind.DECLARED) { DeclaredType declaredType = (DeclaredType)type; - TypeElement el = (TypeElement) declaredType.asElement(); + TypeElement el = (TypeElement)declaredType.asElement(); return el.getQualifiedName().toString(); } From 4010d1bc12108636bdf9bd4715080b41ce7bfea3 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Thu, 29 Jan 2026 11:30:46 +0300 Subject: [PATCH 05/18] fixed test --- .../org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java index bebf1e488616f..2f1aef7d3316c 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java @@ -812,6 +812,7 @@ public void testGetAllColumns() throws Exception { "SYS.NODES.NODE_ORDER.null", "SYS.NODES.ADDRESSES.null", "SYS.NODES.HOSTNAMES.null", + "SYS.NODES.DATA_CENTER_ID.null", "SYS.NODE_ATTRIBUTES.NODE_ID.null", "SYS.NODE_ATTRIBUTES.NAME.null", "SYS.NODE_ATTRIBUTES.VALUE.null", From 287811196e3828cd0f66b38240df27fe7a8fd86f Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Thu, 29 Jan 2026 11:31:53 +0300 Subject: [PATCH 06/18] fixed actions --- .github/workflows/commit-check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/commit-check.yml b/.github/workflows/commit-check.yml index f0b8f6d7510e7..6fa46cfbc89ba 100644 --- a/.github/workflows/commit-check.yml +++ b/.github/workflows/commit-check.yml @@ -68,7 +68,7 @@ jobs: - name: Check javadocs. run : | - ./mvnw -DskipTests install -pl modules/tools,modules/codegen2 -B -V && ./mvnw initialize -Pjavadoc -B -V + ./mvnw -DskipTests install -pl modules/tools,modules/codegen -B -V && ./mvnw initialize -Pjavadoc -B -V check-dotnet: name: Сheck .NET code From c81d31e2fba4caa9f55c8642a2ebdf4ffad29e45 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Thu, 29 Jan 2026 17:35:28 +0300 Subject: [PATCH 07/18] fixed toString invokes --- ...SystemViewRowAttributeWalkerGenerator.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java index 5ff5bc5293dec..3bd81847f07fa 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java @@ -112,10 +112,10 @@ private Collection generateWalker(TypeElement clazz) { forEachMethod(clazz, (m, i) -> { if (m.getAnnotation(Filtrable.class) != null) { - code.add(TAB + "/** Filter key for attribute \"" + m.getSimpleName().toString() + "\" */"); + code.add(TAB + "/** Filter key for attribute \"" + m.getSimpleName() + "\" */"); code.add(TAB + "public static final String " + m.getSimpleName().toString() .replaceAll("(\\p{Upper})", "_$1") - .toUpperCase() + "_FILTER = \"" + m.getSimpleName().toString() + "\";"); + .toUpperCase() + "_FILTER = \"" + m.getSimpleName() + "\";"); code.add(""); filtrableAttrs.add(m.getSimpleName().toString()); @@ -171,24 +171,24 @@ private Collection generateWalker(TypeElement clazz) { if (!retClazz.getKind().isPrimitive()) { line += "v.accept(" + i + ", \"" + name + "\", " + simpleName(retClazz) + ".class, row." - + m.getSimpleName().toString() + "());"; + + m.getSimpleName() + "());"; } else if (retClazz.getKind() == TypeKind.BOOLEAN) - line += "v.acceptBoolean(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + line += "v.acceptBoolean(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; else if (retClazz.getKind() == TypeKind.CHAR) - line += "v.acceptChar(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + line += "v.acceptChar(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; else if (retClazz.getKind() == TypeKind.BYTE) - line += "v.acceptByte(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + line += "v.acceptByte(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; else if (retClazz.getKind() == TypeKind.SHORT) - line += "v.acceptShort(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + line += "v.acceptShort(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; else if (retClazz.getKind() == TypeKind.INT) - line += "v.acceptInt(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + line += "v.acceptInt(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; else if (retClazz.getKind() == TypeKind.LONG) - line += "v.acceptLong(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + line += "v.acceptLong(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; else if (retClazz.getKind() == TypeKind.FLOAT) - line += "v.acceptFloat(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + line += "v.acceptFloat(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; else if (retClazz.getKind() == TypeKind.DOUBLE) - line += "v.acceptDouble(" + i + ", \"" + name + "\", row." + m.getSimpleName().toString() + "());"; + line += "v.acceptDouble(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; code.add(line); }); From cd7a198c4367643e9a80cd0946c23794caf8b311 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Thu, 29 Jan 2026 17:49:41 +0300 Subject: [PATCH 08/18] fixed merge --- .../org/apache/ignite/internal/idto/IDTOSerializerGenerator.java | 0 .../ignite/internal/idto/IgniteDataTransferObjectProcessor.java | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java (100%) rename modules/{codegen2 => codegen}/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java (100%) diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/idto/IDTOSerializerGenerator.java diff --git a/modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java similarity index 100% rename from modules/codegen2/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/idto/IgniteDataTransferObjectProcessor.java From a46437a1d6bb4bc15a03f96b16700f450b5b82f7 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Fri, 30 Jan 2026 16:26:39 +0300 Subject: [PATCH 09/18] fixed merge --- .../org/apache/ignite/internal/metric/SystemViewSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java index df30409a69d6a..baf7b29d4d6b7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java @@ -82,10 +82,10 @@ import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectAllTypes; import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectEnum; import org.apache.ignite.internal.client.thin.ProtocolVersion; -import org.apache.ignite.internal.managers.systemview.walker.MetastorageViewWalker; import org.apache.ignite.internal.managers.systemview.walker.codegen.BaselineNodeAttributeViewWalker; import org.apache.ignite.internal.managers.systemview.walker.codegen.CachePagesListViewWalker; import org.apache.ignite.internal.managers.systemview.walker.codegen.ClientConnectionAttributeViewWalker; +import org.apache.ignite.internal.managers.systemview.walker.codegen.MetastorageViewWalker; import org.apache.ignite.internal.managers.systemview.walker.codegen.NodeAttributeViewWalker; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager; From 56e71fe827e8979bdc2149ffa2b940fb1db9684b Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 10:02:44 +0300 Subject: [PATCH 10/18] Review fixes --- modules/codegen/README.md | 19 ++++++++----------- ...SystemViewRowAttributeWalkerProcessor.java | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/modules/codegen/README.md b/modules/codegen/README.md index 58014a023ad10..c075317ad2979 100644 --- a/modules/codegen/README.md +++ b/modules/codegen/README.md @@ -1,8 +1,12 @@ -# Message Processor Module +# Code generation module -This Maven module provides an annotation processor that automatically generates efficient serializer classes for all types implementing the `Message` interface. It is designed to run during the Java compilation phase and integrates seamlessly into build process. +This Maven module provides annotation processors that automatically generate code, such as serializers, walkers, etc. It is designed to run during the Java compilation phase and integrates seamlessly into the build process. -## Purpose +## Message Processor + +This annotation processor automatically generates efficient serializer classes for all types implementing the `Message` interface. + +### Purpose The `MessageProcessor` performs the following tasks: @@ -13,7 +17,7 @@ The `MessageProcessor` performs the following tasks: - A setter named after the field, accepting a single argument (e.g., `fieldName(Type val)`) - **Access Modifiers**: Getters and setters for all fields annotated with `@Order` must be declared as `public` -## Usage +### Usage 1. **Prepare your Message class** @@ -38,10 +42,3 @@ At compile time, a class `MyMessageSerializer` implemented `MessageSerializer` w 3. **Validation** If the `@Order` values are not sequential starting from 0, or if getter/setter method names do not match the field name, compilation will fail with a meaningful error message pointing to the problematic element. - -## **Maven codegen modules** - -To avoid a circular dependency between `ignite-core` (which contains message classes) and `ignite-codegen` (which needs to know about them), the annotation processor is **temporarily placed in a separate module**. This separation allows the processor to remain independent of core classes during compilation. - -In the future, this structure may be consolidated when build system constraints are resolved. - diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java index 0a3a183fd2c32..7be87cc073568 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java @@ -67,7 +67,7 @@ public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { catch (Exception e) { processingEnv.getMessager().printMessage( Diagnostic.Kind.ERROR, - "Failed to generate a message serializer:" + e.getMessage(), + "Failed to generate a walker:" + e.getMessage(), clazz); } } From cb516692f87b9d69f20e1b92d4a5e7bcb68f1754 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 10:47:22 +0300 Subject: [PATCH 11/18] Review fixes --- .../walker => systemview}/Filtrable.java | 2 +- .../walker => systemview}/Order.java | 2 +- .../systemview/SystemViewDescriptor.java | 9 ++------- .../SystemViewRowAttributeWalkerGenerator.java | 6 +++--- .../SystemViewRowAttributeWalkerProcessor.java | 8 ++++---- .../javax.annotation.processing.Processor | 2 +- modules/core/pom.xml | 4 ++-- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../discovery/GridDiscoveryManager.java | 6 +++--- .../systemview/ScanQuerySystemView.java | 2 +- .../processors/cache/ClusterCachesInfo.java | 4 ++-- .../processors/cache/GridCacheProcessor.java | 6 +++--- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../GridCacheDatabaseSharedManager.java | 2 +- .../IgniteCacheDatabaseSharedManager.java | 4 ++-- .../snapshot/IgniteSnapshotManager.java | 2 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../cluster/GridClusterStateProcessor.java | 4 ++-- .../continuous/GridContinuousProcessor.java | 2 +- .../DataStructuresProcessor.java | 18 +++++++++--------- .../processors/job/GridJobProcessor.java | 2 +- .../DistributedMetaStorageImpl.java | 2 +- .../metric/SqlViewMetricExporterSpi.java | 2 +- .../odbc/ClientListenerProcessor.java | 4 ++-- .../processors/pool/PoolProcessor.java | 2 +- .../query/running/RunningQueryManager.java | 6 +++--- .../query/schema/management/SchemaManager.java | 12 ++++++------ .../stat/IgniteGlobalStatisticsManager.java | 6 +++--- .../IgniteStatisticsConfigurationManager.java | 2 +- .../query/stat/IgniteStatisticsRepository.java | 4 ++-- .../view/ColumnConfigurationViewSupplier.java | 2 +- .../stat/view/ColumnLocalDataViewSupplier.java | 4 ++-- .../view/ColumnPartitionDataViewSupplier.java | 2 +- .../StatisticsColumnConfigurationView.java | 6 +++--- .../view/StatisticsColumnGlobalDataView.java | 6 +++--- .../view/StatisticsColumnLocalDataView.java | 6 +++--- .../StatisticsColumnPartitionDataView.java | 6 +++--- .../service/IgniteServiceProcessor.java | 2 +- .../processors/task/GridTaskProcessor.java | 2 +- .../view/BaselineNodeAttributeView.java | 6 +++--- .../spi/systemview/view/BaselineNodeView.java | 4 ++-- .../systemview/view/BinaryMetadataView.java | 4 ++-- .../spi/systemview/view/CacheGroupIoView.java | 4 ++-- .../spi/systemview/view/CacheGroupView.java | 4 ++-- .../systemview/view/CachePagesListView.java | 4 ++-- .../ignite/spi/systemview/view/CacheView.java | 4 ++-- .../view/ClientConnectionAttributeView.java | 6 +++--- .../systemview/view/ClientConnectionView.java | 2 +- .../spi/systemview/view/ClusterNodeView.java | 4 ++-- .../spi/systemview/view/ComputeJobView.java | 4 ++-- .../spi/systemview/view/ComputeTaskView.java | 4 ++-- .../spi/systemview/view/ConfigurationView.java | 4 ++-- .../systemview/view/ContinuousQueryView.java | 4 ++-- .../spi/systemview/view/MetastorageView.java | 6 +++--- .../spi/systemview/view/MetricsView.java | 4 ++-- .../spi/systemview/view/NodeAttributeView.java | 6 +++--- .../spi/systemview/view/NodeMetricsView.java | 4 ++-- .../spi/systemview/view/PagesListView.java | 6 +++--- .../view/PagesTimestampHistogramView.java | 4 ++-- .../systemview/view/PartitionStateView.java | 6 +++--- .../spi/systemview/view/ScanQueryView.java | 4 ++-- .../spi/systemview/view/ServiceView.java | 4 ++-- .../spi/systemview/view/SnapshotView.java | 4 ++-- .../systemview/view/SqlPlanHistoryView.java | 4 ++-- .../systemview/view/SqlQueryHistoryView.java | 4 ++-- .../spi/systemview/view/SqlQueryView.java | 4 ++-- .../view/StripedExecutorTaskView.java | 4 ++-- .../spi/systemview/view/TransactionView.java | 4 ++-- .../AbstractDataStructureView.java | 4 ++-- .../view/datastructures/AtomicLongView.java | 2 +- .../datastructures/AtomicReferenceView.java | 2 +- .../datastructures/AtomicSequenceView.java | 2 +- .../view/datastructures/AtomicStampedView.java | 2 +- .../datastructures/CountDownLatchView.java | 2 +- .../view/datastructures/QueueView.java | 4 ++-- .../view/datastructures/ReentrantLockView.java | 2 +- .../view/datastructures/SemaphoreView.java | 2 +- .../view/datastructures/SetView.java | 4 ++-- .../spi/systemview/view/sql/SqlIndexView.java | 4 ++-- .../spi/systemview/view/sql/SqlSchemaView.java | 4 ++-- .../view/sql/SqlTableColumnView.java | 4 ++-- .../spi/systemview/view/sql/SqlTableView.java | 4 ++-- .../systemview/view/sql/SqlViewColumnView.java | 4 ++-- .../spi/systemview/view/sql/SqlViewView.java | 4 ++-- .../internal/metric/JmxExporterSpiTest.java | 2 +- .../internal/metric/SystemViewSelfTest.java | 10 +++++----- .../PerformanceStatisticsSystemViewTest.java | 2 +- 87 files changed, 176 insertions(+), 181 deletions(-) rename modules/codegen/src/main/java/org/apache/ignite/internal/{managers/systemview/walker => systemview}/Filtrable.java (94%) rename modules/codegen/src/main/java/org/apache/ignite/internal/{managers/systemview/walker => systemview}/Order.java (95%) rename modules/{core/src/main/java/org/apache/ignite/internal/managers => codegen/src/main/java/org/apache/ignite/internal}/systemview/SystemViewDescriptor.java (69%) rename modules/codegen/src/main/java/org/apache/ignite/internal/{managers/systemview/walker => systemview}/SystemViewRowAttributeWalkerGenerator.java (98%) rename modules/codegen/src/main/java/org/apache/ignite/internal/{managers/systemview/walker => systemview}/SystemViewRowAttributeWalkerProcessor.java (91%) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/Filtrable.java similarity index 94% rename from modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/systemview/Filtrable.java index 9e66e8ccca551..0dd232bcb62b1 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Filtrable.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/Filtrable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.managers.systemview.walker; +package org.apache.ignite.internal.systemview; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/Order.java similarity index 95% rename from modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/systemview/Order.java index ed747f087e7ec..65a6d6d484715 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/Order.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/Order.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.managers.systemview.walker; +package org.apache.ignite.internal.systemview; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/SystemViewDescriptor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewDescriptor.java similarity index 69% rename from modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/SystemViewDescriptor.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewDescriptor.java index 5e1ff33ac4f19..a9c316da2c673 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/SystemViewDescriptor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewDescriptor.java @@ -15,16 +15,11 @@ * limitations under the License. */ -package org.apache.ignite.internal.managers.systemview; - -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; -import org.apache.ignite.internal.managers.systemview.walker.SystemViewRowAttributeWalkerProcessor; -import org.apache.ignite.spi.systemview.view.SystemViewRowAttributeWalker; +package org.apache.ignite.internal.systemview; /** * Marker of system view descriptor. Processed by {@link SystemViewRowAttributeWalkerProcessor} to generate - * {@link SystemViewRowAttributeWalker} implementations. + * {@code SystemViewRowAttributeWalker} implementations. * * @see Order * @see Filtrable diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java similarity index 98% rename from modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java index 3bd81847f07fa..7608cfb62997a 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.managers.systemview.walker; +package org.apache.ignite.internal.systemview; import java.io.IOException; import java.io.PrintWriter; @@ -51,7 +51,7 @@ public class SystemViewRowAttributeWalkerGenerator { "getClass")); /** Package for {@code SystemViewRowAttributeWalker} implementations. */ - public static final String WALKER_PACKAGE = "org.apache.ignite.internal.managers.systemview.walker.codegen"; + public static final String WALKER_PACKAGE = "org.apache.ignite.internal.systemview"; /** */ public static final String TAB = " "; @@ -104,7 +104,7 @@ private Collection generateWalker(TypeElement clazz) { code.add("/**"); code.add(" * This class is generated automatically."); code.add(" * "); - code.add(" * @see org.apache.ignite.internal.managers.systemview.walker.SystemViewRowAttributeWalkerProcessor"); + code.add(" * @see org.apache.ignite.internal.systemview.SystemViewRowAttributeWalkerProcessor"); code.add(" */"); code.add("public class " + simpleName + "Walker implements SystemViewRowAttributeWalker<" + simpleName + "> {"); diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java similarity index 91% rename from modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java rename to modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java index 7be87cc073568..1add4aa5da12a 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/managers/systemview/walker/SystemViewRowAttributeWalkerProcessor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.ignite.internal.managers.systemview.walker; +package org.apache.ignite.internal.systemview; import java.util.Set; import javax.annotation.processing.AbstractProcessor; @@ -37,11 +37,11 @@ * The generated walker follows the naming convention: * {@code org.apache.ignite.internal.managers.systemview.walker.codegen.[ViewClassName]Walker}. */ -@SupportedAnnotationTypes("org.apache.ignite.internal.managers.systemview.walker.Order") +@SupportedAnnotationTypes("org.apache.ignite.internal.systemview.Order") @SupportedSourceVersion(SourceVersion.RELEASE_11) public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { - /** Base interface that every message must implement. */ - static final String VIEW_INTERFACE = "org.apache.ignite.internal.managers.systemview.SystemViewDescriptor"; + /** Base interface that every system view must implement. */ + static final String VIEW_INTERFACE = "org.apache.ignite.internal.systemview.SystemViewDescriptor"; /** * Processes all classes implementing the {@code SystemViewDescriptor} interface and generates corresponding walker code. diff --git a/modules/codegen/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/modules/codegen/src/main/resources/META-INF/services/javax.annotation.processing.Processor index 4e8aead412551..ba066bcc8beae 100644 --- a/modules/codegen/src/main/resources/META-INF/services/javax.annotation.processing.Processor +++ b/modules/codegen/src/main/resources/META-INF/services/javax.annotation.processing.Processor @@ -1,2 +1,2 @@ org.apache.ignite.internal.MessageProcessor -org.apache.ignite.internal.managers.systemview.walker.SystemViewRowAttributeWalkerProcessor +org.apache.ignite.internal.systemview.SystemViewRowAttributeWalkerProcessor diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 9791872f45d3b..3815997cb2c21 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -77,7 +77,7 @@ ${project.groupId} ignite-codegen - provided + compile @@ -387,7 +387,7 @@ org.apache.ignite.internal.MessageProcessor org.apache.ignite.internal.idto.IgniteDataTransferObjectProcessor - org.apache.ignite.internal.managers.systemview.walker.SystemViewRowAttributeWalkerProcessor + org.apache.ignite.internal.systemview.SystemViewRowAttributeWalkerProcessor -Xmaxerrs diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index d99e7d3d7786b..e4dfba6d877ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -110,7 +110,6 @@ import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; import org.apache.ignite.internal.managers.systemview.IgniteConfigurationIterable; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ConfigurationViewWalker; import org.apache.ignite.internal.managers.tracing.GridTracingManager; import org.apache.ignite.internal.plugin.IgniteLogInfoProvider; import org.apache.ignite.internal.plugin.IgniteLogInfoProviderImpl; @@ -173,6 +172,7 @@ import org.apache.ignite.internal.suggestions.GridPerformanceSuggestions; import org.apache.ignite.internal.suggestions.JvmConfigurationSuggestions; import org.apache.ignite.internal.suggestions.OsConfigurationSuggestions; +import org.apache.ignite.internal.systemview.ConfigurationViewWalker; import org.apache.ignite.internal.util.StripedExecutor; import org.apache.ignite.internal.util.TimeBag; import org.apache.ignite.internal.util.future.GridCompoundFuture; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 344803d82db34..546355e68cd70 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -76,9 +76,6 @@ import org.apache.ignite.internal.events.DiscoveryCustomEvent; import org.apache.ignite.internal.managers.GridManagerAdapter; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ClusterNodeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.NodeAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.NodeMetricsViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; import org.apache.ignite.internal.processors.cache.ClientCacheChangeDummyDiscoveryMessage; @@ -96,6 +93,9 @@ import org.apache.ignite.internal.processors.security.OperationSecurityContext; import org.apache.ignite.internal.processors.security.SecurityContext; import org.apache.ignite.internal.processors.tracing.messages.SpanContainer; +import org.apache.ignite.internal.systemview.ClusterNodeViewWalker; +import org.apache.ignite.internal.systemview.NodeAttributeViewWalker; +import org.apache.ignite.internal.systemview.NodeMetricsViewWalker; import org.apache.ignite.internal.util.GridAtomicLong; import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap; import org.apache.ignite.internal.util.GridSpinBusyLock; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/ScanQuerySystemView.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/ScanQuerySystemView.java index 1d417b3b93450..2008c86f7c584 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/ScanQuerySystemView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/systemview/ScanQuerySystemView.java @@ -25,10 +25,10 @@ import java.util.UUID; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ScanQueryViewWalker; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryManager; import org.apache.ignite.internal.processors.cache.query.ScanQueryIterator; +import org.apache.ignite.internal.systemview.ScanQueryViewWalker; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.spi.IgniteSpiCloseableIterator; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java index 092c720e7defe..562a33ab352ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java @@ -58,8 +58,6 @@ import org.apache.ignite.internal.managers.encryption.GridEncryptionManager; import org.apache.ignite.internal.managers.encryption.GroupKey; import org.apache.ignite.internal.managers.encryption.GroupKeyEncrypted; -import org.apache.ignite.internal.managers.systemview.walker.codegen.CacheGroupViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.CacheViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteClusterReadOnlyException; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager; @@ -70,6 +68,8 @@ import org.apache.ignite.internal.processors.query.QuerySchema; import org.apache.ignite.internal.processors.query.QuerySchemaPatch; import org.apache.ignite.internal.processors.query.QueryUtils; +import org.apache.ignite.internal.systemview.CacheGroupViewWalker; +import org.apache.ignite.internal.systemview.CacheViewWalker; import org.apache.ignite.internal.util.lang.GridFunc; import org.apache.ignite.internal.util.lang.GridPlainCallable; import org.apache.ignite.internal.util.typedef.C1; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 5710d1a82ed73..fe419c8ef308d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -85,9 +85,6 @@ import org.apache.ignite.internal.managers.communication.GridIoPolicy; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.encryption.GroupKeyEncrypted; -import org.apache.ignite.internal.managers.systemview.walker.codegen.CacheGroupIoViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.CachePagesListViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.PartitionStateViewWalker; import org.apache.ignite.internal.metric.IoStatisticsType; import org.apache.ignite.internal.pagemem.store.IgnitePageStoreManager; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; @@ -153,6 +150,9 @@ import org.apache.ignite.internal.processors.security.IgniteSecurity; import org.apache.ignite.internal.processors.security.sandbox.IgniteSandbox; import org.apache.ignite.internal.suggestions.GridPerformanceSuggestions; +import org.apache.ignite.internal.systemview.CacheGroupIoViewWalker; +import org.apache.ignite.internal.systemview.CachePagesListViewWalker; +import org.apache.ignite.internal.systemview.PartitionStateViewWalker; import org.apache.ignite.internal.util.F0; import org.apache.ignite.internal.util.IgniteCollectors; import org.apache.ignite.internal.util.InitializationProtector; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 4e2e09c915f8c..3e874b0c9e49c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -65,7 +65,6 @@ import org.apache.ignite.internal.binary.builder.BinaryObjectBuilders; import org.apache.ignite.internal.binary.streams.BinaryInputStream; import org.apache.ignite.internal.binary.streams.BinaryStreams; -import org.apache.ignite.internal.managers.systemview.walker.codegen.BinaryMetadataViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.cache.CacheDefaultBinaryAffinityKeyMapper; import org.apache.ignite.internal.processors.cache.CacheObject; @@ -88,6 +87,7 @@ import org.apache.ignite.internal.processors.datastructures.CollocatedQueueItemKey; import org.apache.ignite.internal.processors.datastructures.CollocatedSetItemKey; import org.apache.ignite.internal.processors.query.QueryUtils; +import org.apache.ignite.internal.systemview.BinaryMetadataViewWalker; import org.apache.ignite.internal.util.GridUnsafe; import org.apache.ignite.internal.util.MutableSingletonList; import org.apache.ignite.internal.util.future.GridFutureAdapter; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java index 981c7460f58e0..3b2d876769b4f 100755 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java @@ -62,7 +62,6 @@ import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.managers.systemview.walker.codegen.MetastorageViewWalker; import org.apache.ignite.internal.mem.DirectMemoryProvider; import org.apache.ignite.internal.mem.DirectMemoryRegion; import org.apache.ignite.internal.metric.IoStatisticsHolderNoOp; @@ -138,6 +137,7 @@ import org.apache.ignite.internal.processors.configuration.distributed.SimpleDistributedProperty; import org.apache.ignite.internal.processors.port.GridPortRecord; import org.apache.ignite.internal.processors.query.GridQueryProcessor; +import org.apache.ignite.internal.systemview.MetastorageViewWalker; import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.GridCountDownCallback; import org.apache.ignite.internal.util.IgniteUtils; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java index a9b007eedc881..d8b14ce718a1f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java @@ -45,8 +45,6 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.managers.systemview.walker.codegen.PagesListViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.PagesTimestampHistogramViewWalker; import org.apache.ignite.internal.mem.DirectMemoryProvider; import org.apache.ignite.internal.mem.DirectMemoryRegion; import org.apache.ignite.internal.mem.IgniteOutOfMemoryException; @@ -80,6 +78,8 @@ import org.apache.ignite.internal.processors.cache.persistence.wal.WALPointer; import org.apache.ignite.internal.processors.cache.warmup.WarmUpStrategy; import org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport; +import org.apache.ignite.internal.systemview.PagesListViewWalker; +import org.apache.ignite.internal.systemview.PagesTimestampHistogramViewWalker; import org.apache.ignite.internal.util.TimeBag; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.CU; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java index 2c44502c7ca27..2a24ffcca9690 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java @@ -104,7 +104,6 @@ import org.apache.ignite.internal.managers.encryption.GroupKey; import org.apache.ignite.internal.managers.encryption.GroupKeyEncrypted; import org.apache.ignite.internal.managers.eventstorage.DiscoveryEventListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SnapshotViewWalker; import org.apache.ignite.internal.pagemem.PageIdUtils; import org.apache.ignite.internal.pagemem.store.PageStore; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; @@ -154,6 +153,7 @@ import org.apache.ignite.internal.processors.marshaller.MappedName; import org.apache.ignite.internal.processors.metastorage.persistence.DistributedMetaStorageImpl; import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.systemview.SnapshotViewWalker; import org.apache.ignite.internal.util.BasicRateLimiter; import org.apache.ignite.internal.util.GridBusyLock; import org.apache.ignite.internal.util.GridCloseableIteratorAdapter; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index 1ea083eed521a..9990cb67a0f95 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -56,7 +56,6 @@ import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.eventstorage.DiscoveryEventListener; import org.apache.ignite.internal.managers.eventstorage.HighPriorityListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.TransactionViewWalker; import org.apache.ignite.internal.pagemem.wal.record.DataEntry; import org.apache.ignite.internal.pagemem.wal.record.TxRecord; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; @@ -95,6 +94,7 @@ import org.apache.ignite.internal.processors.cluster.BaselineTopology; import org.apache.ignite.internal.processors.metric.impl.HitRateMetric; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; +import org.apache.ignite.internal.systemview.TransactionViewWalker; import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException; import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException; import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index 2f6a733e8aa9c..4640faf6d8e35 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -59,8 +59,6 @@ import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.eventstorage.GridEventStorageManager; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.BaselineNodeAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.BaselineNodeViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; @@ -78,6 +76,8 @@ import org.apache.ignite.internal.processors.configuration.distributed.DistributePropertyListener; import org.apache.ignite.internal.processors.security.SecurityUtils; import org.apache.ignite.internal.processors.subscription.GridInternalSubscriptionProcessor; +import org.apache.ignite.internal.systemview.BaselineNodeAttributeViewWalker; +import org.apache.ignite.internal.systemview.BaselineNodeViewWalker; import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index f46be6ea66a95..3330c91037b6f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -65,7 +65,6 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryMessageResultsCollector; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; import org.apache.ignite.internal.managers.eventstorage.HighPriorityListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ContinuousQueryViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; @@ -74,6 +73,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.CachePartitionPartialCountersMap; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler; import org.apache.ignite.internal.processors.timeout.GridTimeoutObject; +import org.apache.ignite.internal.systemview.ContinuousQueryViewWalker; import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.lang.GridPlainRunnable; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index ca2365cbf7f40..5f81792151696 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -56,15 +56,6 @@ import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.cluster.ClusterTopologyServerNotFoundException; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.AtomicLongViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.AtomicReferenceViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.AtomicSequenceViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.AtomicStampedViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.CountDownLatchViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.QueueViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ReentrantLockViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SemaphoreViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SetViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.cache.CacheType; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; @@ -75,6 +66,15 @@ import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxLocal; import org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport; +import org.apache.ignite.internal.systemview.AtomicLongViewWalker; +import org.apache.ignite.internal.systemview.AtomicReferenceViewWalker; +import org.apache.ignite.internal.systemview.AtomicSequenceViewWalker; +import org.apache.ignite.internal.systemview.AtomicStampedViewWalker; +import org.apache.ignite.internal.systemview.CountDownLatchViewWalker; +import org.apache.ignite.internal.systemview.QueueViewWalker; +import org.apache.ignite.internal.systemview.ReentrantLockViewWalker; +import org.apache.ignite.internal.systemview.SemaphoreViewWalker; +import org.apache.ignite.internal.systemview.SetViewWalker; import org.apache.ignite.internal.util.lang.GridPlainCallable; import org.apache.ignite.internal.util.lang.IgniteClosureX; import org.apache.ignite.internal.util.lang.IgniteInClosureX; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java index 4547ea2001f1a..fd1b0122d6dae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java @@ -67,7 +67,6 @@ import org.apache.ignite.internal.managers.communication.GridMessageListener; import org.apache.ignite.internal.managers.deployment.GridDeployment; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ComputeJobViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.GridCacheContext; @@ -77,6 +76,7 @@ import org.apache.ignite.internal.processors.jobmetrics.GridJobMetricsSnapshot; import org.apache.ignite.internal.processors.metric.MetricRegistryImpl; import org.apache.ignite.internal.processors.metric.impl.AtomicLongMetric; +import org.apache.ignite.internal.systemview.ComputeJobViewWalker; import org.apache.ignite.internal.util.GridAtomicLong; import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap; import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java index 57b79c19a5235..147b98ceead25 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metastorage/persistence/DistributedMetaStorageImpl.java @@ -47,7 +47,6 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.DiscoveryLocalJoinData; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; -import org.apache.ignite.internal.managers.systemview.walker.codegen.MetastorageViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage; @@ -60,6 +59,7 @@ import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorageListener; import org.apache.ignite.internal.processors.metastorage.DistributedMetastorageLifecycleListener; import org.apache.ignite.internal.processors.subscription.GridInternalSubscriptionProcessor; +import org.apache.ignite.internal.systemview.MetastorageViewWalker; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.internal.S; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/SqlViewMetricExporterSpi.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/SqlViewMetricExporterSpi.java index 610f39b733946..94dce349c8b0a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/SqlViewMetricExporterSpi.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/metric/SqlViewMetricExporterSpi.java @@ -20,7 +20,7 @@ import java.util.function.Predicate; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteEx; -import org.apache.ignite.internal.managers.systemview.walker.codegen.MetricsViewWalker; +import org.apache.ignite.internal.systemview.MetricsViewWalker; import org.apache.ignite.spi.IgniteSpiAdapter; import org.apache.ignite.spi.IgniteSpiContext; import org.apache.ignite.spi.IgniteSpiException; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java index 8dd689cc7cf33..d092d37a4c1e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerProcessor.java @@ -41,14 +41,14 @@ import org.apache.ignite.configuration.OdbcConfiguration; import org.apache.ignite.configuration.SqlConnectorConfiguration; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ClientConnectionAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ClientConnectionViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.configuration.distributed.DistributedBooleanProperty; import org.apache.ignite.internal.processors.configuration.distributed.DistributedThinClientConfiguration; import org.apache.ignite.internal.processors.metric.MetricRegistryImpl; import org.apache.ignite.internal.processors.odbc.jdbc.JdbcConnectionContext; import org.apache.ignite.internal.processors.odbc.odbc.OdbcConnectionContext; +import org.apache.ignite.internal.systemview.ClientConnectionAttributeViewWalker; +import org.apache.ignite.internal.systemview.ClientConnectionViewWalker; import org.apache.ignite.internal.util.GridSpinBusyLock; import org.apache.ignite.internal.util.HostAndPortRange; import org.apache.ignite.internal.util.nio.GridNioAsyncNotifyFilter; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java index d3c14f4946024..7c40e9d583cf7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/pool/PoolProcessor.java @@ -40,7 +40,6 @@ import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteComponentType; import org.apache.ignite.internal.managers.communication.GridIoPolicy; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StripedExecutorTaskViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.plugin.IgnitePluginProcessor; import org.apache.ignite.internal.processors.security.IgniteSecurity; @@ -49,6 +48,7 @@ import org.apache.ignite.internal.processors.security.thread.SecurityAwareStripedThreadPoolExecutor; import org.apache.ignite.internal.processors.security.thread.SecurityAwareThreadPoolExecutor; import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor; +import org.apache.ignite.internal.systemview.StripedExecutorTaskViewWalker; import org.apache.ignite.internal.util.StripedExecutor; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.F; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/running/RunningQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/running/RunningQueryManager.java index 204fb649941fe..04e44877b94f5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/running/RunningQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/running/RunningQueryManager.java @@ -43,9 +43,6 @@ import org.apache.ignite.internal.GridTopic; import org.apache.ignite.internal.managers.communication.GridIoPolicy; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlPlanHistoryViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlQueryHistoryViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlQueryViewWalker; import org.apache.ignite.internal.processors.cache.query.GridCacheQueryType; import org.apache.ignite.internal.processors.closure.GridClosureProcessor; import org.apache.ignite.internal.processors.metric.MetricRegistryImpl; @@ -59,6 +56,9 @@ import org.apache.ignite.internal.processors.query.messages.GridQueryKillRequest; import org.apache.ignite.internal.processors.query.messages.GridQueryKillResponse; import org.apache.ignite.internal.processors.tracing.Span; +import org.apache.ignite.internal.systemview.SqlPlanHistoryViewWalker; +import org.apache.ignite.internal.systemview.SqlQueryHistoryViewWalker; +import org.apache.ignite.internal.systemview.SqlQueryViewWalker; import org.apache.ignite.internal.util.GridSpinBusyLock; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.lang.GridPlainRunnable; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/management/SchemaManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/management/SchemaManager.java index 51f5ca6496eff..750ff09dee523 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/management/SchemaManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/schema/management/SchemaManager.java @@ -47,12 +47,6 @@ import org.apache.ignite.internal.cache.query.index.IndexName; import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition; import org.apache.ignite.internal.jdbc2.JdbcUtils; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlIndexViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlSchemaViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlTableColumnViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlTableViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlViewColumnViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.SqlViewViewWalker; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheContextInfo; @@ -71,6 +65,12 @@ import org.apache.ignite.internal.processors.query.schema.SchemaChangeListener; import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitor; import org.apache.ignite.internal.processors.query.schema.SchemaOperationException; +import org.apache.ignite.internal.systemview.SqlIndexViewWalker; +import org.apache.ignite.internal.systemview.SqlSchemaViewWalker; +import org.apache.ignite.internal.systemview.SqlTableColumnViewWalker; +import org.apache.ignite.internal.systemview.SqlTableViewWalker; +import org.apache.ignite.internal.systemview.SqlViewColumnViewWalker; +import org.apache.ignite.internal.systemview.SqlViewViewWalker; import org.apache.ignite.internal.util.GridConcurrentHashSet; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T2; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java index d8e7a56fb1f09..60c0a8bf6de85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteGlobalStatisticsManager.java @@ -41,9 +41,6 @@ import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnGlobalDataViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnLocalDataViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch; import org.apache.ignite.internal.processors.cache.GridCachePartitionExchangeManager; @@ -58,6 +55,9 @@ import org.apache.ignite.internal.processors.query.stat.messages.StatisticsResponse; import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnConfigurationView; import org.apache.ignite.internal.processors.query.stat.view.StatisticsColumnGlobalDataView; +import org.apache.ignite.internal.systemview.StatisticsColumnGlobalDataViewWalker; +import org.apache.ignite.internal.systemview.StatisticsColumnLocalDataViewWalker; +import org.apache.ignite.internal.systemview.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.thread.IgniteThreadPoolExecutor; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java index b02e598cf3672..1453ef2b8aa49 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsConfigurationManager.java @@ -37,7 +37,6 @@ import org.apache.ignite.internal.events.DiscoveryCustomEvent; import org.apache.ignite.internal.managers.discovery.DiscoveryCustomMessage; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnConfigurationViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch; import org.apache.ignite.internal.processors.cache.GridCacheContext; @@ -58,6 +57,7 @@ import org.apache.ignite.internal.processors.query.stat.config.StatisticsObjectConfiguration; import org.apache.ignite.internal.processors.query.stat.view.ColumnConfigurationViewSupplier; import org.apache.ignite.internal.processors.subscription.GridInternalSubscriptionProcessor; +import org.apache.ignite.internal.systemview.StatisticsColumnConfigurationViewWalker; import org.apache.ignite.internal.util.future.GridCompoundFuture; import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepository.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepository.java index 724c5df765eb1..64e276aaf6026 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepository.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/IgniteStatisticsRepository.java @@ -28,12 +28,12 @@ import java.util.function.Function; import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnLocalDataViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.query.stat.config.StatisticsObjectConfiguration; import org.apache.ignite.internal.processors.query.stat.view.ColumnLocalDataViewSupplier; import org.apache.ignite.internal.processors.query.stat.view.ColumnPartitionDataViewSupplier; +import org.apache.ignite.internal.systemview.StatisticsColumnLocalDataViewWalker; +import org.apache.ignite.internal.systemview.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.util.collection.IntHashMap; import org.apache.ignite.internal.util.collection.IntMap; import org.apache.ignite.internal.util.typedef.F; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnConfigurationViewSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnConfigurationViewSupplier.java index 82a7c027b2b77..c7220962e3190 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnConfigurationViewSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnConfigurationViewSupplier.java @@ -25,11 +25,11 @@ import java.util.function.Function; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnConfigurationViewWalker; import org.apache.ignite.internal.processors.query.stat.IgniteStatisticsConfigurationManager; import org.apache.ignite.internal.processors.query.stat.StatisticsKey; import org.apache.ignite.internal.processors.query.stat.config.StatisticsColumnConfiguration; import org.apache.ignite.internal.processors.query.stat.config.StatisticsObjectConfiguration; +import org.apache.ignite.internal.systemview.StatisticsColumnConfigurationViewWalker; import org.apache.ignite.internal.util.typedef.F; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnLocalDataViewSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnLocalDataViewSupplier.java index 66d7c604bc0f2..7365d94194415 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnLocalDataViewSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnLocalDataViewSupplier.java @@ -22,12 +22,12 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnLocalDataViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.processors.query.stat.ColumnStatistics; import org.apache.ignite.internal.processors.query.stat.IgniteStatisticsRepository; import org.apache.ignite.internal.processors.query.stat.ObjectStatisticsImpl; import org.apache.ignite.internal.processors.query.stat.StatisticsKey; +import org.apache.ignite.internal.systemview.StatisticsColumnLocalDataViewWalker; +import org.apache.ignite.internal.systemview.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.util.typedef.F; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnPartitionDataViewSupplier.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnPartitionDataViewSupplier.java index f2320318288c5..bec1e39c6fe85 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnPartitionDataViewSupplier.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/ColumnPartitionDataViewSupplier.java @@ -22,11 +22,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.ignite.internal.managers.systemview.walker.codegen.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.processors.query.stat.ColumnStatistics; import org.apache.ignite.internal.processors.query.stat.IgniteStatisticsStore; import org.apache.ignite.internal.processors.query.stat.ObjectPartitionStatisticsImpl; import org.apache.ignite.internal.processors.query.stat.StatisticsKey; +import org.apache.ignite.internal.systemview.StatisticsColumnPartitionDataViewWalker; import org.apache.ignite.internal.util.typedef.F; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java index a981f64b45e77..0812effc08a69 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.processors.query.stat.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.stat.config.StatisticsColumnConfiguration; import org.apache.ignite.internal.processors.query.stat.config.StatisticsObjectConfiguration; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java index 2966eb3e9e4d4..6416ad5e9cf78 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java @@ -18,11 +18,11 @@ package org.apache.ignite.internal.processors.query.stat.view; import java.sql.Timestamp; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.stat.ObjectStatisticsImpl; import org.apache.ignite.internal.processors.query.stat.StatisticsKey; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Statistics global data view. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java index 86b31f4040f75..f13c606a66c09 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java @@ -18,11 +18,11 @@ package org.apache.ignite.internal.processors.query.stat.view; import java.sql.Timestamp; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.stat.ObjectStatisticsImpl; import org.apache.ignite.internal.processors.query.stat.StatisticsKey; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Statistics local data view. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java index d6dd2e01ceb46..0b8bdc7084510 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java @@ -17,11 +17,11 @@ package org.apache.ignite.internal.processors.query.stat.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.stat.ObjectPartitionStatisticsImpl; import org.apache.ignite.internal.processors.query.stat.StatisticsKey; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Statistics partition data view. diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java index 9e30fbe11d2cf..aed2ac33acb1a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/IgniteServiceProcessor.java @@ -59,7 +59,6 @@ import org.apache.ignite.internal.managers.deployment.GridDeployment; import org.apache.ignite.internal.managers.discovery.CustomEventListener; import org.apache.ignite.internal.managers.discovery.DiscoCache; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ServiceViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.DynamicCacheChangeBatch; @@ -73,6 +72,7 @@ import org.apache.ignite.internal.processors.platform.services.PlatformServiceConfiguration; import org.apache.ignite.internal.processors.security.OperationSecurityContext; import org.apache.ignite.internal.processors.security.SecurityContext; +import org.apache.ignite.internal.systemview.ServiceViewWalker; import org.apache.ignite.internal.util.future.GridCompoundFuture; import org.apache.ignite.internal.util.future.GridFinishedFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index 80d3413ee929d..04b887d809c14 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -65,7 +65,6 @@ import org.apache.ignite.internal.managers.communication.GridMessageListener; import org.apache.ignite.internal.managers.deployment.GridDeployment; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ComputeTaskViewWalker; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cluster.IgniteChangeGlobalStateSupport; @@ -77,6 +76,7 @@ import org.apache.ignite.internal.processors.task.monitor.ComputeGridMonitor; import org.apache.ignite.internal.processors.task.monitor.ComputeTaskStatus; import org.apache.ignite.internal.processors.task.monitor.ComputeTaskStatusSnapshot; +import org.apache.ignite.internal.systemview.ComputeTaskViewWalker; import org.apache.ignite.internal.util.GridConcurrentFactory; import org.apache.ignite.internal.util.GridSpinReadWriteLock; import org.apache.ignite.internal.util.lang.GridPeerDeployAware; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java index 81ddce7c13f93..606dbfde8922e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java index 44f0faa37c80d..24e28fcc3bafb 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java @@ -17,8 +17,8 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java index 9089dd0e0b595..f5637d8167926 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java @@ -18,8 +18,8 @@ package org.apache.ignite.spi.systemview.view; import org.apache.ignite.internal.binary.BinaryMetadata; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.typedef.internal.U; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java index dca93770a94c3..c58cace4ca745 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.CacheGroupContext; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.metric.MetricRegistry; import org.apache.ignite.spi.metric.LongMetric; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java index 5cc9e9a93df5f..1062f2efd02d5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java @@ -25,9 +25,9 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.TopologyValidator; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.lang.IgnitePredicate; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CachePagesListView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CachePagesListView.java index ef546b3254027..3aeaf82122b44 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CachePagesListView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CachePagesListView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.persistence.freelist.PagesList; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; /** * Pages-list representation for a {@link SystemView}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java index 8475500ae2b62..821407f62a92d 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java @@ -33,14 +33,14 @@ import org.apache.ignite.configuration.NearCacheConfiguration; import org.apache.ignite.configuration.TopologyValidator; import org.apache.ignite.internal.GridKernalContext; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.CacheGroupContext; import org.apache.ignite.internal.processors.cache.CacheGroupDescriptor; import org.apache.ignite.internal.processors.cache.CacheType; import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor; import org.apache.ignite.internal.processors.cache.IgniteInternalCache; import org.apache.ignite.internal.processors.cache.version.CacheVersionConflictResolver; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.typedef.internal.S; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java index a402e5d18d32f..e13fd2af142da 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Client connection attribute system view row. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java index 3705e831ebb4e..e0c0683aad41c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java @@ -18,7 +18,6 @@ package org.apache.ignite.spi.systemview.view; import java.net.InetSocketAddress; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; import org.apache.ignite.internal.processors.odbc.ClientListenerConnectionContext; import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion; import org.apache.ignite.internal.processors.odbc.ClientListenerRequestHandler; @@ -26,6 +25,7 @@ import org.apache.ignite.internal.processors.odbc.odbc.OdbcConnectionContext; import org.apache.ignite.internal.processors.platform.client.ClientConnectionContext; import org.apache.ignite.internal.processors.security.SecurityContext; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.nio.GridNioSession; import org.jetbrains.annotations.Nullable; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java index 723365c29396d..ce8b5e0a925ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java @@ -19,8 +19,8 @@ import java.util.UUID; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java index 3f6385258e2e6..c32538d4177e0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java @@ -20,11 +20,11 @@ import java.util.StringJoiner; import java.util.UUID; import org.apache.ignite.internal.managers.collision.GridCollisionManager; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.distributed.dht.GridReservable; import org.apache.ignite.internal.processors.job.GridJobProcessor; import org.apache.ignite.internal.processors.job.GridJobWorker; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.collision.CollisionSpi; import org.jetbrains.annotations.Nullable; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java index df330f001f0a0..02a98917574bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java @@ -18,9 +18,9 @@ package org.apache.ignite.spi.systemview.view; import java.util.UUID; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.task.GridTaskWorker; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java index 2a10fa0a52c26..2174fddf866d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java @@ -17,8 +17,8 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Configuration value representation for a {@link SystemView}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java index 155b4cd0a24e7..93bd31a33b3dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java @@ -25,11 +25,11 @@ import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cache.query.ContinuousQueryWithTransformer; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryHandler; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor.RoutineInfo; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java index b305c178439db..93efb2d107112 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Metastorage key representation for a {@link SystemView}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java index fb8b56e8a3e2a..28286001218a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java @@ -17,8 +17,8 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.spi.metric.Metric; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java index 3c65b7a0dfab5..adfecd68bb99c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java @@ -18,9 +18,9 @@ package org.apache.ignite.spi.systemview.view; import java.util.UUID; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java index 266ad81a0f317..2880ba87232d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java @@ -21,8 +21,8 @@ import java.util.UUID; import org.apache.ignite.cluster.ClusterMetrics; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Node metrics representation for a {@link SystemView}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java index fab190f4bd681..971fd8c8d5bcd 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java @@ -17,10 +17,10 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.persistence.freelist.PagesList; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Pages-list representation for a {@link SystemView}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java index b91b26d838315..beb9ec2e77daf 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java @@ -18,8 +18,8 @@ package org.apache.ignite.spi.systemview.view; import java.util.Date; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Pages timestamp histogramm representation for a {@link SystemView}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java index ad54c783b645c..6b4e0cb1a9982 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java @@ -18,10 +18,10 @@ package org.apache.ignite.spi.systemview.view; import java.util.UUID; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Filtrable; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtPartitionState; +import org.apache.ignite.internal.systemview.Filtrable; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Partition state representation for a {@link SystemView}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java index d92cf3ce12b71..b3701dc25851c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java @@ -18,10 +18,10 @@ package org.apache.ignite.spi.systemview.view; import java.util.UUID; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.distributed.dht.topology.GridDhtLocalPartition; import org.apache.ignite.internal.processors.cache.query.ScanQueryIterator; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteBiTuple; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java index c95c1b9d451c9..8173976be1a4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.UUID; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.service.ServiceInfo; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.services.ServiceDescriptor; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java index 9c20682e18b4f..9bca92620b53b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java @@ -18,11 +18,11 @@ package org.apache.ignite.spi.systemview.view; import java.util.Collection; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.pagemem.wal.record.delta.ClusterSnapshotRecord; import org.apache.ignite.internal.processors.cache.persistence.snapshot.IncrementalSnapshotMetadata; import org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotMetadata; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.typedef.F; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java index c519067f88df5..65fa9c45a1129 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java @@ -19,9 +19,9 @@ import java.util.Date; import java.util.Map; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.running.SqlPlan; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** */ public class SqlPlanHistoryView implements SystemViewDescriptor { diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java index 75b2841a70c9a..dbfd059cfd0b5 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java @@ -18,9 +18,9 @@ package org.apache.ignite.spi.systemview.view; import java.util.Date; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.running.QueryHistory; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * SQL query history representation for a {@link SystemView}. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java index 6e589935fcddc..2dd7f77cedae0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java @@ -19,9 +19,9 @@ import java.util.Date; import java.util.UUID; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.running.GridRunningQueryInfo; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java index dc9570bd35412..decbd297a1edb 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java @@ -17,8 +17,8 @@ package org.apache.ignite.spi.systemview.view; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.StripedExecutor; import org.apache.ignite.internal.util.StripedExecutor.Stripe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java index 7692e60244e52..e20e3a90110ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java @@ -20,11 +20,11 @@ import java.util.Collection; import java.util.Objects; import java.util.UUID; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxEntry; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxState; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.GridIntList; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.internal.util.typedef.internal.U; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java index 38b6e12126b07..d0dc18ad7242f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view.datastructures; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.AtomicDataStructureProxy; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.spi.systemview.view.SystemView; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicLongView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicLongView.java index 61af3afe9949a..f508303308f25 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicLongView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicLongView.java @@ -20,9 +20,9 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.configuration.AtomicConfiguration; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheAtomicLongImpl; import org.apache.ignite.internal.processors.datastructures.GridCacheRemovable; +import org.apache.ignite.internal.systemview.Order; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicReferenceView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicReferenceView.java index 5c100c991ecff..09aff652f23ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicReferenceView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicReferenceView.java @@ -20,9 +20,9 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicReference; import org.apache.ignite.configuration.AtomicConfiguration; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheAtomicReferenceImpl; import org.apache.ignite.internal.processors.datastructures.GridCacheRemovable; +import org.apache.ignite.internal.systemview.Order; import org.apache.ignite.spi.systemview.view.SystemView; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicSequenceView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicSequenceView.java index 38a1de8e7c637..9a157d54fa916 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicSequenceView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicSequenceView.java @@ -20,9 +20,9 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicSequence; import org.apache.ignite.configuration.AtomicConfiguration; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheAtomicSequenceImpl; import org.apache.ignite.internal.processors.datastructures.GridCacheRemovable; +import org.apache.ignite.internal.systemview.Order; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicStampedView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicStampedView.java index 3586e0a86ff4f..1647dab1517e2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicStampedView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AtomicStampedView.java @@ -20,9 +20,9 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteAtomicStamped; import org.apache.ignite.configuration.AtomicConfiguration; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheAtomicStampedImpl; import org.apache.ignite.internal.processors.datastructures.GridCacheRemovable; +import org.apache.ignite.internal.systemview.Order; import org.apache.ignite.spi.systemview.view.SystemView; import static org.apache.ignite.internal.util.IgniteUtils.toStringSafe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/CountDownLatchView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/CountDownLatchView.java index 623a81ca7d682..e5b8318be0350 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/CountDownLatchView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/CountDownLatchView.java @@ -19,9 +19,9 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCountDownLatch; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheCountDownLatchImpl; import org.apache.ignite.internal.processors.datastructures.GridCacheRemovable; +import org.apache.ignite.internal.systemview.Order; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java index 98ef79401caf5..8752b5afff06c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view.datastructures; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheQueueProxy; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.systemview.view.SystemView; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/ReentrantLockView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/ReentrantLockView.java index c28be14d7a180..edaac7bf6649e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/ReentrantLockView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/ReentrantLockView.java @@ -19,9 +19,9 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteLock; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheLockImpl; import org.apache.ignite.internal.processors.datastructures.GridCacheRemovable; +import org.apache.ignite.internal.systemview.Order; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SemaphoreView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SemaphoreView.java index 65895b4d0bad9..82f8f0515d2ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SemaphoreView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SemaphoreView.java @@ -19,9 +19,9 @@ import org.apache.ignite.Ignite; import org.apache.ignite.IgniteSemaphore; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheRemovable; import org.apache.ignite.internal.processors.datastructures.GridCacheSemaphoreImpl; +import org.apache.ignite.internal.systemview.Order; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java index eb233480dfb95..7935914904f48 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view.datastructures; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.datastructures.GridCacheSetProxy; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.systemview.view.SystemView; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java index 5a72f054f0d00..d3ed5f69f9519 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java @@ -18,10 +18,10 @@ package org.apache.ignite.spi.systemview.view.sql; import java.util.stream.Collectors; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.schema.management.IndexDescriptor; import org.apache.ignite.internal.processors.query.schema.management.TableDescriptor; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java index ee1dc1b719212..4a21577e95185 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java @@ -17,9 +17,9 @@ package org.apache.ignite.spi.systemview.view.sql; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.schema.management.SchemaDescriptor; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Sql schema system view representation. diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java index 81a3c7ee2de46..891a0cb506da8 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java @@ -18,10 +18,10 @@ package org.apache.ignite.spi.systemview.view.sql; import java.util.Objects; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.GridQueryProperty; import org.apache.ignite.internal.processors.query.schema.management.TableDescriptor; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.spi.systemview.view.SystemView; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java index 775fbfa40b33f..de8debd6cd60e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java @@ -18,9 +18,9 @@ package org.apache.ignite.spi.systemview.view.sql; import java.util.Objects; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.schema.management.TableDescriptor; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java index 9a3f0d297553e..a470e13ef8d95 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java @@ -18,10 +18,10 @@ package org.apache.ignite.spi.systemview.view.sql; import java.util.Map; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.metric.impl.MetricUtils; import org.apache.ignite.internal.processors.query.QueryUtils; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; import org.apache.ignite.spi.systemview.view.SystemView; /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java index d5ed46f3e68f4..54e398c958989 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java @@ -17,10 +17,10 @@ package org.apache.ignite.spi.systemview.view.sql; -import org.apache.ignite.internal.managers.systemview.SystemViewDescriptor; -import org.apache.ignite.internal.managers.systemview.walker.Order; import org.apache.ignite.internal.processors.query.schema.management.SchemaDescriptor; import org.apache.ignite.internal.processors.query.schema.management.ViewDescriptor; +import org.apache.ignite.internal.systemview.Order; +import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** * Sql view representation for a {@link ViewDescriptor}. diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java index de897dcf93e2c..412ab47f0dccc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/JmxExporterSpiTest.java @@ -65,7 +65,6 @@ import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectAllTypes; import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectEnum; import org.apache.ignite.internal.client.thin.ProtocolVersion; -import org.apache.ignite.internal.managers.systemview.walker.codegen.CachePagesListViewWalker; import org.apache.ignite.internal.metric.SystemViewSelfTest.TestPredicate; import org.apache.ignite.internal.metric.SystemViewSelfTest.TestRunnable; import org.apache.ignite.internal.metric.SystemViewSelfTest.TestTransformer; @@ -77,6 +76,7 @@ import org.apache.ignite.internal.processors.metric.impl.MetricUtils; import org.apache.ignite.internal.processors.odbc.jdbc.JdbcConnectionContext; import org.apache.ignite.internal.processors.service.DummyService; +import org.apache.ignite.internal.systemview.CachePagesListViewWalker; import org.apache.ignite.internal.util.StripedExecutor; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.G; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java index baf7b29d4d6b7..11f6dd2af25e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java @@ -82,11 +82,6 @@ import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectAllTypes; import org.apache.ignite.internal.binary.mutabletest.GridBinaryTestClasses.TestObjectEnum; import org.apache.ignite.internal.client.thin.ProtocolVersion; -import org.apache.ignite.internal.managers.systemview.walker.codegen.BaselineNodeAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.CachePagesListViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.ClientConnectionAttributeViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.MetastorageViewWalker; -import org.apache.ignite.internal.managers.systemview.walker.codegen.NodeAttributeViewWalker; import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.persistence.freelist.PagesList; @@ -95,6 +90,11 @@ import org.apache.ignite.internal.processors.odbc.jdbc.JdbcConnectionContext; import org.apache.ignite.internal.processors.service.DummyService; import org.apache.ignite.internal.processors.task.GridInternal; +import org.apache.ignite.internal.systemview.BaselineNodeAttributeViewWalker; +import org.apache.ignite.internal.systemview.CachePagesListViewWalker; +import org.apache.ignite.internal.systemview.ClientConnectionAttributeViewWalker; +import org.apache.ignite.internal.systemview.MetastorageViewWalker; +import org.apache.ignite.internal.systemview.NodeAttributeViewWalker; import org.apache.ignite.internal.util.GridTestClockTimer; import org.apache.ignite.internal.util.StripedExecutor; import org.apache.ignite.internal.util.typedef.F; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java index 90ca23d3758d3..728bfa89a683c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/performancestatistics/PerformanceStatisticsSystemViewTest.java @@ -30,9 +30,9 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.managers.systemview.GridSystemViewManager; -import org.apache.ignite.internal.managers.systemview.walker.codegen.MetastorageViewWalker; import org.apache.ignite.internal.processors.cache.persistence.file.FileIO; import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory; +import org.apache.ignite.internal.systemview.MetastorageViewWalker; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.systemview.view.MetastorageView; import org.apache.ignite.testframework.ListeningTestLogger; From d8e978853cdb3ef41bb0556860c89eceabbe2e74 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 10:54:35 +0300 Subject: [PATCH 12/18] Review fixes --- .../SystemViewRowAttributeWalkerGenerator.java | 14 +++++++------- .../SystemViewRowAttributeWalkerProcessor.java | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java index 7608cfb62997a..67c0bb74c1ab5 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java @@ -71,9 +71,7 @@ public SystemViewRowAttributeWalkerGenerator(ProcessingEnvironment env) { * @throws IOException If file creation fails. */ public void generate(TypeElement cls) throws IOException { - String clsSimple = cls.getSimpleName().toString(); - String walkerClsName = clsSimple + "Walker"; - String walkerQualified = WALKER_PACKAGE + "." + walkerClsName; + String walkerQualified = WALKER_PACKAGE + "." + cls.getSimpleName() + "Walker"; JavaFileObject file = env.getFiler().createSourceFile(walkerQualified); @@ -111,14 +109,16 @@ private Collection generateWalker(TypeElement clazz) { List filtrableAttrs = new ArrayList<>(); forEachMethod(clazz, (m, i) -> { + String mtdName = m.getSimpleName().toString(); + if (m.getAnnotation(Filtrable.class) != null) { - code.add(TAB + "/** Filter key for attribute \"" + m.getSimpleName() + "\" */"); - code.add(TAB + "public static final String " + m.getSimpleName().toString() + code.add(TAB + "/** Filter key for attribute \"" + mtdName + "\" */"); + code.add(TAB + "public static final String " + mtdName .replaceAll("(\\p{Upper})", "_$1") - .toUpperCase() + "_FILTER = \"" + m.getSimpleName() + "\";"); + .toUpperCase() + "_FILTER = \"" + mtdName + "\";"); code.add(""); - filtrableAttrs.add(m.getSimpleName().toString()); + filtrableAttrs.add(mtdName); } }); diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java index 1add4aa5da12a..3e08e3e08e44e 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java @@ -48,6 +48,7 @@ public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { */ @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { TypeMirror viewType = processingEnv.getElementUtils().getTypeElement(VIEW_INTERFACE).asType(); + SystemViewRowAttributeWalkerGenerator viewGen = new SystemViewRowAttributeWalkerGenerator(processingEnv); for (Element el : roundEnv.getRootElements()) { if (el.getKind() != ElementKind.CLASS) @@ -62,7 +63,7 @@ public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { continue; try { - new SystemViewRowAttributeWalkerGenerator(processingEnv).generate(clazz); + viewGen.generate(clazz); } catch (Exception e) { processingEnv.getMessager().printMessage( From 5a540f445fee7d8271020323f9ec20c9caef6fc0 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 11:15:29 +0300 Subject: [PATCH 13/18] Review fixes --- modules/clients/pom.xml | 6 ++++++ modules/core/pom.xml | 2 +- modules/indexing/pom.xml | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index 15b806af5feb7..f41ac283ef4c9 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -40,6 +40,12 @@ ignite-core + + ${project.groupId} + ignite-codegen + provided + + com.google.code.simple-spring-memcached spymemcached diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3815997cb2c21..4fa445535daa0 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -77,7 +77,7 @@ ${project.groupId} ignite-codegen - compile + provided diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml index d3a1cdd203c60..0b2cff6918505 100644 --- a/modules/indexing/pom.xml +++ b/modules/indexing/pom.xml @@ -70,6 +70,12 @@ ${h2.version} + + ${project.groupId} + ignite-codegen + provided + + ${project.groupId} ignite-core From 1e7ee966d934372aeb88655d644bac7091468188 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 12:59:28 +0300 Subject: [PATCH 14/18] Review fixes --- .../systemview/SystemViewDescriptor.java | 11 ++++++-- ...SystemViewRowAttributeWalkerGenerator.java | 21 ++++---------- ...SystemViewRowAttributeWalkerProcessor.java | 28 ++++++++++++++----- .../StatisticsColumnConfigurationView.java | 3 +- .../view/StatisticsColumnGlobalDataView.java | 3 +- .../view/StatisticsColumnLocalDataView.java | 3 +- .../StatisticsColumnPartitionDataView.java | 3 +- .../view/BaselineNodeAttributeView.java | 3 +- .../spi/systemview/view/BaselineNodeView.java | 3 +- .../systemview/view/BinaryMetadataView.java | 3 +- .../spi/systemview/view/CacheGroupIoView.java | 3 +- .../spi/systemview/view/CacheGroupView.java | 3 +- .../ignite/spi/systemview/view/CacheView.java | 3 +- .../view/ClientConnectionAttributeView.java | 3 +- .../systemview/view/ClientConnectionView.java | 3 +- .../spi/systemview/view/ClusterNodeView.java | 3 +- .../spi/systemview/view/ComputeJobView.java | 3 +- .../spi/systemview/view/ComputeTaskView.java | 3 +- .../systemview/view/ConfigurationView.java | 3 +- .../systemview/view/ContinuousQueryView.java | 3 +- .../spi/systemview/view/MetastorageView.java | 3 +- .../spi/systemview/view/MetricsView.java | 3 +- .../systemview/view/NodeAttributeView.java | 3 +- .../spi/systemview/view/NodeMetricsView.java | 3 +- .../spi/systemview/view/PagesListView.java | 3 +- .../view/PagesTimestampHistogramView.java | 3 +- .../systemview/view/PartitionStateView.java | 3 +- .../spi/systemview/view/ScanQueryView.java | 3 +- .../spi/systemview/view/ServiceView.java | 3 +- .../spi/systemview/view/SnapshotView.java | 3 +- .../systemview/view/SqlPlanHistoryView.java | 3 +- .../systemview/view/SqlQueryHistoryView.java | 3 +- .../spi/systemview/view/SqlQueryView.java | 3 +- .../view/StripedExecutorTaskView.java | 3 +- .../spi/systemview/view/TransactionView.java | 3 +- .../AbstractDataStructureView.java | 3 +- .../view/datastructures/QueueView.java | 3 +- .../view/datastructures/SetView.java | 3 +- .../spi/systemview/view/sql/SqlIndexView.java | 3 +- .../systemview/view/sql/SqlSchemaView.java | 3 +- .../view/sql/SqlTableColumnView.java | 3 +- .../spi/systemview/view/sql/SqlTableView.java | 3 +- .../view/sql/SqlViewColumnView.java | 3 +- .../spi/systemview/view/sql/SqlViewView.java | 3 +- 44 files changed, 117 insertions(+), 66 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewDescriptor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewDescriptor.java index a9c316da2c673..71d25bfd120f0 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewDescriptor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewDescriptor.java @@ -17,12 +17,19 @@ package org.apache.ignite.internal.systemview; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** - * Marker of system view descriptor. Processed by {@link SystemViewRowAttributeWalkerProcessor} to generate + * Annotation to mark all system views. Processed by {@link SystemViewRowAttributeWalkerProcessor} to generate * {@code SystemViewRowAttributeWalker} implementations. * * @see Order * @see Filtrable */ -public interface SystemViewDescriptor { +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface SystemViewDescriptor { } diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java index 67c0bb74c1ab5..e72a213e99ef3 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java @@ -20,11 +20,9 @@ import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -41,15 +39,13 @@ import javax.tools.JavaFileObject; import org.apache.ignite.internal.util.typedef.F; +import static org.apache.ignite.internal.systemview.SystemViewRowAttributeWalkerProcessor.superclasses; + /** * Generator for {@code SystemViewRowAttributeWalker} implementations. * Used by {@link SystemViewRowAttributeWalkerProcessor} to generate walker classes during compilation. */ public class SystemViewRowAttributeWalkerGenerator { - /** Methods that should be excluded from specific {@code SystemViewRowAttributeWalker}. */ - private static final Set SYS_METHODS = new HashSet<>(Arrays.asList("equals", "hashCode", "toString", - "getClass")); - /** Package for {@code SystemViewRowAttributeWalker} implementations. */ public static final String WALKER_PACKAGE = "org.apache.ignite.internal.systemview"; @@ -255,8 +251,8 @@ private void forEachMethod(TypeElement clazz, ObjIntConsumer List notOrdered = new ArrayList<>(); List ordered = new ArrayList<>(); - while (clazz != null) { - for (Element el : clazz.getEnclosedElements()) { + superclasses(env, clazz).forEach(e -> { + for (Element el : e.getEnclosedElements()) { if (el.getKind() != ElementKind.METHOD) continue; @@ -267,19 +263,12 @@ private void forEachMethod(TypeElement clazz, ObjIntConsumer || m.getReturnType().getKind() == TypeKind.VOID) continue; - if (SYS_METHODS.contains(m.getSimpleName().toString())) - continue; - if (el.getAnnotation(Order.class) != null) ordered.add(m); else notOrdered.add(m); } - - Element superType = env.getTypeUtils().asElement(clazz.getSuperclass()); - - clazz = (TypeElement)superType; - } + }); ordered.sort(Comparator.comparingInt(m -> m.getAnnotation(Order.class).value())); notOrdered.sort(Comparator.comparing(m -> m.getSimpleName().toString())); diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java index 3e08e3e08e44e..5fb547d6f2308 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java @@ -17,8 +17,11 @@ package org.apache.ignite.internal.systemview; +import java.util.Objects; import java.util.Set; +import java.util.stream.Stream; import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.ProcessingEnvironment; import javax.annotation.processing.RoundEnvironment; import javax.annotation.processing.SupportedAnnotationTypes; import javax.annotation.processing.SupportedSourceVersion; @@ -27,7 +30,7 @@ import javax.lang.model.element.ElementKind; import javax.lang.model.element.Modifier; import javax.lang.model.element.TypeElement; -import javax.lang.model.type.TypeMirror; +import javax.lang.model.type.TypeKind; import javax.tools.Diagnostic; /** @@ -37,17 +40,17 @@ * The generated walker follows the naming convention: * {@code org.apache.ignite.internal.managers.systemview.walker.codegen.[ViewClassName]Walker}. */ -@SupportedAnnotationTypes("org.apache.ignite.internal.systemview.Order") +@SupportedAnnotationTypes({ + "org.apache.ignite.internal.systemview.SystemViewDescriptor", + "org.apache.ignite.internal.systemview.Order", + "org.apache.ignite.internal.systemview.Filtrable" +}) @SupportedSourceVersion(SourceVersion.RELEASE_11) public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { - /** Base interface that every system view must implement. */ - static final String VIEW_INTERFACE = "org.apache.ignite.internal.systemview.SystemViewDescriptor"; - /** * Processes all classes implementing the {@code SystemViewDescriptor} interface and generates corresponding walker code. */ @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { - TypeMirror viewType = processingEnv.getElementUtils().getTypeElement(VIEW_INTERFACE).asType(); SystemViewRowAttributeWalkerGenerator viewGen = new SystemViewRowAttributeWalkerGenerator(processingEnv); for (Element el : roundEnv.getRootElements()) { @@ -56,7 +59,7 @@ public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { TypeElement clazz = (TypeElement)el; - if (!processingEnv.getTypeUtils().isAssignable(clazz.asType(), viewType)) + if (superclasses(processingEnv, clazz).noneMatch(e -> e.getAnnotation(SystemViewDescriptor.class) != null)) continue; if (clazz.getModifiers().contains(Modifier.ABSTRACT)) @@ -75,4 +78,15 @@ public class SystemViewRowAttributeWalkerProcessor extends AbstractProcessor { return true; } + + /** + * @return Stream of all superclasses including the starting element. Goes up the inheritance chain + * until {@link Object} (excluded). + */ + static Stream superclasses(ProcessingEnvironment env, TypeElement e) { + return Stream.iterate(e, + Objects::nonNull, + c -> (TypeElement)env.getTypeUtils().asElement(c.getSuperclass()) + ).takeWhile(c -> c.getSuperclass().getKind() != TypeKind.NONE); + } } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java index 0812effc08a69..2951c31b89df2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnConfigurationView.java @@ -27,7 +27,8 @@ /** * Statistics column configuration representation for a {@link SystemView}. */ -public class StatisticsColumnConfigurationView implements SystemViewDescriptor { +@SystemViewDescriptor +public class StatisticsColumnConfigurationView { /** Table object type. */ public static final String TABLE_TYPE = "TABLE"; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java index 6416ad5e9cf78..8a7a592f81811 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnGlobalDataView.java @@ -27,7 +27,8 @@ /** * Statistics global data view. */ -public class StatisticsColumnGlobalDataView implements SystemViewDescriptor { +@SystemViewDescriptor +public class StatisticsColumnGlobalDataView { /** Statistics key */ private final StatisticsKey key; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java index f13c606a66c09..fab1baaaddda2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnLocalDataView.java @@ -27,7 +27,8 @@ /** * Statistics local data view. */ -public class StatisticsColumnLocalDataView implements SystemViewDescriptor { +@SystemViewDescriptor +public class StatisticsColumnLocalDataView { /** Statistics key */ private final StatisticsKey key; diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java index 0b8bdc7084510..354b0e7589156 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/stat/view/StatisticsColumnPartitionDataView.java @@ -26,7 +26,8 @@ /** * Statistics partition data view. */ -public class StatisticsColumnPartitionDataView implements SystemViewDescriptor { +@SystemViewDescriptor +public class StatisticsColumnPartitionDataView { /** Statistics key */ private final StatisticsKey key; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java index 606dbfde8922e..bf0442b45c2d6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeAttributeView.java @@ -26,7 +26,8 @@ /** * Baseline node attribute representation for a {@link SystemView}. */ -public class BaselineNodeAttributeView implements SystemViewDescriptor { +@SystemViewDescriptor +public class BaselineNodeAttributeView { /** Node consistent id. */ private final Object consistentId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java index 24e28fcc3bafb..ea911b42e3bf9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BaselineNodeView.java @@ -25,7 +25,8 @@ /** * Baseline topology node representation for a {@link SystemView}. */ -public class BaselineNodeView implements SystemViewDescriptor { +@SystemViewDescriptor +public class BaselineNodeView { /** Consistent id. */ private final Object consistentId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java index f5637d8167926..2120af401a341 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/BinaryMetadataView.java @@ -25,7 +25,8 @@ /** * {@link BinaryMetadata} representation for the {@link SystemView}. */ -public class BinaryMetadataView implements SystemViewDescriptor { +@SystemViewDescriptor +public class BinaryMetadataView { /** Meta. */ private final BinaryMetadata meta; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java index c58cace4ca745..aaa634ce839b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupIoView.java @@ -29,7 +29,8 @@ /** * Cache group IO statistics representation for a {@link SystemView}. */ -public class CacheGroupIoView implements SystemViewDescriptor { +@SystemViewDescriptor +public class CacheGroupIoView { /** Cache group. */ private final CacheGroupContext grpCtx; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java index 1062f2efd02d5..843638cf4cda7 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheGroupView.java @@ -35,7 +35,8 @@ /** * Cache group representation for the {@link SystemView}. */ -public class CacheGroupView implements SystemViewDescriptor { +@SystemViewDescriptor +public class CacheGroupView { /** Cache group. */ private final CacheGroupDescriptor grp; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java index 821407f62a92d..8c2cae3e660ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/CacheView.java @@ -48,7 +48,8 @@ /** * Cache representation for a {@link SystemView}. */ -public class CacheView implements SystemViewDescriptor { +@SystemViewDescriptor +public class CacheView { /** Cache descriptor. */ private final DynamicCacheDescriptor cache; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java index e13fd2af142da..5cae27159d4bf 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionAttributeView.java @@ -24,7 +24,8 @@ /** * Client connection attribute system view row. */ -public class ClientConnectionAttributeView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ClientConnectionAttributeView { /** Connection id. */ private final long connId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java index e0c0683aad41c..834c250b6691f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClientConnectionView.java @@ -34,7 +34,8 @@ /** * Client connection system view row. */ -public class ClientConnectionView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ClientConnectionView { /** Nio session. */ private final GridNioSession ses; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java index ce8b5e0a925ef..31ee6e8f602b2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ClusterNodeView.java @@ -27,7 +27,8 @@ /** * Cluster node representation for a {@link SystemView}. */ -public class ClusterNodeView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ClusterNodeView { /** Cluster node. */ private final ClusterNode n; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java index c32538d4177e0..ea682c381f817 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeJobView.java @@ -32,7 +32,8 @@ /** * Compute job representation for a {@link SystemView}. */ -public class ComputeJobView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ComputeJobView { /** Compute job state. */ public enum ComputeJobState { /** diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java index 02a98917574bb..7988bc19e3501 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ComputeTaskView.java @@ -27,7 +27,8 @@ /** * Compute task representation for a {@link SystemView}. */ -public class ComputeTaskView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ComputeTaskView { /** Worker for task. */ private final GridTaskWorker worker; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java index 2174fddf866d3..76f55d1803695 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ConfigurationView.java @@ -23,7 +23,8 @@ /** * Configuration value representation for a {@link SystemView}. */ -public class ConfigurationView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ConfigurationView { /** Name of the configuration property. */ private final String name; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java index 93bd31a33b3dc..036c87cb80e36 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ContinuousQueryView.java @@ -36,7 +36,8 @@ /** * Continuous query representation for a {@link SystemView}. */ -public class ContinuousQueryView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ContinuousQueryView { /** Routine info. */ private final RoutineInfo qry; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java index 93efb2d107112..72f872c29af9e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetastorageView.java @@ -24,7 +24,8 @@ /** * Metastorage key representation for a {@link SystemView}. */ -public class MetastorageView implements SystemViewDescriptor { +@SystemViewDescriptor +public class MetastorageView { /** */ private final String name; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java index 28286001218a2..cda95b02fcc21 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/MetricsView.java @@ -24,7 +24,8 @@ /** * Metrics representation for a {@link SystemView}. */ -public class MetricsView implements SystemViewDescriptor { +@SystemViewDescriptor +public class MetricsView { /** Metric. */ private final Metric metric; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java index adfecd68bb99c..a3eb69558321c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeAttributeView.java @@ -27,7 +27,8 @@ /** * Node attribute representation for a {@link SystemView}. */ -public class NodeAttributeView implements SystemViewDescriptor { +@SystemViewDescriptor +public class NodeAttributeView { /** Node id. */ private final UUID nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java index 2880ba87232d2..521e695ae9102 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/NodeMetricsView.java @@ -27,7 +27,8 @@ /** * Node metrics representation for a {@link SystemView}. */ -public class NodeMetricsView implements SystemViewDescriptor { +@SystemViewDescriptor +public class NodeMetricsView { /** Cluster node. */ private final ClusterNode node; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java index 971fd8c8d5bcd..9ed49d6629051 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java @@ -25,7 +25,8 @@ /** * Pages-list representation for a {@link SystemView}. */ -public class PagesListView implements SystemViewDescriptor { +@SystemViewDescriptor +public class PagesListView { /** Pages list. */ PagesList pagesList; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java index beb9ec2e77daf..458c4a55d93ad 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesTimestampHistogramView.java @@ -24,7 +24,8 @@ /** * Pages timestamp histogramm representation for a {@link SystemView}. */ -public class PagesTimestampHistogramView implements SystemViewDescriptor { +@SystemViewDescriptor +public class PagesTimestampHistogramView { /** Data region name. */ private final String dataRegionName; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java index 6b4e0cb1a9982..9c0332158b816 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PartitionStateView.java @@ -26,7 +26,8 @@ /** * Partition state representation for a {@link SystemView}. */ -public class PartitionStateView implements SystemViewDescriptor { +@SystemViewDescriptor +public class PartitionStateView { /** Cache group id. */ private final int cacheGrpId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java index b3701dc25851c..3e63e9578d6cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ScanQueryView.java @@ -33,7 +33,8 @@ /** * Scan query iterator representation for a {@link SystemView}. */ -public class ScanQueryView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ScanQueryView { /** Origin node id. */ private final UUID nodeId; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java index 8173976be1a4b..4711e5dc82f32 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/ServiceView.java @@ -32,7 +32,8 @@ * * @see ServiceDescriptor */ -public class ServiceView implements SystemViewDescriptor { +@SystemViewDescriptor +public class ServiceView { /** Service descriptor. */ private final ServiceInfo serviceInfo; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java index 9bca92620b53b..8abeae13625ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SnapshotView.java @@ -28,7 +28,8 @@ /** * Snapshot representation for a {@link SystemView}. */ -public class SnapshotView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SnapshotView { /** Snapshot system view name. */ public static final String SNAPSHOT_SYS_VIEW = "snapshot"; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java index 65fa9c45a1129..7071ef4c30df8 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlPlanHistoryView.java @@ -24,7 +24,8 @@ import org.apache.ignite.internal.systemview.SystemViewDescriptor; /** */ -public class SqlPlanHistoryView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlPlanHistoryView { /** SQL plan. */ private final Map.Entry plan; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java index dbfd059cfd0b5..646ad41ff3434 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryHistoryView.java @@ -25,7 +25,8 @@ /** * SQL query history representation for a {@link SystemView}. */ -public class SqlQueryHistoryView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlQueryHistoryView { /** Query history item. */ private final QueryHistory qry; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java index 2dd7f77cedae0..cd5f2d7d91b4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/SqlQueryView.java @@ -28,7 +28,8 @@ /** * SQL query representation for a {@link SystemView}. */ -public class SqlQueryView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlQueryView { /** Query. */ private final GridRunningQueryInfo qry; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java index decbd297a1edb..466851b0f2b4b 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/StripedExecutorTaskView.java @@ -27,7 +27,8 @@ /** * {@link StripedExecutor} task representation for a {@link SystemView}. */ -public class StripedExecutorTaskView implements SystemViewDescriptor { +@SystemViewDescriptor +public class StripedExecutorTaskView { /** Stripe. */ private final Stripe stripe; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java index e20e3a90110ff..bc09a478c99b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/TransactionView.java @@ -36,7 +36,8 @@ /** * Transaction representation for a {@link SystemView}. */ -public class TransactionView implements SystemViewDescriptor { +@SystemViewDescriptor +public class TransactionView { /** Transaction. */ private final IgniteInternalTx tx; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java index d0dc18ad7242f..d2a5d0d8cbe4e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/AbstractDataStructureView.java @@ -24,7 +24,8 @@ import org.apache.ignite.spi.systemview.view.SystemView; /** Abstract class for a {@link SystemView} representation of data structures. */ -abstract class AbstractDataStructureView implements SystemViewDescriptor { +@SystemViewDescriptor +abstract class AbstractDataStructureView { /** Data structure instance. */ protected final T ds; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java index 8752b5afff06c..6716fce9f0056 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/QueueView.java @@ -26,7 +26,8 @@ /** * Queue representation for a {@link SystemView}. */ -public class QueueView implements SystemViewDescriptor { +@SystemViewDescriptor +public class QueueView { /** Queue. */ private final GridCacheQueueProxy queue; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java index 7935914904f48..bc5cf50d4aa70 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/datastructures/SetView.java @@ -26,7 +26,8 @@ /** * Set representation for a {@link SystemView}. */ -public class SetView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SetView { /** Set. */ private final GridCacheSetProxy set; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java index d3ed5f69f9519..f344fe16a5e71 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlIndexView.java @@ -27,7 +27,8 @@ /** * Sql index representation for a {@link SystemView}. */ -public class SqlIndexView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlIndexView { /** Table. */ private final TableDescriptor tbl; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java index 4a21577e95185..beaf0ffe3696f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlSchemaView.java @@ -24,7 +24,8 @@ /** * Sql schema system view representation. */ -public class SqlSchemaView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlSchemaView { /** Schema. */ private final SchemaDescriptor schema; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java index 891a0cb506da8..0db831ca5aaff 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableColumnView.java @@ -28,7 +28,8 @@ /** * Sql table column representation for a {@link SystemView}. */ -public class SqlTableColumnView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlTableColumnView { /** Table. */ private final TableDescriptor tbl; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java index de8debd6cd60e..6858e660f60f8 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlTableView.java @@ -26,7 +26,8 @@ /** * Sql table representation for a {@link SystemView}. */ -public class SqlTableView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlTableView { /** Table. */ private final TableDescriptor tbl; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java index a470e13ef8d95..922ce45ea73b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewColumnView.java @@ -27,7 +27,8 @@ /** * Sql view column representation for a {@link SystemView}. */ -public class SqlViewColumnView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlViewColumnView { /** System view. */ private final SystemView view; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java index 54e398c958989..9980a86207be7 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/sql/SqlViewView.java @@ -25,7 +25,8 @@ /** * Sql view representation for a {@link ViewDescriptor}. */ -public class SqlViewView implements SystemViewDescriptor { +@SystemViewDescriptor +public class SqlViewView { /** Schema descriptor. */ private final SchemaDescriptor schema; From 06dc8219b029999847e45dae844f8196270d8f11 Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 13:02:12 +0300 Subject: [PATCH 15/18] Review fixes --- modules/clients/pom.xml | 6 ------ modules/indexing/pom.xml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml index f41ac283ef4c9..15b806af5feb7 100644 --- a/modules/clients/pom.xml +++ b/modules/clients/pom.xml @@ -40,12 +40,6 @@ ignite-core - - ${project.groupId} - ignite-codegen - provided - - com.google.code.simple-spring-memcached spymemcached diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml index 0b2cff6918505..d3a1cdd203c60 100644 --- a/modules/indexing/pom.xml +++ b/modules/indexing/pom.xml @@ -70,12 +70,6 @@ ${h2.version} - - ${project.groupId} - ignite-codegen - provided - - ${project.groupId} ignite-core From c2e8bd1fa9f152370a8677e665530ad140943f1a Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 13:29:28 +0300 Subject: [PATCH 16/18] Review fixes --- ...SystemViewRowAttributeWalkerGenerator.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java index e72a213e99ef3..97e9d5b4e0b63 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java @@ -160,31 +160,28 @@ private Collection generateWalker(TypeElement clazz) { forEachMethod(clazz, (m, i) -> { String name = m.getSimpleName().toString(); - TypeMirror retClazz = m.getReturnType(); String line = TAB + TAB; - if (!retClazz.getKind().isPrimitive()) { - line += "v.accept(" + i + ", \"" + name + "\", " + simpleName(retClazz) + ".class, row." - + m.getSimpleName() + "());"; - } + if (!retClazz.getKind().isPrimitive()) + line += "v.accept(" + i + ", \"" + name + "\", " + simpleName(retClazz) + ".class, row." + name + "());"; else if (retClazz.getKind() == TypeKind.BOOLEAN) - line += "v.acceptBoolean(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; + line += "v.acceptBoolean(" + i + ", \"" + name + "\", row." + name + "());"; else if (retClazz.getKind() == TypeKind.CHAR) - line += "v.acceptChar(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; + line += "v.acceptChar(" + i + ", \"" + name + "\", row." + name + "());"; else if (retClazz.getKind() == TypeKind.BYTE) - line += "v.acceptByte(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; + line += "v.acceptByte(" + i + ", \"" + name + "\", row." + name + "());"; else if (retClazz.getKind() == TypeKind.SHORT) - line += "v.acceptShort(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; + line += "v.acceptShort(" + i + ", \"" + name + "\", row." + name + "());"; else if (retClazz.getKind() == TypeKind.INT) - line += "v.acceptInt(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; + line += "v.acceptInt(" + i + ", \"" + name + "\", row." + name + "());"; else if (retClazz.getKind() == TypeKind.LONG) - line += "v.acceptLong(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; + line += "v.acceptLong(" + i + ", \"" + name + "\", row." + name + "());"; else if (retClazz.getKind() == TypeKind.FLOAT) - line += "v.acceptFloat(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; + line += "v.acceptFloat(" + i + ", \"" + name + "\", row." + name + "());"; else if (retClazz.getKind() == TypeKind.DOUBLE) - line += "v.acceptDouble(" + i + ", \"" + name + "\", row." + m.getSimpleName() + "());"; + line += "v.acceptDouble(" + i + ", \"" + name + "\", row." + name + "());"; code.add(line); }); From 9c086fa05a73cc646467453c12d7734f384cb78a Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 13:30:26 +0300 Subject: [PATCH 17/18] Review fixes --- .../systemview/SystemViewRowAttributeWalkerGenerator.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java index 97e9d5b4e0b63..7d264377690b7 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerGenerator.java @@ -140,7 +140,6 @@ private Collection generateWalker(TypeElement clazz) { forEachMethod(clazz, (m, i) -> { String name = m.getSimpleName().toString(); - TypeMirror retClazz = m.getReturnType(); String line = TAB + TAB; From 85e47acfff42f50bc322c5c6fcd59a3feb6a7b6a Mon Sep 17 00:00:00 2001 From: Nikita Amelchev Date: Wed, 4 Feb 2026 13:51:32 +0300 Subject: [PATCH 18/18] review fixes --- .../systemview/SystemViewRowAttributeWalkerProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java index 5fb547d6f2308..b2c6e03d87c47 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java +++ b/modules/codegen/src/main/java/org/apache/ignite/internal/systemview/SystemViewRowAttributeWalkerProcessor.java @@ -38,7 +38,7 @@ * for view classes marked by {@code SystemViewDescriptor} interface. *

* The generated walker follows the naming convention: - * {@code org.apache.ignite.internal.managers.systemview.walker.codegen.[ViewClassName]Walker}. + * {@code org.apache.ignite.internal.systemview.[ViewClassName]Walker}. */ @SupportedAnnotationTypes({ "org.apache.ignite.internal.systemview.SystemViewDescriptor",