You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/06/05 18:55:48 UTC

[1/2] geode git commit: Move SelectExecStep back into DataCommandFunction

Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-2632-21 16ea5e3c6 -> a9f939bb0


Move SelectExecStep back into DataCommandFunction


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bce670aa
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bce670aa
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bce670aa

Branch: refs/heads/feature/GEODE-2632-21
Commit: bce670aa31142fb0195e916f479401592e673b6a
Parents: 16ea5e3
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Jun 5 11:05:48 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Jun 5 11:05:48 2017 -0700

----------------------------------------------------------------------
 .../internal/cli/commands/DataCommands.java     |   2 +-
 .../cli/functions/DataCommandFunction.java      | 100 ++++++++++++++
 .../internal/cli/functions/SelectExecStep.java  | 137 -------------------
 3 files changed, 101 insertions(+), 138 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/bce670aa/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
index f665a67..887470d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
@@ -44,10 +44,10 @@ import org.apache.geode.management.internal.cli.LogWrapper;
 import org.apache.geode.management.internal.cli.domain.DataCommandRequest;
 import org.apache.geode.management.internal.cli.domain.DataCommandResult;
 import org.apache.geode.management.internal.cli.functions.DataCommandFunction;
+import org.apache.geode.management.internal.cli.functions.DataCommandFunction.SelectExecStep;
 import org.apache.geode.management.internal.cli.functions.ExportDataFunction;
 import org.apache.geode.management.internal.cli.functions.ImportDataFunction;
 import org.apache.geode.management.internal.cli.functions.RebalanceFunction;
-import org.apache.geode.management.internal.cli.functions.SelectExecStep;
 import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper;
 import org.apache.geode.management.internal.cli.multistep.CLIStep;

http://git-wip-us.apache.org/repos/asf/geode/blob/bce670aa/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
index ff7aa02..20e2701 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
@@ -913,6 +913,106 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
     }
   }
 
