diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedSerde.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedSerde.java deleted file mode 100644 index c97143c633..0000000000 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/VectorizedSerde.java +++ /dev/null @@ -1,35 +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.hadoop.hive.ql.exec.vector; - -import org.apache.hadoop.hive.serde2.AbstractSerDe; -import org.apache.hadoop.hive.serde2.SerDeException; -import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector; -import org.apache.hadoop.io.Writable; - -/** - * Serdes that support vectorized {@link VectorizedRowBatch} must implement this interface. - */ -public abstract class VectorizedSerde extends AbstractSerDe { - public abstract Writable serializeVector( - VectorizedRowBatch vrg, ObjectInspector objInspector) throws SerDeException; - - public abstract void deserializeVector( - Object rowBlob, int rowsInBlob, VectorizedRowBatch reuseBatch) throws SerDeException; -} diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSerde.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSerde.java index 7b788350b2..dabe4bd4b9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSerde.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcSerde.java @@ -27,8 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; -import org.apache.hadoop.hive.ql.exec.vector.VectorizedSerde; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.AbstractSerDe; import org.apache.hadoop.hive.serde2.SerDeException; @@ -46,14 +44,11 @@ * It transparently passes the object to/from the ORC file reader/writer. */ @SerDeSpec(schemaProps = {serdeConstants.LIST_COLUMNS, serdeConstants.LIST_COLUMN_TYPES, OrcSerde.COMPRESSION}) -public class OrcSerde extends VectorizedSerde { - - private static final Logger LOG = LoggerFactory.getLogger(OrcSerde.class); +public class OrcSerde extends AbstractSerDe { private final OrcSerdeRow row = new OrcSerdeRow(); private ObjectInspector inspector = null; - private VectorizedOrcSerde vos = null; public static final String COMPRESSION = "orc.compress"; final class OrcSerdeRow implements Writable { @@ -150,18 +145,4 @@ public SerDeStats getSerDeStats() { return null; } - @Override - public Writable serializeVector(VectorizedRowBatch vrg, ObjectInspector objInspector) - throws SerDeException { - if (vos == null) { - vos = new VectorizedOrcSerde(getObjectInspector()); - } - return vos.serialize(vrg, getObjectInspector()); - } - - @Override - public void deserializeVector(Object rowBlob, int rowsInBatch, VectorizedRowBatch reuseBatch) - throws SerDeException { - // nothing to do here - } }