This is an automated email from the ASF dual-hosted git repository. caogaofei pushed a commit to branch beyyes/rel-1.2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 58f01fdb552d5b3c339c6c599b6abd7098d88b89 Author: Beyyes <[email protected]> AuthorDate: Sat Sep 16 12:16:37 2023 +0800 Remove the useless code and fix smell in last query (#11156) --- .../impl/mem/mnode/factory/MemMNodeFactory.java | 4 +- .../impl/mem/mnode/impl/LogicalViewMNode.java | 64 ---------------------- 2 files changed, 1 insertion(+), 67 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/factory/MemMNodeFactory.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/factory/MemMNodeFactory.java index a48d21d9230..62f700c398c 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/factory/MemMNodeFactory.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/factory/MemMNodeFactory.java @@ -30,9 +30,7 @@ import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.impl.B import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.impl.DatabaseDeviceMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.impl.DatabaseMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.impl.DeviceMNode; -import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.impl.LogicalViewMNode; import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.impl.MeasurementMNode; -import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.LogicalViewInfo; import org.apache.iotdb.tsfile.write.schema.IMeasurementSchema; @MNodeFactory @@ -78,6 +76,6 @@ public class MemMNodeFactory implements IMNodeFactory<IMemMNode> { @Override public IMeasurementMNode<IMemMNode> createLogicalViewMNode( IDeviceMNode<IMemMNode> parent, String name, IMeasurementInfo measurementInfo) { - return new LogicalViewMNode(parent, name, ((LogicalViewInfo) measurementInfo).getExpression()); + throw new UnsupportedOperationException("View is not supported."); } } diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/impl/LogicalViewMNode.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/impl/LogicalViewMNode.java deleted file mode 100644 index 4b7382f300c..00000000000 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/mem/mnode/impl/LogicalViewMNode.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 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 - * - * http://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.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.impl; - -import org.apache.iotdb.commons.schema.node.common.AbstractMeasurementMNode; -import org.apache.iotdb.commons.schema.node.info.IMeasurementInfo; -import org.apache.iotdb.commons.schema.node.role.IDeviceMNode; -import org.apache.iotdb.commons.schema.node.utils.IMNodeContainer; -import org.apache.iotdb.commons.schema.view.LogicalViewSchema; -import org.apache.iotdb.commons.schema.view.viewExpression.ViewExpression; -import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.IMemMNode; -import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.basic.BasicMNode; -import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.container.MemMNodeContainer; -import org.apache.iotdb.db.schemaengine.schemaregion.mtree.impl.mem.mnode.info.LogicalViewInfo; - -public class LogicalViewMNode extends AbstractMeasurementMNode<IMemMNode, BasicMNode> - implements IMemMNode { - - public LogicalViewMNode( - IDeviceMNode<IMemMNode> parent, String name, ViewExpression viewExpression) { - super( - new BasicMNode(parent == null ? null : parent.getAsMNode(), name), - new LogicalViewInfo(new LogicalViewSchema(name, viewExpression))); - } - - @Override - public IMNodeContainer<IMemMNode> getChildren() { - return MemMNodeContainer.emptyMNodeContainer(); - } - - @Override - public IMemMNode getAsMNode() { - return this; - } - - public void setExpression(ViewExpression expression) { - IMeasurementInfo measurementInfo = this.getMeasurementInfo(); - if (measurementInfo instanceof LogicalViewInfo) { - ((LogicalViewInfo) measurementInfo).setExpression(expression); - } - } - - @Override - public final boolean isLogicalView() { - return true; - } -}
