Till Westmann has submitted this change and it was merged. Change subject: ASTERIXDB-1304: remove interfaces and consolidate ......................................................................
ASTERIXDB-1304: remove interfaces and consolidate Change-Id: Ibb8819f51c655fadaf47fdbad0af5f66b261b2b5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/643 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Till Westmann <[email protected]> Tested-by: Jenkins <[email protected]> --- M asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java D asterix-common/src/main/java/org/apache/asterix/common/parse/IParseFileSplitsDecl.java D asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleParserPolicy.java M asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java R asterix-external-data/src/main/java/org/apache/asterix/external/api/ITupleForwarder.java M asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractDataFlowController.java M asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractFeedDataFlowController.java M asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/CounterTimerTupleForwarder.java M asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedTupleForwarder.java M asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FrameFullTupleForwarder.java M asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/RateControlledTupleForwarder.java M asterix-external-data/src/main/java/org/apache/asterix/external/util/DataflowUtils.java M asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedMessageUtils.java M asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java 14 files changed, 11 insertions(+), 92 deletions(-) Approvals: Michael Blow: Looks good to me, but someone else must approve Till Westmann: Looks good to me, approved Jenkins: Verified diff --git a/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java b/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java index 7cacb70..0f31935 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java @@ -54,7 +54,6 @@ protected final long[] longHashes; protected final LogRecord logRecord; protected final FrameTupleReference frameTupleReference; - protected final IHyracksTaskContext ctx; protected ITransactionContext transactionContext; protected FrameTupleAccessor frameTupleAccessor; @@ -64,7 +63,6 @@ boolean isTemporaryDatasetWriteJob, boolean isWriteTransaction, int resourcePartition) { IAsterixAppRuntimeContext runtimeCtx = (IAsterixAppRuntimeContext) ctx.getJobletContext() .getApplicationContext().getApplicationObject(); - this.ctx = ctx; this.transactionManager = runtimeCtx.getTransactionSubsystem().getTransactionManager(); this.logMgr = runtimeCtx.getTransactionSubsystem().getLogManager(); this.jobId = jobId; diff --git a/asterix-common/src/main/java/org/apache/asterix/common/parse/IParseFileSplitsDecl.java b/asterix-common/src/main/java/org/apache/asterix/common/parse/IParseFileSplitsDecl.java deleted file mode 100644 index 6e9ce2d..0000000 --- a/asterix-common/src/main/java/org/apache/asterix/common/parse/IParseFileSplitsDecl.java +++ /dev/null @@ -1,33 +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.asterix.common.parse; - -import org.apache.hyracks.dataflow.std.file.FileSplit; - -public interface IParseFileSplitsDecl { - public boolean isDelimitedFileFormat(); - - public char getDelimChar(); - - public char getQuote(); - - public boolean getHasHeader(); - - public FileSplit[] getSplits(); -} diff --git a/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleParserPolicy.java b/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleParserPolicy.java deleted file mode 100644 index bba23a2..0000000 --- a/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleParserPolicy.java +++ /dev/null @@ -1,45 +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.asterix.common.parse; - -import java.util.Map; - -import org.apache.hyracks.api.comm.IFrameWriter; -import org.apache.hyracks.api.context.IHyracksTaskContext; -import org.apache.hyracks.api.exceptions.HyracksDataException; -import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder; - -public interface ITupleParserPolicy { - - public enum TupleParserPolicy { - FRAME_FULL, - TIME_COUNT_ELAPSED, - RATE_CONTROLLED - } - - public TupleParserPolicy getType(); - - public void configure(Map<String, String> configuration) throws HyracksDataException; - - public void initialize(IHyracksTaskContext ctx, IFrameWriter writer) throws HyracksDataException; - - public void addTuple(ArrayTupleBuilder tb) throws HyracksDataException; - - public void close() throws HyracksDataException; -} diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java b/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java index e4435a1..d9ed131 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java @@ -20,7 +20,6 @@ import java.util.Map; -import org.apache.asterix.common.parse.ITupleForwarder; import org.apache.hyracks.api.comm.IFrameWriter; import org.apache.hyracks.api.context.IHyracksTaskContext; import org.apache.hyracks.api.exceptions.HyracksDataException; diff --git a/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleForwarder.java b/asterix-external-data/src/main/java/org/apache/asterix/external/api/ITupleForwarder.java similarity index 97% rename from asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleForwarder.java rename to asterix-external-data/src/main/java/org/apache/asterix/external/api/ITupleForwarder.java index afd8920..c0add02 100644 --- a/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleForwarder.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/api/ITupleForwarder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.common.parse; +package org.apache.asterix.external.api; import java.util.Map; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractDataFlowController.java b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractDataFlowController.java index c5c8e48..a5aaac4 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractDataFlowController.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractDataFlowController.java @@ -20,7 +20,7 @@ import java.util.Map; -import org.apache.asterix.common.parse.ITupleForwarder; +import org.apache.asterix.external.api.ITupleForwarder; import org.apache.asterix.external.api.IDataFlowController; import org.apache.hyracks.api.comm.IFrameWriter; import org.apache.hyracks.api.context.IHyracksTaskContext; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractFeedDataFlowController.java b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractFeedDataFlowController.java index 461eaf9..ef71769 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractFeedDataFlowController.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractFeedDataFlowController.java @@ -20,7 +20,7 @@ import java.util.Map; -import org.apache.asterix.common.parse.ITupleForwarder; +import org.apache.asterix.external.api.ITupleForwarder; import org.apache.asterix.external.api.IDataFlowController; import org.apache.hyracks.api.comm.IFrameWriter; import org.apache.hyracks.api.context.IHyracksTaskContext; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/CounterTimerTupleForwarder.java b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/CounterTimerTupleForwarder.java index 4bff040..93f866c 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/CounterTimerTupleForwarder.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/CounterTimerTupleForwarder.java @@ -24,7 +24,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.apache.asterix.common.parse.ITupleForwarder; +import org.apache.asterix.external.api.ITupleForwarder; import org.apache.hyracks.api.comm.IFrame; import org.apache.hyracks.api.comm.IFrameWriter; import org.apache.hyracks.api.comm.VSizeFrame; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedTupleForwarder.java b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedTupleForwarder.java index 34a0207..e728fab 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedTupleForwarder.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedTupleForwarder.java @@ -21,7 +21,7 @@ import java.nio.ByteBuffer; import java.util.Map; -import org.apache.asterix.common.parse.ITupleForwarder; +import org.apache.asterix.external.api.ITupleForwarder; import org.apache.asterix.external.util.DataflowUtils; import org.apache.asterix.external.util.FeedMessageUtils; import org.apache.hyracks.api.comm.IFrame; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FrameFullTupleForwarder.java b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FrameFullTupleForwarder.java index bc6a780..2caf98c 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FrameFullTupleForwarder.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FrameFullTupleForwarder.java @@ -20,7 +20,7 @@ import java.util.Map; -import org.apache.asterix.common.parse.ITupleForwarder; +import org.apache.asterix.external.api.ITupleForwarder; import org.apache.hyracks.api.comm.IFrame; import org.apache.hyracks.api.comm.IFrameWriter; import org.apache.hyracks.api.comm.VSizeFrame; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/RateControlledTupleForwarder.java b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/RateControlledTupleForwarder.java index afe7b01..f8fcd6f 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/RateControlledTupleForwarder.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/RateControlledTupleForwarder.java @@ -20,7 +20,7 @@ import java.util.Map; -import org.apache.asterix.common.parse.ITupleForwarder; +import org.apache.asterix.external.api.ITupleForwarder; import org.apache.hyracks.api.comm.IFrame; import org.apache.hyracks.api.comm.IFrameWriter; import org.apache.hyracks.api.comm.VSizeFrame; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/util/DataflowUtils.java b/asterix-external-data/src/main/java/org/apache/asterix/external/util/DataflowUtils.java index 27a1d0e..e604d42 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/util/DataflowUtils.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/util/DataflowUtils.java @@ -21,8 +21,8 @@ import java.util.Map; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.common.parse.ITupleForwarder; -import org.apache.asterix.common.parse.ITupleForwarder.TupleForwardPolicy; +import org.apache.asterix.external.api.ITupleForwarder; +import org.apache.asterix.external.api.ITupleForwarder.TupleForwardPolicy; import org.apache.asterix.external.dataflow.CounterTimerTupleForwarder; import org.apache.asterix.external.dataflow.FeedTupleForwarder; import org.apache.asterix.external.dataflow.FrameFullTupleForwarder; diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedMessageUtils.java b/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedMessageUtils.java index 4175ce1..68783ca 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedMessageUtils.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedMessageUtils.java @@ -25,5 +25,5 @@ } public static final byte NULL_FEED_MESSAGE = (byte) MessageType.NULL.ordinal(); - public static final byte ACK_REQ_FEED_MESSAGE = (byte) MessageType.ACK_REQUEST.ordinal();; + public static final byte ACK_REQ_FEED_MESSAGE = (byte) MessageType.ACK_REQUEST.ordinal(); } diff --git a/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java b/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java index 6921392..852b31d 100644 --- a/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java +++ b/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java @@ -22,7 +22,7 @@ import java.util.Map; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.common.parse.ITupleForwarder; +import org.apache.asterix.external.api.ITupleForwarder; import org.apache.asterix.external.api.IAdapterFactory; import org.apache.asterix.external.api.IDataSourceAdapter; import org.apache.asterix.external.parser.ADMDataParser; -- To view, visit https://asterix-gerrit.ics.uci.edu/643 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb8819f51c655fadaf47fdbad0af5f66b261b2b5 Gerrit-PatchSet: 4 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
