You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by kw...@apache.org on 2016/09/30 02:15:16 UTC

[59/61] incubator-impala git commit: IMPALA-3786: Replace "cloudera" with "apache" (part 2)

IMPALA-3786: Replace "cloudera" with "apache" (part 2)

As part of the ASF transition, we need to replace references to
Cloudera in Impala with references to Apache. This primarily means
changing Java package names from com.cloudera.impala.* to
org.apache.impala.*

A prior patch renamed all the files as necessary, and this patch
performs the actual code changes. Most of the changes in this patch
were generated with some commands of the form:

find . | grep "\.java\|\.py\|\.h\|\.cc" | \
  xargs sed -i s/'com\(.\)cloudera\(\.\)impala/org\1apache\2impala/g

along with some manual fixes.

After this patch, the remaining references to Cloudera in the repo
mostly fall into the categories:
- External components that have cloudera in their own package names,
  eg. com.cloudera.kudu/llama
- URLs, eg. https://repository.cloudera.com/

Change-Id: I0d35fa6602a7fc0c212b2ef5e2b3322b77dde7e2
Reviewed-on: http://gerrit.cloudera.org:8080/3937
Reviewed-by: Thomas Tauber-Marshall <tm...@cloudera.com>
Reviewed-by: Jim Apple <jb...@cloudera.com>
Tested-by: Internal Jenkins


Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/b2c2fe78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/b2c2fe78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/b2c2fe78

Branch: refs/heads/master
Commit: b2c2fe7813cbde794acc3dcf9c1d9e937683be72
Parents: b544f01
Author: Thomas Tauber-Marshall <tm...@cloudera.com>
Authored: Fri Aug 12 09:49:06 2016 -0700
Committer: Internal Jenkins <cl...@gerrit.cloudera.org>
Committed: Thu Sep 29 21:14:13 2016 +0000

