Skip to content

Commit 1c8f0f9

Browse files
authored
Minor suggestion on InlineJsonResult (#519)
1 parent 37fe235 commit 1c8f0f9

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

src/main/java/com/databricks/jdbc/api/impl/ExecutionResultFactory.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import com.databricks.jdbc.api.callback.IDatabricksResultSetHandle;
77
import com.databricks.jdbc.api.callback.IDatabricksStatementHandle;
88
import com.databricks.jdbc.api.impl.arrow.ArrowStreamResult;
9-
import com.databricks.jdbc.api.impl.inline.InlineJsonResult;
109
import com.databricks.jdbc.api.impl.volume.VolumeOperationResult;
1110
import com.databricks.jdbc.common.util.DatabricksThriftUtil;
1211
import com.databricks.jdbc.exception.DatabricksParsingException;

src/main/java/com/databricks/jdbc/api/impl/inline/InlineJsonResult.java renamed to src/main/java/com/databricks/jdbc/api/impl/InlineJsonResult.java

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package com.databricks.jdbc.api.impl.inline;
1+
package com.databricks.jdbc.api.impl;
22

3-
import com.databricks.jdbc.api.impl.IExecutionResult;
43
import com.databricks.jdbc.exception.DatabricksSQLException;
54
import com.databricks.jdbc.model.core.ResultData;
65
import com.databricks.jdbc.model.core.ResultManifest;
@@ -15,18 +14,14 @@ public class InlineJsonResult implements IExecutionResult {
1514
private boolean isClosed;
1615

1716
public InlineJsonResult(ResultManifest resultManifest, ResultData resultData) {
18-
this.data = getDataList(resultData.getDataArray());
19-
this.currentRow = -1;
20-
this.isClosed = false;
17+
this(getDataList(resultData.getDataArray()));
2118
}
2219

2320
public InlineJsonResult(Object[][] rows) {
24-
this.data =
21+
this(
2522
Arrays.stream(rows)
2623
.map(row -> Arrays.stream(row).collect(Collectors.toList()))
27-
.collect(Collectors.toList());
28-
this.currentRow = -1;
29-
this.isClosed = false;
24+
.collect(Collectors.toList()));
3025
}
3126

3227
public InlineJsonResult(List<List<Object>> rows) {
@@ -53,7 +48,7 @@ private static List<List<Object>> getDataList(Collection<Collection<String>> dat
5348
@Override
5449
public Object getObject(int columnIndex) throws DatabricksSQLException {
5550
if (isClosed()) {
56-
throw new DatabricksSQLException("Method called on closed result");
51+
throw new DatabricksSQLException("Result is already closed");
5752
}
5853
if (currentRow == -1) {
5954
throw new DatabricksSQLException("Cursor is before first row");

src/test/java/com/databricks/jdbc/api/impl/DatabricksResultSetTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.databricks.jdbc.api.IDatabricksSession;
1010
import com.databricks.jdbc.api.callback.IDatabricksResultSetHandle;
1111
import com.databricks.jdbc.api.callback.IDatabricksStatementHandle;
12-
import com.databricks.jdbc.api.impl.inline.InlineJsonResult;
1312
import com.databricks.jdbc.common.StatementType;
1413
import com.databricks.jdbc.exception.DatabricksSQLException;
1514
import com.databricks.jdbc.exception.DatabricksSQLFeatureNotSupportedException;

src/test/java/com/databricks/jdbc/api/impl/ExecutionResultFactoryTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.databricks.jdbc.api.callback.IDatabricksResultSetHandle;
99
import com.databricks.jdbc.api.callback.IDatabricksStatementHandle;
1010
import com.databricks.jdbc.api.impl.arrow.ArrowStreamResult;
11-
import com.databricks.jdbc.api.impl.inline.InlineJsonResult;
1211
import com.databricks.jdbc.api.impl.volume.VolumeOperationResult;
1312
import com.databricks.jdbc.exception.DatabricksParsingException;
1413
import com.databricks.jdbc.exception.DatabricksSQLFeatureNotSupportedException;

0 commit comments

Comments
 (0)