HIVE-29745: Remove Druid integration

common/src/java/org/apache/hadoop/hive/conf/Constants.java

@@ -30,23 +30,6 @@ public class Constants {
   public static final String LLAP_NUM_BUCKETS = "llap.num.buckets";
   public static final String LLAP_BUCKET_ID = "llap.bucket.id";
 
-  /* Constants for Druid storage handler */
-  public static final String DRUID_HIVE_STORAGE_HANDLER_ID =
-          "org.apache.hadoop.hive.druid.DruidStorageHandler";
-  public static final String DRUID_HIVE_OUTPUT_FORMAT =
-          "org.apache.hadoop.hive.druid.io.DruidOutputFormat";
-  public static final String DRUID_DATA_SOURCE = "druid.datasource";
-  public static final String DRUID_SEGMENT_GRANULARITY = "druid.segment.granularity";
-
-  public static final String DRUID_TARGET_SHARDS_PER_GRANULARITY =
-      "druid.segment.targetShardsPerGranularity";
-  public static final String DRUID_TIMESTAMP_GRANULARITY_COL_NAME = "__time_granularity";
-  public static final String DRUID_SHARD_KEY_COL_NAME = "__druid_extra_partition_key";
-  public static final String DRUID_QUERY_JSON = "druid.query.json";
-  public static final String DRUID_QUERY_FIELD_NAMES = "druid.fieldNames";
-  public static final String DRUID_QUERY_FIELD_TYPES = "druid.fieldTypes";
-  public static final String DRUID_QUERY_TYPE = "druid.query.type";
-
   public static final String JDBC_HIVE_STORAGE_HANDLER_ID =
       "org.apache.hive.storage.jdbc.JdbcStorageHandler";
   public static final String JDBC_CONFIG_PREFIX = "hive.sql";

common/src/java/org/apache/hadoop/hive/conf/HiveConf.java

@@ -3382,72 +3382,6 @@ public static enum ConfVars {
     OPTIMIZE_ACID_META_COLUMNS("hive.optimize.acid.meta.columns", true,
         "If true, don't decode Acid metadata columns from storage unless" +
         " they are needed."),
-
-    // For Druid storage handler
-    HIVE_DRUID_INDEXING_GRANULARITY("hive.druid.indexer.segments.granularity", "DAY",
-            new PatternSet("YEAR", "MONTH", "WEEK", "DAY", "HOUR", "MINUTE", "SECOND"),
-            "Granularity for the segments created by the Druid storage handler"
-    ),
-    HIVE_DRUID_MAX_PARTITION_SIZE("hive.druid.indexer.partition.size.max", 5000000,
-            "Maximum number of records per segment partition"
-    ),
-    HIVE_DRUID_MAX_ROW_IN_MEMORY("hive.druid.indexer.memory.rownum.max", 75000,
-            "Maximum number of records in memory while storing data in Druid"
-    ),
-    HIVE_DRUID_BROKER_DEFAULT_ADDRESS("hive.druid.broker.address.default", "localhost:8082",
-            "Address of the Druid broker. If we are querying Druid from Hive, this address needs to be\n"
-                    +
-                    "declared"
-    ),
-    HIVE_DRUID_COORDINATOR_DEFAULT_ADDRESS("hive.druid.coordinator.address.default", "localhost:8081",
-            "Address of the Druid coordinator. It is used to check the load status of newly created segments"
-    ),
-    HIVE_DRUID_OVERLORD_DEFAULT_ADDRESS("hive.druid.overlord.address.default", "localhost:8090",
-        "Address of the Druid overlord. It is used to submit indexing tasks to druid."
-    ),
-    HIVE_DRUID_SELECT_THRESHOLD("hive.druid.select.threshold", 10000,
-        "Takes only effect when hive.druid.select.distribute is set to false. \n" +
-        "When we can split a Select query, this is the maximum number of rows that we try to retrieve\n" +
-        "per query. In order to do that, we obtain the estimated size for the complete result. If the\n" +
-        "number of records of the query results is larger than this threshold, we split the query in\n" +
-        "total number of rows/threshold parts across the time dimension. Note that we assume the\n" +
-        "records to be split uniformly across the time dimension."),
-    HIVE_DRUID_NUM_HTTP_CONNECTION("hive.druid.http.numConnection", 20, "Number of connections used by\n" +
-        "the HTTP client."),
-    HIVE_DRUID_HTTP_READ_TIMEOUT("hive.druid.http.read.timeout", "PT1M", "Read timeout period for the HTTP\n" +
-        "client in ISO8601 format (for example P2W, P3M, PT1H30M, PT0.750S), default is period of 1 minute."),
-    HIVE_DRUID_SLEEP_TIME("hive.druid.sleep.time", "PT10S",
-            "Sleep time between retries in ISO8601 format (for example P2W, P3M, PT1H30M, PT0.750S), default is period of 10 seconds."
-    ),
-    HIVE_DRUID_BASE_PERSIST_DIRECTORY("hive.druid.basePersistDirectory", "",
-            "Local temporary directory used to persist intermediate indexing state, will default to JVM system property java.io.tmpdir."
-    ),
-    HIVE_DRUID_ROLLUP("hive.druid.rollup", true, "Whether to rollup druid rows or not."),
-    DRUID_SEGMENT_DIRECTORY("hive.druid.storage.storageDirectory", "/druid/segments"
-            , "druid deep storage location."),
-    DRUID_METADATA_BASE("hive.druid.metadata.base", "druid", "Default prefix for metadata tables"),
-    DRUID_METADATA_DB_TYPE("hive.druid.metadata.db.type", "mysql",
-            new PatternSet("mysql", "postgresql", "derby"), "Type of the metadata database."
-    ),
-    DRUID_METADATA_DB_USERNAME("hive.druid.metadata.username", "",
-            "Username to connect to Type of the metadata DB."
-    ),
-    DRUID_METADATA_DB_PASSWORD("hive.druid.metadata.password", "",
-            "Password to connect to Type of the metadata DB."
-    ),
-    DRUID_METADATA_DB_URI("hive.druid.metadata.uri", "",
-            "URI to connect to the database (for example jdbc:mysql://hostname:port/DBName)."
-    ),
-    DRUID_WORKING_DIR("hive.druid.working.directory", "/tmp/workingDirectory",
-            "Default hdfs working directory used to store some intermediate metadata"
-    ),
-    HIVE_DRUID_MAX_TRIES("hive.druid.maxTries", 5, "Maximum number of retries before giving up"),
-    HIVE_DRUID_PASSIVE_WAIT_TIME("hive.druid.passiveWaitTimeMs", 30000L,
-            "Wait time in ms default to 30 seconds."
-    ),
-    HIVE_DRUID_BITMAP_FACTORY_TYPE("hive.druid.bitmap.type", "roaring", new PatternSet("roaring", "concise"), "Coding algorithm use to encode the bitmaps"),
-    HIVE_DRUID_KERBEROS_ENABLE("hive.druid.kerberos.enable", true,
-        "Enable/Disable Kerberos authentication explicitly while connecting to a druid cluster."),
     // For HBase storage handler
     HIVE_HBASE_WAL_ENABLED("hive.hbase.wal.enabled", true,
         "Whether writes to HBase should be forced to the write-ahead log. \n" +
@@ -5570,8 +5504,6 @@ public static enum ConfVars {
             "hive.privilege.synchronizer," +
             "hive.privilege.synchronizer.interval," +
             "hive.query.max.length," +
-            "hive.druid.broker.address.default," +
-            "hive.druid.coordinator.address.default," +
             "hikaricp.," +
             "hadoop.bin.path," +
             "yarn.bin.path," +
@@ -5591,7 +5523,6 @@ public static enum ConfVars {
     HIVE_CONF_HIDDEN_LIST("hive.conf.hidden.list",
         METASTORE_PWD.varname + "," + HIVE_SERVER2_SSL_KEYSTORE_PASSWORD.varname
         + "," + HIVE_SERVER2_WEBUI_SSL_KEYSTORE_PASSWORD.varname
-        + "," + DRUID_METADATA_DB_PASSWORD.varname
         // Adding the S3 credentials from Hadoop config to be hidden
         + ",fs.s3.awsAccessKeyId"
         + ",fs.s3.awsSecretAccessKey"
@@ -6787,7 +6718,6 @@ private static String[] convertVarsToRegex(String[] paramList) {
     "hive\\.auto\\..*",
     "hive\\.cbo\\..*",
     "hive\\.convert\\..*",
-    "hive\\.druid\\..*",
     "hive\\.exec\\.dynamic\\.partition.*",
     "hive\\.exec\\.max\\.dynamic\\.partitions.*",
     "hive\\.exec\\.compress\\..*",