Return-Path: X-Original-To: apmail-asterixdb-commits-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D90D418C0A for ; Sat, 20 Feb 2016 00:33:09 +0000 (UTC) Received: (qmail 10514 invoked by uid 500); 20 Feb 2016 00:33:09 -0000 Delivered-To: apmail-asterixdb-commits-archive@asterixdb.apache.org Received: (qmail 10478 invoked by uid 500); 20 Feb 2016 00:33:09 -0000 Mailing-List: contact commits-help@asterixdb.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@asterixdb.incubator.apache.org Delivered-To: mailing list commits@asterixdb.incubator.apache.org Received: (qmail 10469 invoked by uid 99); 20 Feb 2016 00:33:09 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Feb 2016 00:33:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 5DDA818054A for ; Sat, 20 Feb 2016 00:33:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.549 X-Spam-Level: X-Spam-Status: No, score=-3.549 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.329] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id p-oJcqy0UvHm for ; Sat, 20 Feb 2016 00:33:05 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 74F725F1E5 for ; Sat, 20 Feb 2016 00:33:04 +0000 (UTC) Received: (qmail 10448 invoked by uid 99); 20 Feb 2016 00:33:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Feb 2016 00:33:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D6100E0092; Sat, 20 Feb 2016 00:33:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tillw@apache.org To: commits@asterixdb.incubator.apache.org Message-Id: <352eaf8db977445997d4a942e133bdc6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-asterixdb git commit: ASTERIXDB-1304: remove interfaces and consolidate Date: Sat, 20 Feb 2016 00:33:03 +0000 (UTC) Repository: incubator-asterixdb Updated Branches: refs/heads/master 138431917 -> 478d60ea0 ASTERIXDB-1304: remove interfaces and consolidate Change-Id: Ibb8819f51c655fadaf47fdbad0af5f66b261b2b5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/643 Reviewed-by: Michael Blow Reviewed-by: Till Westmann Tested-by: Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/478d60ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/478d60ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/478d60ea Branch: refs/heads/master Commit: 478d60ea017d95626c52242f217b568e264cb2ec Parents: 1384319 Author: Till Westmann Authored: Thu Feb 18 17:27:09 2016 -0800 Committer: Till Westmann Committed: Fri Feb 19 16:28:00 2016 -0800 ---------------------------------------------------------------------- .../operators/physical/CommitRuntime.java | 2 - .../common/parse/IParseFileSplitsDecl.java | 33 -------------- .../asterix/common/parse/ITupleForwarder.java | 47 -------------------- .../common/parse/ITupleParserPolicy.java | 45 ------------------- .../external/api/IDataFlowController.java | 1 - .../asterix/external/api/ITupleForwarder.java | 47 ++++++++++++++++++++ .../dataflow/AbstractDataFlowController.java | 2 +- .../AbstractFeedDataFlowController.java | 2 +- .../dataflow/CounterTimerTupleForwarder.java | 2 +- .../external/dataflow/FeedTupleForwarder.java | 2 +- .../dataflow/FrameFullTupleForwarder.java | 2 +- .../dataflow/RateControlledTupleForwarder.java | 2 +- .../asterix/external/util/DataflowUtils.java | 4 +- .../asterix/external/util/FeedMessageUtils.java | 2 +- .../adapter/TestTypedAdapterFactory.java | 2 +- 15 files changed, 57 insertions(+), 138 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitRuntime.java ---------------------------------------------------------------------- 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 @@ public class CommitRuntime implements IPushRuntime { 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 @@ public class CommitRuntime implements IPushRuntime { 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-common/src/main/java/org/apache/asterix/common/parse/IParseFileSplitsDecl.java ---------------------------------------------------------------------- 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(); -} http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleForwarder.java ---------------------------------------------------------------------- diff --git a/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleForwarder.java b/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleForwarder.java deleted file mode 100644 index afd8920..0000000 --- a/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleForwarder.java +++ /dev/null @@ -1,47 +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 ITupleForwarder { - - public static final String FORWARD_POLICY = "forward-policy"; - - public enum TupleForwardPolicy { - FRAME_FULL, - COUNTER_TIMER_EXPIRED, - RATE_CONTROLLED, - FEED - } - - public void configure(Map configuration) throws HyracksDataException; - - public void initialize(IHyracksTaskContext ctx, IFrameWriter frameWriter) throws HyracksDataException; - - public void addTuple(ArrayTupleBuilder tb) throws HyracksDataException; - - public void close() throws HyracksDataException; - -} http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-common/src/main/java/org/apache/asterix/common/parse/ITupleParserPolicy.java ---------------------------------------------------------------------- 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 configuration) throws HyracksDataException; - - public void initialize(IHyracksTaskContext ctx, IFrameWriter writer) throws HyracksDataException; - - public void addTuple(ArrayTupleBuilder tb) throws HyracksDataException; - - public void close() throws HyracksDataException; -} http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataFlowController.java ---------------------------------------------------------------------- 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 @@ package org.apache.asterix.external.api; 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/api/ITupleForwarder.java ---------------------------------------------------------------------- diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/api/ITupleForwarder.java b/asterix-external-data/src/main/java/org/apache/asterix/external/api/ITupleForwarder.java new file mode 100644 index 0000000..c0add02 --- /dev/null +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/api/ITupleForwarder.java @@ -0,0 +1,47 @@ +/* + * 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.external.api; + +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 ITupleForwarder { + + public static final String FORWARD_POLICY = "forward-policy"; + + public enum TupleForwardPolicy { + FRAME_FULL, + COUNTER_TIMER_EXPIRED, + RATE_CONTROLLED, + FEED + } + + public void configure(Map configuration) throws HyracksDataException; + + public void initialize(IHyracksTaskContext ctx, IFrameWriter frameWriter) throws HyracksDataException; + + public void addTuple(ArrayTupleBuilder tb) throws HyracksDataException; + + public void close() throws HyracksDataException; + +} http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractDataFlowController.java ---------------------------------------------------------------------- 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 @@ package org.apache.asterix.external.dataflow; 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/AbstractFeedDataFlowController.java ---------------------------------------------------------------------- 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 @@ package org.apache.asterix.external.dataflow; 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/CounterTimerTupleForwarder.java ---------------------------------------------------------------------- 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.TimerTask; 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FeedTupleForwarder.java ---------------------------------------------------------------------- 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 @@ package org.apache.asterix.external.dataflow; 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/FrameFullTupleForwarder.java ---------------------------------------------------------------------- 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 @@ package org.apache.asterix.external.dataflow; 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/dataflow/RateControlledTupleForwarder.java ---------------------------------------------------------------------- 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 @@ package org.apache.asterix.external.dataflow; 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/util/DataflowUtils.java ---------------------------------------------------------------------- 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 @@ package org.apache.asterix.external.util; 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; http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedMessageUtils.java ---------------------------------------------------------------------- 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 class FeedMessageUtils { } 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(); } http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/478d60ea/asterix-external-data/src/test/java/org/apache/asterix/external/library/adapter/TestTypedAdapterFactory.java ---------------------------------------------------------------------- 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.io.InputStream; 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;