keith-turner commented on code in PR #5689: URL: https://github.com/apache/accumulo/pull/5689#discussion_r2175666219
########## shell/src/test/java/org/apache/accumulo/shell/commands/QuotedStringTokenizerTest.java: ########## @@ -0,0 +1,56 @@ +/* + * 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 + * + * https://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.accumulo.shell.commands; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +public class QuotedStringTokenizerTest { + + @Test + public void testProperties() { + String jsonProperty = "config -s tserver.compaction.major.service.meta.planner.opts.executors=" + + "[{\"name\":\"small\",\"type\":\"internal\",\"maxSize\":\"32M\",\"numThreads\":2}," + + "{\"name\":\"huge\",\"type\":\"internal\",\"numThreads\":2}]"; + testTokens(jsonProperty, 3); + + testTokens("config -t accumulo.root -f table.custom.test", 5); + + String spaceWithForceProperty = "config -s table.custom.test.property=\"test\" -force"; + testTokens(spaceWithForceProperty, 4); + } + Review Comment: This PR is changing the way that hex escaping works for this case. ```java @Test public void testHex(){ String input = "a=\\x56"; testTokens(input, 1); } ``` Running the above it prints `Token:a=\x56`. If I change `QuotedStringTokenizer` to never set `inValue` to true then the test will print `Token:a=V`. ########## shell/src/test/java/org/apache/accumulo/shell/commands/QuotedStringTokenizerTest.java: ########## @@ -0,0 +1,56 @@ +/* + * 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 + * + * https://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.accumulo.shell.commands; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +public class QuotedStringTokenizerTest { + + @Test + public void testProperties() { + String jsonProperty = "config -s tserver.compaction.major.service.meta.planner.opts.executors=" + + "[{\"name\":\"small\",\"type\":\"internal\",\"maxSize\":\"32M\",\"numThreads\":2}," + + "{\"name\":\"huge\",\"type\":\"internal\",\"numThreads\":2}]"; + testTokens(jsonProperty, 3); + + testTokens("config -t accumulo.root -f table.custom.test", 5); Review Comment: Would be nice to make the test more specific and instead of passing a count pass a list of the expected tokens. ```suggestion testTokens("config -t accumulo.root -f table.custom.test", List.of("config","-t","accumulo.root","-f","table.custom.tests")); ``` ########## shell/src/test/java/org/apache/accumulo/shell/commands/QuotedStringTokenizerTest.java: ########## @@ -0,0 +1,56 @@ +/* + * 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 + * + * https://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.accumulo.shell.commands; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +public class QuotedStringTokenizerTest { + + @Test + public void testProperties() { + String jsonProperty = "config -s tserver.compaction.major.service.meta.planner.opts.executors=" + + "[{\"name\":\"small\",\"type\":\"internal\",\"maxSize\":\"32M\",\"numThreads\":2}," + + "{\"name\":\"huge\",\"type\":\"internal\",\"numThreads\":2}]"; + testTokens(jsonProperty, 3); Review Comment: Before this change needed to wrap the entire key value in an outer single quote to make it work. Would be nice to test that still works. ```suggestion String jsonProperty = "config -s tserver.compaction.major.service.meta.planner.opts.executors=" + "[{\"name\":\"small\",\"type\":\"internal\",\"maxSize\":\"32M\",\"numThreads\":2}," + "{\"name\":\"huge\",\"type\":\"internal\",\"numThreads\":2}]"; testTokens(jsonProperty, 3); jsonProperty = "config -s 'tserver.compaction.major.service.meta.planner.opts.executors=" + "[{\"name\":\"small\",\"type\":\"internal\",\"maxSize\":\"32M\",\"numThreads\":2}," + "{\"name\":\"huge\",\"type\":\"internal\",\"numThreads\":2}]'"; testTokens(jsonProperty, 3); ``` ########## shell/src/main/java/org/apache/accumulo/shell/commands/QuotedStringTokenizer.java: ########## @@ -109,7 +110,18 @@ private void createTokens() throws BadArgumentException, UnsupportedEncodingExce } else { token[tokenLength++] = inputBytes[i]; } + } else if (inValue) { + if (ch != ' ') { + token[tokenLength++] = inputBytes[i]; + } else { + inValue = false; + tokens.add(new String(token, 0, tokenLength, Shell.CHARSET)); + tokenLength = 0; + } } else { + if (ch == '=') { + inValue = true; + } Review Comment: Seems like the rest of the if checks could be chained. Seems like they are all looking for mutually exclusive chars. ```suggestion } else if (ch == '\'' || ch == '"') { ``` -- 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]
