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 <tmarshall@cloudera.com> Reviewed-by: Jim Apple <jbapple@cloudera.com> Tested-by: Internal Jenkins
2025-12-19 18:12:08 -05:00 · 2016-08-12 09:49:06 -07:00
parent b544f019aa
commit b2c2fe7813
441 changed files with 2862 additions and 2862 deletions
--- 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_;
--- 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]);
--- 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()
--- 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_;
--- 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_;
 };

--- 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";
--- 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) {
--- 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()
--- 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);
--- 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]);
--- 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[])
--- 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.");
--- 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);
 }
--- 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"
--- 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 "$@"
--- 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
--- 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
--- 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"

--- 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"
--- 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"
--- 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 {
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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
--- 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.

--- 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 {
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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
--- 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
--- 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
--- 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"

--- 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>
--- 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;
--- 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)
--- 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>

--- 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>
--- 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;

 /**
--- 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>
--- 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;
--- 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>
--- 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;
+package org.apache.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;
+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;
--- 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;
--- 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;
--- 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;

--- 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;
--- 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;

 /**
--- 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;

 /**
--- 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;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableOrViewRenameStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableOrViewRenameStmt.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.View;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAccessEvent;
-import com.cloudera.impala.thrift.TAlterTableOrViewRenameParams;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableType;
-import com.cloudera.impala.thrift.TTableName;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.View;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAccessEvent;
+import org.apache.impala.thrift.TAlterTableOrViewRenameParams;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableType;
+import org.apache.impala.thrift.TTableName;
 import com.google.common.base.Preconditions;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableRecoverPartitionsStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableRecoverPartitionsStmt.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 com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableType;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableType;

 /**
 * Represents an ALTER TABLE RECOVER PARTITIONS statement.
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableSetCachedStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableSetCachedStmt.java
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.

-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;

-import com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.catalog.HdfsPartition;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableSetCachedParams;
-import com.cloudera.impala.thrift.TAlterTableType;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.catalog.HdfsPartition;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableSetCachedParams;
+import org.apache.impala.thrift.TAlterTableType;
 import com.google.common.base.Preconditions;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableSetColumnStats.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableSetColumnStats.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 java.util.HashMap;
 import java.util.Map;

-import com.cloudera.impala.catalog.Column;
-import com.cloudera.impala.catalog.ColumnStats;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableType;
-import com.cloudera.impala.thrift.TAlterTableUpdateStatsParams;
+import org.apache.impala.catalog.Column;
+import org.apache.impala.catalog.ColumnStats;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableType;
+import org.apache.impala.thrift.TAlterTableUpdateStatsParams;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;

--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableSetFileFormatStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableSetFileFormatStmt.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.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableSetFileFormatParams;
-import com.cloudera.impala.thrift.TAlterTableType;
-import com.cloudera.impala.thrift.THdfsFileFormat;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableSetFileFormatParams;
+import org.apache.impala.thrift.TAlterTableType;
+import org.apache.impala.thrift.THdfsFileFormat;

 /**
 * Represents an ALTER TABLE [PARTITION partitionSpec] SET FILEFORMAT statement.
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableSetLocationStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableSetLocationStmt.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.HdfsPartition;
-import com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TAlterTableSetLocationParams;
-import com.cloudera.impala.thrift.TAlterTableType;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.HdfsPartition;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TAlterTableSetLocationParams;
+import org.apache.impala.thrift.TAlterTableType;
 import com.google.common.base.Preconditions;
 import org.apache.hadoop.fs.permission.FsAction;

--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableSetStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableSetStmt.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 com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.catalog.HBaseTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.HBaseTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;

 /**
 * Base class for all ALTER TABLE ... SET statements
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableSetTblProperties.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableSetTblProperties.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.HashMap;
 import java.util.List;
@@ -24,14 +24,14 @@ import java.util.Map;
 import org.apache.avro.SchemaParseException;
 import org.apache.hadoop.hive.serde2.avro.AvroSerdeUtils;

-import com.cloudera.impala.catalog.HdfsFileFormat;
-import com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.*;
-import com.cloudera.impala.util.AvroSchemaParser;
-import com.cloudera.impala.util.AvroSchemaUtils;
-import com.cloudera.impala.util.MetaStoreUtil;
+import org.apache.impala.catalog.HdfsFileFormat;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.*;
+import org.apache.impala.util.AvroSchemaParser;
+import org.apache.impala.util.AvroSchemaUtils;
+import org.apache.impala.util.MetaStoreUtil;

 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
--- a/fe/src/main/java/org/apache/impala/analysis/AlterTableStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterTableStmt.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.DataSourceTable;
-import com.cloudera.impala.catalog.KuduTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.catalog.View;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAlterTableParams;
-import com.cloudera.impala.thrift.TTableName;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.DataSourceTable;
+import org.apache.impala.catalog.KuduTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.catalog.View;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAlterTableParams;
+import org.apache.impala.thrift.TTableName;
 import com.google.common.base.Preconditions;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/AlterViewStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AlterViewStmt.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.catalog.Table;
-import com.cloudera.impala.catalog.View;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.RuntimeEnv;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.catalog.View;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.RuntimeEnv;

 import com.google.common.base.Preconditions;

--- a/fe/src/main/java/org/apache/impala/analysis/AnalysisContext.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AnalysisContext.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.io.StringReader;
 import java.util.List;
@@ -25,21 +25,21 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.cloudera.impala.authorization.AuthorizationChecker;
-import com.cloudera.impala.authorization.AuthorizationConfig;
-import com.cloudera.impala.authorization.AuthorizeableColumn;
-import com.cloudera.impala.authorization.AuthorizeableTable;
-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.authorization.PrivilegeRequest;
-import com.cloudera.impala.catalog.AuthorizationException;
-import com.cloudera.impala.catalog.Db;
-import com.cloudera.impala.catalog.ImpaladCatalog;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.InternalException;
-import com.cloudera.impala.common.Pair;
-import com.cloudera.impala.thrift.TAccessEvent;
-import com.cloudera.impala.thrift.TLineageGraph;
-import com.cloudera.impala.thrift.TQueryCtx;
+import org.apache.impala.authorization.AuthorizationChecker;
+import org.apache.impala.authorization.AuthorizationConfig;
+import org.apache.impala.authorization.AuthorizeableColumn;
+import org.apache.impala.authorization.AuthorizeableTable;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.authorization.PrivilegeRequest;
+import org.apache.impala.catalog.AuthorizationException;
+import org.apache.impala.catalog.Db;
+import org.apache.impala.catalog.ImpaladCatalog;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.InternalException;
+import org.apache.impala.common.Pair;
+import org.apache.impala.thrift.TAccessEvent;
+import org.apache.impala.thrift.TLineageGraph;
+import org.apache.impala.thrift.TQueryCtx;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
--- a/fe/src/main/java/org/apache/impala/analysis/AnalyticExpr.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AnalyticExpr.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.math.BigDecimal;
 import java.math.BigInteger;
@@ -25,19 +25,19 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.cloudera.impala.analysis.AnalyticWindow.Boundary;
-import com.cloudera.impala.analysis.AnalyticWindow.BoundaryType;
-import com.cloudera.impala.catalog.AggregateFunction;
-import com.cloudera.impala.catalog.Function;
-import com.cloudera.impala.catalog.ScalarType;
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.InternalException;
-import com.cloudera.impala.common.TreeNode;
-import com.cloudera.impala.service.FeSupport;
-import com.cloudera.impala.thrift.TColumnValue;
-import com.cloudera.impala.thrift.TExprNode;
-import com.cloudera.impala.util.TColumnValueUtil;
+import org.apache.impala.analysis.AnalyticWindow.Boundary;
+import org.apache.impala.analysis.AnalyticWindow.BoundaryType;
+import org.apache.impala.catalog.AggregateFunction;
+import org.apache.impala.catalog.Function;
+import org.apache.impala.catalog.ScalarType;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.InternalException;
+import org.apache.impala.common.TreeNode;
+import org.apache.impala.service.FeSupport;
+import org.apache.impala.thrift.TColumnValue;
+import org.apache.impala.thrift.TExprNode;
+import org.apache.impala.util.TColumnValueUtil;
 import com.google.common.base.Joiner;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
--- a/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AnalyticInfo.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,7 +23,7 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.cloudera.impala.catalog.Type;
+import org.apache.impala.catalog.Type;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
--- a/fe/src/main/java/org/apache/impala/analysis/AnalyticWindow.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AnalyticWindow.java
@@ -15,19 +15,19 @@
 // specific language governing permissions and limitations
 // under the License.

-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;

 import java.math.BigDecimal;

-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.InternalException;
-import com.cloudera.impala.service.FeSupport;
-import com.cloudera.impala.thrift.TAnalyticWindow;
-import com.cloudera.impala.thrift.TAnalyticWindowBoundary;
-import com.cloudera.impala.thrift.TAnalyticWindowBoundaryType;
-import com.cloudera.impala.thrift.TAnalyticWindowType;
-import com.cloudera.impala.thrift.TColumnValue;
-import com.cloudera.impala.util.TColumnValueUtil;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.InternalException;
+import org.apache.impala.service.FeSupport;
+import org.apache.impala.thrift.TAnalyticWindow;
+import org.apache.impala.thrift.TAnalyticWindowBoundary;
+import org.apache.impala.thrift.TAnalyticWindowBoundaryType;
+import org.apache.impala.thrift.TAnalyticWindowType;
+import org.apache.impala.thrift.TColumnValue;
+import org.apache.impala.util.TColumnValueUtil;
 import com.google.common.base.Preconditions;


--- a/fe/src/main/java/org/apache/impala/analysis/Analyzer.java
+++ b/fe/src/main/java/org/apache/impala/analysis/Analyzer.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.Arrays;
@@ -33,43 +33,43 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.cloudera.impala.analysis.Path.PathType;
-import com.cloudera.impala.authorization.AuthorizationConfig;
-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.authorization.PrivilegeRequest;
-import com.cloudera.impala.authorization.PrivilegeRequestBuilder;
-import com.cloudera.impala.authorization.User;
-import com.cloudera.impala.catalog.CatalogException;
-import com.cloudera.impala.catalog.Column;
-import com.cloudera.impala.catalog.DataSourceTable;
-import com.cloudera.impala.catalog.DatabaseNotFoundException;
-import com.cloudera.impala.catalog.Db;
-import com.cloudera.impala.catalog.HBaseTable;
-import com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.catalog.ImpaladCatalog;
-import com.cloudera.impala.catalog.KuduTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.catalog.TableLoadingException;
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.catalog.View;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.Id;
-import com.cloudera.impala.common.IdGenerator;
-import com.cloudera.impala.common.ImpalaException;
-import com.cloudera.impala.common.InternalException;
-import com.cloudera.impala.common.Pair;
-import com.cloudera.impala.common.PrintUtils;
-import com.cloudera.impala.planner.PlanNode;
-import com.cloudera.impala.service.FeSupport;
-import com.cloudera.impala.thrift.TAccessEvent;
-import com.cloudera.impala.thrift.TCatalogObjectType;
-import com.cloudera.impala.thrift.TLineageGraph;
-import com.cloudera.impala.thrift.TNetworkAddress;
-import com.cloudera.impala.thrift.TQueryCtx;
-import com.cloudera.impala.util.DisjointSet;
-import com.cloudera.impala.util.EventSequence;
-import com.cloudera.impala.util.ListMap;
-import com.cloudera.impala.util.TSessionStateUtil;
+import org.apache.impala.analysis.Path.PathType;
+import org.apache.impala.authorization.AuthorizationConfig;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.authorization.PrivilegeRequest;
+import org.apache.impala.authorization.PrivilegeRequestBuilder;
+import org.apache.impala.authorization.User;
+import org.apache.impala.catalog.CatalogException;
+import org.apache.impala.catalog.Column;
+import org.apache.impala.catalog.DataSourceTable;
+import org.apache.impala.catalog.DatabaseNotFoundException;
+import org.apache.impala.catalog.Db;
+import org.apache.impala.catalog.HBaseTable;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.catalog.ImpaladCatalog;
+import org.apache.impala.catalog.KuduTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.catalog.TableLoadingException;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.catalog.View;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.Id;
+import org.apache.impala.common.IdGenerator;
+import org.apache.impala.common.ImpalaException;
+import org.apache.impala.common.InternalException;
+import org.apache.impala.common.Pair;
+import org.apache.impala.common.PrintUtils;
+import org.apache.impala.planner.PlanNode;
+import org.apache.impala.service.FeSupport;
+import org.apache.impala.thrift.TAccessEvent;
+import org.apache.impala.thrift.TCatalogObjectType;
+import org.apache.impala.thrift.TLineageGraph;
+import org.apache.impala.thrift.TNetworkAddress;
+import org.apache.impala.thrift.TQueryCtx;
+import org.apache.impala.util.DisjointSet;
+import org.apache.impala.util.EventSequence;
+import org.apache.impala.util.ListMap;
+import org.apache.impala.util.TSessionStateUtil;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
--- a/fe/src/main/java/org/apache/impala/analysis/ArithmeticExpr.java
+++ b/fe/src/main/java/org/apache/impala/analysis/ArithmeticExpr.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.catalog.Db;
-import com.cloudera.impala.catalog.Function.CompareMode;
-import com.cloudera.impala.catalog.ScalarFunction;
-import com.cloudera.impala.catalog.ScalarType;
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TExprNode;
-import com.cloudera.impala.thrift.TExprNodeType;
+import org.apache.impala.catalog.Db;
+import org.apache.impala.catalog.Function.CompareMode;
+import org.apache.impala.catalog.ScalarFunction;
+import org.apache.impala.catalog.ScalarType;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TExprNode;
+import org.apache.impala.thrift.TExprNodeType;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
--- a/fe/src/main/java/org/apache/impala/analysis/AuthorizationStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/AuthorizationStmt.java
@@ -15,10 +15,10 @@
 // specific language governing permissions and limitations
 // under the License.

-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;

-import com.cloudera.impala.authorization.User;
-import com.cloudera.impala.common.AnalysisException;
+import org.apache.impala.authorization.User;
+import org.apache.impala.common.AnalysisException;
 import com.google.common.base.Strings;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/BaseTableRef.java
+++ b/fe/src/main/java/org/apache/impala/analysis/BaseTableRef.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 com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.AnalysisException;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.AnalysisException;
 import com.google.common.base.Preconditions;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/BetweenPredicate.java
+++ b/fe/src/main/java/org/apache/impala/analysis/BetweenPredicate.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 java.util.ArrayList;
 import java.util.List;

-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TExprNode;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TExprNode;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;

--- a/fe/src/main/java/org/apache/impala/analysis/BinaryPredicate.java
+++ b/fe/src/main/java/org/apache/impala/analysis/BinaryPredicate.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.Collections;
@@ -24,16 +24,16 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.cloudera.impala.catalog.Db;
-import com.cloudera.impala.catalog.Function.CompareMode;
-import com.cloudera.impala.catalog.ScalarFunction;
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.Pair;
-import com.cloudera.impala.common.Reference;
-import com.cloudera.impala.extdatasource.thrift.TComparisonOp;
-import com.cloudera.impala.thrift.TExprNode;
-import com.cloudera.impala.thrift.TExprNodeType;
+import org.apache.impala.catalog.Db;
+import org.apache.impala.catalog.Function.CompareMode;
+import org.apache.impala.catalog.ScalarFunction;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.Pair;
+import org.apache.impala.common.Reference;
+import org.apache.impala.extdatasource.thrift.TComparisonOp;
+import org.apache.impala.thrift.TExprNode;
+import org.apache.impala.thrift.TExprNodeType;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicates;
--- a/fe/src/main/java/org/apache/impala/analysis/BoolLiteral.java
+++ b/fe/src/main/java/org/apache/impala/analysis/BoolLiteral.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.catalog.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TBoolLiteral;
-import com.cloudera.impala.thrift.TExprNode;
-import com.cloudera.impala.thrift.TExprNodeType;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TBoolLiteral;
+import org.apache.impala.thrift.TExprNode;
+import org.apache.impala.thrift.TExprNodeType;
 import com.google.common.base.Objects;

 public class BoolLiteral extends LiteralExpr {
--- a/fe/src/main/java/org/apache/impala/analysis/CaseExpr.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CaseExpr.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 com.cloudera.impala.catalog.Db;
-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.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TCaseExpr;
-import com.cloudera.impala.thrift.TExprNode;
-import com.cloudera.impala.thrift.TExprNodeType;
+import org.apache.impala.catalog.Db;
+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.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TCaseExpr;
+import org.apache.impala.thrift.TExprNode;
+import org.apache.impala.thrift.TExprNodeType;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
--- a/fe/src/main/java/org/apache/impala/analysis/CaseWhenClause.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CaseWhenClause.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.

-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;


 /**
--- a/fe/src/main/java/org/apache/impala/analysis/CastExpr.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CastExpr.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 com.cloudera.impala.catalog.Catalog;
-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.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TExpr;
-import com.cloudera.impala.thrift.TExprNode;
-import com.cloudera.impala.thrift.TExprNodeType;
+import org.apache.impala.catalog.Catalog;
+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.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TExpr;
+import org.apache.impala.thrift.TExprNode;
+import org.apache.impala.thrift.TExprNodeType;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
--- a/fe/src/main/java/org/apache/impala/analysis/CollectionStructType.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CollectionStructType.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.ArrayList;

 import jline.internal.Preconditions;

-import com.cloudera.impala.catalog.ArrayType;
-import com.cloudera.impala.catalog.MapType;
-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.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;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/CollectionTableRef.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CollectionTableRef.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 com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.authorization.PrivilegeRequestBuilder;
-import com.cloudera.impala.common.AnalysisException;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.authorization.PrivilegeRequestBuilder;
+import org.apache.impala.common.AnalysisException;
 import com.google.common.base.Preconditions;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/ColumnDef.java
+++ b/fe/src/main/java/org/apache/impala/analysis/ColumnDef.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 java.util.List;

 import org.apache.hadoop.hive.metastore.MetaStoreUtils;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;

-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TColumn;
-import com.cloudera.impala.util.MetaStoreUtil;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TColumn;
+import org.apache.impala.util.MetaStoreUtil;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
--- a/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.java
+++ b/fe/src/main/java/org/apache/impala/analysis/ColumnLineageGraph.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.text.SimpleDateFormat;
 import java.util.Collection;
@@ -34,14 +34,14 @@ import org.json.simple.parser.ParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.common.Id;
-import com.cloudera.impala.common.IdGenerator;
-import com.cloudera.impala.thrift.TEdgeType;
-import com.cloudera.impala.thrift.TQueryCtx;
-import com.cloudera.impala.thrift.TLineageGraph;
-import com.cloudera.impala.thrift.TMultiEdge;
-import com.cloudera.impala.thrift.TVertex;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.common.Id;
+import org.apache.impala.common.IdGenerator;
+import org.apache.impala.thrift.TEdgeType;
+import org.apache.impala.thrift.TQueryCtx;
+import org.apache.impala.thrift.TLineageGraph;
+import org.apache.impala.thrift.TMultiEdge;
+import org.apache.impala.thrift.TVertex;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
--- a/fe/src/main/java/org/apache/impala/analysis/CompoundPredicate.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CompoundPredicate.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.ArrayList;
 import java.util.List;

-import com.cloudera.impala.catalog.Db;
-import com.cloudera.impala.catalog.Function.CompareMode;
-import com.cloudera.impala.catalog.ScalarFunction;
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TExprNode;
-import com.cloudera.impala.thrift.TExprNodeType;
+import org.apache.impala.catalog.Db;
+import org.apache.impala.catalog.Function.CompareMode;
+import org.apache.impala.catalog.ScalarFunction;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TExprNode;
+import org.apache.impala.thrift.TExprNodeType;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
--- a/fe/src/main/java/org/apache/impala/analysis/ComputeStatsStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/ComputeStatsStmt.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.Iterator;
 import java.util.List;
@@ -23,19 +23,19 @@ import java.util.List;
 import org.apache.hadoop.hive.metastore.api.FieldSchema;
 import org.apache.log4j.Logger;

-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.catalog.Column;
-import com.cloudera.impala.catalog.HBaseTable;
-import com.cloudera.impala.catalog.HdfsPartition;
-import com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.catalog.View;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.PrintUtils;
-import com.cloudera.impala.thrift.TComputeStatsParams;
-import com.cloudera.impala.thrift.TPartitionStats;
-import com.cloudera.impala.thrift.TTableName;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.Column;
+import org.apache.impala.catalog.HBaseTable;
+import org.apache.impala.catalog.HdfsPartition;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.catalog.View;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.PrintUtils;
+import org.apache.impala.thrift.TComputeStatsParams;
+import org.apache.impala.thrift.TPartitionStats;
+import org.apache.impala.thrift.TTableName;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
--- a/fe/src/main/java/org/apache/impala/analysis/CreateDataSrcStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateDataSrcStmt.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.fs.permission.FsAction;
 import org.apache.hadoop.hive.metastore.MetaStoreUtils;

-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.extdatasource.ApiVersion;
-import com.cloudera.impala.thrift.TCreateDataSourceParams;
-import com.cloudera.impala.thrift.TDataSource;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.extdatasource.ApiVersion;
+import org.apache.impala.thrift.TCreateDataSourceParams;
+import org.apache.impala.thrift.TDataSource;
 import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;

--- a/fe/src/main/java/org/apache/impala/analysis/CreateDbStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateDbStmt.java
@@ -15,15 +15,15 @@
 // specific language governing permissions and limitations
 // under the License.

-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;

 import org.apache.hadoop.fs.permission.FsAction;
 import org.apache.hadoop.hive.metastore.MetaStoreUtils;

-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.catalog.Db;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TCreateDbParams;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.Db;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TCreateDbParams;

 /**
 * Represents a CREATE DATABASE statement
--- a/fe/src/main/java/org/apache/impala/analysis/CreateDropRoleStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateDropRoleStmt.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 com.cloudera.impala.catalog.Role;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TCreateDropRoleParams;
+import org.apache.impala.catalog.Role;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TCreateDropRoleParams;
 import com.google.common.base.Preconditions;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/CreateFunctionStmtBase.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateFunctionStmtBase.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;
@@ -23,16 +23,16 @@ import java.util.List;

 import org.apache.hadoop.fs.permission.FsAction;

-import com.cloudera.impala.authorization.AuthorizeableFn;
-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.authorization.PrivilegeRequest;
-import com.cloudera.impala.catalog.Catalog;
-import com.cloudera.impala.catalog.Db;
-import com.cloudera.impala.catalog.Function;
-import com.cloudera.impala.catalog.Type;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TCreateFunctionParams;
-import com.cloudera.impala.thrift.TFunctionBinaryType;
+import org.apache.impala.authorization.AuthorizeableFn;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.authorization.PrivilegeRequest;
+import org.apache.impala.catalog.Catalog;
+import org.apache.impala.catalog.Db;
+import org.apache.impala.catalog.Function;
+import org.apache.impala.catalog.Type;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TCreateFunctionParams;
+import org.apache.impala.thrift.TFunctionBinaryType;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;

--- a/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateOrAlterViewStmtBase.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;
@@ -24,9 +24,9 @@ import java.util.Set;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TCreateOrAlterViewParams;
-import com.cloudera.impala.thrift.TTableName;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TCreateOrAlterViewParams;
+import org.apache.impala.thrift.TTableName;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
--- a/fe/src/main/java/org/apache/impala/analysis/CreateTableAsSelectStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateTableAsSelectStmt.java
@@ -15,22 +15,22 @@
 // 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.EnumSet;

-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.catalog.Db;
-import com.cloudera.impala.catalog.HdfsTable;
-import com.cloudera.impala.catalog.KuduTable;
-import com.cloudera.impala.catalog.MetaStoreClientPool.MetaStoreClient;
-import com.cloudera.impala.catalog.Table;
-import com.cloudera.impala.catalog.TableId;
-import com.cloudera.impala.catalog.TableLoadingException;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.service.CatalogOpExecutor;
-import com.cloudera.impala.thrift.THdfsFileFormat;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.Db;
+import org.apache.impala.catalog.HdfsTable;
+import org.apache.impala.catalog.KuduTable;
+import org.apache.impala.catalog.MetaStoreClientPool.MetaStoreClient;
+import org.apache.impala.catalog.Table;
+import org.apache.impala.catalog.TableId;
+import org.apache.impala.catalog.TableLoadingException;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.service.CatalogOpExecutor;
+import org.apache.impala.thrift.THdfsFileFormat;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;

--- a/fe/src/main/java/org/apache/impala/analysis/CreateTableDataSrcStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateTableDataSrcStmt.java
@@ -15,23 +15,23 @@
 // specific language governing permissions and limitations
 // under the License.

-package com.cloudera.impala.analysis;
+package org.apache.impala.analysis;

-import static com.cloudera.impala.catalog.DataSourceTable.TBL_PROP_API_VER;
-import static com.cloudera.impala.catalog.DataSourceTable.TBL_PROP_CLASS;
-import static com.cloudera.impala.catalog.DataSourceTable.TBL_PROP_DATA_SRC_NAME;
-import static com.cloudera.impala.catalog.DataSourceTable.TBL_PROP_INIT_STRING;
-import static com.cloudera.impala.catalog.DataSourceTable.TBL_PROP_LOCATION;
+import static org.apache.impala.catalog.DataSourceTable.TBL_PROP_API_VER;
+import static org.apache.impala.catalog.DataSourceTable.TBL_PROP_CLASS;
+import static org.apache.impala.catalog.DataSourceTable.TBL_PROP_DATA_SRC_NAME;
+import static org.apache.impala.catalog.DataSourceTable.TBL_PROP_INIT_STRING;
+import static org.apache.impala.catalog.DataSourceTable.TBL_PROP_LOCATION;

 import java.util.List;
 import java.util.Map;

-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.catalog.DataSource;
-import com.cloudera.impala.catalog.DataSourceTable;
-import com.cloudera.impala.catalog.RowFormat;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.THdfsFileFormat;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.DataSource;
+import org.apache.impala.catalog.DataSourceTable;
+import org.apache.impala.catalog.RowFormat;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.THdfsFileFormat;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
--- a/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeFileStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeFileStmt.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.io.FileNotFoundException;
 import java.io.IOException;
@@ -32,19 +32,19 @@ import parquet.hadoop.metadata.ParquetMetadata;
 import parquet.schema.OriginalType;
 import parquet.schema.PrimitiveType;

-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.catalog.ArrayType;
-import com.cloudera.impala.catalog.HdfsCompression;
-import com.cloudera.impala.catalog.HdfsFileFormat;
-import com.cloudera.impala.catalog.MapType;
-import com.cloudera.impala.catalog.RowFormat;
-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.thrift.THdfsFileFormat;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.ArrayType;
+import org.apache.impala.catalog.HdfsCompression;
+import org.apache.impala.catalog.HdfsFileFormat;
+import org.apache.impala.catalog.MapType;
+import org.apache.impala.catalog.RowFormat;
+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.thrift.THdfsFileFormat;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;

--- a/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateTableLikeStmt.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 org.apache.hadoop.fs.permission.FsAction;

-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.thrift.TAccessEvent;
-import com.cloudera.impala.thrift.TCatalogObjectType;
-import com.cloudera.impala.thrift.TCreateTableLikeParams;
-import com.cloudera.impala.thrift.THdfsFileFormat;
-import com.cloudera.impala.thrift.TTableName;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.thrift.TAccessEvent;
+import org.apache.impala.thrift.TCatalogObjectType;
+import org.apache.impala.thrift.TCreateTableLikeParams;
+import org.apache.impala.thrift.THdfsFileFormat;
+import org.apache.impala.thrift.TTableName;
 import com.google.common.base.Preconditions;

 /**
--- a/fe/src/main/java/org/apache/impala/analysis/CreateTableStmt.java
+++ b/fe/src/main/java/org/apache/impala/analysis/CreateTableStmt.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;
@@ -26,22 +26,22 @@ import org.apache.avro.Schema;
 import org.apache.avro.SchemaParseException;
 import org.apache.hadoop.fs.permission.FsAction;

-import com.cloudera.impala.authorization.Privilege;
-import com.cloudera.impala.catalog.HdfsStorageDescriptor;
-import com.cloudera.impala.catalog.KuduTable;
-import com.cloudera.impala.catalog.RowFormat;
-import com.cloudera.impala.common.AnalysisException;
-import com.cloudera.impala.common.FileSystemUtil;
-import com.cloudera.impala.thrift.TAccessEvent;
-import com.cloudera.impala.thrift.TCatalogObjectType;
-import com.cloudera.impala.thrift.TCreateTableParams;
-import com.cloudera.impala.thrift.THdfsFileFormat;
-import com.cloudera.impala.thrift.TTableName;
-import com.cloudera.impala.util.AvroSchemaConverter;
-import com.cloudera.impala.util.AvroSchemaParser;
-import com.cloudera.impala.util.AvroSchemaUtils;
-import com.cloudera.impala.util.KuduUtil;
-import com.cloudera.impala.util.MetaStoreUtil;
+import org.apache.impala.authorization.Privilege;
+import org.apache.impala.catalog.HdfsStorageDescriptor;
+import org.apache.impala.catalog.KuduTable;
+import org.apache.impala.catalog.RowFormat;
+import org.apache.impala.common.AnalysisException;
+import org.apache.impala.common.FileSystemUtil;
+import org.apache.impala.thrift.TAccessEvent;
+import org.apache.impala.thrift.TCatalogObjectType;
+import org.apache.impala.thrift.TCreateTableParams;
+import org.apache.impala.thrift.THdfsFileFormat;
+import org.apache.impala.thrift.TTableName;
+import org.apache.impala.util.AvroSchemaConverter;
+import org.apache.impala.util.AvroSchemaParser;
+import org.apache.impala.util.AvroSchemaUtils;
+import org.apache.impala.util.KuduUtil;
+import org.apache.impala.util.MetaStoreUtil;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
--- a/Show More
+++ b/Show More