Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 53FA3200BB8 for ; Fri, 30 Sep 2016 04:15:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 528F5160AE8; Fri, 30 Sep 2016 02:15:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id AF0DB160AE3 for ; Fri, 30 Sep 2016 04:15:34 +0200 (CEST) Received: (qmail 80297 invoked by uid 500); 30 Sep 2016 02:15:33 -0000 Mailing-List: contact commits-help@impala.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@impala.incubator.apache.org Delivered-To: mailing list commits@impala.incubator.apache.org Received: (qmail 80288 invoked by uid 99); 30 Sep 2016 02:15:33 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Sep 2016 02:15:33 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 520A2C1262 for ; Fri, 30 Sep 2016 02:15:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 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=-2.999] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id LZvyUqfmsmBB for ; Fri, 30 Sep 2016 02:14:51 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id D8A1E6123F for ; Fri, 30 Sep 2016 02:14:20 +0000 (UTC) Received: (qmail 75241 invoked by uid 99); 30 Sep 2016 02:14:19 -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; Fri, 30 Sep 2016 02:14:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32A87EEE1B; Fri, 30 Sep 2016 02:14:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kwho@apache.org To: commits@impala.incubator.apache.org Date: Fri, 30 Sep 2016 02:15:10 -0000 Message-Id: <4b47361a52f74fe2a4ce8cb282808a58@git.apache.org> In-Reply-To: <6b67c53a3483457da7e81bb1ab8bb082@git.apache.org> References: <6b67c53a3483457da7e81bb1ab8bb082@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [53/61] incubator-impala git commit: IMPALA-3786: Replace "cloudera" with "apache" (part 2) archived-at: Fri, 30 Sep 2016 02:15:37 -0000 http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/HdfsCachingUtil.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/HdfsCachingUtil.java b/fe/src/main/java/org/apache/impala/util/HdfsCachingUtil.java index a3a1fa0..0ee7d28 100644 --- a/fe/src/main/java/org/apache/impala/util/HdfsCachingUtil.java +++ b/fe/src/main/java/org/apache/impala/util/HdfsCachingUtil.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.io.IOException; import java.util.Map; @@ -30,13 +30,13 @@ import org.apache.hadoop.hdfs.protocol.CacheDirectiveInfo.Expiration; import org.apache.hadoop.ipc.RemoteException; import org.apache.log4j.Logger; -import com.cloudera.impala.analysis.TableName; -import com.cloudera.impala.catalog.HdfsPartition; -import com.cloudera.impala.common.FileSystemUtil; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.common.ImpalaRuntimeException; -import com.cloudera.impala.thrift.JniCatalogConstants; -import com.cloudera.impala.thrift.THdfsCachingOp; +import org.apache.impala.analysis.TableName; +import org.apache.impala.catalog.HdfsPartition; +import org.apache.impala.common.FileSystemUtil; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.common.ImpalaRuntimeException; +import org.apache.impala.thrift.JniCatalogConstants; +import org.apache.impala.thrift.THdfsCachingOp; import com.google.common.base.Preconditions; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/KuduUtil.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/KuduUtil.java b/fe/src/main/java/org/apache/impala/util/KuduUtil.java index 4f627d8..b9f8653 100644 --- a/fe/src/main/java/org/apache/impala/util/KuduUtil.java +++ b/fe/src/main/java/org/apache/impala/util/KuduUtil.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.io.StringReader; import java.util.HashMap; @@ -25,11 +25,11 @@ import javax.json.Json; import javax.json.JsonArray; import javax.json.JsonReader; -import com.cloudera.impala.catalog.ScalarType; -import com.cloudera.impala.common.ImpalaRuntimeException; -import com.cloudera.impala.thrift.TDistributeByRangeParam; -import com.cloudera.impala.thrift.TRangeLiteral; -import com.cloudera.impala.thrift.TRangeLiteralList; +import org.apache.impala.catalog.ScalarType; +import org.apache.impala.common.ImpalaRuntimeException; +import org.apache.impala.thrift.TDistributeByRangeParam; +import org.apache.impala.thrift.TRangeLiteral; +import org.apache.impala.thrift.TRangeLiteralList; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -43,7 +43,7 @@ import org.apache.kudu.Type; import org.apache.kudu.client.KuduTable; import org.apache.kudu.client.PartialRow; -import static com.cloudera.impala.catalog.Type.parseColumnType; +import static org.apache.impala.catalog.Type.parseColumnType; import static java.lang.String.format; public class KuduUtil { @@ -224,7 +224,7 @@ public class KuduUtil { * Converts a given Impala catalog type to the Kudu type. Throws an exception if the * type cannot be converted. */ - public static Type fromImpalaType(com.cloudera.impala.catalog.Type t) + public static Type fromImpalaType(org.apache.impala.catalog.Type t) throws ImpalaRuntimeException { if (!t.isScalarType()) { throw new ImpalaRuntimeException(format( http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/ListMap.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/ListMap.java b/fe/src/main/java/org/apache/impala/util/ListMap.java index 989a510..07de611 100644 --- a/fe/src/main/java/org/apache/impala/util/ListMap.java +++ b/fe/src/main/java/org/apache/impala/util/ListMap.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/MaxRowsProcessedVisitor.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/MaxRowsProcessedVisitor.java b/fe/src/main/java/org/apache/impala/util/MaxRowsProcessedVisitor.java index ac85ff8..d4b3da9 100644 --- a/fe/src/main/java/org/apache/impala/util/MaxRowsProcessedVisitor.java +++ b/fe/src/main/java/org/apache/impala/util/MaxRowsProcessedVisitor.java @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; -import com.cloudera.impala.planner.NestedLoopJoinNode; -import com.cloudera.impala.planner.HashJoinNode; -import com.cloudera.impala.planner.PlanNode; -import com.cloudera.impala.planner.ScanNode; +import org.apache.impala.planner.NestedLoopJoinNode; +import org.apache.impala.planner.HashJoinNode; +import org.apache.impala.planner.PlanNode; +import org.apache.impala.planner.ScanNode; /** * Returns the maximum number of rows processed by any node in a given plan tree http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/MembershipSnapshot.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/MembershipSnapshot.java b/fe/src/main/java/org/apache/impala/util/MembershipSnapshot.java index 57574fe..24d1412 100644 --- a/fe/src/main/java/org/apache/impala/util/MembershipSnapshot.java +++ b/fe/src/main/java/org/apache/impala/util/MembershipSnapshot.java @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import com.cloudera.impala.thrift.TNetworkAddress; -import com.cloudera.impala.thrift.TUpdateMembershipRequest; +import org.apache.impala.thrift.TNetworkAddress; +import org.apache.impala.thrift.TUpdateMembershipRequest; import com.google.common.collect.Sets; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/MetaStoreUtil.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/MetaStoreUtil.java b/fe/src/main/java/org/apache/impala/util/MetaStoreUtil.java index 540c749..6968f33 100644 --- a/fe/src/main/java/org/apache/impala/util/MetaStoreUtil.java +++ b/fe/src/main/java/org/apache/impala/util/MetaStoreUtil.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.util.List; import java.util.Map; @@ -27,8 +27,8 @@ import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.log4j.Logger; import org.apache.thrift.TException; -import com.cloudera.impala.catalog.HdfsTable; -import com.cloudera.impala.common.AnalysisException; +import org.apache.impala.catalog.HdfsTable; +import org.apache.impala.common.AnalysisException; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/NativeLibUtil.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/NativeLibUtil.java b/fe/src/main/java/org/apache/impala/util/NativeLibUtil.java index 08c929b..877b36b 100644 --- a/fe/src/main/java/org/apache/impala/util/NativeLibUtil.java +++ b/fe/src/main/java/org/apache/impala/util/NativeLibUtil.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.io.File; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/NativeLogger.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/NativeLogger.java b/fe/src/main/java/org/apache/impala/util/NativeLogger.java index 9956ca4..ebba884 100644 --- a/fe/src/main/java/org/apache/impala/util/NativeLogger.java +++ b/fe/src/main/java/org/apache/impala/util/NativeLogger.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/PatternMatcher.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/PatternMatcher.java b/fe/src/main/java/org/apache/impala/util/PatternMatcher.java index bc85d18..37fa208 100644 --- a/fe/src/main/java/org/apache/impala/util/PatternMatcher.java +++ b/fe/src/main/java/org/apache/impala/util/PatternMatcher.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.util.Arrays; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/RequestPoolService.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/RequestPoolService.java b/fe/src/main/java/org/apache/impala/util/RequestPoolService.java index c1c9bd7..c1e8224 100644 --- a/fe/src/main/java/org/apache/impala/util/RequestPoolService.java +++ b/fe/src/main/java/org/apache/impala/util/RequestPoolService.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.io.File; import java.io.IOException; @@ -37,18 +37,18 @@ import org.apache.thrift.protocol.TBinaryProtocol; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cloudera.impala.authorization.User; -import com.cloudera.impala.common.ByteUnits; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.common.InternalException; -import com.cloudera.impala.common.JniUtil; -import com.cloudera.impala.thrift.TErrorCode; -import com.cloudera.impala.thrift.TPoolConfigParams; -import com.cloudera.impala.thrift.TPoolConfig; -import com.cloudera.impala.thrift.TResolveRequestPoolParams; -import com.cloudera.impala.thrift.TResolveRequestPoolResult; -import com.cloudera.impala.thrift.TStatus; -import com.cloudera.impala.util.FileWatchService.FileChangeListener; +import org.apache.impala.authorization.User; +import org.apache.impala.common.ByteUnits; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.common.InternalException; +import org.apache.impala.common.JniUtil; +import org.apache.impala.thrift.TErrorCode; +import org.apache.impala.thrift.TPoolConfigParams; +import org.apache.impala.thrift.TPoolConfig; +import org.apache.impala.thrift.TResolveRequestPoolParams; +import org.apache.impala.thrift.TResolveRequestPoolResult; +import org.apache.impala.thrift.TStatus; +import org.apache.impala.util.FileWatchService.FileChangeListener; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.base.Strings; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/SentryPolicyService.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/SentryPolicyService.java b/fe/src/main/java/org/apache/impala/util/SentryPolicyService.java index 4f39b3c..083ad48 100644 --- a/fe/src/main/java/org/apache/impala/util/SentryPolicyService.java +++ b/fe/src/main/java/org/apache/impala/util/SentryPolicyService.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.util.List; @@ -30,16 +30,16 @@ import org.apache.sentry.service.thrift.SentryServiceClientFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cloudera.impala.analysis.PrivilegeSpec; -import com.cloudera.impala.authorization.SentryConfig; -import com.cloudera.impala.authorization.User; -import com.cloudera.impala.catalog.AuthorizationException; -import com.cloudera.impala.catalog.RolePrivilege; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.common.InternalException; -import com.cloudera.impala.thrift.TPrivilege; -import com.cloudera.impala.thrift.TPrivilegeLevel; -import com.cloudera.impala.thrift.TPrivilegeScope; +import org.apache.impala.analysis.PrivilegeSpec; +import org.apache.impala.authorization.SentryConfig; +import org.apache.impala.authorization.User; +import org.apache.impala.catalog.AuthorizationException; +import org.apache.impala.catalog.RolePrivilege; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.common.InternalException; +import org.apache.impala.thrift.TPrivilege; +import org.apache.impala.thrift.TPrivilegeLevel; +import org.apache.impala.thrift.TPrivilegeScope; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/SentryProxy.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/SentryProxy.java b/fe/src/main/java/org/apache/impala/util/SentryProxy.java index 76e4931..07669ec 100644 --- a/fe/src/main/java/org/apache/impala/util/SentryProxy.java +++ b/fe/src/main/java/org/apache/impala/util/SentryProxy.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.util.List; import java.util.Set; @@ -28,16 +28,16 @@ import org.apache.sentry.provider.db.service.thrift.TSentryGroup; import org.apache.sentry.provider.db.service.thrift.TSentryPrivilege; import org.apache.sentry.provider.db.service.thrift.TSentryRole; -import com.cloudera.impala.authorization.SentryConfig; -import com.cloudera.impala.authorization.User; -import com.cloudera.impala.catalog.AuthorizationException; -import com.cloudera.impala.catalog.CatalogException; -import com.cloudera.impala.catalog.CatalogServiceCatalog; -import com.cloudera.impala.catalog.Role; -import com.cloudera.impala.catalog.RolePrivilege; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.common.ImpalaRuntimeException; -import com.cloudera.impala.thrift.TPrivilege; +import org.apache.impala.authorization.SentryConfig; +import org.apache.impala.authorization.User; +import org.apache.impala.catalog.AuthorizationException; +import org.apache.impala.catalog.CatalogException; +import org.apache.impala.catalog.CatalogServiceCatalog; +import org.apache.impala.catalog.Role; +import org.apache.impala.catalog.RolePrivilege; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.common.ImpalaRuntimeException; +import org.apache.impala.thrift.TPrivilege; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/StatsHelper.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/StatsHelper.java b/fe/src/main/java/org/apache/impala/util/StatsHelper.java index 9956c79..cb110ac 100644 --- a/fe/src/main/java/org/apache/impala/util/StatsHelper.java +++ b/fe/src/main/java/org/apache/impala/util/StatsHelper.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; /** * This is a utility class to incrementally calculate average, variance http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/TAccessLevelUtil.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/TAccessLevelUtil.java b/fe/src/main/java/org/apache/impala/util/TAccessLevelUtil.java index 2e58efa..0e59252 100644 --- a/fe/src/main/java/org/apache/impala/util/TAccessLevelUtil.java +++ b/fe/src/main/java/org/apache/impala/util/TAccessLevelUtil.java @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; -import com.cloudera.impala.thrift.TAccessLevel; +import org.apache.impala.thrift.TAccessLevel; /** * Utility functions for working with TAccessLevel types. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/TColumnValueUtil.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/TColumnValueUtil.java b/fe/src/main/java/org/apache/impala/util/TColumnValueUtil.java index 23d6eb6..16085b0 100644 --- a/fe/src/main/java/org/apache/impala/util/TColumnValueUtil.java +++ b/fe/src/main/java/org/apache/impala/util/TColumnValueUtil.java @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; -import com.cloudera.impala.thrift.TColumnValue; +import org.apache.impala.thrift.TColumnValue; /** * Utility functions for working with TColumnValue objects. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/TResultRowBuilder.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/TResultRowBuilder.java b/fe/src/main/java/org/apache/impala/util/TResultRowBuilder.java index ae70eb4..1481823 100644 --- a/fe/src/main/java/org/apache/impala/util/TResultRowBuilder.java +++ b/fe/src/main/java/org/apache/impala/util/TResultRowBuilder.java @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; -import com.cloudera.impala.common.PrintUtils; -import com.cloudera.impala.thrift.TColumnValue; -import com.cloudera.impala.thrift.TResultRow; +import org.apache.impala.common.PrintUtils; +import org.apache.impala.thrift.TColumnValue; +import org.apache.impala.thrift.TResultRow; /** * Utility class for building TResultRows. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/TSessionStateUtil.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/TSessionStateUtil.java b/fe/src/main/java/org/apache/impala/util/TSessionStateUtil.java index f055a58..b52c213 100644 --- a/fe/src/main/java/org/apache/impala/util/TSessionStateUtil.java +++ b/fe/src/main/java/org/apache/impala/util/TSessionStateUtil.java @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; -import com.cloudera.impala.thrift.TSessionState; +import org.apache.impala.thrift.TSessionState; /** * Utility functions for working with TSessionState objects. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/UnsafeUtil.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/UnsafeUtil.java b/fe/src/main/java/org/apache/impala/util/UnsafeUtil.java index f0c69c5..8ba0f59 100644 --- a/fe/src/main/java/org/apache/impala/util/UnsafeUtil.java +++ b/fe/src/main/java/org/apache/impala/util/UnsafeUtil.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.lang.reflect.Field; import java.security.AccessController; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/util/Visitor.java ---------------------------------------------------------------------- diff --git a/fe/src/main/java/org/apache/impala/util/Visitor.java b/fe/src/main/java/org/apache/impala/util/Visitor.java index ac7b8e3..504c24a 100644 --- a/fe/src/main/java/org/apache/impala/util/Visitor.java +++ b/fe/src/main/java/org/apache/impala/util/Visitor.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; /** * Interface for visitor pattern http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/jflex/sql-scanner.flex ---------------------------------------------------------------------- diff --git a/fe/src/main/jflex/sql-scanner.flex b/fe/src/main/jflex/sql-scanner.flex index 8a1fe67..a0a0122 100644 --- a/fe/src/main/jflex/sql-scanner.flex +++ b/fe/src/main/jflex/sql-scanner.flex @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import java_cup.runtime.Symbol; import java.lang.Integer; @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.ArrayList; -import com.cloudera.impala.analysis.SqlParserSymbols; +import org.apache.impala.analysis.SqlParserSymbols; %% http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AnalyzeAuthStmtsTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AnalyzeAuthStmtsTest.java b/fe/src/test/java/org/apache/impala/analysis/AnalyzeAuthStmtsTest.java index ec12ab8..c37047f 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AnalyzeAuthStmtsTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AnalyzeAuthStmtsTest.java @@ -15,18 +15,18 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import java.util.HashSet; import org.junit.Test; -import com.cloudera.impala.authorization.AuthorizationConfig; -import com.cloudera.impala.catalog.Catalog; -import com.cloudera.impala.catalog.Role; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.testutil.TestUtils; -import com.cloudera.impala.thrift.TQueryCtx; +import org.apache.impala.authorization.AuthorizationConfig; +import org.apache.impala.catalog.Catalog; +import org.apache.impala.catalog.Role; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.testutil.TestUtils; +import org.apache.impala.thrift.TQueryCtx; public class AnalyzeAuthStmtsTest extends AnalyzerTest { public AnalyzeAuthStmtsTest() throws AnalysisException { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AnalyzeDDLTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AnalyzeDDLTest.java b/fe/src/test/java/org/apache/impala/analysis/AnalyzeDDLTest.java index f998e91..c47135e 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AnalyzeDDLTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AnalyzeDDLTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import static org.junit.Assert.assertTrue; @@ -34,22 +34,22 @@ import org.apache.hadoop.fs.permission.FsPermission; import org.junit.Assert; import org.junit.Test; -import com.cloudera.impala.catalog.ArrayType; -import com.cloudera.impala.catalog.CatalogException; -import com.cloudera.impala.catalog.ColumnStats; -import com.cloudera.impala.catalog.DataSource; -import com.cloudera.impala.catalog.DataSourceTable; -import com.cloudera.impala.catalog.PrimitiveType; -import com.cloudera.impala.catalog.ScalarType; -import com.cloudera.impala.catalog.StructField; -import com.cloudera.impala.catalog.StructType; -import com.cloudera.impala.catalog.Type; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.common.FileSystemUtil; -import com.cloudera.impala.common.FrontendTestBase; -import com.cloudera.impala.common.RuntimeEnv; -import com.cloudera.impala.testutil.TestUtils; -import com.cloudera.impala.util.MetaStoreUtil; +import org.apache.impala.catalog.ArrayType; +import org.apache.impala.catalog.CatalogException; +import org.apache.impala.catalog.ColumnStats; +import org.apache.impala.catalog.DataSource; +import org.apache.impala.catalog.DataSourceTable; +import org.apache.impala.catalog.PrimitiveType; +import org.apache.impala.catalog.ScalarType; +import org.apache.impala.catalog.StructField; +import org.apache.impala.catalog.StructType; +import org.apache.impala.catalog.Type; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.common.FileSystemUtil; +import org.apache.impala.common.FrontendTestBase; +import org.apache.impala.common.RuntimeEnv; +import org.apache.impala.testutil.TestUtils; +import org.apache.impala.util.MetaStoreUtil; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -2143,7 +2143,7 @@ public class AnalyzeDDLTest extends FrontendTestBase { "SYMBOL=" + symbol; final String hdfsPath = "hdfs://localhost:20500/test-warehouse/libTestUdfs.so"; final String javaFnSuffix = " LOCATION '/test-warehouse/impala-hive-udfs.jar' " + - "SYMBOL='com.cloudera.impala.TestUdf'"; + "SYMBOL='org.apache.impala.TestUdf'"; AnalyzesOk("create function foo() RETURNS int" + udfSuffix); AnalyzesOk("create function foo(int, int, string) RETURNS int" + udfSuffix); http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AnalyzeExprsTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AnalyzeExprsTest.java b/fe/src/test/java/org/apache/impala/analysis/AnalyzeExprsTest.java index 1763095..72b5163 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AnalyzeExprsTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AnalyzeExprsTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,24 +29,24 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.cloudera.impala.analysis.TimestampArithmeticExpr.TimeUnit; -import com.cloudera.impala.authorization.Privilege; -import com.cloudera.impala.catalog.Catalog; -import com.cloudera.impala.catalog.CatalogException; -import com.cloudera.impala.catalog.Column; -import com.cloudera.impala.catalog.Db; -import com.cloudera.impala.catalog.Function; -import com.cloudera.impala.catalog.Function.CompareMode; -import com.cloudera.impala.catalog.PrimitiveType; -import com.cloudera.impala.catalog.ScalarFunction; -import com.cloudera.impala.catalog.ScalarType; -import com.cloudera.impala.catalog.Table; -import com.cloudera.impala.catalog.TestSchemaUtils; -import com.cloudera.impala.catalog.Type; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.thrift.TExpr; -import com.cloudera.impala.thrift.TFunctionBinaryType; -import com.cloudera.impala.thrift.TQueryOptions; +import org.apache.impala.analysis.TimestampArithmeticExpr.TimeUnit; +import org.apache.impala.authorization.Privilege; +import org.apache.impala.catalog.Catalog; +import org.apache.impala.catalog.CatalogException; +import org.apache.impala.catalog.Column; +import org.apache.impala.catalog.Db; +import org.apache.impala.catalog.Function; +import org.apache.impala.catalog.Function.CompareMode; +import org.apache.impala.catalog.PrimitiveType; +import org.apache.impala.catalog.ScalarFunction; +import org.apache.impala.catalog.ScalarType; +import org.apache.impala.catalog.Table; +import org.apache.impala.catalog.TestSchemaUtils; +import org.apache.impala.catalog.Type; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.thrift.TExpr; +import org.apache.impala.thrift.TFunctionBinaryType; +import org.apache.impala.thrift.TQueryOptions; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AnalyzeModifyStmtsTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AnalyzeModifyStmtsTest.java b/fe/src/test/java/org/apache/impala/analysis/AnalyzeModifyStmtsTest.java index 9ed20c8..939d499 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AnalyzeModifyStmtsTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AnalyzeModifyStmtsTest.java @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import org.junit.Test; -import com.cloudera.impala.testutil.TestUtils; +import org.apache.impala.testutil.TestUtils; /** * Tests analysis phase of the ModifyStmt and its sub-classes. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AnalyzeStmtsTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AnalyzeStmtsTest.java b/fe/src/test/java/org/apache/impala/analysis/AnalyzeStmtsTest.java index aeef89a..f437bc8 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AnalyzeStmtsTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AnalyzeStmtsTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -26,10 +26,10 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.cloudera.impala.catalog.PrimitiveType; -import com.cloudera.impala.catalog.ScalarType; -import com.cloudera.impala.catalog.Type; -import com.cloudera.impala.common.AnalysisException; +import org.apache.impala.catalog.PrimitiveType; +import org.apache.impala.catalog.ScalarType; +import org.apache.impala.catalog.Type; +import org.apache.impala.common.AnalysisException; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AnalyzeSubqueriesTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AnalyzeSubqueriesTest.java b/fe/src/test/java/org/apache/impala/analysis/AnalyzeSubqueriesTest.java index 8c30439..a37ba72 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AnalyzeSubqueriesTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AnalyzeSubqueriesTest.java @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import org.junit.Test; -import com.cloudera.impala.catalog.Type; -import com.cloudera.impala.common.AnalysisException; +import org.apache.impala.catalog.Type; +import org.apache.impala.common.AnalysisException; public class AnalyzeSubqueriesTest extends AnalyzerTest { private static String cmpOperators[] = {"=", "!=", "<=", ">=", ">", "<"}; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AnalyzerTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AnalyzerTest.java b/fe/src/test/java/org/apache/impala/analysis/AnalyzerTest.java index 815279c..d763deb 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AnalyzerTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AnalyzerTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import java.util.ArrayList; import java.util.HashMap; @@ -27,13 +27,13 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cloudera.impala.catalog.Function; -import com.cloudera.impala.catalog.PrimitiveType; -import com.cloudera.impala.catalog.ScalarType; -import com.cloudera.impala.catalog.Type; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.common.FrontendTestBase; -import com.cloudera.impala.thrift.TExpr; +import org.apache.impala.catalog.Function; +import org.apache.impala.catalog.PrimitiveType; +import org.apache.impala.catalog.ScalarType; +import org.apache.impala.catalog.Type; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.common.FrontendTestBase; +import org.apache.impala.thrift.TExpr; import com.google.common.base.Preconditions; public class AnalyzerTest extends FrontendTestBase { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AuditingTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AuditingTest.java b/fe/src/test/java/org/apache/impala/analysis/AuditingTest.java index 3160511..eee9cce 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AuditingTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AuditingTest.java @@ -15,24 +15,24 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import java.util.Set; import org.junit.Assert; import org.junit.Test; -import com.cloudera.impala.authorization.AuthorizationConfig; -import com.cloudera.impala.catalog.AuthorizationException; -import com.cloudera.impala.catalog.Catalog; -import com.cloudera.impala.catalog.ImpaladCatalog; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.common.InternalException; -import com.cloudera.impala.service.Frontend; -import com.cloudera.impala.testutil.ImpaladTestCatalog; -import com.cloudera.impala.testutil.TestUtils; -import com.cloudera.impala.thrift.TAccessEvent; -import com.cloudera.impala.thrift.TCatalogObjectType; +import org.apache.impala.authorization.AuthorizationConfig; +import org.apache.impala.catalog.AuthorizationException; +import org.apache.impala.catalog.Catalog; +import org.apache.impala.catalog.ImpaladCatalog; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.common.InternalException; +import org.apache.impala.service.Frontend; +import org.apache.impala.testutil.ImpaladTestCatalog; +import org.apache.impala.testutil.TestUtils; +import org.apache.impala.thrift.TAccessEvent; +import org.apache.impala.thrift.TCatalogObjectType; import com.google.common.collect.Sets; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/AuthorizationTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/AuthorizationTest.java b/fe/src/test/java/org/apache/impala/analysis/AuthorizationTest.java index 9ee4312..38aff7d 100644 --- a/fe/src/test/java/org/apache/impala/analysis/AuthorizationTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/AuthorizationTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -46,34 +46,34 @@ import org.junit.runners.Parameterized.Parameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cloudera.impala.authorization.AuthorizationConfig; -import com.cloudera.impala.authorization.AuthorizeableTable; -import com.cloudera.impala.authorization.User; -import com.cloudera.impala.catalog.AuthorizationException; -import com.cloudera.impala.catalog.Catalog; -import com.cloudera.impala.catalog.Db; -import com.cloudera.impala.catalog.ImpaladCatalog; -import com.cloudera.impala.catalog.ScalarFunction; -import com.cloudera.impala.catalog.Type; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.common.InternalException; -import com.cloudera.impala.common.RuntimeEnv; -import com.cloudera.impala.service.Frontend; -import com.cloudera.impala.testutil.ImpaladTestCatalog; -import com.cloudera.impala.testutil.TestUtils; -import com.cloudera.impala.thrift.TFunctionBinaryType; -import com.cloudera.impala.thrift.TMetadataOpRequest; -import com.cloudera.impala.thrift.TMetadataOpcode; -import com.cloudera.impala.thrift.TNetworkAddress; -import com.cloudera.impala.thrift.TPrivilege; -import com.cloudera.impala.thrift.TPrivilegeLevel; -import com.cloudera.impala.thrift.TPrivilegeScope; -import com.cloudera.impala.thrift.TQueryCtx; -import com.cloudera.impala.thrift.TResultSet; -import com.cloudera.impala.thrift.TSessionState; -import com.cloudera.impala.util.PatternMatcher; -import com.cloudera.impala.util.SentryPolicyService; +import org.apache.impala.authorization.AuthorizationConfig; +import org.apache.impala.authorization.AuthorizeableTable; +import org.apache.impala.authorization.User; +import org.apache.impala.catalog.AuthorizationException; +import org.apache.impala.catalog.Catalog; +import org.apache.impala.catalog.Db; +import org.apache.impala.catalog.ImpaladCatalog; +import org.apache.impala.catalog.ScalarFunction; +import org.apache.impala.catalog.Type; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.common.InternalException; +import org.apache.impala.common.RuntimeEnv; +import org.apache.impala.service.Frontend; +import org.apache.impala.testutil.ImpaladTestCatalog; +import org.apache.impala.testutil.TestUtils; +import org.apache.impala.thrift.TFunctionBinaryType; +import org.apache.impala.thrift.TMetadataOpRequest; +import org.apache.impala.thrift.TMetadataOpcode; +import org.apache.impala.thrift.TNetworkAddress; +import org.apache.impala.thrift.TPrivilege; +import org.apache.impala.thrift.TPrivilegeLevel; +import org.apache.impala.thrift.TPrivilegeScope; +import org.apache.impala.thrift.TQueryCtx; +import org.apache.impala.thrift.TResultSet; +import org.apache.impala.thrift.TSessionState; +import org.apache.impala.util.PatternMatcher; +import org.apache.impala.util.SentryPolicyService; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -435,7 +435,7 @@ public class AuthorizationTest { @After public void TestTPCHCleanup() throws AuthorizationException, AnalysisException { // Failure to cleanup TPCH can cause: - // TestDropDatabase(com.cloudera.impala.analysis.AuthorizationTest): + // TestDropDatabase(org.apache.impala.analysis.AuthorizationTest): // Cannot drop non-empty database: tpch if (ctx_.catalog.getDb("tpch").numFunctions() != 0) { fail("Failed to clean up functions in tpch."); http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/ExprTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/ExprTest.java b/fe/src/test/java/org/apache/impala/analysis/ExprTest.java index feede2c..7ae0f89 100644 --- a/fe/src/test/java/org/apache/impala/analysis/ExprTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/ExprTest.java @@ -15,14 +15,14 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import static org.junit.Assert.fail; import org.junit.Test; -import com.cloudera.impala.catalog.ScalarType; -import com.cloudera.impala.catalog.Type; +import org.apache.impala.catalog.ScalarType; +import org.apache.impala.catalog.Type; public class ExprTest { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/ParserTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/ParserTest.java b/fe/src/test/java/org/apache/impala/analysis/ParserTest.java index 0db8af5..8b8ea42 100644 --- a/fe/src/test/java/org/apache/impala/analysis/ParserTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/ParserTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,9 +30,9 @@ import java.util.List; import org.apache.hadoop.hive.metastore.MetaStoreUtils; import org.junit.Test; -import com.cloudera.impala.analysis.TimestampArithmeticExpr.TimeUnit; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.testutil.TestUtils; +import org.apache.impala.analysis.TimestampArithmeticExpr.TimeUnit; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.testutil.TestUtils; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/ToSqlTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/ToSqlTest.java b/fe/src/test/java/org/apache/impala/analysis/ToSqlTest.java index 6b502a1..371e811 100644 --- a/fe/src/test/java/org/apache/impala/analysis/ToSqlTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/ToSqlTest.java @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import static org.junit.Assert.fail; import org.junit.Ignore; import org.junit.Test; -import com.cloudera.impala.authorization.AuthorizationConfig; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.common.FrontendTestBase; -import com.cloudera.impala.testutil.TestUtils; +import org.apache.impala.authorization.AuthorizationConfig; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.common.FrontendTestBase; +import org.apache.impala.testutil.TestUtils; import com.google.common.base.Preconditions; // TODO: Expand this test, in particular, because view creation relies http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/analysis/TypesUtilTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/analysis/TypesUtilTest.java b/fe/src/test/java/org/apache/impala/analysis/TypesUtilTest.java index 4e590d4..9b36608 100644 --- a/fe/src/test/java/org/apache/impala/analysis/TypesUtilTest.java +++ b/fe/src/test/java/org/apache/impala/analysis/TypesUtilTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.analysis; +package org.apache.impala.analysis; import static org.junit.Assert.assertTrue; @@ -25,13 +25,13 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -import com.cloudera.impala.catalog.ArrayType; -import com.cloudera.impala.catalog.MapType; -import com.cloudera.impala.catalog.PrimitiveType; -import com.cloudera.impala.catalog.ScalarType; -import com.cloudera.impala.catalog.StructField; -import com.cloudera.impala.catalog.StructType; -import com.cloudera.impala.catalog.Type; +import org.apache.impala.catalog.ArrayType; +import org.apache.impala.catalog.MapType; +import org.apache.impala.catalog.PrimitiveType; +import org.apache.impala.catalog.ScalarType; +import org.apache.impala.catalog.StructField; +import org.apache.impala.catalog.StructType; +import org.apache.impala.catalog.Type; import com.google.common.collect.Lists; // TODO: move other types related tests into this class to break up the large http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/catalog/CatalogObjectToFromThriftTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/catalog/CatalogObjectToFromThriftTest.java b/fe/src/test/java/org/apache/impala/catalog/CatalogObjectToFromThriftTest.java index 0fcb7a6..ebd99ba 100644 --- a/fe/src/test/java/org/apache/impala/catalog/CatalogObjectToFromThriftTest.java +++ b/fe/src/test/java/org/apache/impala/catalog/CatalogObjectToFromThriftTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.catalog; +package org.apache.impala.catalog; import static org.junit.Assert.fail; @@ -26,17 +26,17 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.cloudera.impala.testutil.CatalogServiceTestCatalog; -import com.cloudera.impala.analysis.LiteralExpr; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.thrift.ImpalaInternalServiceConstants; -import com.cloudera.impala.thrift.TAccessLevel; -import com.cloudera.impala.thrift.THBaseTable; -import com.cloudera.impala.thrift.THdfsPartition; -import com.cloudera.impala.thrift.THdfsTable; -import com.cloudera.impala.thrift.TTable; -import com.cloudera.impala.thrift.TTableType; +import org.apache.impala.testutil.CatalogServiceTestCatalog; +import org.apache.impala.analysis.LiteralExpr; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.thrift.ImpalaInternalServiceConstants; +import org.apache.impala.thrift.TAccessLevel; +import org.apache.impala.thrift.THBaseTable; +import org.apache.impala.thrift.THdfsPartition; +import org.apache.impala.thrift.THdfsTable; +import org.apache.impala.thrift.TTable; +import org.apache.impala.thrift.TTableType; import com.google.common.collect.Lists; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/catalog/CatalogTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/catalog/CatalogTest.java b/fe/src/test/java/org/apache/impala/catalog/CatalogTest.java index 9ed09ed..e6b71cd 100644 --- a/fe/src/test/java/org/apache/impala/catalog/CatalogTest.java +++ b/fe/src/test/java/org/apache/impala/catalog/CatalogTest.java @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.catalog; +package org.apache.impala.catalog; -import static com.cloudera.impala.thrift.ImpalaInternalServiceConstants.DEFAULT_PARTITION_ID; +import static org.apache.impala.thrift.ImpalaInternalServiceConstants.DEFAULT_PARTITION_ID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; @@ -35,13 +35,13 @@ import org.apache.hadoop.hive.metastore.TableType; import org.apache.hadoop.hive.metastore.api.ColumnStatisticsData; import org.junit.Test; -import com.cloudera.impala.analysis.FunctionName; -import com.cloudera.impala.analysis.HdfsUri; -import com.cloudera.impala.analysis.LiteralExpr; -import com.cloudera.impala.analysis.NumericLiteral; -import com.cloudera.impala.catalog.MetaStoreClientPool.MetaStoreClient; -import com.cloudera.impala.testutil.CatalogServiceTestCatalog; -import com.cloudera.impala.thrift.TFunctionBinaryType; +import org.apache.impala.analysis.FunctionName; +import org.apache.impala.analysis.HdfsUri; +import org.apache.impala.analysis.LiteralExpr; +import org.apache.impala.analysis.NumericLiteral; +import org.apache.impala.catalog.MetaStoreClientPool.MetaStoreClient; +import org.apache.impala.testutil.CatalogServiceTestCatalog; +import org.apache.impala.thrift.TFunctionBinaryType; import com.google.common.base.Strings; import com.google.common.collect.Lists; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/catalog/HdfsPartitionTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/catalog/HdfsPartitionTest.java b/fe/src/test/java/org/apache/impala/catalog/HdfsPartitionTest.java index fa86d14..100a513 100644 --- a/fe/src/test/java/org/apache/impala/catalog/HdfsPartitionTest.java +++ b/fe/src/test/java/org/apache/impala/catalog/HdfsPartitionTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.catalog; +package org.apache.impala.catalog; import static org.junit.Assert.assertTrue; @@ -23,11 +23,11 @@ import java.math.BigDecimal; import java.util.List; import java.lang.*; -import com.cloudera.impala.analysis.*; +import org.apache.impala.analysis.*; import com.google.common.collect.Lists; import org.junit.Test; -import static com.cloudera.impala.catalog.HdfsPartition.comparePartitionKeyValues; +import static org.apache.impala.catalog.HdfsPartition.comparePartitionKeyValues; public class HdfsPartitionTest { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/catalog/HdfsStorageDescriptorTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/catalog/HdfsStorageDescriptorTest.java b/fe/src/test/java/org/apache/impala/catalog/HdfsStorageDescriptorTest.java index decfc84..0d8af1c 100644 --- a/fe/src/test/java/org/apache/impala/catalog/HdfsStorageDescriptorTest.java +++ b/fe/src/test/java/org/apache/impala/catalog/HdfsStorageDescriptorTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.catalog; +package org.apache.impala.catalog; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -29,8 +29,8 @@ import org.apache.hadoop.hive.metastore.api.StorageDescriptor; import org.apache.hadoop.hive.serde.serdeConstants; import org.junit.Test; -import com.cloudera.impala.catalog.HdfsStorageDescriptor.InvalidStorageDescriptorException; -import com.cloudera.impala.thrift.THdfsFileFormat; +import org.apache.impala.catalog.HdfsStorageDescriptor.InvalidStorageDescriptorException; +import org.apache.impala.thrift.THdfsFileFormat; import com.google.common.collect.ImmutableList; public class HdfsStorageDescriptorTest { @@ -60,7 +60,7 @@ public class HdfsStorageDescriptorTest { "parquet.hive.MapredParquetInputFormat", "org.apache.hadoop.hive.ql.io.parquet.MapredParquetInputFormat"}; String [] outputFormats = new String [] { - "com.cloudera.impala.hive.serde.ParquetOutputFormat", + "org.apache.impala.hive.serde.ParquetOutputFormat", "parquet.hive.DeprecatedParquetOutputFormat", "parquet.hive.MapredParquetOutputFormat", "org.apache.hadoop.hive.ql.io.parquet.MapredParquetOutputFormat"}; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/catalog/TestSchemaUtils.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/catalog/TestSchemaUtils.java b/fe/src/test/java/org/apache/impala/catalog/TestSchemaUtils.java index 1afcb38..43ac610 100644 --- a/fe/src/test/java/org/apache/impala/catalog/TestSchemaUtils.java +++ b/fe/src/test/java/org/apache/impala/catalog/TestSchemaUtils.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.catalog; +package org.apache.impala.catalog; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/common/FrontendTestBase.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/common/FrontendTestBase.java b/fe/src/test/java/org/apache/impala/common/FrontendTestBase.java index 228dd49..5a53f64 100644 --- a/fe/src/test/java/org/apache/impala/common/FrontendTestBase.java +++ b/fe/src/test/java/org/apache/impala/common/FrontendTestBase.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.common; +package org.apache.impala.common; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; @@ -28,35 +28,35 @@ import java.util.List; import org.junit.After; import org.junit.Assert; -import com.cloudera.impala.analysis.AnalysisContext; -import com.cloudera.impala.analysis.Analyzer; -import com.cloudera.impala.analysis.ColumnDef; -import com.cloudera.impala.analysis.CreateTableStmt; -import com.cloudera.impala.analysis.CreateViewStmt; -import com.cloudera.impala.analysis.FunctionName; -import com.cloudera.impala.analysis.ParseNode; -import com.cloudera.impala.analysis.QueryStmt; -import com.cloudera.impala.analysis.SqlParser; -import com.cloudera.impala.analysis.SqlScanner; -import com.cloudera.impala.authorization.AuthorizationConfig; -import com.cloudera.impala.catalog.AggregateFunction; -import com.cloudera.impala.catalog.Catalog; -import com.cloudera.impala.catalog.Column; -import com.cloudera.impala.catalog.Db; -import com.cloudera.impala.catalog.Function; -import com.cloudera.impala.catalog.HdfsTable; -import com.cloudera.impala.catalog.ImpaladCatalog; -import com.cloudera.impala.catalog.ScalarFunction; -import com.cloudera.impala.catalog.ScalarType; -import com.cloudera.impala.catalog.Table; -import com.cloudera.impala.catalog.Type; -import com.cloudera.impala.catalog.View; -import com.cloudera.impala.service.Frontend; -import com.cloudera.impala.testutil.ImpaladTestCatalog; -import com.cloudera.impala.testutil.TestUtils; -import com.cloudera.impala.thrift.TFunctionBinaryType; -import com.cloudera.impala.thrift.TQueryCtx; -import com.cloudera.impala.thrift.TQueryOptions; +import org.apache.impala.analysis.AnalysisContext; +import org.apache.impala.analysis.Analyzer; +import org.apache.impala.analysis.ColumnDef; +import org.apache.impala.analysis.CreateTableStmt; +import org.apache.impala.analysis.CreateViewStmt; +import org.apache.impala.analysis.FunctionName; +import org.apache.impala.analysis.ParseNode; +import org.apache.impala.analysis.QueryStmt; +import org.apache.impala.analysis.SqlParser; +import org.apache.impala.analysis.SqlScanner; +import org.apache.impala.authorization.AuthorizationConfig; +import org.apache.impala.catalog.AggregateFunction; +import org.apache.impala.catalog.Catalog; +import org.apache.impala.catalog.Column; +import org.apache.impala.catalog.Db; +import org.apache.impala.catalog.Function; +import org.apache.impala.catalog.HdfsTable; +import org.apache.impala.catalog.ImpaladCatalog; +import org.apache.impala.catalog.ScalarFunction; +import org.apache.impala.catalog.ScalarType; +import org.apache.impala.catalog.Table; +import org.apache.impala.catalog.Type; +import org.apache.impala.catalog.View; +import org.apache.impala.service.Frontend; +import org.apache.impala.testutil.ImpaladTestCatalog; +import org.apache.impala.testutil.TestUtils; +import org.apache.impala.thrift.TFunctionBinaryType; +import org.apache.impala.thrift.TQueryCtx; +import org.apache.impala.thrift.TQueryOptions; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/hive/executor/TestUdf.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/hive/executor/TestUdf.java b/fe/src/test/java/org/apache/impala/hive/executor/TestUdf.java index 0d3d7cc..58cb24c 100644 --- a/fe/src/test/java/org/apache/impala/hive/executor/TestUdf.java +++ b/fe/src/test/java/org/apache/impala/hive/executor/TestUdf.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.hive.executor; +package org.apache.impala.hive.executor; import org.apache.hadoop.hive.ql.exec.UDF; import org.apache.hadoop.hive.serde2.io.ByteWritable; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/hive/executor/UdfExecutorTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/hive/executor/UdfExecutorTest.java b/fe/src/test/java/org/apache/impala/hive/executor/UdfExecutorTest.java index c248df1..243d015 100644 --- a/fe/src/test/java/org/apache/impala/hive/executor/UdfExecutorTest.java +++ b/fe/src/test/java/org/apache/impala/hive/executor/UdfExecutorTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.hive.executor; +package org.apache.impala.hive.executor; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -63,14 +63,14 @@ import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocolFactory; import org.junit.Test; -import com.cloudera.impala.catalog.PrimitiveType; -import com.cloudera.impala.catalog.ScalarFunction; -import com.cloudera.impala.catalog.Type; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.thrift.TFunction; -import com.cloudera.impala.thrift.TFunctionBinaryType; -import com.cloudera.impala.thrift.THiveUdfExecutorCtorParams; -import com.cloudera.impala.util.UnsafeUtil; +import org.apache.impala.catalog.PrimitiveType; +import org.apache.impala.catalog.ScalarFunction; +import org.apache.impala.catalog.Type; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.thrift.TFunction; +import org.apache.impala.thrift.TFunctionBinaryType; +import org.apache.impala.thrift.THiveUdfExecutorCtorParams; +import org.apache.impala.util.UnsafeUtil; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/planner/PlannerTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/planner/PlannerTest.java b/fe/src/test/java/org/apache/impala/planner/PlannerTest.java index 6c88170..88a8631 100644 --- a/fe/src/test/java/org/apache/impala/planner/PlannerTest.java +++ b/fe/src/test/java/org/apache/impala/planner/PlannerTest.java @@ -15,16 +15,16 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.planner; +package org.apache.impala.planner; import org.junit.Assume; import org.junit.Test; -import com.cloudera.impala.catalog.Db; -import com.cloudera.impala.common.RuntimeEnv; -import com.cloudera.impala.thrift.TExplainLevel; -import com.cloudera.impala.thrift.TQueryOptions; -import com.cloudera.impala.thrift.TRuntimeFilterMode; +import org.apache.impala.catalog.Db; +import org.apache.impala.common.RuntimeEnv; +import org.apache.impala.thrift.TExplainLevel; +import org.apache.impala.thrift.TQueryOptions; +import org.apache.impala.thrift.TRuntimeFilterMode; // All planner tests, except for S3 specific tests should go here. public class PlannerTest extends PlannerTestBase { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java b/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java index 6db1293..4464203 100644 --- a/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java +++ b/fe/src/test/java/org/apache/impala/planner/PlannerTestBase.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.planner; +package org.apache.impala.planner; import static org.junit.Assert.fail; @@ -40,38 +40,38 @@ import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cloudera.impala.analysis.ColumnLineageGraph; -import com.cloudera.impala.catalog.CatalogException; -import com.cloudera.impala.common.FrontendTestBase; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.common.NotImplementedException; -import com.cloudera.impala.common.RuntimeEnv; -import com.cloudera.impala.testutil.TestFileParser; -import com.cloudera.impala.testutil.TestFileParser.Section; -import com.cloudera.impala.testutil.TestFileParser.TestCase; -import com.cloudera.impala.testutil.TestUtils; -import com.cloudera.impala.thrift.ImpalaInternalServiceConstants; -import com.cloudera.impala.thrift.TDescriptorTable; -import com.cloudera.impala.thrift.TExecRequest; -import com.cloudera.impala.thrift.TExplainLevel; -import com.cloudera.impala.thrift.THBaseKeyRange; -import com.cloudera.impala.thrift.THdfsFileSplit; -import com.cloudera.impala.thrift.THdfsPartition; -import com.cloudera.impala.thrift.THdfsPartitionLocation; -import com.cloudera.impala.thrift.THdfsScanNode; -import com.cloudera.impala.thrift.THdfsTable; -import com.cloudera.impala.thrift.TLineageGraph; -import com.cloudera.impala.thrift.TNetworkAddress; -import com.cloudera.impala.thrift.TPlanFragment; -import com.cloudera.impala.thrift.TPlanNode; -import com.cloudera.impala.thrift.TQueryCtx; -import com.cloudera.impala.thrift.TQueryExecRequest; -import com.cloudera.impala.thrift.TQueryOptions; -import com.cloudera.impala.thrift.TScanRangeLocations; -import com.cloudera.impala.thrift.TTableDescriptor; -import com.cloudera.impala.thrift.TTupleDescriptor; -import com.cloudera.impala.thrift.TUpdateMembershipRequest; -import com.cloudera.impala.util.MembershipSnapshot; +import org.apache.impala.analysis.ColumnLineageGraph; +import org.apache.impala.catalog.CatalogException; +import org.apache.impala.common.FrontendTestBase; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.common.NotImplementedException; +import org.apache.impala.common.RuntimeEnv; +import org.apache.impala.testutil.TestFileParser; +import org.apache.impala.testutil.TestFileParser.Section; +import org.apache.impala.testutil.TestFileParser.TestCase; +import org.apache.impala.testutil.TestUtils; +import org.apache.impala.thrift.ImpalaInternalServiceConstants; +import org.apache.impala.thrift.TDescriptorTable; +import org.apache.impala.thrift.TExecRequest; +import org.apache.impala.thrift.TExplainLevel; +import org.apache.impala.thrift.THBaseKeyRange; +import org.apache.impala.thrift.THdfsFileSplit; +import org.apache.impala.thrift.THdfsPartition; +import org.apache.impala.thrift.THdfsPartitionLocation; +import org.apache.impala.thrift.THdfsScanNode; +import org.apache.impala.thrift.THdfsTable; +import org.apache.impala.thrift.TLineageGraph; +import org.apache.impala.thrift.TNetworkAddress; +import org.apache.impala.thrift.TPlanFragment; +import org.apache.impala.thrift.TPlanNode; +import org.apache.impala.thrift.TQueryCtx; +import org.apache.impala.thrift.TQueryExecRequest; +import org.apache.impala.thrift.TQueryOptions; +import org.apache.impala.thrift.TScanRangeLocations; +import org.apache.impala.thrift.TTableDescriptor; +import org.apache.impala.thrift.TTupleDescriptor; +import org.apache.impala.thrift.TUpdateMembershipRequest; +import org.apache.impala.util.MembershipSnapshot; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/planner/S3PlannerTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/planner/S3PlannerTest.java b/fe/src/test/java/org/apache/impala/planner/S3PlannerTest.java index a6e0661..f571ebe 100644 --- a/fe/src/test/java/org/apache/impala/planner/S3PlannerTest.java +++ b/fe/src/test/java/org/apache/impala/planner/S3PlannerTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.planner; +package org.apache.impala.planner; import static org.junit.Assume.assumeTrue; @@ -28,7 +28,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import com.cloudera.impala.planner.PlannerTestBase; +import org.apache.impala.planner.PlannerTestBase; // S3 specific planner tests go here, and will run against tables in S3. These tests // are run only when test.fs.s3a.name is set in the configuration. http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/service/FrontendTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/service/FrontendTest.java b/fe/src/test/java/org/apache/impala/service/FrontendTest.java index c710ae8..dfbdb12 100644 --- a/fe/src/test/java/org/apache/impala/service/FrontendTest.java +++ b/fe/src/test/java/org/apache/impala/service/FrontendTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.service; +package org.apache.impala.service; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -33,19 +33,19 @@ import org.apache.hive.service.cli.thrift.TGetSchemasReq; import org.apache.hive.service.cli.thrift.TGetTablesReq; import org.junit.Test; -import com.cloudera.impala.analysis.AuthorizationTest; -import com.cloudera.impala.authorization.AuthorizationConfig; -import com.cloudera.impala.catalog.Catalog; -import com.cloudera.impala.catalog.PrimitiveType; -import com.cloudera.impala.common.AnalysisException; -import com.cloudera.impala.common.ImpalaException; -import com.cloudera.impala.testutil.ImpaladTestCatalog; -import com.cloudera.impala.testutil.TestUtils; -import com.cloudera.impala.thrift.TMetadataOpRequest; -import com.cloudera.impala.thrift.TMetadataOpcode; -import com.cloudera.impala.thrift.TQueryCtx; -import com.cloudera.impala.thrift.TResultRow; -import com.cloudera.impala.thrift.TResultSet; +import org.apache.impala.analysis.AuthorizationTest; +import org.apache.impala.authorization.AuthorizationConfig; +import org.apache.impala.catalog.Catalog; +import org.apache.impala.catalog.PrimitiveType; +import org.apache.impala.common.AnalysisException; +import org.apache.impala.common.ImpalaException; +import org.apache.impala.testutil.ImpaladTestCatalog; +import org.apache.impala.testutil.TestUtils; +import org.apache.impala.thrift.TMetadataOpRequest; +import org.apache.impala.thrift.TMetadataOpcode; +import org.apache.impala.thrift.TQueryCtx; +import org.apache.impala.thrift.TResultRow; +import org.apache.impala.thrift.TResultSet; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/service/JdbcTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/service/JdbcTest.java b/fe/src/test/java/org/apache/impala/service/JdbcTest.java index c79a52c..a1f4a29 100644 --- a/fe/src/test/java/org/apache/impala/service/JdbcTest.java +++ b/fe/src/test/java/org/apache/impala/service/JdbcTest.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.service; +package org.apache.impala.service; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -39,10 +39,10 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import com.cloudera.impala.analysis.CreateTableStmt; -import com.cloudera.impala.analysis.SqlParser; -import com.cloudera.impala.analysis.SqlScanner; -import com.cloudera.impala.testutil.ImpalaJdbcClient; +import org.apache.impala.analysis.CreateTableStmt; +import org.apache.impala.analysis.SqlParser; +import org.apache.impala.analysis.SqlScanner; +import org.apache.impala.testutil.ImpalaJdbcClient; import com.google.common.collect.Lists; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/testutil/BlockIdGenerator.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/testutil/BlockIdGenerator.java b/fe/src/test/java/org/apache/impala/testutil/BlockIdGenerator.java index b59cc53..d5cce94 100644 --- a/fe/src/test/java/org/apache/impala/testutil/BlockIdGenerator.java +++ b/fe/src/test/java/org/apache/impala/testutil/BlockIdGenerator.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.testutil; +package org.apache.impala.testutil; import java.io.File; import java.io.FileWriter; @@ -27,14 +27,14 @@ import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.hadoop.hdfs.protocol.LocatedBlock; import org.apache.hadoop.hdfs.protocol.LocatedBlocks; -import com.cloudera.impala.catalog.Catalog; -import com.cloudera.impala.catalog.Db; -import com.cloudera.impala.catalog.HdfsPartition; -import com.cloudera.impala.catalog.HdfsPartition.FileDescriptor; -import com.cloudera.impala.catalog.HdfsTable; -import com.cloudera.impala.catalog.Table; -import com.cloudera.impala.thrift.ImpalaInternalServiceConstants; -import com.cloudera.impala.util.PatternMatcher; +import org.apache.impala.catalog.Catalog; +import org.apache.impala.catalog.Db; +import org.apache.impala.catalog.HdfsPartition; +import org.apache.impala.catalog.HdfsPartition.FileDescriptor; +import org.apache.impala.catalog.HdfsTable; +import org.apache.impala.catalog.Table; +import org.apache.impala.thrift.ImpalaInternalServiceConstants; +import org.apache.impala.util.PatternMatcher; /** * Utility to generate an output file with all the block ids for each table http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/testutil/CatalogServiceTestCatalog.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/testutil/CatalogServiceTestCatalog.java b/fe/src/test/java/org/apache/impala/testutil/CatalogServiceTestCatalog.java index ee1cba7..92b127f 100644 --- a/fe/src/test/java/org/apache/impala/testutil/CatalogServiceTestCatalog.java +++ b/fe/src/test/java/org/apache/impala/testutil/CatalogServiceTestCatalog.java @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.testutil; +package org.apache.impala.testutil; -import com.cloudera.impala.authorization.SentryConfig; -import com.cloudera.impala.catalog.AuthorizationPolicy; -import com.cloudera.impala.catalog.CatalogException; -import com.cloudera.impala.catalog.CatalogServiceCatalog; -import com.cloudera.impala.thrift.TUniqueId; +import org.apache.impala.authorization.SentryConfig; +import org.apache.impala.catalog.AuthorizationPolicy; +import org.apache.impala.catalog.CatalogException; +import org.apache.impala.catalog.CatalogServiceCatalog; +import org.apache.impala.thrift.TUniqueId; /** * Test class of the Catalog Server's catalog that exposes internal state that is useful http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/testutil/ImpalaJdbcClient.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/testutil/ImpalaJdbcClient.java b/fe/src/test/java/org/apache/impala/testutil/ImpalaJdbcClient.java index 095d123..7176342 100644 --- a/fe/src/test/java/org/apache/impala/testutil/ImpalaJdbcClient.java +++ b/fe/src/test/java/org/apache/impala/testutil/ImpalaJdbcClient.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.testutil; +package org.apache.impala.testutil; import java.sql.Connection; import java.sql.DriverManager; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/testutil/ImpaladTestCatalog.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/testutil/ImpaladTestCatalog.java b/fe/src/test/java/org/apache/impala/testutil/ImpaladTestCatalog.java index 549e572..1dfed8a 100644 --- a/fe/src/test/java/org/apache/impala/testutil/ImpaladTestCatalog.java +++ b/fe/src/test/java/org/apache/impala/testutil/ImpaladTestCatalog.java @@ -15,16 +15,16 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.testutil; +package org.apache.impala.testutil; -import com.cloudera.impala.authorization.AuthorizationConfig; -import com.cloudera.impala.catalog.CatalogException; -import com.cloudera.impala.catalog.CatalogServiceCatalog; -import com.cloudera.impala.catalog.Db; -import com.cloudera.impala.catalog.HdfsCachePool; -import com.cloudera.impala.catalog.ImpaladCatalog; -import com.cloudera.impala.catalog.Table; -import com.cloudera.impala.util.PatternMatcher; +import org.apache.impala.authorization.AuthorizationConfig; +import org.apache.impala.catalog.CatalogException; +import org.apache.impala.catalog.CatalogServiceCatalog; +import org.apache.impala.catalog.Db; +import org.apache.impala.catalog.HdfsCachePool; +import org.apache.impala.catalog.ImpaladCatalog; +import org.apache.impala.catalog.Table; +import org.apache.impala.util.PatternMatcher; import com.google.common.base.Preconditions; /** http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/testutil/SentryServicePinger.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/testutil/SentryServicePinger.java b/fe/src/test/java/org/apache/impala/testutil/SentryServicePinger.java index 7e4c503..9bb3a5d 100644 --- a/fe/src/test/java/org/apache/impala/testutil/SentryServicePinger.java +++ b/fe/src/test/java/org/apache/impala/testutil/SentryServicePinger.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.testutil; +package org.apache.impala.testutil; import org.apache.commons.cli.BasicParser; import org.apache.commons.cli.CommandLine; @@ -24,9 +24,9 @@ import org.apache.commons.cli.Options; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cloudera.impala.authorization.User; -import com.cloudera.impala.authorization.SentryConfig; -import com.cloudera.impala.util.SentryPolicyService; +import org.apache.impala.authorization.User; +import org.apache.impala.authorization.SentryConfig; +import org.apache.impala.util.SentryPolicyService; /** * Simple class that issues a read-only RPC to the Sentry Service to check if it http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/testutil/TestFileParser.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/testutil/TestFileParser.java b/fe/src/test/java/org/apache/impala/testutil/TestFileParser.java index b70d868..5bfd018 100644 --- a/fe/src/test/java/org/apache/impala/testutil/TestFileParser.java +++ b/fe/src/test/java/org/apache/impala/testutil/TestFileParser.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.testutil; +package org.apache.impala.testutil; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/testutil/TestUtils.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/testutil/TestUtils.java b/fe/src/test/java/org/apache/impala/testutil/TestUtils.java index e53b831..5454c7b 100644 --- a/fe/src/test/java/org/apache/impala/testutil/TestUtils.java +++ b/fe/src/test/java/org/apache/impala/testutil/TestUtils.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.testutil; +package org.apache.impala.testutil; import java.io.StringReader; import java.io.StringWriter; import java.text.SimpleDateFormat; @@ -36,15 +36,15 @@ import org.junit.Assume; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.cloudera.impala.catalog.Catalog; -import com.cloudera.impala.common.RuntimeEnv; -import com.cloudera.impala.thrift.TClientRequest; -import com.cloudera.impala.thrift.TNetworkAddress; -import com.cloudera.impala.thrift.TQueryCtx; -import com.cloudera.impala.thrift.TQueryOptions; -import com.cloudera.impala.thrift.TSessionState; -import com.cloudera.impala.thrift.TSessionType; -import com.cloudera.impala.thrift.TUniqueId; +import org.apache.impala.catalog.Catalog; +import org.apache.impala.common.RuntimeEnv; +import org.apache.impala.thrift.TClientRequest; +import org.apache.impala.thrift.TNetworkAddress; +import org.apache.impala.thrift.TQueryCtx; +import org.apache.impala.thrift.TQueryOptions; +import org.apache.impala.thrift.TSessionState; +import org.apache.impala.thrift.TSessionType; +import org.apache.impala.thrift.TUniqueId; import com.google.common.collect.Maps; public class TestUtils { http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/util/KuduUtilTest.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/util/KuduUtilTest.java b/fe/src/test/java/org/apache/impala/util/KuduUtilTest.java index ef5c817..3827d72 100644 --- a/fe/src/test/java/org/apache/impala/util/KuduUtilTest.java +++ b/fe/src/test/java/org/apache/impala/util/KuduUtilTest.java @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.util.List; -import com.cloudera.impala.common.ImpalaRuntimeException; +import org.apache.impala.common.ImpalaRuntimeException; import com.google.common.collect.ImmutableList; import org.junit.Test; import org.apache.kudu.ColumnSchema; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/util/TestDisjointSet.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/util/TestDisjointSet.java b/fe/src/test/java/org/apache/impala/util/TestDisjointSet.java index 8038494..a932dfc 100644 --- a/fe/src/test/java/org/apache/impala/util/TestDisjointSet.java +++ b/fe/src/test/java/org/apache/impala/util/TestDisjointSet.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/test/java/org/apache/impala/util/TestRequestPoolService.java ---------------------------------------------------------------------- diff --git a/fe/src/test/java/org/apache/impala/util/TestRequestPoolService.java b/fe/src/test/java/org/apache/impala/util/TestRequestPoolService.java index 7f0a126..f0887ef 100644 --- a/fe/src/test/java/org/apache/impala/util/TestRequestPoolService.java +++ b/fe/src/test/java/org/apache/impala/util/TestRequestPoolService.java @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -package com.cloudera.impala.util; +package org.apache.impala.util; import java.io.File; import java.io.IOException; @@ -29,12 +29,12 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import com.cloudera.impala.common.ByteUnits; -import com.cloudera.impala.common.InternalException; -import com.cloudera.impala.thrift.TErrorCode; -import com.cloudera.impala.thrift.TPoolConfig; -import com.cloudera.impala.thrift.TResolveRequestPoolParams; -import com.cloudera.impala.thrift.TResolveRequestPoolResult; +import org.apache.impala.common.ByteUnits; +import org.apache.impala.common.InternalException; +import org.apache.impala.thrift.TErrorCode; +import org.apache.impala.thrift.TPoolConfig; +import org.apache.impala.thrift.TResolveRequestPoolParams; +import org.apache.impala.thrift.TResolveRequestPoolResult; import com.google.common.collect.Iterables; import com.google.common.io.Files; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/testdata/ComplexTypesTbl/nonnullable.avsc ---------------------------------------------------------------------- diff --git a/testdata/ComplexTypesTbl/nonnullable.avsc b/testdata/ComplexTypesTbl/nonnullable.avsc index 2b6bd1c..5f78dcf 100644 --- a/testdata/ComplexTypesTbl/nonnullable.avsc +++ b/testdata/ComplexTypesTbl/nonnullable.avsc @@ -1,5 +1,5 @@ {"type": "record", - "namespace": "com.cloudera.impala", + "namespace": "org.apache.impala", "name": "ComplexTypesTbl", "fields": [ {"name": "id", "type": "long"}, http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/testdata/ComplexTypesTbl/nullable.avsc ---------------------------------------------------------------------- diff --git a/testdata/ComplexTypesTbl/nullable.avsc b/testdata/ComplexTypesTbl/nullable.avsc index 0520241..564bea8 100644 --- a/testdata/ComplexTypesTbl/nullable.avsc +++ b/testdata/ComplexTypesTbl/nullable.avsc @@ -1,5 +1,5 @@ {"type": "record", - "namespace": "com.cloudera.impala", + "namespace": "org.apache.impala", "name": "ComplexTypesTbl", "fields": [ {"name": "id", "type": ["null", "long"]}, http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/testdata/bin/create-data-source-table.sql ---------------------------------------------------------------------- diff --git a/testdata/bin/create-data-source-table.sql b/testdata/bin/create-data-source-table.sql index df592fe..3ac0eba 100644 --- a/testdata/bin/create-data-source-table.sql +++ b/testdata/bin/create-data-source-table.sql @@ -23,7 +23,7 @@ USE functional; DROP DATA SOURCE IF EXISTS AllTypesDataSource; CREATE DATA SOURCE AllTypesDataSource LOCATION '/test-warehouse/data-sources/test-data-source.jar' -CLASS 'com.cloudera.impala.extdatasource.AllTypesDataSource' +CLASS 'org.apache.impala.extdatasource.AllTypesDataSource' API_VERSION 'V1'; DROP TABLE IF EXISTS alltypes_datasource; http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/testdata/bin/generate-block-ids.sh ---------------------------------------------------------------------- diff --git a/testdata/bin/generate-block-ids.sh b/testdata/bin/generate-block-ids.sh index ee2ee12..85d4403 100755 --- a/testdata/bin/generate-block-ids.sh +++ b/testdata/bin/generate-block-ids.sh @@ -18,5 +18,5 @@ # under the License. cd $IMPALA_FE_DIR -mvn -e exec:java -Dexec.mainClass=com.cloudera.impala.testutil.BlockIdGenerator \ +mvn -e exec:java -Dexec.mainClass=org.apache.impala.testutil.BlockIdGenerator \ -Dexec.classpathScope=test -Dexec.args="../testdata/block-ids" http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/testdata/bin/generate-load-nested.sh ---------------------------------------------------------------------- diff --git a/testdata/bin/generate-load-nested.sh b/testdata/bin/generate-load-nested.sh index 5df5b23..f943358 100755 --- a/testdata/bin/generate-load-nested.sh +++ b/testdata/bin/generate-load-nested.sh @@ -75,12 +75,12 @@ do FILE_NAME=$(basename ${AVRO_SCHEMA_PATH}) TABLE_NAME="${FILE_NAME%.*}" mvn -f "${IMPALA_HOME}/testdata/pom.xml" exec:java \ - -Dexec.mainClass="com.cloudera.impala.datagenerator.RandomNestedDataGenerator" \ + -Dexec.mainClass="org.apache.impala.datagenerator.RandomNestedDataGenerator" \ -Dexec.args="${AVRO_SCHEMA_PATH} ${NUM_ELEMENTS} ${NUM_FIELDS} ${DB_DIR}/${TABLE_NAME}/${TABLE_NAME}.parquet"; if $FLATTEN; then mvn -f "${IMPALA_HOME}/testdata/TableFlattener/pom.xml" \ - exec:java -Dexec.mainClass=com.cloudera.impala.infra.tableflattener.Main \ + exec:java -Dexec.mainClass=org.apache.impala.infra.tableflattener.Main \ -Dexec.arguments="file://${DB_DIR}/${TABLE_NAME}/${TABLE_NAME}.parquet,file://${DB_DIR}/${TABLE_NAME}_flat,-sfile://${AVRO_SCHEMA_PATH}"; fi done http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/testdata/bin/random_avro_schema.py ---------------------------------------------------------------------- diff --git a/testdata/bin/random_avro_schema.py b/testdata/bin/random_avro_schema.py index 5984f86..ccdf25c 100755 --- a/testdata/bin/random_avro_schema.py +++ b/testdata/bin/random_avro_schema.py @@ -108,7 +108,7 @@ class AvroGenerator(object): tree_root = self._schema_tree_generator.create_tree() result = {} result['type'] = 'record' - result['namespace'] = 'com.cloudera.impala' + result['namespace'] = 'org.apache.impala' result['name'] = table_name result['fields'] = self._convert_struct_fields(tree_root.fields) return result http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/testdata/bin/run-sentry-service.sh ---------------------------------------------------------------------- diff --git a/testdata/bin/run-sentry-service.sh b/testdata/bin/run-sentry-service.sh index 365a616..cb6de28 100755 --- a/testdata/bin/run-sentry-service.sh +++ b/testdata/bin/run-sentry-service.sh @@ -33,5 +33,5 @@ export HADOOP_CLASSPATH=${POSTGRES_JDBC_DRIVER} ${SENTRY_HOME}/bin/sentry --command service -c ${SENTRY_SERVICE_CONFIG} & # Wait for the service to come online -"$JAVA" -cp $CLASSPATH com.cloudera.impala.testutil.SentryServicePinger \ +"$JAVA" -cp $CLASSPATH org.apache.impala.testutil.SentryServicePinger \ --config_file "${SENTRY_SERVICE_CONFIG}" -n 30 -s 2