harjitdotsingh commented on pull request #2255: URL: https://github.com/apache/accumulo/pull/2255#issuecomment-920154297
All set. Just committed the changes On Wed, Sep 15, 2021 at 10:59 AM Jeffrey Manno ***@***.***> wrote: > ***@***.**** commented on this pull request. > > This is getting close. Just a few more minor changes/suggestions. > ------------------------------ > > In test/src/main/java/org/apache/accumulo/test/ShellServerIT.java > <https://github.com/apache/accumulo/pull/2255#discussion_r709250559>: > > > + String result = ts.exec("scan -b row -cf c:f -cq cq -e row"); > > + assertEquals(2, result.split("\n").length); > > + result = ts.exec("scan -b row -c cf -cf c:f -cq cq -e row", false); > > + assertTrue(result.contains("mutually exclusive")); > > + > > + result = ts.exec("scan -b row -cq col1 -e row", false); > > + assertTrue(result.contains("cannot be empty")); > > + > > > ⬇️ Suggested change > > - String result = ts.exec("scan -b row -cf c:f -cq cq -e row"); > > - assertEquals(2, result.split("\n").length); > > - result = ts.exec("scan -b row -c cf -cf c:f -cq cq -e row", false); > > - assertTrue(result.contains("mutually exclusive")); > > - > > - result = ts.exec("scan -b row -cq col1 -e row", false); > > - assertTrue(result.contains("cannot be empty")); > > - > > + ts.exec("scan -b row -cf c:f -cq cq -e row", true, "value"); > > + ts.exec("scan -b row -c cf -cf c:f -cq cq -e row", false, "mutually exclusive"); > > + ts.exec("scan -b row -cq col1 -e row", false, "cannot be empty"); > > > A slight simplification so we don't have to create the results object to > compare against. > ------------------------------ > > In shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java > <https://github.com/apache/accumulo/pull/2255#discussion_r709251683>: > > > @@ -347,7 +385,11 @@ public Options getOptions() { > > "make end row exclusive (by default it's inclusive)"); > > optEndRowExclusive.setArgName("end-exclusive"); > > scanOptRow = new Option("r", "row", true, "row to scan"); > > - scanOptColumns = new Option("c", "columns", true, "comma-separated columns"); > > + scanOptColumns = new Option("c", "columns", true, > > + "comma-separated columns.This" + "option is mutually exclusive with cf"); > > > ⬇️ Suggested change > > - "comma-separated columns.This" + "option is mutually exclusive with cf"); > > + "comma-separated columns.This" + " option is mutually exclusive with cf and cq"); > > > ------------------------------ > > In shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java > <https://github.com/apache/accumulo/pull/2255#discussion_r709252455>: > > > @@ -347,7 +385,11 @@ public Options getOptions() { > > "make end row exclusive (by default it's inclusive)"); > > optEndRowExclusive.setArgName("end-exclusive"); > > scanOptRow = new Option("r", "row", true, "row to scan"); > > - scanOptColumns = new Option("c", "columns", true, "comma-separated columns"); > > + scanOptColumns = new Option("c", "columns", true, > > + "comma-separated columns.This" + "option is mutually exclusive with cf"); > > + scanOptCf = new Option("cf", "column-family", true, "column family to scan."); > > + scanOptCq = new Option("cq", "column-qualifier", true, "column qualifier"); > > > ⬇️ Suggested change > > - scanOptCq = new Option("cq", "column-qualifier", true, "column qualifier"); > > + scanOptCq = new Option("cq", "column-qualifier", true, "column qualifier to scan"); > > > ------------------------------ > > In shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java > <https://github.com/apache/accumulo/pull/2255#discussion_r709269705>: > > > + String.format("Option - %s when used with (%s" + " cannot be empty )", scanOptCf.getOpt(), > > + scanOptCq.getOpt(), scanOptCq.getOpt()); > > > ⬇️ Suggested change > > - String.format("Option - %s when used with (%s" + " cannot be empty )", scanOptCf.getOpt(), > > - scanOptCq.getOpt(), scanOptCq.getOpt()); > > + String.format("Option -%s is required when using -%s.", scanOptCf.getOpt(), > > + scanOptCq.getOpt()); > > > Some suggestions are wording to make it easier to understand. Also, extra > parameter was removed and fixed spacing. > ------------------------------ > > In shell/src/main/java/org/apache/accumulo/shell/commands/ScanCommand.java > <https://github.com/apache/accumulo/pull/2255#discussion_r709274898>: > > > + String.format("Options - %s AND (- %s" + " OR - %s are mutually exclusive )", > > + scanOptColumns.getOpt(), scanOptCf.getOpt(), scanOptCq.getOpt()); > > > ⬇️ Suggested change > > - String.format("Options - %s AND (- %s" + " OR - %s are mutually exclusive )", > > - scanOptColumns.getOpt(), scanOptCf.getOpt(), scanOptCq.getOpt()); > > + String.format("Option -%s is mutually exclusive with options -%s and -%s.", > > + scanOptColumns.getOpt(), scanOptCf.getOpt(), scanOptCq.getOpt()); > > > Some suggestions on wording to make it easier to understand and fixed > spacing. > > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub > <https://github.com/apache/accumulo/pull/2255#pullrequestreview-755207287>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/AAASJ7V2OLCUA7ZC4RYSA5TUCCYEXANCNFSM5DGYZX4A> > . > Triage notifications on the go with GitHub Mobile for iOS > <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> > or Android > <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>. > > -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