----------------------------------------------------------------------
 be/src/benchmarks/expr-benchmark.cc             |   4 +-
 be/src/catalog/catalog.cc                       |   2 +-
 be/src/catalog/catalog.h                        |   2 +-
 be/src/exec/external-data-source-executor.cc    |   4 +-
 be/src/exec/external-data-source-executor.h     |   2 +-
 be/src/exprs/hive-udf-call.cc                   |   2 +-
 be/src/scheduling/request-pool-service.cc       |   2 +-
 be/src/scheduling/request-pool-service.h        |   2 +-
 be/src/service/fe-support.cc                    |  26 +--
 be/src/service/frontend.cc                      |   2 +-
 be/src/service/frontend.h                       |   2 +-
 be/src/util/jni-util.cc                         |   4 +-
 be/src/util/logging-support.cc                  |   6 +-
 bin/create_testdata.sh                          |   4 +-
 bin/run-jdbc-client.sh                          |   2 +-
 common/function-registry/CMakeLists.txt         |   2 +-
 .../function-registry/gen_builtins_catalog.py   |   8 +-
 common/thrift/CatalogInternalService.thrift     |   2 +-
 common/thrift/CatalogObjects.thrift             |   2 +-
 common/thrift/CatalogService.thrift             |   2 +-
 common/thrift/Data.thrift                       |   2 +-
 common/thrift/DataSinks.thrift                  |   2 +-
 common/thrift/Descriptors.thrift                |   2 +-
 common/thrift/ExecStats.thrift                  |   2 +-
 common/thrift/Exprs.thrift                      |   2 +-
 common/thrift/ExternalDataSource.thrift         |   2 +-
 common/thrift/Frontend.thrift                   |   2 +-
 common/thrift/ImpalaInternalService.thrift      |   2 +-
 common/thrift/ImpalaService.thrift              |   2 +-
 common/thrift/JniCatalog.thrift                 |   2 +-
 common/thrift/LineageGraph.thrift               |   2 +-
 common/thrift/Logging.thrift                    |   2 +-
 common/thrift/Metrics.thrift                    |   2 +-
 common/thrift/Partitions.thrift                 |   2 +-
 common/thrift/PlanNodes.thrift                  |   2 +-
 common/thrift/Planner.thrift                    |   2 +-
 common/thrift/Results.thrift                    |   2 +-
 common/thrift/RuntimeProfile.thrift             |   2 +-
 common/thrift/StatestoreService.thrift          |   2 +-
 common/thrift/Status.thrift                     |   2 +-
 common/thrift/Types.thrift                      |   2 +-
 common/thrift/generate_error_codes.py           |   2 +-
 common/thrift/generate_metrics.py               |   2 +-
 ext-data-source/api/pom.xml                     |   6 +-
 .../extdatasource/util/SerializationUtils.java  |   2 +-
 .../extdatasource/v1/ExternalDataSource.java    |  18 +-
 ext-data-source/pom.xml                         |   4 +-
 ext-data-source/sample/pom.xml                  |   8 +-
 .../extdatasource/sample/EchoDataSource.java    |  28 +--
 ext-data-source/test/pom.xml                    |   8 +-
 .../extdatasource/AllTypesDataSource.java       |  44 ++---
 fe/pom.xml                                      |   6 +-
 fe/src/main/cup/sql-parser.cup                  |  42 ++--
 .../apache/impala/analysis/AggregateInfo.java   |  12 +-
 .../impala/analysis/AggregateInfoBase.java      |   8 +-
 .../analysis/AlterTableAddPartitionStmt.java    |  18 +-
 .../analysis/AlterTableAddReplaceColsStmt.java  |  16 +-
 .../analysis/AlterTableChangeColStmt.java       |  14 +-
 .../impala/analysis/AlterTableDropColStmt.java  |  14 +-
 .../analysis/AlterTableDropPartitionStmt.java   |  12 +-
 .../analysis/AlterTableOrViewRenameStmt.java    |  18 +-
 .../AlterTableRecoverPartitionsStmt.java        |  10 +-
 .../analysis/AlterTableSetCachedStmt.java       |  16 +-
 .../analysis/AlterTableSetColumnStats.java      |  14 +-
 .../analysis/AlterTableSetFileFormatStmt.java   |  12 +-
 .../analysis/AlterTableSetLocationStmt.java     |  18 +-
 .../impala/analysis/AlterTableSetStmt.java      |  10 +-
 .../analysis/AlterTableSetTblProperties.java    |  18 +-
 .../apache/impala/analysis/AlterTableStmt.java  |  18 +-
 .../apache/impala/analysis/AlterViewStmt.java   |  12 +-
 .../apache/impala/analysis/AnalysisContext.java |  32 +--
 .../apache/impala/analysis/AnalyticExpr.java    |  28 +--
 .../apache/impala/analysis/AnalyticInfo.java    |   4 +-
 .../apache/impala/analysis/AnalyticWindow.java  |  20 +-
 .../org/apache/impala/analysis/Analyzer.java    |  76 +++----
 .../apache/impala/analysis/ArithmeticExpr.java  |  18 +-
 .../impala/analysis/AuthorizationStmt.java      |   6 +-
 .../apache/impala/analysis/BaseTableRef.java    |   8 +-
 .../impala/analysis/BetweenPredicate.java       |   6 +-
 .../apache/impala/analysis/BinaryPredicate.java |  22 +--
 .../org/apache/impala/analysis/BoolLiteral.java |  12 +-
 .../org/apache/impala/analysis/CaseExpr.java    |  22 +--
 .../apache/impala/analysis/CaseWhenClause.java  |   2 +-
 .../org/apache/impala/analysis/CastExpr.java    |  26 +--
 .../impala/analysis/CollectionStructType.java   |  14 +-
 .../impala/analysis/CollectionTableRef.java     |   8 +-
 .../org/apache/impala/analysis/ColumnDef.java   |  10 +-
 .../impala/analysis/ColumnLineageGraph.java     |  18 +-
 .../impala/analysis/CompoundPredicate.java      |  16 +-
 .../impala/analysis/ComputeStatsStmt.java       |  28 +--
 .../impala/analysis/CreateDataSrcStmt.java      |  12 +-
 .../apache/impala/analysis/CreateDbStmt.java    |  10 +-
 .../impala/analysis/CreateDropRoleStmt.java     |   8 +-
 .../impala/analysis/CreateFunctionStmtBase.java |  22 +--
 .../analysis/CreateOrAlterViewStmtBase.java     |   8 +-
 .../analysis/CreateTableAsSelectStmt.java       |  24 +--
 .../impala/analysis/CreateTableDataSrcStmt.java |  24 +--
 .../analysis/CreateTableLikeFileStmt.java       |  28 +--
 .../impala/analysis/CreateTableLikeStmt.java    |  16 +-
 .../apache/impala/analysis/CreateTableStmt.java |  34 ++--
 .../apache/impala/analysis/CreateUdaStmt.java   |  16 +-
 .../apache/impala/analysis/CreateUdfStmt.java   |  24 +--
 .../apache/impala/analysis/CreateViewStmt.java  |  12 +-
 .../org/apache/impala/analysis/DeleteStmt.java  |  10 +-
 .../apache/impala/analysis/DescribeDbStmt.java  |  10 +-
 .../impala/analysis/DescribeTableStmt.java      |  18 +-
 .../apache/impala/analysis/DescriptorTable.java |  10 +-
 .../apache/impala/analysis/DistributeParam.java |  16 +-
 .../apache/impala/analysis/DropDataSrcStmt.java |   6 +-
 .../org/apache/impala/analysis/DropDbStmt.java  |  10 +-
 .../impala/analysis/DropFunctionStmt.java       |  20 +-
 .../apache/impala/analysis/DropStatsStmt.java   |  12 +-
 .../impala/analysis/DropTableOrViewStmt.java    |  14 +-
 .../impala/analysis/EquivalenceClassId.java     |   6 +-
 .../apache/impala/analysis/ExistsPredicate.java |   6 +-
 .../java/org/apache/impala/analysis/Expr.java   |  24 +--
 .../java/org/apache/impala/analysis/ExprId.java |   6 +-
 .../impala/analysis/ExprSubstitutionMap.java    |   2 +-
 .../apache/impala/analysis/ExtractFromExpr.java |  10 +-
 .../org/apache/impala/analysis/FromClause.java  |   4 +-
 .../apache/impala/analysis/FunctionArgs.java    |   6 +-
 .../impala/analysis/FunctionCallExpr.java       |  30 +--
 .../apache/impala/analysis/FunctionName.java    |  10 +-
 .../apache/impala/analysis/FunctionParams.java  |   2 +-
 .../impala/analysis/GrantRevokePrivStmt.java    |  10 +-
 .../impala/analysis/GrantRevokeRoleStmt.java    |   6 +-
 .../apache/impala/analysis/HdfsCachingOp.java   |   8 +-
 .../org/apache/impala/analysis/HdfsUri.java     |  14 +-
 .../org/apache/impala/analysis/InPredicate.java |  20 +-
 .../apache/impala/analysis/InlineViewRef.java   |  12 +-
 .../org/apache/impala/analysis/InsertStmt.java  |  28 +--
 .../impala/analysis/IsNotEmptyPredicate.java    |   8 +-
 .../apache/impala/analysis/IsNullPredicate.java |  26 +--
 .../apache/impala/analysis/JoinOperator.java    |   4 +-
 .../apache/impala/analysis/LikePredicate.java   |  16 +-
 .../apache/impala/analysis/LimitElement.java    |  10 +-
 .../org/apache/impala/analysis/LiteralExpr.java |  20 +-
 .../apache/impala/analysis/LoadDataStmt.java    |  28 +--
 .../org/apache/impala/analysis/ModifyStmt.java  |  18 +-
 .../org/apache/impala/analysis/NullLiteral.java |   8 +-
 .../apache/impala/analysis/NumericLiteral.java  |  20 +-
 .../apache/impala/analysis/OrderByElement.java  |   2 +-
 .../org/apache/impala/analysis/ParseNode.java   |   4 +-
 .../impala/analysis/PartitionKeyValue.java      |   4 +-
 .../impala/analysis/PartitionListItem.java      |   2 +-
 .../apache/impala/analysis/PartitionSpec.java   |  16 +-
 .../java/org/apache/impala/analysis/Path.java   |  16 +-
 .../org/apache/impala/analysis/Predicate.java   |  10 +-
 .../apache/impala/analysis/PrivilegeSpec.java   |  22 +--
 .../org/apache/impala/analysis/QueryStmt.java   |   8 +-
 .../impala/analysis/ResetMetadataStmt.java      |  14 +-
 .../org/apache/impala/analysis/SelectList.java  |   2 +-
 .../apache/impala/analysis/SelectListItem.java  |   2 +-
 .../org/apache/impala/analysis/SelectStmt.java  |  22 +--
 .../org/apache/impala/analysis/SetStmt.java     |   4 +-
 .../impala/analysis/ShowCreateFunctionStmt.java |  16 +-
 .../impala/analysis/ShowCreateTableStmt.java    |  14 +-
 .../impala/analysis/ShowDataSrcsStmt.java       |   6 +-
 .../org/apache/impala/analysis/ShowDbsStmt.java |   6 +-
 .../apache/impala/analysis/ShowFilesStmt.java   |  16 +-
 .../impala/analysis/ShowFunctionsStmt.java      |  10 +-
 .../impala/analysis/ShowGrantRoleStmt.java      |  10 +-
 .../impala/analysis/ShowPartitionsStmt.java     |   6 +-
 .../apache/impala/analysis/ShowRolesStmt.java   |  10 +-
 .../apache/impala/analysis/ShowStatsStmt.java   |  12 +-
 .../apache/impala/analysis/ShowTablesStmt.java  |   8 +-
 .../impala/analysis/SingularRowSrcTableRef.java |   4 +-
 .../apache/impala/analysis/SlotDescriptor.java  |  12 +-
 .../java/org/apache/impala/analysis/SlotId.java |   6 +-
 .../org/apache/impala/analysis/SlotRef.java     |  18 +-
 .../org/apache/impala/analysis/SortInfo.java    |   2 +-
 .../apache/impala/analysis/StatementBase.java   |   8 +-
 .../apache/impala/analysis/StmtRewriter.java    |   8 +-
 .../apache/impala/analysis/StringLiteral.java   |  14 +-
 .../org/apache/impala/analysis/Subquery.java    |  12 +-
 .../org/apache/impala/analysis/TableName.java   |   6 +-
 .../org/apache/impala/analysis/TableRef.java    |  12 +-
 .../analysis/TimestampArithmeticExpr.java       |  12 +-
 .../org/apache/impala/analysis/ToSqlUtils.java  |  24 +--
 .../apache/impala/analysis/TruncateStmt.java    |  16 +-
 .../apache/impala/analysis/TupleDescriptor.java |  14 +-
 .../org/apache/impala/analysis/TupleId.java     |   6 +-
 .../impala/analysis/TupleIsNullPredicate.java   |  12 +-
 .../org/apache/impala/analysis/TypeDef.java     |  18 +-
 .../org/apache/impala/analysis/TypesUtil.java   |   8 +-
 .../org/apache/impala/analysis/UnionStmt.java   |   6 +-
 .../org/apache/impala/analysis/UpdateStmt.java  |  10 +-
 .../org/apache/impala/analysis/UseStmt.java     |  10 +-
 .../org/apache/impala/analysis/ValuesStmt.java  |   2 +-
 .../org/apache/impala/analysis/WithClause.java  |   8 +-
 .../authorization/AuthorizationChecker.java     |   8 +-
 .../authorization/AuthorizationConfig.java      |   2 +-
 .../impala/authorization/Authorizeable.java     |   2 +-
 .../authorization/AuthorizeableColumn.java      |   2 +-
 .../impala/authorization/AuthorizeableDb.java   |   2 +-
 .../impala/authorization/AuthorizeableFn.java   |   2 +-
 .../authorization/AuthorizeableServer.java      |   2 +-
 .../authorization/AuthorizeableTable.java       |   2 +-
 .../impala/authorization/AuthorizeableUri.java  |   2 +-
 .../authorization/ImpalaInternalAdminUser.java  |   2 +-
 .../apache/impala/authorization/Privilege.java  |   2 +-
 .../impala/authorization/PrivilegeRequest.java  |   2 +-
 .../authorization/PrivilegeRequestBuilder.java  |   2 +-
 .../impala/authorization/SentryConfig.java      |   4 +-
 .../org/apache/impala/authorization/User.java   |   8 +-
 .../impala/catalog/AggregateFunction.java       |  12 +-
 .../org/apache/impala/catalog/ArrayType.java    |   8 +-
 .../impala/catalog/AuthorizationException.java  |   2 +-
 .../impala/catalog/AuthorizationPolicy.java     |  14 +-
 .../org/apache/impala/catalog/BuiltinsDb.java   |  20 +-
 .../java/org/apache/impala/catalog/Catalog.java |  16 +-
 .../apache/impala/catalog/CatalogDeltaLog.java  |   6 +-
 .../apache/impala/catalog/CatalogException.java |   4 +-
 .../apache/impala/catalog/CatalogObject.java    |   4 +-
 .../impala/catalog/CatalogObjectCache.java      |   2 +-
 .../impala/catalog/CatalogServiceCatalog.java   |  46 ++---
 .../java/org/apache/impala/catalog/Column.java  |   6 +-
 .../impala/catalog/ColumnNotFoundException.java |   2 +-
 .../org/apache/impala/catalog/ColumnStats.java  |   8 +-
 .../org/apache/impala/catalog/DataSource.java   |   6 +-
 .../apache/impala/catalog/DataSourceTable.java  |  24 +--
 .../catalog/DatabaseNotFoundException.java      |   2 +-
 .../main/java/org/apache/impala/catalog/Db.java |  22 +--
 .../org/apache/impala/catalog/Function.java     |  32 +--
 .../org/apache/impala/catalog/HBaseColumn.java  |   4 +-
 .../org/apache/impala/catalog/HBaseTable.java   |  24 +--
 .../apache/impala/catalog/HdfsCachePool.java    |   6 +-
 .../apache/impala/catalog/HdfsCompression.java  |   4 +-
 .../apache/impala/catalog/HdfsFileFormat.java   |   4 +-
 .../apache/impala/catalog/HdfsPartition.java    |  40 ++--
 .../HdfsPartitionLocationCompressor.java        |   8 +-
 .../impala/catalog/HdfsStorageDescriptor.java   |   2 +-
 .../org/apache/impala/catalog/HdfsTable.java    |  78 ++++----
 .../catalog/HiveStorageDescriptorFactory.java   |   4 +-
 .../apache/impala/catalog/ImpaladCatalog.java   |  28 +--
 .../apache/impala/catalog/IncompleteTable.java  |  16 +-
 .../org/apache/impala/catalog/KuduColumn.java   |   4 +-
 .../org/apache/impala/catalog/KuduTable.java    |  26 +--
 .../java/org/apache/impala/catalog/MapType.java |   8 +-
 .../impala/catalog/MetaStoreClientPool.java     |   2 +-
 .../catalog/PartitionNotFoundException.java     |   2 +-
 .../impala/catalog/PartitionStatsUtil.java      |  12 +-
 .../apache/impala/catalog/PrimitiveType.java    |   4 +-
 .../java/org/apache/impala/catalog/Role.java    |   6 +-
 .../apache/impala/catalog/RolePrivilege.java    |  10 +-
 .../org/apache/impala/catalog/RowFormat.java    |   6 +-
 .../apache/impala/catalog/ScalarFunction.java   |  18 +-
 .../org/apache/impala/catalog/ScalarType.java   |  12 +-
 .../org/apache/impala/catalog/StructField.java  |   8 +-
 .../org/apache/impala/catalog/StructType.java   |  10 +-
 .../java/org/apache/impala/catalog/Table.java   |  28 +--
 .../java/org/apache/impala/catalog/TableId.java |   6 +-
 .../org/apache/impala/catalog/TableLoader.java  |   4 +-
 .../impala/catalog/TableLoadingException.java   |   2 +-
 .../apache/impala/catalog/TableLoadingMgr.java  |   6 +-
 .../impala/catalog/TableNotFoundException.java  |   2 +-
 .../java/org/apache/impala/catalog/Type.java    |  24 +--
 .../java/org/apache/impala/catalog/View.java    |  18 +-
 .../impala/catalog/delegates/DdlDelegate.java   |   8 +-
 .../catalog/delegates/KuduDdlDelegate.java      |  18 +-
 .../delegates/UnsupportedOpDelegate.java        |   4 +-
 .../apache/impala/common/AliasGenerator.java    |   2 +-
 .../apache/impala/common/AnalysisException.java |   2 +-
 .../org/apache/impala/common/ByteUnits.java     |   2 +-
 .../impala/common/ColumnAliasGenerator.java     |   2 +-
 .../apache/impala/common/FileSystemUtil.java    |   2 +-
 .../main/java/org/apache/impala/common/Id.java  |   2 +-
 .../org/apache/impala/common/IdGenerator.java   |   2 +-
 .../apache/impala/common/ImpalaException.java   |   2 +-
 .../impala/common/ImpalaRuntimeException.java   |   2 +-
 .../apache/impala/common/InternalException.java |   2 +-
 .../java/org/apache/impala/common/JniUtil.java  |   8 +-
 .../impala/common/NotImplementedException.java  |   2 +-
 .../java/org/apache/impala/common/Pair.java     |   2 +-
 .../org/apache/impala/common/PrintUtils.java    |  12 +-
 .../org/apache/impala/common/Reference.java     |   2 +-
 .../org/apache/impala/common/RuntimeEnv.java    |   6 +-
 .../impala/common/TableAliasGenerator.java      |   4 +-
 .../java/org/apache/impala/common/TreeNode.java |   4 +-
 .../apache/impala/extdatasource/ApiVersion.java |   6 +-
 .../ExternalDataSourceExecutor.java             |  32 +--
 .../hive/executor/ImpalaBigIntWritable.java     |   4 +-
 .../hive/executor/ImpalaBooleanWritable.java    |   4 +-
 .../hive/executor/ImpalaBytesWritable.java      |   2 +-
 .../hive/executor/ImpalaDoubleWritable.java     |   4 +-
 .../hive/executor/ImpalaFloatWritable.java      |   4 +-
 .../impala/hive/executor/ImpalaIntWritable.java |   4 +-
 .../hive/executor/ImpalaSmallIntWritable.java   |   4 +-
 .../hive/executor/ImpalaStringWritable.java     |   4 +-
 .../hive/executor/ImpalaTextWritable.java       |   2 +-
 .../hive/executor/ImpalaTinyIntWritable.java    |   4 +-
 .../impala/hive/executor/UdfExecutor.java       |  18 +-
 .../apache/impala/planner/AggregationNode.java  |  26 +--
 .../apache/impala/planner/AnalyticEvalNode.java |  24 +--
 .../apache/impala/planner/AnalyticPlanner.java  |  44 ++---
 .../org/apache/impala/planner/CohortId.java     |   6 +-
 .../apache/impala/planner/DataPartition.java    |  12 +-
 .../org/apache/impala/planner/DataSink.java     |  16 +-
 .../impala/planner/DataSourceScanNode.java      |  70 +++----
 .../apache/impala/planner/DataStreamSink.java   |  10 +-
 .../impala/planner/DistributedPlanner.java      |  24 +--
 .../org/apache/impala/planner/EmptySetNode.java |  12 +-
 .../org/apache/impala/planner/ExchangeNode.java |  22 +--
 .../apache/impala/planner/HBaseScanNode.java    |  54 ++---
 .../apache/impala/planner/HBaseTableSink.java   |  16 +-
 .../org/apache/impala/planner/HashJoinNode.java |  32 +--
 .../impala/planner/HdfsPartitionFilter.java     |  28 +--
 .../impala/planner/HdfsPartitionPruner.java     |  38 ++--
 .../org/apache/impala/planner/HdfsScanNode.java |  62 +++---
 .../apache/impala/planner/HdfsTableSink.java    |  24 +--
 .../apache/impala/planner/JoinBuildSink.java    |  24 +--
 .../org/apache/impala/planner/JoinNode.java     |  20 +-
 .../org/apache/impala/planner/JoinTableId.java  |   6 +-
 .../org/apache/impala/planner/KuduScanNode.java |  44 ++---
 .../apache/impala/planner/KuduTableSink.java    |  18 +-
 .../impala/planner/NestedLoopJoinNode.java      |  22 +--
 .../apache/impala/planner/ParallelPlanner.java  |   4 +-
 .../impala/planner/PipelinedPlanNodeSet.java    |   4 +-
 .../org/apache/impala/planner/PlanFragment.java |  36 ++--
 .../apache/impala/planner/PlanFragmentId.java   |   6 +-
 .../java/org/apache/impala/planner/PlanId.java  |   6 +-
 .../org/apache/impala/planner/PlanNode.java     |  32 +--
 .../org/apache/impala/planner/PlanNodeId.java   |   6 +-
 .../java/org/apache/impala/planner/Planner.java |  40 ++--
 .../apache/impala/planner/PlannerContext.java   |  14 +-
 .../impala/planner/RuntimeFilterGenerator.java  |  34 ++--
 .../apache/impala/planner/RuntimeFilterId.java  |   6 +-
 .../org/apache/impala/planner/ScanNode.java     |  18 +-
 .../org/apache/impala/planner/SelectNode.java   |  12 +-
 .../impala/planner/SingleNodePlanner.java       |  78 ++++----
 .../impala/planner/SingularRowSrcNode.java      |  12 +-
 .../org/apache/impala/planner/SortNode.java     |  30 +--
 .../org/apache/impala/planner/SubplanNode.java  |  12 +-
 .../org/apache/impala/planner/TableSink.java    |  14 +-
 .../org/apache/impala/planner/UnionNode.java    |  22 +--
 .../org/apache/impala/planner/UnnestNode.java   |  18 +-
 .../org/apache/impala/planner/ValueRange.java   |  18 +-
 .../apache/impala/service/BackendConfig.java    |   2 +-
 .../impala/service/CatalogOpExecutor.java       | 196 +++++++++----------
 .../impala/service/DescribeResultFactory.java   |  20 +-
 .../org/apache/impala/service/FeSupport.java    |  46 ++---
 .../org/apache/impala/service/Frontend.java     | 194 +++++++++---------
 .../org/apache/impala/service/JniCatalog.java   |  60 +++---
 .../org/apache/impala/service/JniFrontend.java  | 100 +++++-----
 .../org/apache/impala/service/MetadataOp.java   |  38 ++--
 .../apache/impala/util/AvroSchemaConverter.java |  22 +--
 .../apache/impala/util/AvroSchemaParser.java    |  20 +-
 .../org/apache/impala/util/AvroSchemaUtils.java |  10 +-
 .../org/apache/impala/util/DisjointSet.java     |   2 +-
 .../org/apache/impala/util/EventSequence.java   |   4 +-
 .../apache/impala/util/FileWatchService.java    |   2 +-
 .../apache/impala/util/FsPermissionChecker.java |   2 +-
 .../org/apache/impala/util/GlogAppender.java    |  12 +-
 .../org/apache/impala/util/HdfsCachingUtil.java |  16 +-
 .../java/org/apache/impala/util/KuduUtil.java   |  16 +-
 .../java/org/apache/impala/util/ListMap.java    |   2 +-
 .../impala/util/MaxRowsProcessedVisitor.java    |  10 +-
 .../apache/impala/util/MembershipSnapshot.java  |   6 +-
 .../org/apache/impala/util/MetaStoreUtil.java   |   6 +-
 .../org/apache/impala/util/NativeLibUtil.java   |   2 +-
 .../org/apache/impala/util/NativeLogger.java    |   2 +-
 .../org/apache/impala/util/PatternMatcher.java  |   2 +-
 .../apache/impala/util/RequestPoolService.java  |  26 +--
 .../apache/impala/util/SentryPolicyService.java |  22 +--
 .../org/apache/impala/util/SentryProxy.java     |  22 +--
 .../org/apache/impala/util/StatsHelper.java     |   2 +-
 .../apache/impala/util/TAccessLevelUtil.java    |   4 +-
 .../apache/impala/util/TColumnValueUtil.java    |   4 +-
 .../apache/impala/util/TResultRowBuilder.java   |   8 +-
 .../apache/impala/util/TSessionStateUtil.java   |   4 +-
 .../java/org/apache/impala/util/UnsafeUtil.java |   2 +-
 .../java/org/apache/impala/util/Visitor.java    |   2 +-
 fe/src/main/jflex/sql-scanner.flex              |   4 +-
 .../impala/analysis/AnalyzeAuthStmtsTest.java   |  14 +-
 .../apache/impala/analysis/AnalyzeDDLTest.java  |  36 ++--
 .../impala/analysis/AnalyzeExprsTest.java       |  38 ++--
 .../impala/analysis/AnalyzeModifyStmtsTest.java |   4 +-
 .../impala/analysis/AnalyzeStmtsTest.java       |  10 +-
 .../impala/analysis/AnalyzeSubqueriesTest.java  |   6 +-
 .../apache/impala/analysis/AnalyzerTest.java    |  16 +-
 .../apache/impala/analysis/AuditingTest.java    |  24 +--
 .../impala/analysis/AuthorizationTest.java      |  60 +++---
 .../org/apache/impala/analysis/ExprTest.java    |   6 +-
 .../org/apache/impala/analysis/ParserTest.java  |   8 +-
 .../org/apache/impala/analysis/ToSqlTest.java   |  10 +-
 .../apache/impala/analysis/TypesUtilTest.java   |  16 +-
 .../catalog/CatalogObjectToFromThriftTest.java  |  24 +--
 .../org/apache/impala/catalog/CatalogTest.java  |  18 +-
 .../impala/catalog/HdfsPartitionTest.java       |   6 +-
 .../catalog/HdfsStorageDescriptorTest.java      |   8 +-
 .../apache/impala/catalog/TestSchemaUtils.java  |   2 +-
 .../apache/impala/common/FrontendTestBase.java  |  60 +++---
 .../apache/impala/hive/executor/TestUdf.java    |   2 +-
 .../impala/hive/executor/UdfExecutorTest.java   |  18 +-
 .../org/apache/impala/planner/PlannerTest.java  |  12 +-
 .../apache/impala/planner/PlannerTestBase.java  |  66 +++----
 .../apache/impala/planner/S3PlannerTest.java    |   4 +-
 .../org/apache/impala/service/FrontendTest.java |  28 +--
 .../org/apache/impala/service/JdbcTest.java     |  10 +-
 .../impala/testutil/BlockIdGenerator.java       |  18 +-
 .../testutil/CatalogServiceTestCatalog.java     |  12 +-
 .../impala/testutil/ImpalaJdbcClient.java       |   2 +-
 .../impala/testutil/ImpaladTestCatalog.java     |  18 +-
 .../impala/testutil/SentryServicePinger.java    |   8 +-
 .../apache/impala/testutil/TestFileParser.java  |   2 +-
 .../org/apache/impala/testutil/TestUtils.java   |  20 +-
 .../org/apache/impala/util/KuduUtilTest.java    |   4 +-
 .../org/apache/impala/util/TestDisjointSet.java |   2 +-
 .../impala/util/TestRequestPoolService.java     |  14 +-
 testdata/ComplexTypesTbl/nonnullable.avsc       |   2 +-
 testdata/ComplexTypesTbl/nullable.avsc          |   2 +-
 testdata/bin/create-data-source-table.sql       |   2 +-
 testdata/bin/generate-block-ids.sh              |   2 +-
 testdata/bin/generate-load-nested.sh            |   4 +-
 testdata/bin/random_avro_schema.py              |   2 +-
 testdata/bin/run-sentry-service.sh              |   2 +-
 testdata/bin/split-hbase.sh                     |   2 +-
 testdata/data/README                            |   2 +-
 testdata/data/schemas/nested/README             |   6 +-
 testdata/data/schemas/nested/nested.avsc        |   2 +-
 testdata/parquet_schema_resolution/README       |   2 +-
 .../parquet_schema_resolution/switched_map.avsc |   2 +-
 testdata/pom.xml                                |   2 +-
 .../datagenerator/CsvToHBaseConverter.java      |   2 +-
 .../HBaseTestDataRegionAssigment.java           |   2 +-
 .../datagenerator/JsonToParquetConverter.java   |   2 +-
 .../RandomNestedDataGenerator.java              |   2 +-
 .../impala/datagenerator/TestDataGenerator.java |   2 +-
 .../queries/QueryTest/load-java-udfs.test       |  34 ++--
 .../queries/QueryTest/show-data-sources.test    |  10 +-
 tests/custom_cluster/test_permanent_udfs.py     |  20 +-
 tests/metadata/test_ddl.py                      |   2 +-
 .../metadata/test_metadata_query_statements.py  |   2 +-
 tests/query_test/test_udfs.py                   |   4 +-
 tests/test-hive-udfs/pom.xml                    |   2 +-
 .../org/apache/impala/IncompatibleUdfTest.java  |   2 +-
 .../java/org/apache/impala/JavaUdfTest.java     |   2 +-
 .../main/java/org/apache/impala/TestUdf.java    |   2 +-
 .../org/apache/impala/TestUdfException.java     |   2 +-
 .../java/org/apache/impala/TestUpdateUdf.java   |   2 +-
 .../java/org/apache/impala/UnresolvedUdf.java   |   2 +-
 441 files changed, 2864 insertions(+), 2864 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/benchmarks/expr-benchmark.cc