+  public static class SelectExecStep extends CLIMultiStepHelper.RemoteStep {
+    private static final Logger logger = LogService.getLogger();
+
+    private static final long serialVersionUID = 1L;
+
+    public SelectExecStep(Object[] arguments) {
+      super(DataCommandFunction.SELECT_STEP_EXEC, arguments);
+    }
+
+    @Override
+    public Result exec() {
+      String remainingQuery = (String) commandArguments[0];
+      boolean interactive = (Boolean) commandArguments[2];
+      DataCommandResult result = _select(remainingQuery);
+      int endCount = 0;
+      DataCommandFunction.cachedResult = result;
+      if (interactive) {
+        endCount = DataCommandFunction.getPageSize();
+      } else {
+        if (result.getSelectResult() != null) {
+          endCount = result.getSelectResult().size();
+        }
+      }
+      if (interactive) {
+        return result.pageResult(0, endCount, DataCommandFunction.SELECT_STEP_DISPLAY);
+      } else {
+        return CLIMultiStepHelper.createBannerResult(new String[] {}, new Object[] {},
+            DataCommandFunction.SELECT_STEP_END);
+      }
+    }
+
+    public DataCommandResult _select(String query) {
+      InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
+      DataCommandResult dataResult;
+
+      if (StringUtils.isEmpty(query)) {
+        dataResult = DataCommandResult.createSelectInfoResult(null, null, -1, null,
+            CliStrings.QUERY__MSG__QUERY_EMPTY, false);
+        return dataResult;
+      }
+
+      Object array[] = DataCommands.replaceGfshEnvVar(query, CommandExecutionContext.getShellEnv());
+      query = (String) array[1];
+      query = addLimit(query);
+
+      @SuppressWarnings("deprecation")
+      QCompiler compiler = new QCompiler();
+      Set<String> regionsInQuery;
+      try {
+        CompiledValue compiledQuery = compiler.compileQuery(query);
+        Set<String> regions = new HashSet<>();
+        compiledQuery.getRegionsInQuery(regions, null);
+
+        // authorize data read on these regions
+        for (String region : regions) {
+          cache.getSecurityService().authorizeRegionRead(region);
+        }
+
+        regionsInQuery = Collections.unmodifiableSet(regions);
+        if (regionsInQuery.size() > 0) {
+          Set<DistributedMember> members =
+              DataCommands.getQueryRegionsAssociatedMembers(regionsInQuery, cache, false);
+          if (members != null && members.size() > 0) {
+            DataCommandFunction function = new DataCommandFunction();
+            DataCommandRequest request = new DataCommandRequest();
+            request.setCommand(CliStrings.QUERY);
+            request.setQuery(query);
+            Subject subject = cache.getSecurityService().getSubject();
+            if (subject != null) {
+              request.setPrincipal(subject.getPrincipal());
+            }
+            dataResult = DataCommands.callFunctionForRegion(request, function, members);
+            dataResult.setInputQuery(query);
+            return dataResult;
+          } else {
+            return DataCommandResult.createSelectInfoResult(null, null, -1, null, CliStrings.format(
+                CliStrings.QUERY__MSG__REGIONS_NOT_FOUND, regionsInQuery.toString()), false);
+          }
+        } else {
+          return DataCommandResult.createSelectInfoResult(null, null, -1, null,
+              CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY,
+                  "Region mentioned in query probably missing /"),
+              false);
+        }
+      } catch (QueryInvalidException qe) {
+        logger.error("{} Failed Error {}", query, qe.getMessage(), qe);
+        return DataCommandResult.createSelectInfoResult(null, null, -1, null,
+            CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY, qe.getMessage()), false);
+      }
+    }
+
+    private String addLimit(String query) {
+      if (StringUtils.containsIgnoreCase(query, " limit")
+          || StringUtils.containsIgnoreCase(query, " count(")) {
+        return query;
+      }
+      return query + " limit " + DataCommandFunction.getFetchSize();
+    }
+  }
+
   public static class SelectQuitStep extends CLIMultiStepHelper.RemoteStep {
 
     public SelectQuitStep(Object[] arguments) {

http://git-wip-us.apache.org/repos/asf/geode/blob/bce670aa/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SelectExecStep.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SelectExecStep.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SelectExecStep.java
deleted file mode 100644
index 8d9e57b..0000000
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/SelectExecStep.java
+++ /dev/null
@@ -1,137 +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.geode.management.internal.cli.functions;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.query.QueryInvalidException;
-import org.apache.geode.cache.query.internal.CompiledValue;
-import org.apache.geode.cache.query.internal.QCompiler;
-import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.management.cli.Result;
-import org.apache.geode.management.internal.cli.commands.DataCommands;
-import org.apache.geode.management.internal.cli.domain.DataCommandRequest;
-import org.apache.geode.management.internal.cli.domain.DataCommandResult;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper;
-import org.apache.geode.management.internal.cli.remote.CommandExecutionContext;
-import org.apache.logging.log4j.Logger;
-import org.apache.shiro.subject.Subject;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-public class SelectExecStep extends CLIMultiStepHelper.RemoteStep {
-  private static final Logger logger = LogService.getLogger();
-
-  private static final long serialVersionUID = 1L;
-
-  public SelectExecStep(Object[] arguments) {
-    super(DataCommandFunction.SELECT_STEP_EXEC, arguments);
-  }
-
-  @Override
-  public Result exec() {
-    String remainingQuery = (String) commandArguments[0];
-    boolean interactive = (Boolean) commandArguments[2];
-    DataCommandResult result = _select(remainingQuery);
-    int endCount = 0;
-    DataCommandFunction.cachedResult = result;
-    if (interactive) {
-      endCount = DataCommandFunction.getPageSize();
-    } else {
-      if (result.getSelectResult() != null) {
-        endCount = result.getSelectResult().size();
-      }
-    }
-    if (interactive) {
-      return result.pageResult(0, endCount, DataCommandFunction.SELECT_STEP_DISPLAY);
-    } else {
-      return CLIMultiStepHelper.createBannerResult(new String[] {}, new Object[] {},
-          DataCommandFunction.SELECT_STEP_END);
-    }
-  }
-
-  public DataCommandResult _select(String query) {
-    InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
-    DataCommandResult dataResult;
-
-    if (StringUtils.isEmpty(query)) {
-      dataResult = DataCommandResult.createSelectInfoResult(null, null, -1, null,
-          CliStrings.QUERY__MSG__QUERY_EMPTY, false);
-      return dataResult;
-    }
-
-    Object array[] = DataCommands.replaceGfshEnvVar(query, CommandExecutionContext.getShellEnv());
-    query = (String) array[1];
-    query = addLimit(query);
-
-    @SuppressWarnings("deprecation")
-    QCompiler compiler = new QCompiler();
-    Set<String> regionsInQuery;
-    try {
-      CompiledValue compiledQuery = compiler.compileQuery(query);
-      Set<String> regions = new HashSet<>();
-      compiledQuery.getRegionsInQuery(regions, null);
-
-      // authorize data read on these regions
-      for (String region : regions) {
-        cache.getSecurityService().authorizeRegionRead(region);
-      }
-
-      regionsInQuery = Collections.unmodifiableSet(regions);
-      if (regionsInQuery.size() > 0) {
-        Set<DistributedMember> members =
-            DataCommands.getQueryRegionsAssociatedMembers(regionsInQuery, cache, false);
-        if (members != null && members.size() > 0) {
-          DataCommandFunction function = new DataCommandFunction();
-          DataCommandRequest request = new DataCommandRequest();
-          request.setCommand(CliStrings.QUERY);
-          request.setQuery(query);
-          Subject subject = cache.getSecurityService().getSubject();
-          if (subject != null) {
-            request.setPrincipal(subject.getPrincipal());
-          }
-          dataResult = DataCommands.callFunctionForRegion(request, function, members);
-          dataResult.setInputQuery(query);
-          return dataResult;
-        } else {
-          return DataCommandResult.createSelectInfoResult(null, null, -1, null, CliStrings
-              .format(CliStrings.QUERY__MSG__REGIONS_NOT_FOUND, regionsInQuery.toString()), false);
-        }
-      } else {
-        return DataCommandResult.createSelectInfoResult(null, null, -1, null,
-            CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY,
-                "Region mentioned in query probably missing /"),
-            false);
-      }
-    } catch (QueryInvalidException qe) {
-      logger.error("{} Failed Error {}", query, qe.getMessage(), qe);
-      return DataCommandResult.createSelectInfoResult(null, null, -1, null,
-          CliStrings.format(CliStrings.QUERY__MSG__INVALID_QUERY, qe.getMessage()), false);
-    }
-  }
-
-  private String addLimit(String query) {
-    if (StringUtils.containsIgnoreCase(query, " limit")
-        || StringUtils.containsIgnoreCase(query, " count(")) {
-      return query;
-    }
-    return query + " limit " + DataCommandFunction.getFetchSize();
-  }
-}


[2/2] geode git commit: Fix AnalyzeSerializablesJUnitTest

Posted by kl...@apache.org.
Fix AnalyzeSerializablesJUnitTest


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a9f939bb
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a9f939bb
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a9f939bb

Branch: refs/heads/feature/GEODE-2632-21
Commit: a9f939bb09942fb15295132f90d2fb6b22486e4f
Parents: bce670a
Author: Kirk Lund <kl...@apache.org>
Authored: Mon Jun 5 11:55:32 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Mon Jun 5 11:55:32 2017 -0700

----------------------------------------------------------------------
 .../AnalyzeSerializablesJUnitTest.java          | 43 +++++++++++---------
 .../codeAnalysis/sanctionedSerializables.txt    | 22 ++--------
 2 files changed, 27 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/a9f939bb/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
index 079448d..f68d4d7 100644
--- a/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/codeAnalysis/AnalyzeSerializablesJUnitTest.java
@@ -52,6 +52,13 @@ import java.util.Map;
 @Category(IntegrationTest.class)
 public class AnalyzeSerializablesJUnitTest {
 
+  private static final String NEW_LINE = System.getProperty("line.separator");
+
+  private static final String FAIL_MESSAGE = NEW_LINE + NEW_LINE
+      + "If the class is not persisted or sent over the wire add it to the file " + NEW_LINE + "%s"
+      + NEW_LINE + "Otherwise if this doesn't break backward compatibility, copy the file "
+      + NEW_LINE + "%s to " + NEW_LINE + "%s.";
+
   /** all loaded classes */
   private Map<String, CompiledClass> classes;
 
@@ -115,17 +122,13 @@ public class AnalyzeSerializablesJUnitTest {
 
     String diff =
         diffSortedClassesAndMethods(this.expectedDataSerializables, actualDataSerializables);
-    if (diff.length() > 0) {
+    if (!diff.isEmpty()) {
       System.out.println(
           "++++++++++++++++++++++++++++++testDataSerializables found discrepancies++++++++++++++++++++++++++++++++++++");
       System.out.println(diff);
-      fail(
-          diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the "
-              + "\norg/apache/geode/codeAnalysis directory.  Otherwise if this doesn't "
-              + "\nbreak backward compatibility move the file "
-              + this.actualDataSerializablesFile.getAbsolutePath() + " to the codeAnalysis "
-              + "\ntest directory and rename to "
-              + this.expectedDataSerializablesFile.getAbsolutePath());
+      fail(diff + FAIL_MESSAGE, getSrcPathFor(getResourceAsFile("excludedClasses.txt")),
+          this.actualDataSerializablesFile.getAbsolutePath(),
+          getSrcPathFor(this.expectedDataSerializablesFile));
     }
   }
 
@@ -137,20 +140,22 @@ public class AnalyzeSerializablesJUnitTest {
     storeClassesAndVariables(actualSerializables, this.actualSerializablesFile);
 
     String diff = diffSortedClassesAndVariables(this.expectedSerializables, actualSerializables);
-    if (diff.length() > 0) {
+    if (!diff.isEmpty()) {
       System.out.println(
           "++++++++++++++++++++++++++++++testSerializables found discrepancies++++++++++++++++++++++++++++++++++++");
       System.out.println(diff);
-      fail(
-          diff + "\n\nIf the class is not persisted or sent over the wire add it to the excludedClasses.txt file in the "
-              + "\n/org/apache/geode/codeAnalysis/ directory.  Otherwise if this doesn't "
-              + "\nbreak backward compatibility move the file "
-              + this.actualSerializablesFile.getAbsolutePath() + " to the "
-              + "\ncodeAnalysis test directory and rename to "
-              + this.expectedSerializablesFile.getAbsolutePath());
+      fail(diff + FAIL_MESSAGE, getSrcPathFor(getResourceAsFile("excludedClasses.txt")),
+          this.actualSerializablesFile.getAbsolutePath(),
+          getSrcPathFor(this.expectedSerializablesFile));
     }
   }
 
+  private String getSrcPathFor(File file) {
+    return file.getAbsolutePath().replace(
+        "build" + File.separator + "resources" + File.separator + "test",
+        "src" + File.separator + "test" + File.separator + "resources");
+  }
+
   private void loadClasses() throws IOException {
     System.out.println("loadClasses starting");
 
@@ -181,7 +186,7 @@ public class AnalyzeSerializablesJUnitTest {
     loadClassesFromBuild(new File(buildDir), excludedClasses);
     long finish = System.currentTimeMillis();
 
-    System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
+    System.out.println("done loading " + this.classes.size() + " classes.  elapsed time = "
         + (finish - start) / 1000 + " seconds");
   }
 
@@ -193,7 +198,7 @@ public class AnalyzeSerializablesJUnitTest {
       String line;
       while ((line = br.readLine()) != null) {
         line = line.trim();
-        if (line.length() > 0 && !line.startsWith("#")) {
+        if (!line.isEmpty() && !line.startsWith("#")) {
           excludedClasses.add(line);
         }
       }
@@ -212,7 +217,7 @@ public class AnalyzeSerializablesJUnitTest {
       // each line should have bug#,full-class-name
       while ((line = br.readLine()) != null) {
         line = line.trim();
-        if (line.length() > 0 && !line.startsWith("#")) {
+        if (!line.isEmpty() && !line.startsWith("#")) {
           String[] split = line.split(",");
           if (split.length != 2) {
             fail("unable to load classes due to malformed line in openBugs.txt: " + line);

http://git-wip-us.apache.org/repos/asf/geode/blob/a9f939bb/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
index 9a85c7e..a5a6ff0 100755
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
@@ -14,13 +14,11 @@ org/apache/geode/InternalGemFireException,true,-6912843691545178619
 org/apache/geode/InvalidDeltaException,true,7846464807353214091
 org/apache/geode/InvalidValueException,true,6186767885369527709
 org/apache/geode/InvalidVersionException,true,6342040462194322698
-org/apache/geode/LicenseException,true,-1178557127300465801
 org/apache/geode/NoSystemException,true,-101890149467219630
 org/apache/geode/OutOfOffHeapMemoryException,true,4111959438738739010
 org/apache/geode/SerializationException,true,7783018024920098997
 org/apache/geode/SystemConnectException,true,-7378174428634468238
 org/apache/geode/SystemIsRunningException,true,3516268055878767189
-org/apache/geode/ThreadInterruptedException,true,6169940883541267514
 org/apache/geode/ToDataException,true,-2329606027453879918
 org/apache/geode/UncreatedSystemException,true,5424354567878425435
 org/apache/geode/UnmodifiableException,true,-1043243260052395455
@@ -69,7 +67,6 @@ org/apache/geode/cache/DuplicatePrimaryPartitionException,true,1
 org/apache/geode/cache/EntryDestroyedException,true,831865939772672542
 org/apache/geode/cache/EntryExistsException,true,2925082493103537925,oldValue:java/lang/Object
 org/apache/geode/cache/EntryNotFoundException,true,-2404101631744605659
-org/apache/geode/cache/EntryNotFoundInRegion,true,5572550909947420405
 org/apache/geode/cache/EvictionAction,true,-98840597493242980
 org/apache/geode/cache/EvictionAlgorithm,true,5778669432033106789
 org/apache/geode/cache/ExpirationAction,true,658925707882047900,ordinal:int
@@ -95,7 +92,6 @@ org/apache/geode/cache/RegionExistsException,true,-5643670216230359426
 org/apache/geode/cache/RegionReinitializedException,true,8532904304288670752
 org/apache/geode/cache/RegionRoleException,true,202660222740132890,regionFullPath:java/lang/String
 org/apache/geode/cache/RegionShortcut,false
-org/apache/geode/cache/RemoteTransactionException,true,-2217135580436381984
 org/apache/geode/cache/ResourceException,true,-5559328592343363268
 org/apache/geode/cache/ResumptionAction,true,6632254151314915610,ordinal:byte
 org/apache/geode/cache/RoleException,true,-7521056108445887394
@@ -450,6 +446,7 @@ org/apache/geode/internal/process/PidUnavailableException,true,-1660269538268828
 org/apache/geode/internal/process/signal/Signal,false,description:java/lang/String,name:java/lang/String,number:int,type:org/apache/geode/internal/process/signal/SignalType
 org/apache/geode/internal/process/signal/SignalEvent,false,signal:org/apache/geode/internal/process/signal/Signal
 org/apache/geode/internal/process/signal/SignalType,false,description:java/lang/String
+org/apache/geode/internal/security/SecurityServiceType,false
 org/apache/geode/internal/sequencelog/GraphType,false
 org/apache/geode/internal/sequencelog/model/GraphID,false,graphName:java/lang/String,type:org/apache/geode/internal/sequencelog/GraphType
 org/apache/geode/internal/size/ReflectionObjectSizer,false
@@ -527,18 +524,6 @@ org/apache/geode/management/internal/cli/domain/RegionDescriptionPerMember,true,
 org/apache/geode/management/internal/cli/domain/RegionInformation,true,1,dataPolicy:org/apache/geode/cache/DataPolicy,isRoot:boolean,name:java/lang/String,parentRegion:java/lang/String,path:java/lang/String,scope:org/apache/geode/cache/Scope,subRegionInformationSet:java/util/Set
 org/apache/geode/management/internal/cli/domain/StackTracesPerMember,true,1,memberNameOrId:java/lang/String,stackTraces:byte[]
 org/apache/geode/management/internal/cli/domain/SubscriptionQueueSizeResult,true,1,subscriptionQueueSize:long
-org/apache/geode/management/internal/cli/exceptions/CliCommandException,true,968411094429216130,commandTarget:org/apache/geode/management/internal/cli/parser/CommandTarget,optionSet:org/apache/geode/management/internal/cli/parser/OptionSet
-org/apache/geode/management/internal/cli/exceptions/CliCommandInvalidException,true,-2195809850441234116
-org/apache/geode/management/internal/cli/exceptions/CliCommandMultiModeOptionException,true,-5658813370141696448,code:int,leadOptionString:java/lang/String
-org/apache/geode/management/internal/cli/exceptions/CliCommandNotAvailableException,true,-631339463163773007
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionException,true,-5443638512704442487,option:org/apache/geode/management/internal/cli/parser/Option
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionHasMultipleValuesException,true,-5277268341319591711
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionInvalidException,true,8773148664471110429
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionMissingException,true,7152881150151676813
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionNotApplicableException,true,4190478428338602501
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueConversionException,true,5144720637801591
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueException,true,-7339487978861146474,value:java/lang/String
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueMissingException,true,7842061609469545533
 org/apache/geode/management/internal/cli/exceptions/CliException,true,-7603040667204839200
 org/apache/geode/management/internal/cli/exceptions/CreateSubregionException,true,4387344870743824916
 org/apache/geode/management/internal/cli/exceptions/IndexNotFoundException,true,1,indexName:java/lang/String,message:java/lang/String
@@ -565,7 +550,6 @@ org/apache/geode/management/internal/cli/functions/ExportConfigFunction,true,1
 org/apache/geode/management/internal/cli/functions/ExportDataFunction,true,1
 org/apache/geode/management/internal/cli/functions/ExportLogsFunction,true,1
 org/apache/geode/management/internal/cli/functions/ExportLogsFunction$Args,false,endTime:java/time/LocalDateTime,includeLogs:boolean,includeStats:boolean,logLevel:org/apache/logging/log4j/Level,startTime:java/time/LocalDateTime,thisLogLevelOnly:boolean
-org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction,true,1
 org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction,true,4366812590788342070
 org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction$FetchRegionAttributesFunctionResult,true,-3970828263897978845,cacheListenerClasses:java/lang/String[],cacheLoaderClass:java/lang/String,cacheWriterClass:java/lang/String,regionAttributes:org/apache/geode/cache/RegionAttributes
 org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction,true,1
@@ -589,7 +573,6 @@ org/apache/geode/management/internal/cli/functions/ListDiskStoresFunction,false
 org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction,true,1
 org/apache/geode/management/internal/cli/functions/ListFunctionFunction,true,1
 org/apache/geode/management/internal/cli/functions/ListIndexFunction,false
-org/apache/geode/management/internal/cli/functions/LogFileFunction,true,1
 org/apache/geode/management/internal/cli/functions/MemberRegionFunction,true,1
 org/apache/geode/management/internal/cli/functions/MembersForRegionFunction,true,8746830191680509335
 org/apache/geode/management/internal/cli/functions/NetstatFunction,true,1
@@ -605,6 +588,7 @@ org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$Expiration
 org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$PartitionArgs,true,5907052187323280919,hasPartitionAttributes:boolean,isPartitionResolver:boolean,isSetPRLocalMaxMemory:boolean,isSetPRRecoveryDelay:boolean,isSetPRRedundantCopies:boolean,isSetPRStartupRecoveryDelay:boolean,isSetPRTotalMaxMemory:boolean,isSetPRTotalNumBuckets:boolean,partitionResolver:java/lang/String,prColocatedWith:java/lang/String,prLocalMaxMemory:int,prRecoveryDelay:long,prRedundantCopies:int,prStartupRecoveryDelay:long,prTotalMaxMemory:long,prTotalNumBuckets:int,userSpecifiedPartitionAttributes:java/util/Set
 org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunction,false
 org/apache/geode/management/internal/cli/functions/ShutDownFunction,true,1
+org/apache/geode/management/internal/cli/functions/SizeExportLogsFunction,true,1
 org/apache/geode/management/internal/cli/functions/UndeployFunction,true,1
 org/apache/geode/management/internal/cli/functions/UnregisterFunction,true,1
 org/apache/geode/management/internal/cli/functions/UserFunctionExecution,true,1
@@ -629,8 +613,8 @@ org/apache/geode/management/internal/cli/util/MemberInformation,true,1,cacheXmlF
 org/apache/geode/management/internal/cli/util/MemberNotFoundException,true,5686788909239181174
 org/apache/geode/management/internal/cli/util/VisualVmNotFoundException,true,-8491645604829510102
 org/apache/geode/management/internal/configuration/domain/SharedConfigurationStatus,false
-org/apache/geode/management/internal/configuration/functions/RecreateCacheFunction,false
 org/apache/geode/management/internal/configuration/functions/GetRegionNamesFunction,false
+org/apache/geode/management/internal/configuration/functions/RecreateCacheFunction,false
 org/apache/geode/management/internal/configuration/functions/UploadJarFunction,true,1
 org/apache/geode/management/internal/web/domain/Link,false,href:java/net/URI,method:org/apache/geode/management/internal/web/http/HttpMethod,relation:java/lang/String
 org/apache/geode/management/internal/web/domain/QueryParameterSource,true,34131123582155,objectName:javax/management/ObjectName,queryExpression:javax/management/QueryExp