Return-Path: X-Original-To: apmail-asterixdb-notifications-archive@minotaur.apache.org Delivered-To: apmail-asterixdb-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C3385187F9 for ; Mon, 15 Feb 2016 13:32:59 +0000 (UTC) Received: (qmail 47121 invoked by uid 500); 15 Feb 2016 13:32:59 -0000 Delivered-To: apmail-asterixdb-notifications-archive@asterixdb.apache.org Received: (qmail 47087 invoked by uid 500); 15 Feb 2016 13:32:59 -0000 Mailing-List: contact notifications-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 notifications@asterixdb.incubator.apache.org Received: (qmail 47078 invoked by uid 99); 15 Feb 2016 13:32:59 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 15 Feb 2016 13:32:59 +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 D46BD180059 for ; Mon, 15 Feb 2016 13:32:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 2.126 X-Spam-Level: ** X-Spam-Status: No, score=2.126 tagged_above=-999 required=6.31 tests=[MISSING_HEADERS=1.207, SPF_FAIL=0.919] 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 qImE2xlRvuLP for ; Mon, 15 Feb 2016 13:32:57 +0000 (UTC) Received: from unhygienix.ics.uci.edu (unhygienix.ics.uci.edu [128.195.14.130]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with ESMTP id 03ABB5FAD8 for ; Mon, 15 Feb 2016 13:32:57 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by unhygienix.ics.uci.edu (Postfix) with ESMTP id E94A8241982; Mon, 15 Feb 2016 05:28:33 -0800 (PST) Date: Mon, 15 Feb 2016 05:28:33 -0800 From: "abdullah alamoudi (Code Review)" CC: Jianfeng Jia , Jenkins , Till Westmann Reply-To: bamousaa@gmail.com X-Gerrit-MessageType: merged Subject: Change in asterixdb[master]: Add compatibility for Socket adapter X-Gerrit-Change-Id: I8c8c78598c0cfea36c18503a73b002ece700be71 X-Gerrit-ChangeURL: X-Gerrit-Commit: aa9879fb06d5a1e634a90cf98cf20073bfa88b42 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/2.8.4 Message-Id: <20160215132833.E94A8241982@unhygienix.ics.uci.edu> abdullah alamoudi has submitted this change and it was merged. Change subject: Add compatibility for Socket adapter ...................................................................... Add compatibility for Socket adapter This change allows the use of alias for socket adapter Change-Id: I8c8c78598c0cfea36c18503a73b002ece700be71 Reviewed-on: https://asterix-gerrit.ics.uci.edu/609 Tested-by: Jenkins Reviewed-by: abdullah alamoudi --- M asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataCompatibilityUtils.java 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: abdullah alamoudi: Looks good to me, approved Jenkins: Verified diff --git a/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataCompatibilityUtils.java b/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataCompatibilityUtils.java index 4e6401a..7bfe698 100644 --- a/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataCompatibilityUtils.java +++ b/asterix-external-data/src/main/java/org/apache/asterix/external/util/ExternalDataCompatibilityUtils.java @@ -78,6 +78,15 @@ configuration.put(ExternalDataConstants.KEY_READER_STREAM, ExternalDataConstants.ALIAS_LOCALFS_ADAPTER); } + // Socket + if (adapterName.equalsIgnoreCase(ExternalDataConstants.ALIAS_SOCKET_ADAPTER)) { + if (configuration.get(ExternalDataConstants.KEY_FORMAT) == null) { + throw new AsterixException("Unspecified format parameter for socket adapter"); + } + configuration.put(ExternalDataConstants.KEY_READER, configuration.get(ExternalDataConstants.KEY_FORMAT)); + configuration.put(ExternalDataConstants.KEY_READER_STREAM, ExternalDataConstants.STREAM_SOCKET); + } + // Twitter (Pull) if (adapterName.equals(ExternalDataConstants.ALIAS_TWITTER_PULL_ADAPTER)) { configuration.put(ExternalDataConstants.KEY_READER, ExternalDataConstants.READER_TWITTER_PULL); -- To view, visit https://asterix-gerrit.ics.uci.edu/609 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8c8c78598c0cfea36c18503a73b002ece700be71 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudi Gerrit-Reviewer: Jenkins Gerrit-Reviewer: Jianfeng Jia Gerrit-Reviewer: Till Westmann Gerrit-Reviewer: abdullah alamoudi