----------------------------------------------------------------------
diff --git a/be/src/benchmarks/expr-benchmark.cc b/be/src/benchmarks/expr-benchmark.cc
index e7788be..b95e6d7 100644
--- a/be/src/benchmarks/expr-benchmark.cc
+++ b/be/src/benchmarks/expr-benchmark.cc
@@ -58,7 +58,7 @@ class Planner {
   Planner() {
     JNIEnv* jni_env = getJNIEnv();
     // create instance of java class JniFrontend
-    jclass fe_class = jni_env->FindClass("com/cloudera/impala/service/JniFrontend");
+    jclass fe_class = jni_env->FindClass("org/apache/impala/service/JniFrontend");
     jmethodID fe_ctor = jni_env->GetMethodID(fe_class, "<init>", "(Z)V");
     EXIT_IF_EXC(jni_env);
     create_exec_request_id_ =
@@ -91,7 +91,7 @@ class Planner {
   }
 
  private:
-  jobject fe_;  // instance of com.cloudera.impala.service.JniFrontend
+  jobject fe_;  // instance of org.apache.impala.service.JniFrontend
   jmethodID create_exec_request_id_;  // JniFrontend.createExecRequest()
 
   TQueryOptions query_options_;

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/catalog/catalog.cc
----------------------------------------------------------------------
diff --git a/be/src/catalog/catalog.cc b/be/src/catalog/catalog.cc
index cef341a..44771c8 100644
--- a/be/src/catalog/catalog.cc
+++ b/be/src/catalog/catalog.cc
@@ -59,7 +59,7 @@ Catalog::Catalog() {
 
   JNIEnv* jni_env = getJNIEnv();
   // Create an instance of the java class JniCatalog
-  catalog_class_ = jni_env->FindClass("com/cloudera/impala/service/JniCatalog");
+  catalog_class_ = jni_env->FindClass("org/apache/impala/service/JniCatalog");
   EXIT_IF_EXC(jni_env);
 
   uint32_t num_methods = sizeof(methods) / sizeof(methods[0]);

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/catalog/catalog.h
----------------------------------------------------------------------
diff --git a/be/src/catalog/catalog.h b/be/src/catalog/catalog.h
index 3fb0646..ab6a2a3 100644
--- a/be/src/catalog/catalog.h
+++ b/be/src/catalog/catalog.h
@@ -104,7 +104,7 @@ class Catalog {
   /// Descriptor of Java Catalog class itself, used to create a new instance.
   jclass catalog_class_;
 
-  jobject catalog_;  // instance of com.cloudera.impala.service.JniCatalog
+  jobject catalog_;  // instance of org.apache.impala.service.JniCatalog
   jmethodID update_metastore_id_;  // JniCatalog.updateMetaastore()
   jmethodID exec_ddl_id_;  // JniCatalog.execDdl()
   jmethodID reset_metadata_id_;  // JniCatalog.resetMetdata()

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/exec/external-data-source-executor.cc
----------------------------------------------------------------------
diff --git a/be/src/exec/external-data-source-executor.cc b/be/src/exec/external-data-source-executor.cc
index 5c8d89e..df93893 100644
--- a/be/src/exec/external-data-source-executor.cc
+++ b/be/src/exec/external-data-source-executor.cc
@@ -62,7 +62,7 @@ class ExternalDataSourceExecutor::JniState {
     RETURN_IF_ERROR(jni_frame.push(env));
 
     RETURN_IF_ERROR(JniUtil::GetGlobalClassRef(env,
-        "com/cloudera/impala/extdatasource/ExternalDataSourceExecutor",
+        "org/apache/impala/extdatasource/ExternalDataSourceExecutor",
         &executor_class_));
     uint32_t num_methods = sizeof(methods) / sizeof(methods[0]);
     for (int i = 0; i < num_methods; ++i) {
@@ -100,7 +100,7 @@ class ExternalDataSourceExecutor::JniState {
     return Status::OK();
   }
 
-  /// Class reference for com.cloudera.impala.extdatasource.ExternalDataSourceExecutor
+  /// Class reference for org.apache.impala.extdatasource.ExternalDataSourceExecutor
   jclass executor_class_;
 
   jmethodID ctor_;

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/exec/external-data-source-executor.h
----------------------------------------------------------------------
diff --git a/be/src/exec/external-data-source-executor.h b/be/src/exec/external-data-source-executor.h
index 5335ba5..cdeaf84 100644
--- a/be/src/exec/external-data-source-executor.h
+++ b/be/src/exec/external-data-source-executor.h
@@ -66,7 +66,7 @@ class ExternalDataSourceExecutor {
 
   bool is_initialized_; // Set true in Init() to ensure the class is initialized.
 
-  /// Instance of com.cloudera.impala.extdatasource.ExternalDataSourceExecutor
+  /// Instance of org.apache.impala.extdatasource.ExternalDataSourceExecutor
   jobject executor_;
 };
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/exprs/hive-udf-call.cc
----------------------------------------------------------------------
diff --git a/be/src/exprs/hive-udf-call.cc b/be/src/exprs/hive-udf-call.cc
index 8b8ea4d..c7a3f32 100644
--- a/be/src/exprs/hive-udf-call.cc
+++ b/be/src/exprs/hive-udf-call.cc
@@ -33,7 +33,7 @@
 
 #include "common/names.h"
 
-const char* EXECUTOR_CLASS = "com/cloudera/impala/hive/executor/UdfExecutor";
+const char* EXECUTOR_CLASS = "org/apache/impala/hive/executor/UdfExecutor";
 const char* EXECUTOR_CTOR_SIGNATURE ="([B)V";
 const char* EXECUTOR_EVALUATE_SIGNATURE = "()V";
 const char* EXECUTOR_CLOSE_SIGNATURE = "()V";

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/scheduling/request-pool-service.cc
----------------------------------------------------------------------
diff --git a/be/src/scheduling/request-pool-service.cc b/be/src/scheduling/request-pool-service.cc
index ea2553e..6c9ccdb 100644
--- a/be/src/scheduling/request-pool-service.cc
+++ b/be/src/scheduling/request-pool-service.cc
@@ -123,7 +123,7 @@ RequestPoolService::RequestPoolService(MetricGroup* metrics) :
 
   JNIEnv* jni_env = getJNIEnv();
   request_pool_service_class_ =
-    jni_env->FindClass("com/cloudera/impala/util/RequestPoolService");
+    jni_env->FindClass("org/apache/impala/util/RequestPoolService");
   EXIT_IF_EXC(jni_env);
   uint32_t num_methods = sizeof(methods) / sizeof(methods[0]);
   for (int i = 0; i < num_methods; ++i) {

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/scheduling/request-pool-service.h
----------------------------------------------------------------------
diff --git a/be/src/scheduling/request-pool-service.h b/be/src/scheduling/request-pool-service.h
index fdfe11d..935bae8 100644
--- a/be/src/scheduling/request-pool-service.h
+++ b/be/src/scheduling/request-pool-service.h
@@ -71,7 +71,7 @@ class RequestPoolService {
   /// The following members are not initialized if default_pool_only_ is true.
   /// Descriptor of Java RequestPoolService class itself, used to create a new instance.
   jclass request_pool_service_class_;
-  /// Instance of com.cloudera.impala.util.RequestPoolService
+  /// Instance of org.apache.impala.util.RequestPoolService
   jobject request_pool_service_;
   jmethodID resolve_request_pool_id_;  // RequestPoolService.resolveRequestPool()
   jmethodID get_pool_config_id_;  // RequestPoolService.getPoolConfig()

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/service/fe-support.cc
----------------------------------------------------------------------
diff --git a/be/src/service/fe-support.cc b/be/src/service/fe-support.cc
index f3fc445..996770c 100644
--- a/be/src/service/fe-support.cc
+++ b/be/src/service/fe-support.cc
@@ -56,7 +56,7 @@ using namespace apache::thrift::server;
 // This is not called when we first start up the BE.
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_cloudera_impala_service_FeSupport_NativeFeTestInit(
+Java_org_apache_impala_service_FeSupport_NativeFeTestInit(
     JNIEnv* env, jclass caller_class) {
   DCHECK(ExecEnv::GetInstance() == NULL) << "This should only be called once from the FE";
   char* name = const_cast<char*>("FeSupport");
@@ -72,7 +72,7 @@ Java_com_cloudera_impala_service_FeSupport_NativeFeTestInit(
 // called.
 extern "C"
 JNIEXPORT jbyteArray JNICALL
-Java_com_cloudera_impala_service_FeSupport_NativeEvalConstExprs(
+Java_org_apache_impala_service_FeSupport_NativeEvalConstExprs(
     JNIEnv* env, jclass caller_class, jbyteArray thrift_expr_batch,
     jbyteArray thrift_query_ctx_bytes) {
   jbyteArray result_bytes = NULL;
@@ -256,7 +256,7 @@ static void ResolveSymbolLookup(const TSymbolLookupParams params,
 
 extern "C"
 JNIEXPORT jbyteArray JNICALL
-Java_com_cloudera_impala_service_FeSupport_NativeCacheJar(
+Java_org_apache_impala_service_FeSupport_NativeCacheJar(
     JNIEnv* env, jclass caller_class, jbyteArray thrift_struct) {
   TCacheJarParams params;
   DeserializeThriftMsg(env, thrift_struct, &params);
@@ -276,7 +276,7 @@ Java_com_cloudera_impala_service_FeSupport_NativeCacheJar(
 
 extern "C"
 JNIEXPORT jbyteArray JNICALL
-Java_com_cloudera_impala_service_FeSupport_NativeLookupSymbol(
+Java_org_apache_impala_service_FeSupport_NativeLookupSymbol(
     JNIEnv* env, jclass caller_class, jbyteArray thrift_struct) {
   TSymbolLookupParams lookup;
   DeserializeThriftMsg(env, thrift_struct, &lookup);
@@ -299,7 +299,7 @@ Java_com_cloudera_impala_service_FeSupport_NativeLookupSymbol(
 // specific catalog objects.
 extern "C"
 JNIEXPORT jbyteArray JNICALL
-Java_com_cloudera_impala_service_FeSupport_NativePrioritizeLoad(
+Java_org_apache_impala_service_FeSupport_NativePrioritizeLoad(
     JNIEnv* env, jclass caller_class, jbyteArray thrift_struct) {
   TPrioritizeLoadRequest request;
   DeserializeThriftMsg(env, thrift_struct, &request);
@@ -323,7 +323,7 @@ Java_com_cloudera_impala_service_FeSupport_NativePrioritizeLoad(
 
 extern "C"
 JNIEXPORT jbyteArray JNICALL
-Java_com_cloudera_impala_service_FeSupport_NativeGetStartupOptions(JNIEnv* env,
+Java_org_apache_impala_service_FeSupport_NativeGetStartupOptions(JNIEnv* env,
     jclass caller_class) {
   TStartupOptions options;
   ExecEnv* exec_env = ExecEnv::GetInstance();
@@ -340,33 +340,33 @@ namespace impala {
 static JNINativeMethod native_methods[] = {
   {
     (char*)"NativeFeTestInit", (char*)"()V",
-    (void*)::Java_com_cloudera_impala_service_FeSupport_NativeFeTestInit
+    (void*)::Java_org_apache_impala_service_FeSupport_NativeFeTestInit
   },
   {
     (char*)"NativeEvalConstExprs", (char*)"([B[B)[B",
-    (void*)::Java_com_cloudera_impala_service_FeSupport_NativeEvalConstExprs
+    (void*)::Java_org_apache_impala_service_FeSupport_NativeEvalConstExprs
   },
   {
     (char*)"NativeCacheJar", (char*)"([B)[B",
-    (void*)::Java_com_cloudera_impala_service_FeSupport_NativeCacheJar
+    (void*)::Java_org_apache_impala_service_FeSupport_NativeCacheJar
   },
   {
     (char*)"NativeLookupSymbol", (char*)"([B)[B",
-    (void*)::Java_com_cloudera_impala_service_FeSupport_NativeLookupSymbol
+    (void*)::Java_org_apache_impala_service_FeSupport_NativeLookupSymbol
   },
   {
     (char*)"NativePrioritizeLoad", (char*)"([B)[B",
-    (void*)::Java_com_cloudera_impala_service_FeSupport_NativePrioritizeLoad
+    (void*)::Java_org_apache_impala_service_FeSupport_NativePrioritizeLoad
   },
   {
     (char*)"NativeGetStartupOptions", (char*)"()[B",
-    (void*)::Java_com_cloudera_impala_service_FeSupport_NativeGetStartupOptions
+    (void*)::Java_org_apache_impala_service_FeSupport_NativeGetStartupOptions
   },
 };
 
 void InitFeSupport() {
   JNIEnv* env = getJNIEnv();
-  jclass native_backend_cl = env->FindClass("com/cloudera/impala/service/FeSupport");
+  jclass native_backend_cl = env->FindClass("org/apache/impala/service/FeSupport");
   env->RegisterNatives(native_backend_cl, native_methods,
       sizeof(native_methods) / sizeof(native_methods[0]));
   EXIT_IF_EXC(env);

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/service/frontend.cc
----------------------------------------------------------------------
diff --git a/be/src/service/frontend.cc b/be/src/service/frontend.cc
index d7357f6..107354b 100644
--- a/be/src/service/frontend.cc
+++ b/be/src/service/frontend.cc
@@ -89,7 +89,7 @@ Frontend::Frontend() {
 
   JNIEnv* jni_env = getJNIEnv();
   // create instance of java class JniFrontend
-  fe_class_ = jni_env->FindClass("com/cloudera/impala/service/JniFrontend");
+  fe_class_ = jni_env->FindClass("org/apache/impala/service/JniFrontend");
   EXIT_IF_EXC(jni_env);
 
   uint32_t num_methods = sizeof(methods) / sizeof(methods[0]);

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/service/frontend.h
----------------------------------------------------------------------
diff --git a/be/src/service/frontend.h b/be/src/service/frontend.h
index 875789d..29dec68 100644
--- a/be/src/service/frontend.h
+++ b/be/src/service/frontend.h
@@ -172,7 +172,7 @@ class Frontend {
   /// Descriptor of Java Frontend class itself, used to create a new instance.
   jclass fe_class_;
 
-  jobject fe_;  // instance of com.cloudera.impala.service.JniFrontend
+  jobject fe_;  // instance of org.apache.impala.service.JniFrontend
   jmethodID create_exec_request_id_;  // JniFrontend.createExecRequest()
   jmethodID get_explain_plan_id_;  // JniFrontend.getExplainPlan()
   jmethodID get_hadoop_config_id_;  // JniFrontend.getHadoopConfig(byte[])

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/util/jni-util.cc
----------------------------------------------------------------------
diff --git a/be/src/util/jni-util.cc b/be/src/util/jni-util.cc
index 30edaf9..3d9f6a4 100644
--- a/be/src/util/jni-util.cc
+++ b/be/src/util/jni-util.cc
@@ -82,7 +82,7 @@ Status JniUtil::Init() {
   JNIEnv* env = getJNIEnv();
   if (env == NULL) return Status("Failed to get/create JVM");
   // Find JniUtil class and create a global ref.
-  jclass local_jni_util_cl = env->FindClass("com/cloudera/impala/common/JniUtil");
+  jclass local_jni_util_cl = env->FindClass("org/apache/impala/common/JniUtil");
   if (local_jni_util_cl == NULL) {
     if (env->ExceptionOccurred()) env->ExceptionDescribe();
     return Status("Failed to find JniUtil class.");
@@ -99,7 +99,7 @@ Status JniUtil::Init() {
 
   // Find InternalException class and create a global ref.
   jclass local_internal_exc_cl =
-      env->FindClass("com/cloudera/impala/common/InternalException");
+      env->FindClass("org/apache/impala/common/InternalException");
   if (local_internal_exc_cl == NULL) {
     if (env->ExceptionOccurred()) env->ExceptionDescribe();
     return Status("Failed to find JniUtil class.");

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/be/src/util/logging-support.cc
----------------------------------------------------------------------
diff --git a/be/src/util/logging-support.cc b/be/src/util/logging-support.cc
index 1e202d7..6958e43 100644
--- a/be/src/util/logging-support.cc
+++ b/be/src/util/logging-support.cc
@@ -33,7 +33,7 @@ DEFINE_int32(non_impala_java_vlog, 0, "(Advanced) The log level (equivalent to -
 // service to log messages to Glog.
 extern "C"
 JNIEXPORT void JNICALL
-Java_com_cloudera_impala_util_NativeLogger_Log(
+Java_org_apache_impala_util_NativeLogger_Log(
     JNIEnv* env, jclass caller_class, int severity, jstring msg, jstring file,
     int line_number) {
 
@@ -79,10 +79,10 @@ namespace impala {
 void InitJvmLoggingSupport() {
   JNIEnv* env = getJNIEnv();
   JNINativeMethod nm;
-  jclass native_backend_cl = env->FindClass("com/cloudera/impala/util/NativeLogger");
+  jclass native_backend_cl = env->FindClass("org/apache/impala/util/NativeLogger");
   nm.name = const_cast<char*>("Log");
   nm.signature = const_cast<char*>("(ILjava/lang/String;Ljava/lang/String;I)V");
-  nm.fnPtr = reinterpret_cast<void*>(::Java_com_cloudera_impala_util_NativeLogger_Log);
+  nm.fnPtr = reinterpret_cast<void*>(::Java_org_apache_impala_util_NativeLogger_Log);
   env->RegisterNatives(native_backend_cl, &nm, 1);
   EXIT_IF_EXC(env);
 }

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/bin/create_testdata.sh
----------------------------------------------------------------------
diff --git a/bin/create_testdata.sh b/bin/create_testdata.sh
index 57b9cc1..cc296bf 100755
--- a/bin/create_testdata.sh
+++ b/bin/create_testdata.sh
@@ -46,6 +46,6 @@ done
 # run test data generator
 echo $DATALOC
 mkdir -p $DATALOC
-"$JAVA" -cp $CP com.cloudera.impala.datagenerator.TestDataGenerator $DATALOC
-"$JAVA" -cp $CP com.cloudera.impala.datagenerator.CsvToHBaseConverter
+"$JAVA" -cp $CP org.apache.impala.datagenerator.TestDataGenerator $DATALOC
+"$JAVA" -cp $CP org.apache.impala.datagenerator.CsvToHBaseConverter
 echo "SUCCESS, data generated into $DATALOC"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/bin/run-jdbc-client.sh
----------------------------------------------------------------------
diff --git a/bin/run-jdbc-client.sh b/bin/run-jdbc-client.sh
index 66a8afe..e944b2d 100755
--- a/bin/run-jdbc-client.sh
+++ b/bin/run-jdbc-client.sh
@@ -18,4 +18,4 @@
 # under the License.
 
 . ${IMPALA_HOME}/bin/set-classpath.sh
-"$JAVA" -cp $CLASSPATH com.cloudera.impala.testutil.ImpalaJdbcClient "$@"
+"$JAVA" -cp $CLASSPATH org.apache.impala.testutil.ImpalaJdbcClient "$@"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/function-registry/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/common/function-registry/CMakeLists.txt b/common/function-registry/CMakeLists.txt
index faaa731..013632f 100644
--- a/common/function-registry/CMakeLists.txt
+++ b/common/function-registry/CMakeLists.txt
@@ -19,7 +19,7 @@
 cmake_minimum_required(VERSION 2.6)
 
 set(BE_OUTPUT_DIR ${CMAKE_SOURCE_DIR}/be/generated-sources)
-set(FE_OUTPUT_DIR ${CMAKE_SOURCE_DIR}/fe/generated-sources/gen-java/com/cloudera/impala/)
+set(FE_OUTPUT_DIR ${CMAKE_SOURCE_DIR}/fe/generated-sources/gen-java/org/apache/impala/)
 
 # Set output files for dependency tracking
 set(CODE_GEN_OUTPUT

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/function-registry/gen_builtins_catalog.py
----------------------------------------------------------------------
diff --git a/common/function-registry/gen_builtins_catalog.py b/common/function-registry/gen_builtins_catalog.py
index 2f94d1c..6f1cc22 100755
--- a/common/function-registry/gen_builtins_catalog.py
+++ b/common/function-registry/gen_builtins_catalog.py
@@ -44,10 +44,10 @@ java_registry_preamble = '\
 // common/function-registry/gen_builtins_catalog.py or the function list at\n\
 // common/function-registry/impala_functions.py.\n\
 \n\
-package com.cloudera.impala.builtins;\n\
+package org.apache.impala.builtins;\n\
 \n\
-import com.cloudera.impala.catalog.Type;\n\
-import com.cloudera.impala.catalog.Db;\n\
+import org.apache.impala.catalog.Type;\n\
+import org.apache.impala.catalog.Db;\n\
 \n\
 public class ScalarBuiltins { \n\
   public static void initBuiltins(Db db) { \
@@ -58,7 +58,7 @@ java_registry_epilogue = '\
 }\n'
 
 FE_PATH = os.path.expandvars(
-  "$IMPALA_HOME/fe/generated-sources/gen-java/com/cloudera/impala/builtins/")
+  "$IMPALA_HOME/fe/generated-sources/gen-java/org/apache/impala/builtins/")
 
 # This contains all the metadata to describe all the builtins.
 # Each meta data entry is itself a map to store all the meta data

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/CatalogInternalService.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/CatalogInternalService.thrift b/common/thrift/CatalogInternalService.thrift
index ef8c320..5b68408 100644
--- a/common/thrift/CatalogInternalService.thrift
+++ b/common/thrift/CatalogInternalService.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "CatalogObjects.thrift"
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/CatalogObjects.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/CatalogObjects.thrift b/common/thrift/CatalogObjects.thrift
index 46370fb..5378988 100644
--- a/common/thrift/CatalogObjects.thrift
+++ b/common/thrift/CatalogObjects.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Exprs.thrift"
 include "Status.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/CatalogService.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/CatalogService.thrift b/common/thrift/CatalogService.thrift
index 64bd52d..ec4bde2 100644
--- a/common/thrift/CatalogService.thrift
+++ b/common/thrift/CatalogService.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "CatalogObjects.thrift"
 include "JniCatalog.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Data.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Data.thrift b/common/thrift/Data.thrift
index 2232b4a..61d1988 100644
--- a/common/thrift/Data.thrift
+++ b/common/thrift/Data.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 // this is a union over all possible return types
 struct TColumnValue {

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/DataSinks.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/DataSinks.thrift b/common/thrift/DataSinks.thrift
index 922dcd8..12a75b9 100644
--- a/common/thrift/DataSinks.thrift
+++ b/common/thrift/DataSinks.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Exprs.thrift"
 include "Types.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Descriptors.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Descriptors.thrift b/common/thrift/Descriptors.thrift
index 40dcd16..1077bb6 100644
--- a/common/thrift/Descriptors.thrift
+++ b/common/thrift/Descriptors.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "CatalogObjects.thrift"
 include "Types.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/ExecStats.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/ExecStats.thrift b/common/thrift/ExecStats.thrift
index 05aab55..8068b63 100644
--- a/common/thrift/ExecStats.thrift
+++ b/common/thrift/ExecStats.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Status.thrift"
 include "Types.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Exprs.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Exprs.thrift b/common/thrift/Exprs.thrift
index 2441189..3f91ac3 100644
--- a/common/thrift/Exprs.thrift
+++ b/common/thrift/Exprs.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Types.thrift"
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/ExternalDataSource.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/ExternalDataSource.thrift b/common/thrift/ExternalDataSource.thrift
index 3ddf3f7..59e6617 100644
--- a/common/thrift/ExternalDataSource.thrift
+++ b/common/thrift/ExternalDataSource.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala.extdatasource
-namespace java com.cloudera.impala.extdatasource.thrift
+namespace java org.apache.impala.extdatasource.thrift
 
 include "Status.thrift"
 include "Data.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Frontend.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Frontend.thrift b/common/thrift/Frontend.thrift
index 732ea4a..95d6ba3 100644
--- a/common/thrift/Frontend.thrift
+++ b/common/thrift/Frontend.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Types.thrift"
 include "ImpalaInternalService.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/ImpalaInternalService.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/ImpalaInternalService.thrift b/common/thrift/ImpalaInternalService.thrift
index fdb8aa8..089524d 100644
--- a/common/thrift/ImpalaInternalService.thrift
+++ b/common/thrift/ImpalaInternalService.thrift
@@ -19,7 +19,7 @@
 // This file contains the details of the protocol between coordinators and backends.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Status.thrift"
 include "ErrorCodes.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/ImpalaService.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/ImpalaService.thrift b/common/thrift/ImpalaService.thrift
index ae00ea2..da41a8e 100644
--- a/common/thrift/ImpalaService.thrift
+++ b/common/thrift/ImpalaService.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "ExecStats.thrift"
 include "Status.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/JniCatalog.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/JniCatalog.thrift b/common/thrift/JniCatalog.thrift
index 8cbe039..b97e458 100644
--- a/common/thrift/JniCatalog.thrift
+++ b/common/thrift/JniCatalog.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "CatalogObjects.thrift"
 include "Types.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/LineageGraph.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/LineageGraph.thrift b/common/thrift/LineageGraph.thrift
index e4c1b0f..f0d3540 100644
--- a/common/thrift/LineageGraph.thrift
+++ b/common/thrift/LineageGraph.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 struct TVertex {
   // Vertex id

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Logging.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Logging.thrift b/common/thrift/Logging.thrift
index ed2573d..cd3db98 100644
--- a/common/thrift/Logging.thrift
+++ b/common/thrift/Logging.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 // Types to support Impala log forwarding.
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Metrics.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Metrics.thrift b/common/thrift/Metrics.thrift
index c2bc9c1..04f5946 100644
--- a/common/thrift/Metrics.thrift
+++ b/common/thrift/Metrics.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 // Metric and counter data types.
 enum TUnit {

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Partitions.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Partitions.thrift b/common/thrift/Partitions.thrift
index a34481b..0e918d1 100644
--- a/common/thrift/Partitions.thrift
+++ b/common/thrift/Partitions.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Exprs.thrift"
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/PlanNodes.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/PlanNodes.thrift b/common/thrift/PlanNodes.thrift
index 0219bcd..4cf1357 100644
--- a/common/thrift/PlanNodes.thrift
+++ b/common/thrift/PlanNodes.thrift
@@ -22,7 +22,7 @@
 // (those are recorded in TPlanFragmentInstanceCtx).
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "CatalogObjects.thrift"
 include "ExecStats.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Planner.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Planner.thrift b/common/thrift/Planner.thrift
index 81d97b2..eb95585 100644
--- a/common/thrift/Planner.thrift
+++ b/common/thrift/Planner.thrift
@@ -19,7 +19,7 @@
 // This file contains structures produced by the planner.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Types.thrift"
 include "Exprs.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Results.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Results.thrift b/common/thrift/Results.thrift
index d4840b1..54aae75 100644
--- a/common/thrift/Results.thrift
+++ b/common/thrift/Results.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Data.thrift"
 include "Types.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/RuntimeProfile.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/RuntimeProfile.thrift b/common/thrift/RuntimeProfile.thrift
index 71419a0..068108b 100644
--- a/common/thrift/RuntimeProfile.thrift
+++ b/common/thrift/RuntimeProfile.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Metrics.thrift"
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/StatestoreService.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/StatestoreService.thrift b/common/thrift/StatestoreService.thrift
index a1dcc24..1677635 100644
--- a/common/thrift/StatestoreService.thrift
+++ b/common/thrift/StatestoreService.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Status.thrift"
 include "Types.thrift"

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Status.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Status.thrift b/common/thrift/Status.thrift
index 3f7b2f2..c119875 100644
--- a/common/thrift/Status.thrift
+++ b/common/thrift/Status.thrift
@@ -18,7 +18,7 @@
 include "ErrorCodes.thrift"
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 struct TStatus {
   1: required ErrorCodes.TErrorCode status_code

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/Types.thrift
----------------------------------------------------------------------
diff --git a/common/thrift/Types.thrift b/common/thrift/Types.thrift
index 1a503bb..770a414 100644
--- a/common/thrift/Types.thrift
+++ b/common/thrift/Types.thrift
@@ -16,7 +16,7 @@
 // under the License.
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 typedef i64 TTimestamp
 typedef i32 TPlanNodeId

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/generate_error_codes.py
----------------------------------------------------------------------
diff --git a/common/thrift/generate_error_codes.py b/common/thrift/generate_error_codes.py
index 2554a18..216d1c1 100755
--- a/common/thrift/generate_error_codes.py
+++ b/common/thrift/generate_error_codes.py
@@ -332,7 +332,7 @@ preamble = """
 //
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 """
 # The script will always generate the file, CMake will take care of running it only if

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/common/thrift/generate_metrics.py
----------------------------------------------------------------------
diff --git a/common/thrift/generate_metrics.py b/common/thrift/generate_metrics.py
index df21336..dae92bf 100755
--- a/common/thrift/generate_metrics.py
+++ b/common/thrift/generate_metrics.py
@@ -88,7 +88,7 @@ THRIFT_PREAMBLE = """
 //
 
 namespace cpp impala
-namespace java com.cloudera.impala.thrift
+namespace java org.apache.impala.thrift
 
 include "Metrics.thrift"
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/ext-data-source/api/pom.xml
----------------------------------------------------------------------
diff --git a/ext-data-source/api/pom.xml b/ext-data-source/api/pom.xml
index 0234972..12f1e56 100644
--- a/ext-data-source/api/pom.xml
+++ b/ext-data-source/api/pom.xml
@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.cloudera.impala</groupId>
+    <groupId>org.apache.impala</groupId>
     <artifactId>impala-data-source</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <groupId>com.cloudera.impala</groupId>
+  <groupId>org.apache.impala</groupId>
   <artifactId>impala-data-source-api</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <name>Cloudera Impala External Data Source API</name>
+  <name>Apache Impala (Incubating) External Data Source API</name>
   <description>External Data Source API interface definition</description>
   <packaging>jar</packaging>
   <url>.</url>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/util/SerializationUtils.java
----------------------------------------------------------------------
diff --git a/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/util/SerializationUtils.java b/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/util/SerializationUtils.java
index b8fd675..ce7c55a 100644
--- a/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/util/SerializationUtils.java
+++ b/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/util/SerializationUtils.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.extdatasource.util;
+package org.apache.impala.extdatasource.util;
 
 import java.math.BigDecimal;
 import java.nio.ByteBuffer;

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/v1/ExternalDataSource.java
----------------------------------------------------------------------
diff --git a/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/v1/ExternalDataSource.java b/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/v1/ExternalDataSource.java
index 66cf1e5..30109a2 100644
--- a/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/v1/ExternalDataSource.java
+++ b/ext-data-source/api/src/main/java/org/apache/impala/extdatasource/v1/ExternalDataSource.java
@@ -15,16 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.extdatasource.v1;
+package org.apache.impala.extdatasource.v1;
 
-import com.cloudera.impala.extdatasource.thrift.TCloseParams;
-import com.cloudera.impala.extdatasource.thrift.TCloseResult;
-import com.cloudera.impala.extdatasource.thrift.TGetNextParams;
-import com.cloudera.impala.extdatasource.thrift.TGetNextResult;
-import com.cloudera.impala.extdatasource.thrift.TOpenParams;
-import com.cloudera.impala.extdatasource.thrift.TOpenResult;
-import com.cloudera.impala.extdatasource.thrift.TPrepareParams;
-import com.cloudera.impala.extdatasource.thrift.TPrepareResult;
+import org.apache.impala.extdatasource.thrift.TCloseParams;
+import org.apache.impala.extdatasource.thrift.TCloseResult;
+import org.apache.impala.extdatasource.thrift.TGetNextParams;
+import org.apache.impala.extdatasource.thrift.TGetNextResult;
+import org.apache.impala.extdatasource.thrift.TOpenParams;
+import org.apache.impala.extdatasource.thrift.TOpenResult;
+import org.apache.impala.extdatasource.thrift.TPrepareParams;
+import org.apache.impala.extdatasource.thrift.TPrepareResult;
 
 /**
  * Defines an external data source. Called by Impala during planning (prepare() only)

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/ext-data-source/pom.xml
----------------------------------------------------------------------
diff --git a/ext-data-source/pom.xml b/ext-data-source/pom.xml
index 63e9a99..db107f3 100644
--- a/ext-data-source/pom.xml
+++ b/ext-data-source/pom.xml
@@ -20,9 +20,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.cloudera.impala</groupId>
+  <groupId>org.apache.impala</groupId>
   <artifactId>impala-data-source</artifactId>
-  <name>Cloudera Impala External Data Source</name>
+  <name>Apache Impala (Incubating) External Data Source</name>
   <version>1.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/ext-data-source/sample/pom.xml
----------------------------------------------------------------------
diff --git a/ext-data-source/sample/pom.xml b/ext-data-source/sample/pom.xml
index e2323a9..383164b 100644
--- a/ext-data-source/sample/pom.xml
+++ b/ext-data-source/sample/pom.xml
@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.cloudera.impala</groupId>
+    <groupId>org.apache.impala</groupId>
     <artifactId>impala-data-source</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <groupId>com.cloudera.impala</groupId>
+  <groupId>org.apache.impala</groupId>
   <artifactId>impala-data-source-sample</artifactId>
   <version>1.0-SNAPSHOT</version>
-  <name>Cloudera Impala External Data Source Sample</name>
+  <name>Apache Impala (Incubating) External Data Source Sample</name>
   <description>External Data Source Sample</description>
   <packaging>jar</packaging>
   <url>.</url>
@@ -64,7 +64,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.cloudera.impala</groupId>
+      <groupId>org.apache.impala</groupId>
       <artifactId>impala-data-source-api</artifactId>
       <version>${project.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/ext-data-source/sample/src/main/java/org/apache/impala/extdatasource/sample/EchoDataSource.java
----------------------------------------------------------------------
diff --git a/ext-data-source/sample/src/main/java/org/apache/impala/extdatasource/sample/EchoDataSource.java b/ext-data-source/sample/src/main/java/org/apache/impala/extdatasource/sample/EchoDataSource.java
index e3d39c4..0f4d899 100644
--- a/ext-data-source/sample/src/main/java/org/apache/impala/extdatasource/sample/EchoDataSource.java
+++ b/ext-data-source/sample/src/main/java/org/apache/impala/extdatasource/sample/EchoDataSource.java
@@ -15,21 +15,21 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.extdatasource.sample;
+package org.apache.impala.extdatasource.sample;
 
-import com.cloudera.impala.extdatasource.thrift.TCloseParams;
-import com.cloudera.impala.extdatasource.thrift.TCloseResult;
-import com.cloudera.impala.extdatasource.thrift.TGetNextParams;
-import com.cloudera.impala.extdatasource.thrift.TGetNextResult;
-import com.cloudera.impala.extdatasource.thrift.TOpenParams;
-import com.cloudera.impala.extdatasource.thrift.TOpenResult;
-import com.cloudera.impala.extdatasource.thrift.TPrepareParams;
-import com.cloudera.impala.extdatasource.thrift.TPrepareResult;
-import com.cloudera.impala.extdatasource.thrift.TRowBatch;
-import com.cloudera.impala.extdatasource.v1.ExternalDataSource;
-import com.cloudera.impala.thrift.TColumnData;
-import com.cloudera.impala.thrift.TStatus;
-import com.cloudera.impala.thrift.TErrorCode;
+import org.apache.impala.extdatasource.thrift.TCloseParams;
+import org.apache.impala.extdatasource.thrift.TCloseResult;
+import org.apache.impala.extdatasource.thrift.TGetNextParams;
+import org.apache.impala.extdatasource.thrift.TGetNextResult;
+import org.apache.impala.extdatasource.thrift.TOpenParams;
+import org.apache.impala.extdatasource.thrift.TOpenResult;
+import org.apache.impala.extdatasource.thrift.TPrepareParams;
+import org.apache.impala.extdatasource.thrift.TPrepareResult;
+import org.apache.impala.extdatasource.thrift.TRowBatch;
+import org.apache.impala.extdatasource.v1.ExternalDataSource;
+import org.apache.impala.thrift.TColumnData;
+import org.apache.impala.thrift.TStatus;
+import org.apache.impala.thrift.TErrorCode;
 import com.google.common.collect.Lists;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/ext-data-source/test/pom.xml
----------------------------------------------------------------------
diff --git a/ext-data-source/test/pom.xml b/ext-data-source/test/pom.xml
index af13940..3c3d5a1 100644
--- a/ext-data-source/test/pom.xml
+++ b/ext-data-source/test/pom.xml
@@ -21,14 +21,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.cloudera.impala</groupId>
+    <groupId>org.apache.impala</groupId>
     <artifactId>impala-data-source</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
-  <groupId>com.cloudera.impala</groupId>
+  <groupId>org.apache.impala</groupId>
   <artifactId>impala-data-source-test</artifactId>
   <version>0.1-SNAPSHOT</version>
-  <name>Cloudera Impala External Data Source Test Library</name>
+  <name>Apache Impala (Incubating) External Data Source Test Library</name>
   <description>Test External Data Source</description>
   <packaging>jar</packaging>
   <url>.</url>
@@ -68,7 +68,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.cloudera.impala</groupId>
+      <groupId>org.apache.impala</groupId>
       <artifactId>impala-data-source-api</artifactId>
       <version>${impala.extdatasrc.api.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/ext-data-source/test/src/main/java/org/apache/impala/extdatasource/AllTypesDataSource.java
----------------------------------------------------------------------
diff --git a/ext-data-source/test/src/main/java/org/apache/impala/extdatasource/AllTypesDataSource.java b/ext-data-source/test/src/main/java/org/apache/impala/extdatasource/AllTypesDataSource.java
index a6a731b..a80c7a4 100644
--- a/ext-data-source/test/src/main/java/org/apache/impala/extdatasource/AllTypesDataSource.java
+++ b/ext-data-source/test/src/main/java/org/apache/impala/extdatasource/AllTypesDataSource.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.extdatasource;
+package org.apache.impala.extdatasource;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -23,27 +23,27 @@ import java.sql.Timestamp;
 import java.util.List;
 import java.util.UUID;
 
-import com.cloudera.impala.extdatasource.thrift.TBinaryPredicate;
-import com.cloudera.impala.extdatasource.thrift.TCloseParams;
-import com.cloudera.impala.extdatasource.thrift.TCloseResult;
-import com.cloudera.impala.extdatasource.thrift.TColumnDesc;
-import com.cloudera.impala.extdatasource.thrift.TGetNextParams;
-import com.cloudera.impala.extdatasource.thrift.TGetNextResult;
-import com.cloudera.impala.extdatasource.thrift.TOpenParams;
-import com.cloudera.impala.extdatasource.thrift.TOpenResult;
-import com.cloudera.impala.extdatasource.thrift.TPrepareParams;
-import com.cloudera.impala.extdatasource.thrift.TPrepareResult;
-import com.cloudera.impala.extdatasource.thrift.TRowBatch;
-import com.cloudera.impala.extdatasource.thrift.TTableSchema;
-import com.cloudera.impala.extdatasource.util.SerializationUtils;
-import com.cloudera.impala.extdatasource.v1.ExternalDataSource;
-import com.cloudera.impala.thrift.TColumnData;
-import com.cloudera.impala.thrift.TColumnType;
-import com.cloudera.impala.thrift.TPrimitiveType;
-import com.cloudera.impala.thrift.TScalarType;
-import com.cloudera.impala.thrift.TStatus;
-import com.cloudera.impala.thrift.TErrorCode;
-import com.cloudera.impala.thrift.TTypeNodeType;
+import org.apache.impala.extdatasource.thrift.TBinaryPredicate;
+import org.apache.impala.extdatasource.thrift.TCloseParams;
+import org.apache.impala.extdatasource.thrift.TCloseResult;
+import org.apache.impala.extdatasource.thrift.TColumnDesc;
+import org.apache.impala.extdatasource.thrift.TGetNextParams;
+import org.apache.impala.extdatasource.thrift.TGetNextResult;
+import org.apache.impala.extdatasource.thrift.TOpenParams;
+import org.apache.impala.extdatasource.thrift.TOpenResult;
+import org.apache.impala.extdatasource.thrift.TPrepareParams;
+import org.apache.impala.extdatasource.thrift.TPrepareResult;
+import org.apache.impala.extdatasource.thrift.TRowBatch;
+import org.apache.impala.extdatasource.thrift.TTableSchema;
+import org.apache.impala.extdatasource.util.SerializationUtils;
+import org.apache.impala.extdatasource.v1.ExternalDataSource;
+import org.apache.impala.thrift.TColumnData;
+import org.apache.impala.thrift.TColumnType;
+import org.apache.impala.thrift.TPrimitiveType;
+import org.apache.impala.thrift.TScalarType;
+import org.apache.impala.thrift.TStatus;
+import org.apache.impala.thrift.TErrorCode;
+import org.apache.impala.thrift.TTypeNodeType;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/pom.xml
----------------------------------------------------------------------
diff --git a/fe/pom.xml b/fe/pom.xml
index f7bffb9..08f6623 100644
--- a/fe/pom.xml
+++ b/fe/pom.xml
@@ -21,12 +21,12 @@ under the License.
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.cloudera.impala</groupId>
+  <groupId>org.apache.impala</groupId>
   <artifactId>impala-frontend</artifactId>
   <version>0.1-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>Cloudera Impala Query Engine Frontend</name>
+  <name>Apache Impala (Incubating) Query Engine Frontend</name>
 
   <properties>
     <surefire.reports.dir>${env.IMPALA_LOGS_DIR}/fe_tests</surefire.reports.dir>
@@ -55,7 +55,7 @@ under the License.
       <version>3.0.4</version>
     </dependency>
     <dependency>
-      <groupId>com.cloudera.impala</groupId>
+      <groupId>org.apache.impala</groupId>
       <artifactId>impala-data-source-api</artifactId>
       <version>${impala.extdatasrc.api.version}</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/cup/sql-parser.cup
----------------------------------------------------------------------
diff --git a/fe/src/main/cup/sql-parser.cup b/fe/src/main/cup/sql-parser.cup
index 94a0a01..6fc76f9 100644
--- a/fe/src/main/cup/sql-parser.cup
+++ b/fe/src/main/cup/sql-parser.cup
@@ -15,27 +15,27 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.analysis;
-
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.catalog.ScalarType;
-import com.cloudera.impala.catalog.ArrayType;
-import com.cloudera.impala.catalog.MapType;
-import com.cloudera.impala.catalog.StructType;
-import com.cloudera.impala.catalog.StructField;
-import com.cloudera.impala.catalog.RowFormat;
-import com.cloudera.impala.catalog.View;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.Pair;
-import com.cloudera.impala.analysis.ColumnDef;
-import com.cloudera.impala.analysis.UnionStmt.UnionOperand;
-import com.cloudera.impala.analysis.UnionStmt.Qualifier;
-import com.cloudera.impala.thrift.TCatalogObjectType;
-import com.cloudera.impala.thrift.TFunctionCategory;
-import com.cloudera.impala.thrift.TDescribeOutputStyle;
-import com.cloudera.impala.thrift.THdfsFileFormat;
-import com.cloudera.impala.thrift.TPrivilegeLevel;
-import com.cloudera.impala.thrift.TTablePropertyType;
+package org.apache.impala.analysis;
+
+import org.apache.impala.catalog.Type;
+import org.apache.impala.catalog.ScalarType;
+import org.apache.impala.catalog.ArrayType;
+import org.apache.impala.catalog.MapType;
+import org.apache.impala.catalog.StructType;
+import org.apache.impala.catalog.StructField;
+import org.apache.impala.catalog.RowFormat;
+import org.apache.impala.catalog.View;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.Pair;
+import org.apache.impala.analysis.ColumnDef;
+import org.apache.impala.analysis.UnionStmt.UnionOperand;
+import org.apache.impala.analysis.UnionStmt.Qualifier;
+import org.apache.impala.thrift.TCatalogObjectType;
+import org.apache.impala.thrift.TFunctionCategory;
+import org.apache.impala.thrift.TDescribeOutputStyle;
+import org.apache.impala.thrift.THdfsFileFormat;
+import org.apache.impala.thrift.TPrivilegeLevel;
+import org.apache.impala.thrift.TTablePropertyType;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java
----------------------------------------------------------------------
diff --git a/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java b/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java
index e8e9445..29b80ef 100644
--- a/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AggregateInfo.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.List;
@@ -23,11 +23,11 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.InternalException;
-import com.cloudera.impala.planner.DataPartition;
-import com.cloudera.impala.thrift.TPartitionType;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.InternalException;
+import org.apache.impala.planner.DataPartition;
+import org.apache.impala.thrift.TPartitionType;
 import com.google.common.base.Objects;
 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/analysis/AggregateInfoBase.java
----------------------------------------------------------------------
diff --git a/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.java b/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.java
index f3ad3f8..bced878 100644
--- a/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AggregateInfoBase.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.List;
@@ -23,9 +23,9 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.cloudera.impala.catalog.AggregateFunction;
-import com.cloudera.impala.catalog.ColumnStats;
-import com.cloudera.impala.catalog.Type;
+import org.apache.impala.catalog.AggregateFunction;
+import org.apache.impala.catalog.ColumnStats;
+import org.apache.impala.catalog.Type;
 import com.google.common.base.Objects;
 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/analysis/AlterTableAddPartitionStmt.java
----------------------------------------------------------------------
diff --git a/fe/src/main/java/org/apache/impala/analysis/AlterTableAddPartitionStmt.java b/fe/src/main/java/org/apache/impala/analysis/AlterTableAddPartitionStmt.java
index a5cb2ca..4b5fbb4 100644
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableAddPartitionStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableAddPartitionStmt.java
@@ -15,16 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;
 
-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.FileSystemUtil;
-import com.cloudera.impala.thrift.TAlterTableAddPartitionParams;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableType;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.FileSystemUtil;
+import org.apache.impala.thrift.TAlterTableAddPartitionParams;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableType;
 import com.google.common.base.Preconditions;
 import org.apache.hadoop.fs.permission.FsAction;
 

http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/b2c2fe78/fe/src/main/java/org/apache/impala/analysis/AlterTableAddReplaceColsStmt.java
----------------------------------------------------------------------
diff --git a/fe/src/main/java/org/apache/impala/analysis/AlterTableAddReplaceColsStmt.java b/fe/src/main/java/org/apache/impala/analysis/AlterTableAddReplaceColsStmt.java
index aaa223a..0354117 100644
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableAddReplaceColsStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableAddReplaceColsStmt.java
@@ -15,20 +15,20 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;
 
 import java.util.List;
 import java.util.Set;
 
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 
-import com.cloudera.impala.catalog.Column;
-import com.cloudera.impala.catalog.HBaseTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableAddReplaceColsParams;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableType;
+import org.apache.impala.catalog.Column;
+import org.apache.impala.catalog.HBaseTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableAddReplaceColsParams;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableType;
 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/main/java/org/apache/impala/analysis/AlterTableChangeColStmt.java
----------------------------------------------------------------------
diff --git a/fe/src/main/java/org/apache/impala/analysis/AlterTableChangeColStmt.java b/fe/src/main/java/org/apache/impala/analysis/AlterTableChangeColStmt.java
index c733ca0..9130740 100644
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableChangeColStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableChangeColStmt.java
@@ -15,16 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;
 
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 
-import com.cloudera.impala.catalog.HBaseTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableChangeColParams;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableType;
+import org.apache.impala.catalog.HBaseTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableChangeColParams;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableType;
 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/analysis/AlterTableDropColStmt.java
----------------------------------------------------------------------
diff --git a/fe/src/main/java/org/apache/impala/analysis/AlterTableDropColStmt.java b/fe/src/main/java/org/apache/impala/analysis/AlterTableDropColStmt.java
index d7f5ab5..3753dbe 100644
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableDropColStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableDropColStmt.java
@@ -15,16 +15,16 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;
 
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 
-import com.cloudera.impala.catalog.HBaseTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableDropColParams;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableType;
+import org.apache.impala.catalog.HBaseTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableDropColParams;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableType;
 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/analysis/AlterTableDropPartitionStmt.java
----------------------------------------------------------------------
diff --git a/fe/src/main/java/org/apache/impala/analysis/AlterTableDropPartitionStmt.java b/fe/src/main/java/org/apache/impala/analysis/AlterTableDropPartitionStmt.java
index f8bc09c..773fea4 100644
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableDropPartitionStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableDropPartitionStmt.java
@@ -15,13 +15,13 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;
 
-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableDropPartitionParams;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableType;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableDropPartitionParams;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableType;
 import com.google.common.base.Preconditions;
 
 /**