Yingyi Bu has submitted this change and it was merged. Change subject: Eliminate Duplicate Hyracks Classes From AsterixDB ......................................................................
Eliminate Duplicate Hyracks Classes From AsterixDB The following hyracks classes (package org/apache/hyracks/dataflow/std/ misc) are duplicated in asterixdb repo: - ConstantTupleSourceOperatorDescriptor - ConstantTupleSourceOperatorNodePushable This eliminates the copies in asterixdb repo. Change-Id: I64bded72def25fa34ea1545d4bf0f01218d04b9f Reviewed-on: https://asterix-gerrit.ics.uci.edu/722 Tested-by: Jenkins <[email protected]> Reviewed-by: Yingyi Bu <[email protected]> --- D asterix-app/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java D asterix-app/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorNodePushable.java 2 files changed, 0 insertions(+), 111 deletions(-) Approvals: Yingyi Bu: Looks good to me, approved Jenkins: Verified diff --git a/asterix-app/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java b/asterix-app/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java deleted file mode 100644 index c06079b..0000000 --- a/asterix-app/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java +++ /dev/null @@ -1,51 +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.hyracks.dataflow.std.misc; - -import org.apache.hyracks.api.context.IHyracksTaskContext; -import org.apache.hyracks.api.dataflow.IOperatorNodePushable; -import org.apache.hyracks.api.dataflow.value.IRecordDescriptorProvider; -import org.apache.hyracks.api.dataflow.value.RecordDescriptor; -import org.apache.hyracks.api.exceptions.HyracksDataException; -import org.apache.hyracks.api.job.JobSpecification; -import org.apache.hyracks.dataflow.std.base.AbstractSingleActivityOperatorDescriptor; - -public class ConstantTupleSourceOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor { - - private static final long serialVersionUID = 1L; - - private int[] fieldSlots; - private byte[] tupleData; - private int tupleSize; - - public ConstantTupleSourceOperatorDescriptor(JobSpecification spec, RecordDescriptor recDesc, int[] fieldSlots, - byte[] tupleData, int tupleSize) { - super(spec, 0, 1); - this.tupleData = tupleData; - this.fieldSlots = fieldSlots; - this.tupleSize = tupleSize; - recordDescriptors[0] = recDesc; - } - - @Override - public IOperatorNodePushable createPushRuntime(IHyracksTaskContext ctx, - IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) throws HyracksDataException { - return new ConstantTupleSourceOperatorNodePushable(ctx, fieldSlots, tupleData, tupleSize); - } -} diff --git a/asterix-app/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorNodePushable.java b/asterix-app/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorNodePushable.java deleted file mode 100644 index 5ee2169..0000000 --- a/asterix-app/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorNodePushable.java +++ /dev/null @@ -1,60 +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.hyracks.dataflow.std.misc; - -import org.apache.hyracks.api.comm.VSizeFrame; -import org.apache.hyracks.api.context.IHyracksTaskContext; -import org.apache.hyracks.api.exceptions.HyracksDataException; -import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAppender; -import org.apache.hyracks.dataflow.std.base.AbstractUnaryOutputSourceOperatorNodePushable; - -public class ConstantTupleSourceOperatorNodePushable extends AbstractUnaryOutputSourceOperatorNodePushable { - private IHyracksTaskContext ctx; - - private int[] fieldSlots; - private byte[] tupleData; - private int tupleSize; - - public ConstantTupleSourceOperatorNodePushable(IHyracksTaskContext ctx, int[] fieldSlots, byte[] tupleData, - int tupleSize) { - super(); - this.fieldSlots = fieldSlots; - this.tupleData = tupleData; - this.tupleSize = tupleSize; - this.ctx = ctx; - } - - @Override - public void initialize() throws HyracksDataException { - FrameTupleAppender appender = new FrameTupleAppender(new VSizeFrame(ctx)); - if (fieldSlots != null && tupleData != null && tupleSize > 0) { - appender.append(fieldSlots, tupleData, 0, tupleSize); - } - try { - writer.open(); - appender.write(writer, true); - } catch (Throwable th) { - writer.fail(); - throw new HyracksDataException(th); - } finally { - writer.close(); - } - } -} -- To view, visit https://asterix-gerrit.ics.uci.edu/722 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64bded72def25fa34ea1545d4bf0f01218d04b9f Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: Yingyi Bu <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
