Skip to content

[IOTDB-1234] fix ImportCsv tool cannot parse empty string #2857

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

Merged
jixuan1989 merged 2 commits into from
Mar 19, 2021
Merged

[IOTDB-1234] fix ImportCsv tool cannot parse empty string #2857

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f78c06a
[IOTDB-1234] fix ImportCsv tool cannot parse empty string
coldgust Mar 16, 2021
07f9ccd
optimize import
coldgust Mar 17, 2021
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
21 changes: 19 additions & 2 deletions server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,9 +1281,8 @@ public TSStatus insertStringRecords(TSInsertStringRecordsReq req) {
try {
plan.setDeviceId(new PartialPath(req.getDeviceIds().get(i)));
plan.setTime(req.getTimestamps().get(i));
plan.setMeasurements(req.getMeasurementsList().get(i).toArray(new String[0]));
addMeasurementAndValue(plan, req.getMeasurementsList().get(i), req.getValuesList().get(i));
plan.setDataTypes(new TSDataType[plan.getMeasurements().length]);
plan.setValues(req.getValuesList().get(i).toArray(new Object[0]));
plan.setNeedInferType(true);
TSStatus status = checkAuthority(plan, req.getSessionId());
if (status != null) {
Expand All @@ -1307,6 +1306,24 @@ public TSStatus insertStringRecords(TSInsertStringRecordsReq req) {
allCheckSuccess, tsStatus, insertRowsPlan.getResults(), req.deviceIds.size());
}

private void addMeasurementAndValue(
InsertRowPlan insertRowPlan, List<String> measurements, List<String> values) {
List<String> newMeasurements = new ArrayList<>(measurements.size());
List<Object> newValues = new ArrayList<>(values.size());

for (int i = 0; i < measurements.size(); ++i) {
String value = values.get(i);
if (value.isEmpty()) {
continue;
}
newMeasurements.add(measurements.get(i));
newValues.add(value);
}

insertRowPlan.setValues(newValues.toArray(new Object[0]));
insertRowPlan.setMeasurements(newMeasurements.toArray(new String[0]));
}

@Override
public TSStatus testInsertTablet(TSInsertTabletReq req) {
LOGGER.debug("Test insert batch request receive.");
Expand Down