Skip to content

HIVE-20608: Fix incorrect derivation of command args #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
soumabrata-chakraborty wants to merge 2 commits into from
Closed

HIVE-20608: Fix incorrect derivation of command args #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6be2819
Fix incorrect derivation of command args
Sep 21, 2018
76b9279
Add test to check for setting of correct arguments for untrimmed input
Oct 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion service/src/java/org/apache/hive/service/cli/operation/HiveCommandOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public void runInternal() throws HiveSQLException {
setState(OperationState.RUNNING);
try {
String command = getStatement().trim();
String[] tokens = statement.split("\\s");
String[] tokens = command.split("\\s");
String commandArgs = command.substring(tokens[0].length()).trim();

CommandProcessorResponse response = commandProcessor.run(commandArgs);
Expand Down
45 changes: 45 additions & 0 deletions service/src/test/org/apache/hive/service/cli/operation/TestHiveCommandOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package org.apache.hive.service.cli.operation;

import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.processors.CommandProcessor;
import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse;
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hive.service.cli.HiveSQLException;
import org.apache.hive.service.cli.session.HiveSession;
import org.junit.Test;
import org.mockito.ArgumentCaptor;

import java.io.File;

import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

public class TestHiveCommandOperation {

@Test
public void testRunInternalSetsCorrectArgumentsForUntrimmedInput() throws HiveSQLException {

HiveConf conf = new HiveConf(TestHiveCommandOperation.class);
File tmpFile = new File("/dev/null");

HiveSession mockHiveSession = mock(HiveSession.class);
SessionState mockSessionState = mock(SessionState.class);
CommandProcessor mockCommandProcessor = mock(CommandProcessor.class);

ArgumentCaptor<String> commandArgsCaptor = ArgumentCaptor.forClass(String.class);

when(mockHiveSession.getHiveConf()).thenReturn(conf);
when(mockHiveSession.getSessionState()).thenReturn(mockSessionState);
when(mockSessionState.getTmpOutputFile()).thenReturn(tmpFile);
when(mockSessionState.getTmpErrOutputFile()).thenReturn(tmpFile);
when(mockCommandProcessor.run(commandArgsCaptor.capture())).thenReturn(new CommandProcessorResponse(0));

HiveCommandOperation hiveCommandOperation = new HiveCommandOperation(mockHiveSession,
" set a = b", mockCommandProcessor, null);
hiveCommandOperation.runInternal();

String commandArgs = commandArgsCaptor.getValue();
assertEquals("a = b", commandArgs);
}
}