Skip to content

[IOTDB-5834] Fix unclear error msg when querying nonexistent schema template #9738

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
MarcosZyk merged 2 commits into from
Apr 28, 2023
Merged

[IOTDB-5834] Fix unclear error msg when querying nonexistent schema template #9738

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
116deaa
fix if-else
MarcosZyk Apr 28, 2023
981da9b
fix error msg
MarcosZyk Apr 28, 2023
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
13 changes: 8 additions & 5 deletions confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,11 +741,14 @@ public synchronized TSStatus extendSchemaTemplate(TemplateExtendInfo templateExt
}
}

Template template =
clusterSchemaInfo
.getTemplate(new GetSchemaTemplatePlan(templateExtendInfo.getTemplateName()))
.getTemplateList()
.get(0);
TemplateInfoResp resp =
clusterSchemaInfo.getTemplate(
new GetSchemaTemplatePlan(templateExtendInfo.getTemplateName()));
if (resp.getStatus().getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return resp.getStatus();
}

Template template = resp.getTemplateList().get(0);
boolean needExtend = false;
for (String measurement : templateExtendInfo.getMeasurements()) {
if (!template.hasSchema(measurement)) {
Expand Down
7 changes: 3 additions & 4 deletions server/src/main/java/org/apache/iotdb/db/metadata/template/ClusterTemplateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ public List<Template> getAllTemplates() {
}

@Override
public Template getTemplate(String name) {
public Template getTemplate(String name) throws IoTDBException {
try (ConfigNodeClient configNodeClient =
CONFIG_NODE_CLIENT_MANAGER.borrowClient(ConfigNodeInfo.CONFIG_REGION_ID)) {
TGetTemplateResp resp = configNodeClient.getTemplate(name);
Expand All @@ -193,10 +193,9 @@ public Template getTemplate(String name) {
template.deserialize(ByteBuffer.wrap(templateBytes));
return template;
} else {
throw new RuntimeException(
new IoTDBException(resp.status.getMessage(), resp.status.getCode()));
throw new IoTDBException(resp.status.getMessage(), resp.status.getCode());
}
} catch (Exception e) {
} catch (ClientManagerException | TException e) {
throw new RuntimeException(
new IoTDBException(
"get template info error.", TSStatusCode.UNDEFINED_TEMPLATE.getStatusCode()));
Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/apache/iotdb/db/metadata/template/ITemplateManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package org.apache.iotdb.db.metadata.template;

import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.mpp.plan.statement.metadata.template.CreateSchemaTemplateStatement;
import org.apache.iotdb.tsfile.utils.Pair;
Expand Down Expand Up @@ -48,7 +49,7 @@ public interface ITemplateManager {
* @param name
* @return Template
*/
Template getTemplate(String name);
Template getTemplate(String name) throws IoTDBException;

Template getTemplate(int id);

Expand Down