You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2018/02/14 10:00:34 UTC
[10/15] hive git commit: HIVE-18448: Drop Support For Indexes From
Apache Hive (Zoltan Haindrich reviewed by Ashutosh Chauhan)
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/database_drop.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/database_drop.q b/ql/src/test/queries/clientpositive/database_drop.q
index c8f6b0a..1a892e7 100644
--- a/ql/src/test/queries/clientpositive/database_drop.q
+++ b/ql/src/test/queries/clientpositive/database_drop.q
@@ -1,6 +1,6 @@
--- create database with multiple tables, indexes and views.
+-- create database with multiple tables, views.
-- Use both partitioned and non-partitioned tables, as well as
--- tables and indexes with specific storage locations
+-- tables with specific storage locations
-- verify the drop the database with cascade works and that the directories
-- outside the database's default storage are removed as part of the drop
@@ -13,57 +13,37 @@ dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp;
dfs -rmr ${system:test.tmp.dir}/dbcascade;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade;
--- add a table, index and view
+-- add a table, view
CREATE TABLE temp_tbl (id INT, name STRING);
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE temp_tbl;
CREATE VIEW temp_tbl_view AS SELECT * FROM temp_tbl;
-CREATE INDEX idx1 ON TABLE temp_tbl(id) AS 'COMPACT' with DEFERRED REBUILD;
-ALTER INDEX idx1 ON temp_tbl REBUILD;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp_tbl2;
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/temp_tbl2_idx2;
--- add a table, index and view with a different storage location
+-- add a table, view with a different storage location
CREATE TABLE temp_tbl2 (id INT, name STRING) LOCATION 'file:${system:test.tmp.dir}/dbcascade/temp_tbl2';
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' into table temp_tbl2;
CREATE VIEW temp_tbl2_view AS SELECT * FROM temp_tbl2;
-CREATE INDEX idx2 ON TABLE temp_tbl2(id) AS 'COMPACT' with DEFERRED REBUILD LOCATION 'file:${system:test.tmp.dir}/dbcascade/temp_tbl2_idx2';
-ALTER INDEX idx2 ON temp_tbl2 REBUILD;
--- add a partitioned table, index and view
+-- add a partitioned table, view
CREATE TABLE part_tab (id INT, name STRING) PARTITIONED BY (ds string);
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab PARTITION (ds='2008-04-09');
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab PARTITION (ds='2009-04-09');
-CREATE INDEX idx3 ON TABLE part_tab(id) AS 'COMPACT' with DEFERRED REBUILD;
-ALTER INDEX idx3 ON part_tab PARTITION (ds='2008-04-09') REBUILD;
-ALTER INDEX idx3 ON part_tab PARTITION (ds='2009-04-09') REBUILD;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab2;
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab2_idx4;
--- add a partitioned table, index and view with a different storage location
+-- add a partitioned table, view with a different storage location
CREATE TABLE part_tab2 (id INT, name STRING) PARTITIONED BY (ds string)
LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab2';
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab2 PARTITION (ds='2008-04-09');
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab2 PARTITION (ds='2009-04-09');
-CREATE INDEX idx4 ON TABLE part_tab2(id) AS 'COMPACT' with DEFERRED REBUILD
- LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab2_idx4';
-ALTER INDEX idx4 ON part_tab2 PARTITION (ds='2008-04-09') REBUILD;
-ALTER INDEX idx4 ON part_tab2 PARTITION (ds='2009-04-09') REBUILD;
-
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3;
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3_p1;
-dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/part_tab3_idx5;
--- add a partitioned table, index and view with a different storage location
+-- add a partitioned table, view with a different storage location
CREATE TABLE part_tab3 (id INT, name STRING) PARTITIONED BY (ds string)
LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab3';
ALTER TABLE part_tab3 ADD PARTITION (ds='2007-04-09') LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab3_p1';
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab3 PARTITION (ds='2008-04-09');
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' INTO TABLE part_tab3 PARTITION (ds='2009-04-09');
-CREATE INDEX idx5 ON TABLE part_tab3(id) AS 'COMPACT' with DEFERRED REBUILD
- LOCATION 'file:${system:test.tmp.dir}/dbcascade/part_tab3_idx5';
-ALTER INDEX idx5 ON part_tab3 PARTITION (ds='2008-04-09') REBUILD;
-ALTER INDEX idx5 ON part_tab3 PARTITION (ds='2009-04-09') REBUILD;
-
dfs ${system:test.dfs.mkdir} ${system:test.tmp.dir}/dbcascade/extab1;
@@ -75,11 +55,9 @@ CREATE EXTERNAL TABLE extab1(id INT, name STRING) ROW FORMAT
STORED AS TEXTFILE
LOCATION 'file:${system:test.tmp.dir}/dbcascade/extab1';
--- add a table, create index (give a name for index table)
+-- add a table
CREATE TABLE temp_tbl3 (id INT, name STRING);
LOAD DATA LOCAL INPATH '../../data/files/kv1.txt' into table temp_tbl3;
-CREATE INDEX temp_tbl3_idx ON TABLE temp_tbl3(id) AS 'COMPACT' with DEFERRED REBUILD IN TABLE temp_tbl3_idx_tbl;
-ALTER INDEX temp_tbl3_idx ON temp_tbl3 REBUILD;
-- drop the database with cascade
DROP DATABASE db5 CASCADE;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/drop_index.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/drop_index.q b/ql/src/test/queries/clientpositive/drop_index.q
deleted file mode 100644
index e03856c..0000000
--- a/ql/src/test/queries/clientpositive/drop_index.q
+++ /dev/null
@@ -1,2 +0,0 @@
-DROP INDEX IF EXISTS UnknownIndex ON src;
-DROP INDEX IF EXISTS UnknownIndex ON UnknownTable;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/drop_index_removes_partition_dirs.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/drop_index_removes_partition_dirs.q b/ql/src/test/queries/clientpositive/drop_index_removes_partition_dirs.q
deleted file mode 100644
index ed471db..0000000
--- a/ql/src/test/queries/clientpositive/drop_index_removes_partition_dirs.q
+++ /dev/null
@@ -1,22 +0,0 @@
--- This test verifies that if a partition exists outside an index table's current location when the
--- index is dropped the partition's location is dropped as well.
-
-CREATE TABLE test_table (key STRING, value STRING)
-PARTITIONED BY (part STRING)
-STORED AS RCFILE
-LOCATION 'file:${system:test.tmp.dir}/drop_database_removes_partition_dirs_table';
-
-CREATE INDEX test_index ON
-TABLE test_table(key) AS 'compact' WITH DEFERRED REBUILD
-IN TABLE test_index_table;
-
-ALTER TABLE test_index_table ADD PARTITION (part = '1')
-LOCATION 'file:${system:test.tmp.dir}/drop_index_removes_partition_dirs_index_table2/part=1';
-
-dfs -ls ${system:test.tmp.dir}/drop_index_removes_partition_dirs_index_table2;
-
-DROP INDEX test_index ON test_table;
-
-dfs -ls ${system:test.tmp.dir}/drop_index_removes_partition_dirs_index_table2;
-
-dfs -rmr ${system:test.tmp.dir}/drop_index_removes_partition_dirs_index_table2;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/drop_table_with_index.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/drop_table_with_index.q b/ql/src/test/queries/clientpositive/drop_table_with_index.q
deleted file mode 100644
index 1790664..0000000
--- a/ql/src/test/queries/clientpositive/drop_table_with_index.q
+++ /dev/null
@@ -1,35 +0,0 @@
-set hive.stats.dbclass=fs;
-set hive.stats.autogather=true;
-set hive.cbo.enable=true;
-
-DROP TABLE IF EXISTS aa;
-CREATE TABLE aa (L_ORDERKEY INT,
- L_PARTKEY INT,
- L_SUPPKEY INT,
- L_LINENUMBER INT,
- L_QUANTITY DOUBLE,
- L_EXTENDEDPRICE DOUBLE,
- L_DISCOUNT DOUBLE,
- L_TAX DOUBLE,
- L_RETURNFLAG STRING,
- L_LINESTATUS STRING,
- l_shipdate STRING,
- L_COMMITDATE STRING,
- L_RECEIPTDATE STRING,
- L_SHIPINSTRUCT STRING,
- L_SHIPMODE STRING,
- L_COMMENT STRING)
-ROW FORMAT DELIMITED
-FIELDS TERMINATED BY '|';
-
-LOAD DATA LOCAL INPATH '../../data/files/lineitem.txt' OVERWRITE INTO TABLE aa;
-
-CREATE INDEX aa_lshipdate_idx ON TABLE aa(l_shipdate) AS 'org.apache.hadoop.hive.ql.index.AggregateIndexHandler' WITH DEFERRED REBUILD IDXPROPERTIES("AGGREGATES"="count(l_shipdate)");
-ALTER INDEX aa_lshipdate_idx ON aa REBUILD;
-
-show tables;
-
-explain select l_shipdate, count(l_shipdate)
-from aa
-group by l_shipdate;
-
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/escape_comments.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/escape_comments.q b/ql/src/test/queries/clientpositive/escape_comments.q
index bcfac3d..d586e08 100644
--- a/ql/src/test/queries/clientpositive/escape_comments.q
+++ b/ql/src/test/queries/clientpositive/escape_comments.q
@@ -5,7 +5,6 @@ create table escape_comments_tbl1
partitioned by (p1 string comment 'a\nb');
create view escape_comments_view1 (col1 comment 'a\nb') comment 'a\nb'
as select col1 from escape_comments_tbl1;
-create index index2 on table escape_comments_tbl1(col1) as 'COMPACT' with deferred rebuild comment 'a\nb';
describe database extended escape_comments_db;
describe database escape_comments_db;
@@ -14,6 +13,5 @@ describe formatted escape_comments_tbl1;
describe escape_comments_tbl1;
show create table escape_comments_view1;
describe formatted escape_comments_view1;
-show formatted index on escape_comments_tbl1;
drop database escape_comments_db cascade;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auth.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auth.q b/ql/src/test/queries/clientpositive/index_auth.q
deleted file mode 100644
index b12b742..0000000
--- a/ql/src/test/queries/clientpositive/index_auth.q
+++ /dev/null
@@ -1,20 +0,0 @@
-set hive.stats.dbclass=fs;
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-set hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.DefaultHiveAuthorizationProvider;
-
-create table foobar(key int, value string) PARTITIONED BY (ds string, hr string);
-alter table foobar add partition (ds='2008-04-08',hr='12');
-
-CREATE INDEX srcpart_AUTH_index ON TABLE foobar(key) as 'BITMAP' WITH DEFERRED REBUILD;
-SHOW INDEXES ON foobar;
-
-grant select on table foobar to user hive_test_user;
-grant select on table default__foobar_srcpart_auth_indeX__ to user hive_test_user;
-grant update on table default__foobar_srcpart_auth_indEx__ to user hive_test_user;
-grant create on table default__foobar_srcpart_auth_inDex__ to user hive_test_user;
-set hive.security.authorization.enabled=true;
-
-ALTER INDEX srcpart_auth_INDEX ON foobar PARTITION (ds='2008-04-08',hr='12') REBUILD;
-set hive.security.authorization.enabled=false;
-DROP INDEX srcpart_auth_index on foobar;
-DROP TABLE foobar;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto.q b/ql/src/test/queries/clientpositive/index_auto.q
deleted file mode 100644
index fe8839a..0000000
--- a/ql/src/test/queries/clientpositive/index_auto.q
+++ /dev/null
@@ -1,31 +0,0 @@
-set hive.mapred.mode=nonstrict;
--- try the query without indexing, with manual indexing, and with automatic indexing
--- SORT_QUERY_RESULTS
-
--- without indexing
-SELECT key, value FROM src WHERE key > 80 AND key < 100;
-
-set hive.stats.dbclass=fs;
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-
--- manual indexing
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_where" SELECT `_bucketname` , `_offsets` FROM default__src_src_index__ WHERE key > 80 AND key < 100;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_where;
-SET hive.optimize.index.filter=false;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-
-EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100;
-SELECT key, value FROM src WHERE key > 80 AND key < 100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- automatic indexing
-EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100;
-SELECT key, value FROM src WHERE key > 80 AND key < 100;
-
-DROP INDEX src_index on src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_empty.q b/ql/src/test/queries/clientpositive/index_auto_empty.q
deleted file mode 100644
index 7567887..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_empty.q
+++ /dev/null
@@ -1,26 +0,0 @@
-set hive.mapred.mode=nonstrict;
--- Test to ensure that an empty index result is propagated correctly
-
-CREATE DATABASE it;
--- Create temp, and populate it with some values in src.
-CREATE TABLE it.temp(key STRING, val STRING) STORED AS TEXTFILE;
-
-set hive.stats.dbclass=fs;
--- Build an index on it.temp.
-CREATE INDEX temp_index ON TABLE it.temp(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX temp_index ON it.temp REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- query should not return any values
-SELECT * FROM it.it__temp_temp_index__ WHERE key = 86;
-EXPLAIN SELECT * FROM it.temp WHERE key = 86;
-SELECT * FROM it.temp WHERE key = 86;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=false;
-DROP table it.temp;
-
-DROP DATABASE it;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_file_format.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_file_format.q b/ql/src/test/queries/clientpositive/index_auto_file_format.q
deleted file mode 100644
index 2afafb8..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_file_format.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
--- test automatic use of index on different file formats
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
-EXPLAIN SELECT key, value FROM src WHERE key=86;
-SELECT key, value FROM src WHERE key=86;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
-EXPLAIN SELECT key, value FROM src WHERE key=86;
-SELECT key, value FROM src WHERE key=86;
-
-DROP INDEX src_index on src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_mult_tables.q b/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
deleted file mode 100644
index 924060b..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_mult_tables.q
+++ /dev/null
@@ -1,25 +0,0 @@
-set hive.mapred.mode=nonstrict;
--- SORT_QUERY_RESULTS
--- try the query without indexing, with manual indexing, and with automatic indexing
-
--- without indexing
-EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-
-set hive.stats.dbclass=fs;
-
-CREATE INDEX src_index_bitmap ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src_index_bitmap ON src REBUILD;
-
-CREATE INDEX srcpart_index_bitmap ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_index_bitmap ON srcpart REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
-EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-
-DROP INDEX src_index_bitmap on src;
-DROP INDEX srcpart_index_bitmap on srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q b/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
deleted file mode 100644
index 20f34d1..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_mult_tables_compact.q
+++ /dev/null
@@ -1,26 +0,0 @@
-set hive.mapred.mode=nonstrict;
--- SORT_QUERY_RESULTS
--- try the query without indexing, with manual indexing, and with automatic indexing
-
--- without indexing
-EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-
-set hive.stats.dbclass=fs;
-
-CREATE INDEX src_index_compact ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index_compact ON src REBUILD;
-
-CREATE INDEX srcpart_index_compact ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_index_compact ON srcpart REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- automatic indexing
-EXPLAIN SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-SELECT a.key, a.value FROM src a JOIN srcpart b ON (a.key = b.key) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-
-DROP INDEX src_index_compact on src;
-DROP INDEX srcpart_index_compact on srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_multiple.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_multiple.q b/ql/src/test/queries/clientpositive/index_auto_multiple.q
deleted file mode 100644
index 2bcb5a5..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_multiple.q
+++ /dev/null
@@ -1,20 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
--- With multiple indexes, make sure we choose which to use in a consistent order
-
-CREATE INDEX src_key_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-CREATE INDEX src_val_index ON TABLE src(value) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_key_index ON src REBUILD;
-ALTER INDEX src_val_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
-EXPLAIN SELECT key, value FROM src WHERE key=86;
-SELECT key, value FROM src WHERE key=86;
-
-DROP INDEX src_key_index ON src;
-DROP INDEX src_val_index ON src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_partitioned.q b/ql/src/test/queries/clientpositive/index_auto_partitioned.q
deleted file mode 100644
index e25fdb9..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_partitioned.q
+++ /dev/null
@@ -1,17 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-set hive.fetch.task.conversion=none;
-
--- SORT_QUERY_RESULTS
--- test automatic use of index on table with partitions
-CREATE INDEX src_part_index ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_part_index ON srcpart REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
-EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09';
-SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09';
-
-DROP INDEX src_part_index ON srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_self_join.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_self_join.q b/ql/src/test/queries/clientpositive/index_auto_self_join.q
deleted file mode 100644
index 2ce6d1e..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_self_join.q
+++ /dev/null
@@ -1,19 +0,0 @@
-set hive.mapred.mode=nonstrict;
--- SORT_QUERY_RESULTS
--- try the query without indexing, with manual indexing, and with automatic indexing
-
-EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-
-set hive.stats.dbclass=fs;
-CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
-EXPLAIN SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-SELECT a.key, b.key FROM src a JOIN src b ON (a.value = b.value) WHERE a.key > 80 AND a.key < 100 AND b.key > 70 AND b.key < 90;
-
-DROP INDEX src_index on src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_unused.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_unused.q b/ql/src/test/queries/clientpositive/index_auto_unused.q
deleted file mode 100644
index 4e33366..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_unused.q
+++ /dev/null
@@ -1,64 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
--- test cases where the index should not be used automatically
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=5368709120;
-SET hive.optimize.index.filter.compact.maxsize=-1;
-
--- min size too large (src is less than 5G)
-EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100;
-SELECT * FROM src WHERE key > 80 AND key < 100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-SET hive.optimize.index.filter.compact.maxsize=1;
-
--- max size too small
-EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100;
-SELECT * FROM src WHERE key > 80 AND key < 100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-SET hive.optimize.index.filter.compact.maxsize=-1;
-
--- OR predicate not supported by compact indexes
-EXPLAIN SELECT * FROM src WHERE key < 10 OR key > 480;
-SELECT * FROM src WHERE key < 10 OR key > 480;
-
- SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-SET hive.optimize.index.filter.compact.maxsize=-1;
-
--- columns are not covered by indexes
-DROP INDEX src_index on src;
-CREATE INDEX src_val_index ON TABLE src(value) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_val_index ON src REBUILD;
-
-EXPLAIN SELECT * FROM src WHERE key > 80 AND key < 100;
-SELECT * FROM src WHERE key > 80 AND key < 100;
-
-DROP INDEX src_val_index on src;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-SET hive.optimize.index.filter.compact.maxsize=-1;
-
--- required partitions have not been built yet
-CREATE INDEX src_part_index ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_part_index ON srcpart PARTITION (ds='2008-04-08', hr=11) REBUILD;
-
-EXPLAIN SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10;
-SELECT * FROM srcpart WHERE ds='2008-04-09' AND hr=12 AND key < 10;
-
-DROP INDEX src_part_index on srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_auto_update.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_auto_update.q b/ql/src/test/queries/clientpositive/index_auto_update.q
deleted file mode 100644
index b184080..0000000
--- a/ql/src/test/queries/clientpositive/index_auto_update.q
+++ /dev/null
@@ -1,29 +0,0 @@
-set hive.mapred.mode=nonstrict;
--- Test if index is actually being used.
-
--- Create temp, and populate it with some values in src.
-CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE;
-INSERT OVERWRITE TABLE temp SELECT * FROM src WHERE key < 50;
-
--- Build an index on temp.
-CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX temp_index ON temp REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.autoupdate=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- overwrite temp table so index is out of date
-EXPLAIN INSERT OVERWRITE TABLE temp SELECT * FROM src;
-INSERT OVERWRITE TABLE temp SELECT * FROM src;
-
--- query should return indexed values
-EXPLAIN SELECT * FROM temp WHERE key = 86;
-SELECT * FROM temp WHERE key = 86;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=false;
-drop index temp_index on temp;
-DROP table temp;
-
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_bitmap.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap.q b/ql/src/test/queries/clientpositive/index_bitmap.q
deleted file mode 100644
index 91a4e54..0000000
--- a/ql/src/test/queries/clientpositive/index_bitmap.q
+++ /dev/null
@@ -1,52 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-DROP INDEX srcpart_index_proj on srcpart;
-
-EXPLAIN
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD;
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_index_proj ON srcpart REBUILD;
-SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_test_index_result" SELECT `_bucketname`,
-COLLECT_SET(`_offset`) as `_offsets` FROM default__srcpart_srcpart_index_proj__
-x WHERE NOT EWAH_BITMAP_EMPTY(`_bitmaps`) AND x.key=100 AND x.ds = '2008-04-08' GROUP BY `_bucketname`;
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_test_index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08';
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_test_index_result" SELECT `_bucketname` ,
-COLLECT_SET(`_offset`) as `_offsets` FROM default__srcpart_srcpart_index_proj__
-x WHERE NOT EWAH_BITMAP_EMPTY(`_bitmaps`) AND x.key=100 AND x.ds = '2008-04-08' and x.hr = 11 GROUP BY `_bucketname`;
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_test_index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11;
-
-DROP INDEX srcpart_index_proj on srcpart;
-
-EXPLAIN
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD;
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_index_proj ON srcpart REBUILD;
-SELECT x.* FROM default__srcpart_srcpart_index_proj__ x;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname` ,
-COLLECT_SET(`_offset`) as `_offsets` FROM default__srcpart_srcpart_index_proj__
-WHERE NOT EWAH_BITMAP_EMPTY(`_bitmaps`) AND key=100 GROUP BY `_bucketname`;
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-SELECT key, value FROM srcpart WHERE key=100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM srcpart WHERE key=100;
-
-DROP INDEX srcpart_index_proj on srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_bitmap1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap1.q b/ql/src/test/queries/clientpositive/index_bitmap1.q
deleted file mode 100644
index ff6ae5d..0000000
--- a/ql/src/test/queries/clientpositive/index_bitmap1.q
+++ /dev/null
@@ -1,22 +0,0 @@
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-EXPLAIN
-CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-SELECT x.* FROM default__src_src_index__ x;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname`,
-COLLECT_SET(`_offset`) as `_offsets` FROM default__src_src_index__ WHERE NOT
-EWAH_BITMAP_EMPTY(`_bitmaps`) AND key=100 GROUP BY `_bucketname`;
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-SELECT key, value FROM src WHERE key=100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM src WHERE key=100;
-
-DROP INDEX src_index ON src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_bitmap2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap2.q b/ql/src/test/queries/clientpositive/index_bitmap2.q
deleted file mode 100644
index 89fbe76..0000000
--- a/ql/src/test/queries/clientpositive/index_bitmap2.q
+++ /dev/null
@@ -1,39 +0,0 @@
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-EXPLAIN
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-EXPLAIN
-CREATE INDEX src2_index ON TABLE src(value) as 'BITMAP' WITH DEFERRED REBUILD;
-
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-CREATE INDEX src2_index ON TABLE src(value) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src1_index ON src REBUILD;
-ALTER INDEX src2_index ON src REBUILD;
-SELECT * FROM default__src_src1_index__;
-SELECT * FROM default__src_src2_index__;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result"
-SELECT t.bucketname as `_bucketname`, COLLECT_SET(t.offset) AS `_offsets` FROM
- (SELECT `_bucketname` AS bucketname, `_offset` AS offset
- FROM default__src_src1_index__
- WHERE key = 0 AND NOT EWAH_BITMAP_EMPTY(`_bitmaps`) UNION ALL
- SELECT `_bucketname` AS bucketname, `_offset` AS offset
- FROM default__src_src2_index__
- WHERE value = "val2" AND NOT EWAH_BITMAP_EMPTY(`_bitmaps`)) t
-GROUP BY t.bucketname;
-
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-
-SELECT key, value FROM src WHERE key=0 OR value = "val_2";
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM src WHERE key=0 OR value = "val_2";
-
-DROP INDEX src1_index ON src;
-DROP INDEX src2_index ON src;
-
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_bitmap3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap3.q b/ql/src/test/queries/clientpositive/index_bitmap3.q
deleted file mode 100644
index 73bdc89..0000000
--- a/ql/src/test/queries/clientpositive/index_bitmap3.q
+++ /dev/null
@@ -1,52 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.autogather=true;
-
--- SORT_QUERY_RESULTS
-
-EXPLAIN
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-EXPLAIN
-CREATE INDEX src2_index ON TABLE src(value) as 'BITMAP' WITH DEFERRED REBUILD;
-
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-CREATE INDEX src2_index ON TABLE src(value) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src1_index ON src REBUILD;
-ALTER INDEX src2_index ON src REBUILD;
-SELECT * FROM default__src_src1_index__;
-SELECT * FROM default__src_src2_index__;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-
-EXPLAIN
-SELECT a.bucketname AS `_bucketname`, COLLECT_SET(a.offset) as `_offsets`
-FROM (SELECT `_bucketname` AS bucketname, `_offset` AS offset, `_bitmaps` AS bitmaps FROM default__src_src1_index__
- WHERE key = 0) a
- JOIN
- (SELECT `_bucketname` AS bucketname, `_offset` AS offset, `_bitmaps` AS bitmaps FROM default__src_src2_index__
- WHERE value = "val_0") b
- ON
- a.bucketname = b.bucketname AND a.offset = b.offset WHERE NOT
-EWAH_BITMAP_EMPTY(EWAH_BITMAP_AND(a.bitmaps, b.bitmaps)) GROUP BY a.bucketname;
-
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result"
-SELECT a.bucketname AS `_bucketname`, COLLECT_SET(a.offset) as `_offsets`
-FROM (SELECT `_bucketname` AS bucketname, `_offset` AS offset, `_bitmaps` AS bitmaps FROM default__src_src1_index__
- WHERE key = 0) a
- JOIN
- (SELECT `_bucketname` AS bucketname, `_offset` AS offset, `_bitmaps` AS bitmaps FROM default__src_src2_index__
- WHERE value = "val_0") b
- ON
- a.bucketname = b.bucketname AND a.offset = b.offset WHERE NOT
-EWAH_BITMAP_EMPTY(EWAH_BITMAP_AND(a.bitmaps, b.bitmaps)) GROUP BY a.bucketname;
-
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-
-SELECT key, value FROM src WHERE key=0 AND value = "val_0";
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM src WHERE key=0 AND value = "val_0";
-
-DROP INDEX src1_index ON src;
-DROP INDEX src2_index ON src;
-
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_bitmap_auto.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap_auto.q b/ql/src/test/queries/clientpositive/index_bitmap_auto.q
deleted file mode 100644
index 8020900..0000000
--- a/ql/src/test/queries/clientpositive/index_bitmap_auto.q
+++ /dev/null
@@ -1,57 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.autogather=true;
-
--- SORT_QUERY_RESULTS
-
--- try the query without indexing, with manual indexing, and with automatic indexing
--- without indexing
-SELECT key, value FROM src WHERE key=0 AND value = "val_0";
-
--- create indices
-EXPLAIN
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-EXPLAIN
-CREATE INDEX src2_index ON TABLE src(value) as 'BITMAP' WITH DEFERRED REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-CREATE INDEX src2_index ON TABLE src(value) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src1_index ON src REBUILD;
-ALTER INDEX src2_index ON src REBUILD;
-SELECT * FROM default__src_src1_index__;
-SELECT * FROM default__src_src2_index__;
-
-
--- manual indexing
-EXPLAIN
-SELECT a.bucketname AS `_bucketname`, COLLECT_SET(a.offset) as `_offsets`
-FROM (SELECT `_bucketname` AS bucketname, `_offset` AS offset, `_bitmaps` AS bitmaps FROM default__src_src1_index__
- WHERE key = 0) a
- JOIN
- (SELECT `_bucketname` AS bucketname, `_offset` AS offset, `_bitmaps` AS bitmaps FROM default__src_src2_index__
- WHERE value = "val_0") b
- ON
- a.bucketname = b.bucketname AND a.offset = b.offset WHERE NOT
-EWAH_BITMAP_EMPTY(EWAH_BITMAP_AND(a.bitmaps, b.bitmaps)) GROUP BY a.bucketname;
-
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result"
-SELECT a.bucketname AS `_bucketname`, COLLECT_SET(a.offset) as `_offsets`
-FROM (SELECT `_bucketname` AS bucketname, `_offset` AS offset, `_bitmaps` AS bitmaps FROM default__src_src1_index__
- WHERE key = 0) a
- JOIN
- (SELECT `_bucketname` AS bucketname, `_offset` AS offset, `_bitmaps` AS bitmaps FROM default__src_src2_index__
- WHERE value = "val_0") b
- ON
- a.bucketname = b.bucketname AND a.offset = b.offset WHERE NOT
-EWAH_BITMAP_EMPTY(EWAH_BITMAP_AND(a.bitmaps, b.bitmaps)) GROUP BY a.bucketname;
-
-SELECT key, value FROM src WHERE key=0 AND value = "val_0";
-
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SELECT key, value FROM src WHERE key=0 AND value = "val_0";
-
-DROP INDEX src1_index ON src;
-DROP INDEX src2_index ON src;
-
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q b/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q
deleted file mode 100644
index c6c558b..0000000
--- a/ql/src/test/queries/clientpositive/index_bitmap_auto_partitioned.q
+++ /dev/null
@@ -1,17 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-set hive.fetch.task.conversion=none;
-
--- SORT_QUERY_RESULTS
-
--- test automatic use of index on table with partitions
-CREATE INDEX src_part_index ON TABLE srcpart(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src_part_index ON srcpart REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-
-EXPLAIN SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09';
-SELECT key, value FROM srcpart WHERE key=86 AND ds='2008-04-09';
-
-DROP INDEX src_part_index ON srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_bitmap_compression.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap_compression.q b/ql/src/test/queries/clientpositive/index_bitmap_compression.q
deleted file mode 100644
index 9b0bbe8..0000000
--- a/ql/src/test/queries/clientpositive/index_bitmap_compression.q
+++ /dev/null
@@ -1,18 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-SET hive.exec.compress.output=true;
-
--- SORT_QUERY_RESULTS
-
-CREATE INDEX src_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- automatic indexing
-EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100;
-SELECT key, value FROM src WHERE key > 80 AND key < 100;
-
-DROP INDEX src_index on src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_bitmap_rc.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_bitmap_rc.q b/ql/src/test/queries/clientpositive/index_bitmap_rc.q
deleted file mode 100644
index b8a4f12..0000000
--- a/ql/src/test/queries/clientpositive/index_bitmap_rc.q
+++ /dev/null
@@ -1,58 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE;
-
-INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-08', hr=11) SELECT key, value FROM srcpart WHERE ds = '2008-04-08' AND hr = 11;
-INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-08', hr=12) SELECT key, value FROM srcpart WHERE ds = '2008-04-08' AND hr = 12;
-INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-09', hr=11) SELECT key, value FROM srcpart WHERE ds = '2008-04-09' AND hr = 11;
-INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-09', hr=12) SELECT key, value FROM srcpart WHERE ds = '2008-04-09' AND hr = 12;
-
-EXPLAIN
-CREATE INDEX srcpart_rc_index ON TABLE srcpart_rc(key) as 'BITMAP' WITH DEFERRED REBUILD;
-CREATE INDEX srcpart_rc_index ON TABLE srcpart_rc(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_rc_index ON srcpart_rc REBUILD;
-SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_test_index_result" SELECT `_bucketname`,
-COLLECT_SET(`_offset`) as `_offsets` FROM default__srcpart_rc_srcpart_rc_index__
-x WHERE NOT EWAH_BITMAP_EMPTY(`_bitmaps`) AND x.key=100 AND x.ds = '2008-04-08' GROUP BY `_bucketname`;
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_test_index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08';
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_test_index_result" SELECT `_bucketname` ,
-COLLECT_SET(`_offset`) as `_offsets` FROM default__srcpart_rc_srcpart_rc_index__
-x WHERE NOT EWAH_BITMAP_EMPTY(`_bitmaps`) AND x.key=100 AND x.ds = '2008-04-08' and x.hr = 11 GROUP BY `_bucketname`;
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_test_index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11;
-
-DROP INDEX srcpart_rc_index on srcpart_rc;
-
-EXPLAIN
-CREATE INDEX srcpart_rc_index ON TABLE srcpart_rc(key) as 'BITMAP' WITH DEFERRED REBUILD;
-CREATE INDEX srcpart_rc_index ON TABLE srcpart_rc(key) as 'BITMAP' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_rc_index ON srcpart_rc REBUILD;
-SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.key = 100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname` ,
-COLLECT_SET(`_offset`) as `_offsets` FROM default__srcpart_rc_srcpart_rc_index__
-WHERE NOT EWAH_BITMAP_EMPTY(`_bitmaps`) AND key=100 GROUP BY `_bucketname`;
-SET hive.index.blockfilter.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.HiveIndexedInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100;
-
-DROP INDEX srcpart_rc_index on srcpart_rc;
-DROP TABLE srcpart_rc;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_compact.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compact.q b/ql/src/test/queries/clientpositive/index_compact.q
deleted file mode 100644
index 6add673..0000000
--- a/ql/src/test/queries/clientpositive/index_compact.q
+++ /dev/null
@@ -1,46 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-DROP INDEX srcpart_index_proj on srcpart;
-
-EXPLAIN
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_index_proj ON srcpart REBUILD;
-SELECT x.* FROM default__srcpart_srcpart_index_proj__ x WHERE x.ds = '2008-04-08' and x.hr = 11;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_test_index_result" SELECT `_bucketname` , `_offsets` FROM default__srcpart_srcpart_index_proj__ x WHERE x.key=100 AND x.ds = '2008-04-08';
-SET hive.index.compact.file=${system:test.tmp.dir}/index_test_index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08';
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_test_index_result" SELECT `_bucketname` , `_offsets` FROM default__srcpart_srcpart_index_proj__ x WHERE x.key=100 AND x.ds = '2008-04-08' and x.hr = 11;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_test_index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM srcpart WHERE key=100 AND ds = '2008-04-08' and hr = 11;
-
-DROP INDEX srcpart_index_proj on srcpart;
-
-EXPLAIN
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
-CREATE INDEX srcpart_index_proj ON TABLE srcpart(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_index_proj ON srcpart REBUILD;
-SELECT x.* FROM default__srcpart_srcpart_index_proj__ x;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname` , `_offsets` FROM default__srcpart_srcpart_index_proj__ WHERE key=100;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SELECT key, value FROM srcpart WHERE key=100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM srcpart WHERE key=100;
-
-DROP INDEX srcpart_index_proj on srcpart;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_compact_1.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compact_1.q b/ql/src/test/queries/clientpositive/index_compact_1.q
deleted file mode 100644
index 9cdd563..0000000
--- a/ql/src/test/queries/clientpositive/index_compact_1.q
+++ /dev/null
@@ -1,20 +0,0 @@
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-EXPLAIN
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-SELECT x.* FROM default__src_src_index__ x;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname` , `_offsets` FROM default__src_src_index__ WHERE key=100;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SELECT key, value FROM src WHERE key=100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM src WHERE key=100;
-
-DROP INDEX src_index on src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_compact_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compact_2.q b/ql/src/test/queries/clientpositive/index_compact_2.q
deleted file mode 100644
index 7b2fce2..0000000
--- a/ql/src/test/queries/clientpositive/index_compact_2.q
+++ /dev/null
@@ -1,50 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-CREATE TABLE srcpart_rc (key int, value string) PARTITIONED BY (ds string, hr int) STORED AS RCFILE;
-
-INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-08', hr=11) SELECT key, value FROM srcpart WHERE ds = '2008-04-08' AND hr = 11;
-INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-08', hr=12) SELECT key, value FROM srcpart WHERE ds = '2008-04-08' AND hr = 12;
-INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-09', hr=11) SELECT key, value FROM srcpart WHERE ds = '2008-04-09' AND hr = 11;
-INSERT OVERWRITE TABLE srcpart_rc PARTITION (ds='2008-04-09', hr=12) SELECT key, value FROM srcpart WHERE ds = '2008-04-09' AND hr = 12;
-
-CREATE INDEX srcpart_rc_index ON TABLE srcpart_rc(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_rc_index ON srcpart_rc REBUILD;
-SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.ds = '2008-04-08' and x.hr = 11;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_test_index_result" SELECT `_bucketname` , `_offsets` FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.key=100 AND x.ds = '2008-04-08';
-SET hive.index.compact.file=${system:test.tmp.dir}/index_test_index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08';
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_test_index_result" SELECT `_bucketname` , `_offsets` FROM default__srcpart_rc_srcpart_rc_index__ x WHERE x.key=100 AND x.ds = '2008-04-08' and x.hr = 11;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_test_index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100 AND ds = '2008-04-08' and hr = 11;
-
-DROP INDEX srcpart_rc_index on srcpart_rc;
-
-EXPLAIN
-CREATE INDEX srcpart_rc_index ON TABLE srcpart_rc(key) as 'COMPACT' WITH DEFERRED REBUILD;
-CREATE INDEX srcpart_rc_index ON TABLE srcpart_rc(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX srcpart_rc_index ON srcpart_rc REBUILD;
-SELECT x.* FROM default__srcpart_rc_srcpart_rc_index__ x;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname` , `_offsets` FROM default__srcpart_rc_srcpart_rc_index__ WHERE key=100;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM srcpart_rc WHERE key=100;
-
-DROP INDEX srcpart_rc_index on srcpart_rc;
-DROP TABLE srcpart_rc;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_compact_3.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compact_3.q b/ql/src/test/queries/clientpositive/index_compact_3.q
deleted file mode 100644
index 15ba946..0000000
--- a/ql/src/test/queries/clientpositive/index_compact_3.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-CREATE TABLE src_index_test_rc (key int, value string) STORED AS RCFILE;
-
-INSERT OVERWRITE TABLE src_index_test_rc SELECT * FROM src;
-
-CREATE INDEX src_index ON TABLE src_index_test_rc(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src_index_test_rc REBUILD;
-SELECT x.* FROM default__src_index_test_rc_src_index__ x;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_result" SELECT `_bucketname` , `_offsets` FROM default__src_index_test_rc_src_index__ WHERE key=100;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_result;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-SELECT key, value FROM src_index_test_rc WHERE key=100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SELECT key, value FROM src_index_test_rc WHERE key=100;
-
-DROP INDEX src_index on src_index_test_rc;
-DROP TABLE src_index_test_rc;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_compact_binary_search.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compact_binary_search.q b/ql/src/test/queries/clientpositive/index_compact_binary_search.q
deleted file mode 100644
index e72b27c..0000000
--- a/ql/src/test/queries/clientpositive/index_compact_binary_search.q
+++ /dev/null
@@ -1,132 +0,0 @@
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.default.fileformat=TextFile;
-set hive.stats.dbclass=fs;
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=1;
-SET hive.index.compact.binary.search=true;
-
-SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.VerifyHiveSortedInputFormatUsedHook;
-
-SELECT * FROM src WHERE key = '0';
-
-SELECT * FROM src WHERE key < '1';
-
-SELECT * FROM src WHERE key <= '0';
-
-SELECT * FROM src WHERE key > '8';
-
-SELECT * FROM src WHERE key >= '9';
-
-SET hive.exec.post.hooks=;
-
-DROP INDEX src_index ON src;
-
-SET hive.default.fileformat=RCFILE;
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.VerifyHiveSortedInputFormatUsedHook;
-
-SELECT * FROM src WHERE key = '0';
-
-SELECT * FROM src WHERE key < '1';
-
-SELECT * FROM src WHERE key <= '0';
-
-SELECT * FROM src WHERE key > '8';
-
-SELECT * FROM src WHERE key >= '9';
-
-SET hive.exec.post.hooks=;
-
-DROP INDEX src_index ON src;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.CombineHiveInputFormat;
-SET hive.default.fileformat=TextFile;
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.VerifyHiveSortedInputFormatUsedHook;
-
-SELECT * FROM src WHERE key = '0';
-
-SELECT * FROM src WHERE key < '1';
-
-SELECT * FROM src WHERE key <= '0';
-
-SELECT * FROM src WHERE key > '8';
-
-SELECT * FROM src WHERE key >= '9';
-
-SET hive.exec.post.hooks=;
-
-DROP INDEX src_index ON src;
-
-SET hive.default.fileformat=RCFILE;
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.VerifyHiveSortedInputFormatUsedHook;
-
-SELECT * FROM src WHERE key = '0';
-
-SELECT * FROM src WHERE key < '1';
-
-SELECT * FROM src WHERE key <= '0';
-
-SELECT * FROM src WHERE key > '8';
-
-SELECT * FROM src WHERE key >= '9';
-
-SET hive.exec.post.hooks=;
-
-DROP INDEX src_index ON src;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.BucketizedHiveInputFormat;
-SET hive.default.fileformat=TextFile;
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.VerifyHiveSortedInputFormatUsedHook;
-
-SELECT * FROM src WHERE key = '0';
-
-SELECT * FROM src WHERE key < '1';
-
-SELECT * FROM src WHERE key <= '0';
-
-SELECT * FROM src WHERE key > '8';
-
-SELECT * FROM src WHERE key >= '9';
-
-SET hive.exec.post.hooks=;
-
-DROP INDEX src_index ON src;
-
-SET hive.default.fileformat=RCFILE;
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.exec.post.hooks=org.apache.hadoop.hive.ql.hooks.VerifyHiveSortedInputFormatUsedHook;
-
-SELECT * FROM src WHERE key = '0';
-
-SELECT * FROM src WHERE key < '1';
-
-SELECT * FROM src WHERE key <= '0';
-
-SELECT * FROM src WHERE key > '8';
-
-SELECT * FROM src WHERE key >= '9';
-
-SET hive.exec.post.hooks=;
-
-DROP INDEX src_index ON src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_compression.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_compression.q b/ql/src/test/queries/clientpositive/index_compression.q
deleted file mode 100644
index be93560..0000000
--- a/ql/src/test/queries/clientpositive/index_compression.q
+++ /dev/null
@@ -1,18 +0,0 @@
-set hive.mapred.mode=nonstrict;
-SET hive.exec.compress.output=true;
-SET hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
-
-CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON src REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- automatic indexing
-EXPLAIN SELECT key, value FROM src WHERE key > 80 AND key < 100;
-SELECT key, value FROM src WHERE key > 80 AND key < 100;
-
-DROP INDEX src_index on src;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_creation.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_creation.q b/ql/src/test/queries/clientpositive/index_creation.q
deleted file mode 100644
index ef020b6..0000000
--- a/ql/src/test/queries/clientpositive/index_creation.q
+++ /dev/null
@@ -1,54 +0,0 @@
-set hive.stats.dbclass=fs;
-drop index src_index_2 on src;
-drop index src_index_3 on src;
-drop index src_index_4 on src;
-drop index src_index_5 on src;
-drop index src_index_6 on src;
-drop index src_index_7 on src;
-drop index src_index_8 on src;
-drop index src_index_9 on src;
-drop table `_t`;
-
-create index src_index_2 on table src(key) as 'compact' WITH DEFERRED REBUILD;
-desc extended default__src_src_index_2__;
-
-create index src_index_3 on table src(key) as 'compact' WITH DEFERRED REBUILD in table src_idx_src_index_3;
-desc extended src_idx_src_index_3;
-
-create index src_index_4 on table src(key) as 'compact' WITH DEFERRED REBUILD ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' STORED AS TEXTFILE;
-desc extended default__src_src_index_4__;
-
-create index src_index_5 on table src(key) as 'compact' WITH DEFERRED REBUILD ROW FORMAT DELIMITED FIELDS TERMINATED BY '\t' ESCAPED BY '\\';
-desc extended default__src_src_index_5__;
-
-create index src_index_6 on table src(key) as 'compact' WITH DEFERRED REBUILD STORED AS RCFILE;
-desc extended default__src_src_index_6__;
-
-create index src_index_7 on table src(key) as 'compact' WITH DEFERRED REBUILD in table src_idx_src_index_7 STORED AS RCFILE;
-desc extended src_idx_src_index_7;
-
-create index src_index_8 on table src(key) as 'compact' WITH DEFERRED REBUILD IDXPROPERTIES ("prop1"="val1", "prop2"="val2");
-desc extended default__src_src_index_8__;
-
-create index src_index_9 on table src(key) as 'compact' WITH DEFERRED REBUILD TBLPROPERTIES ("prop1"="val1", "prop2"="val2");
-desc extended default__src_src_index_9__;
-
-create table `_t`(`_i` int, `_j` int);
-create index x on table `_t`(`_j`) as 'compact' WITH DEFERRED REBUILD;
-alter index x on `_t` rebuild;
-
-create index x2 on table `_t`(`_i`,`_j`) as 'compact' WITH DEFERRED
-REBUILD;
-alter index x2 on `_t` rebuild;
-
-drop index src_index_2 on src;
-drop index src_index_3 on src;
-drop index src_index_4 on src;
-drop index src_index_5 on src;
-drop index src_index_6 on src;
-drop index src_index_7 on src;
-drop index src_index_8 on src;
-drop index src_index_9 on src;
-drop table `_t`;
-
-show tables;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_in_db.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_in_db.q b/ql/src/test/queries/clientpositive/index_in_db.q
deleted file mode 100644
index 1c34781..0000000
--- a/ql/src/test/queries/clientpositive/index_in_db.q
+++ /dev/null
@@ -1,16 +0,0 @@
-set hive.optimize.index.filter=true;
-drop database if exists index_test_db cascade;
--- Test selecting selecting from a table that is backed by an index
--- create table, index in a db, then set default db as current db, and try selecting
-
-create database index_test_db;
-
-use index_test_db;
-create table testtb (id int, name string);
-create index id_index on table testtb (id) as 'COMPACT' WITH DEFERRED REBUILD in table testdb_id_idx_tb;
-
-use default;
-select * from index_test_db.testtb where id>2;
-
-use index_test_db;
-drop index id_index on testtb;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_serde.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_serde.q b/ql/src/test/queries/clientpositive/index_serde.q
deleted file mode 100644
index 8f20f28..0000000
--- a/ql/src/test/queries/clientpositive/index_serde.q
+++ /dev/null
@@ -1,52 +0,0 @@
-set hive.stats.dbclass=fs;
-
--- SORT_QUERY_RESULTS
--- Want to ensure we can build and use indices on tables stored with SerDes
--- Build the (Avro backed) table
-CREATE TABLE doctors
-ROW FORMAT
-SERDE 'org.apache.hadoop.hive.serde2.avro.AvroSerDe'
-STORED AS
-INPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerInputFormat'
-OUTPUTFORMAT 'org.apache.hadoop.hive.ql.io.avro.AvroContainerOutputFormat'
-TBLPROPERTIES ('avro.schema.literal'='{
- "namespace": "testing.hive.avro.serde",
- "name": "doctors",
- "type": "record",
- "fields": [
- {
- "name":"number",
- "type":"int",
- "doc":"Order of playing the role"
- },
- {
- "name":"first_name",
- "type":"string",
- "doc":"first name of actor playing role"
- },
- {
- "name":"last_name",
- "type":"string",
- "doc":"last name of actor playing role"
- }
- ]
-}');
-
-DESCRIBE doctors;
-
-LOAD DATA LOCAL INPATH '../../data/files/doctors.avro' INTO TABLE doctors;
-
--- Create and build an index
-CREATE INDEX doctors_index ON TABLE doctors(number) AS 'COMPACT' WITH DEFERRED REBUILD;
-DESCRIBE EXTENDED default__doctors_doctors_index__;
-ALTER INDEX doctors_index ON doctors REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
-EXPLAIN SELECT * FROM doctors WHERE number > 6;
-SELECT * FROM doctors WHERE number > 6;
-
-DROP INDEX doctors_index ON doctors;
-DROP TABLE doctors;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_skewtable.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_skewtable.q b/ql/src/test/queries/clientpositive/index_skewtable.q
deleted file mode 100644
index e85e646..0000000
--- a/ql/src/test/queries/clientpositive/index_skewtable.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.mapred.mode=nonstrict;
--- Test creating an index on skewed table
-
--- Create a skew table
-CREATE TABLE kv(key STRING, value STRING) SKEWED BY (key) ON ((3), (8)) STORED AS TEXTFILE;
-
-LOAD DATA LOCAL INPATH '../../data/files/T2.txt' INTO TABLE kv;
-
--- Create and build an index
-CREATE INDEX kv_index ON TABLE kv(value) AS 'COMPACT' WITH DEFERRED REBUILD;
-DESCRIBE FORMATTED default__kv_kv_index__;
-ALTER INDEX kv_index ON kv REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- Run a query that uses the index
-EXPLAIN SELECT * FROM kv WHERE value > '15' ORDER BY value;
-SELECT * FROM kv WHERE value > '15' ORDER BY value;
-
-DROP INDEX kv_index ON kv;
-DROP TABLE kv;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_stale.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_stale.q b/ql/src/test/queries/clientpositive/index_stale.q
deleted file mode 100644
index 6daba83..0000000
--- a/ql/src/test/queries/clientpositive/index_stale.q
+++ /dev/null
@@ -1,23 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
--- test that stale indexes are not used
-
-CREATE TABLE temp(key STRING, val STRING) STORED AS TEXTFILE;
-INSERT OVERWRITE TABLE temp SELECT * FROM src WHERE key < 50;
-
--- Build an index on temp.
-CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX temp_index ON temp REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- overwrite temp table so index is out of date
-INSERT OVERWRITE TABLE temp SELECT * FROM src;
-
--- should return correct results bypassing index
-EXPLAIN SELECT * FROM temp WHERE key = 86;
-SELECT * FROM temp WHERE key = 86;
-DROP index temp_index on temp;
-DROP table temp;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/index_stale_partitioned.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/index_stale_partitioned.q b/ql/src/test/queries/clientpositive/index_stale_partitioned.q
deleted file mode 100644
index 630b415..0000000
--- a/ql/src/test/queries/clientpositive/index_stale_partitioned.q
+++ /dev/null
@@ -1,29 +0,0 @@
-set hive.mapred.mode=nonstrict;
-set hive.stats.dbclass=fs;
--- Test if index is actually being used.
-
--- Create temp, and populate it with some values in src.
-CREATE TABLE temp(key STRING, val STRING) PARTITIONED BY (foo string) STORED AS TEXTFILE;
-ALTER TABLE temp ADD PARTITION (foo = 'bar');
-INSERT OVERWRITE TABLE temp PARTITION (foo = 'bar') SELECT * FROM src WHERE key < 50;
-
--- Build an index on temp.
-CREATE INDEX temp_index ON TABLE temp(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX temp_index ON temp PARTITION (foo = 'bar') REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- overwrite temp table so index is out of date
-INSERT OVERWRITE TABLE temp PARTITION (foo = 'bar') SELECT * FROM src;
-
--- query should not return any values
-SELECT * FROM default__temp_temp_index__ WHERE key = 86 AND foo='bar';
-EXPLAIN SELECT * FROM temp WHERE key = 86 AND foo = 'bar';
-SELECT * FROM temp WHERE key = 86 AND foo = 'bar';
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=false;
-DROP index temp_index on temp;
-DROP table temp;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/show_indexes_edge_cases.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/show_indexes_edge_cases.q b/ql/src/test/queries/clientpositive/show_indexes_edge_cases.q
deleted file mode 100644
index 9758c16..0000000
--- a/ql/src/test/queries/clientpositive/show_indexes_edge_cases.q
+++ /dev/null
@@ -1,28 +0,0 @@
-set hive.stats.dbclass=fs;
-DROP TABLE show_idx_empty;
-DROP TABLE show_idx_full;
-
-CREATE TABLE show_idx_empty(KEY STRING, VALUE STRING);
-CREATE TABLE show_idx_full(KEY STRING, VALUE1 STRING, VALUE2 STRING);
-
-CREATE INDEX idx_1 ON TABLE show_idx_full(KEY) AS "COMPACT" WITH DEFERRED REBUILD;
-CREATE INDEX idx_2 ON TABLE show_idx_full(VALUE1) AS "COMPACT" WITH DEFERRED REBUILD;
-
-CREATE INDEX idx_comment ON TABLE show_idx_full(VALUE2) AS "COMPACT" WITH DEFERRED REBUILD COMMENT "index comment";
-CREATE INDEX idx_compound ON TABLE show_idx_full(KEY, VALUE1) AS "COMPACT" WITH DEFERRED REBUILD;
-
-ALTER INDEX idx_1 ON show_idx_full REBUILD;
-ALTER INDEX idx_2 ON show_idx_full REBUILD;
-ALTER INDEX idx_comment ON show_idx_full REBUILD;
-ALTER INDEX idx_compound ON show_idx_full REBUILD;
-
-EXPLAIN SHOW INDEXES ON show_idx_full;
-SHOW INDEXES ON show_idx_full;
-
-EXPLAIN SHOW INDEXES ON show_idx_empty;
-SHOW INDEXES ON show_idx_empty;
-
-DROP INDEX idx_1 on show_idx_full;
-DROP INDEX idx_2 on show_idx_full;
-DROP TABLE show_idx_empty;
-DROP TABLE show_idx_full;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/show_indexes_syntax.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/show_indexes_syntax.q b/ql/src/test/queries/clientpositive/show_indexes_syntax.q
deleted file mode 100644
index bb43c5e..0000000
--- a/ql/src/test/queries/clientpositive/show_indexes_syntax.q
+++ /dev/null
@@ -1,24 +0,0 @@
-set hive.stats.dbclass=fs;
-DROP TABLE show_idx_t1;
-
-CREATE TABLE show_idx_t1(KEY STRING, VALUE STRING);
-
-CREATE INDEX idx_t1 ON TABLE show_idx_t1(KEY) AS "COMPACT" WITH DEFERRED REBUILD;
-ALTER INDEX idx_t1 ON show_idx_t1 REBUILD;
-
-EXPLAIN
-SHOW INDEX ON show_idx_t1;
-
-SHOW INDEX ON show_idx_t1;
-
-EXPLAIN
-SHOW INDEXES ON show_idx_t1;
-
-SHOW INDEXES ON show_idx_t1;
-
-EXPLAIN
-SHOW FORMATTED INDEXES ON show_idx_t1;
-
-SHOW FORMATTED INDEXES ON show_idx_t1;
-
-DROP TABLE show_idx_t1;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/special_character_in_tabnames_2.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/special_character_in_tabnames_2.q b/ql/src/test/queries/clientpositive/special_character_in_tabnames_2.q
index d7010e9..d8993dd 100644
--- a/ql/src/test/queries/clientpositive/special_character_in_tabnames_2.q
+++ b/ql/src/test/queries/clientpositive/special_character_in_tabnames_2.q
@@ -13,30 +13,7 @@ ANALYZE TABLE `s/c` COMPUTE STATISTICS;
ANALYZE TABLE `s/c` COMPUTE STATISTICS FOR COLUMNS key,value;
--- without indexing
SELECT key, value FROM `s/c` WHERE key > 80 AND key < 100;
-set hive.stats.dbclass=fs;
-CREATE INDEX src_index ON TABLE `s/c`(key) as 'COMPACT' WITH DEFERRED REBUILD;
-ALTER INDEX src_index ON `s/c` REBUILD;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-
--- manual indexing
-INSERT OVERWRITE DIRECTORY "${system:test.tmp.dir}/index_where" SELECT `_bucketname` , `_offsets` FROM `default__s/c_src_index__` WHERE key > 80 AND key < 100;
-SET hive.index.compact.file=${system:test.tmp.dir}/index_where;
-SET hive.optimize.index.filter=false;
-SET hive.input.format=org.apache.hadoop.hive.ql.index.compact.HiveCompactIndexInputFormat;
-
-EXPLAIN SELECT key, value FROM `s/c` WHERE key > 80 AND key < 100;
-SELECT key, value FROM `s/c` WHERE key > 80 AND key < 100;
-
-SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
-SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
-
--- automatic indexing
EXPLAIN SELECT key, value FROM `s/c` WHERE key > 80 AND key < 100;
SELECT key, value FROM `s/c` WHERE key > 80 AND key < 100;
-
-DROP INDEX src_index on `s/c`;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/udf_bitmap_and.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_bitmap_and.q b/ql/src/test/queries/clientpositive/udf_bitmap_and.q
deleted file mode 100644
index ed7711c..0000000
--- a/ql/src/test/queries/clientpositive/udf_bitmap_and.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.fetch.task.conversion=more;
-
-select ewah_bitmap_and(array(13,2,4,8589934592,4096,0), array(13,2,4,8589934592,4096,0)) from src tablesample (1 rows);
-select ewah_bitmap_and(array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0)) from src tablesample (1 rows);
-
-drop table bitmap_test;
-create table bitmap_test (a array<bigint>, b array<bigint>);
-
-insert overwrite table bitmap_test
-select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src tablesample (10 rows);
-
-select ewah_bitmap_and(a,b) from bitmap_test;
-
-drop table bitmap_test;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/udf_bitmap_empty.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_bitmap_empty.q b/ql/src/test/queries/clientpositive/udf_bitmap_empty.q
deleted file mode 100644
index 142b248..0000000
--- a/ql/src/test/queries/clientpositive/udf_bitmap_empty.q
+++ /dev/null
@@ -1,5 +0,0 @@
-set hive.fetch.task.conversion=more;
-
-select ewah_bitmap_empty(array(13,2,4,8589934592,0,0)) from src tablesample (1 rows);
-
-select ewah_bitmap_empty(array(13,2,4,8589934592,4096,0)) from src tablesample (1 rows);
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/udf_bitmap_or.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/udf_bitmap_or.q b/ql/src/test/queries/clientpositive/udf_bitmap_or.q
deleted file mode 100644
index 00785b7..0000000
--- a/ql/src/test/queries/clientpositive/udf_bitmap_or.q
+++ /dev/null
@@ -1,14 +0,0 @@
-set hive.fetch.task.conversion=more;
-
-select ewah_bitmap_or(array(13,2,4,8589934592,4096,0), array(13,2,4,8589934592,4096,0)) from src tablesample (1 rows);
-select ewah_bitmap_or(array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0)) from src tablesample (1 rows);
-
-drop table bitmap_test;
-create table bitmap_test (a array<bigint>, b array<bigint>);
-
-insert overwrite table bitmap_test
-select array(13,2,4,8589934592,4096,0), array(8,2,4,8589934592,128,0) from src tablesample (10 rows);
-
-select ewah_bitmap_or(a,b) from bitmap_test;
-
-drop table bitmap_test;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/unicode_comments.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/unicode_comments.q b/ql/src/test/queries/clientpositive/unicode_comments.q
index 4d958e4..00c94f3 100644
--- a/ql/src/test/queries/clientpositive/unicode_comments.q
+++ b/ql/src/test/queries/clientpositive/unicode_comments.q
@@ -5,13 +5,11 @@ create table unicode_comments_tbl1
partitioned by (p1 string comment '分割');
create view unicode_comments_view1 (col1 comment '第一列') comment '视图'
as select col1 from unicode_comments_tbl1;
-create index index2 on table unicode_comments_tbl1(col1) as 'COMPACT' with deferred rebuild comment '索引';
describe database extended unicode_comments_db;
show create table unicode_comments_tbl1;
describe formatted unicode_comments_tbl1;
show create table unicode_comments_view1;
describe formatted unicode_comments_view1;
-show formatted index on unicode_comments_tbl1;
drop database unicode_comments_db cascade;
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/queries/clientpositive/union_view.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/union_view.q b/ql/src/test/queries/clientpositive/union_view.q
index c4f63e6..74e77a8 100644
--- a/ql/src/test/queries/clientpositive/union_view.q
+++ b/ql/src/test/queries/clientpositive/union_view.q
@@ -3,18 +3,14 @@ set hive.stats.dbclass=fs;
set hive.explain.user=false;
CREATE TABLE src_union_1 (key int, value string) PARTITIONED BY (ds string);
-CREATE INDEX src_union_1_key_idx ON TABLE src_union_1(key) AS 'COMPACT' WITH DEFERRED REBUILD;
CREATE TABLE src_union_2 (key int, value string) PARTITIONED BY (ds string, part_1 string);
-CREATE INDEX src_union_2_key_idx ON TABLE src_union_2(key) AS 'COMPACT' WITH DEFERRED REBUILD;
CREATE TABLE src_union_3(key int, value string) PARTITIONED BY (ds string, part_1 string, part_2 string);
-CREATE INDEX src_union_3_key_idx ON TABLE src_union_3(key) AS 'COMPACT' WITH DEFERRED REBUILD;
SET hive.input.format=org.apache.hadoop.hive.ql.io.HiveInputFormat;
SET hive.optimize.index.filter=true;
-SET hive.optimize.index.filter.compact.minsize=0;
SET hive.exec.pre.hooks=;
SET hive.exec.post.hooks=;
@@ -23,17 +19,12 @@ SET hive.merge.mapfiles=false;
SET hive.merge.mapredfiles=false;
INSERT OVERWRITE TABLE src_union_1 PARTITION (ds='1') SELECT * FROM src;
-ALTER INDEX src_union_1_key_idx ON src_union_1 PARTITION (ds='1') REBUILD;
INSERT OVERWRITE TABLE src_union_2 PARTITION (ds='2', part_1='1') SELECT * FROM src;
INSERT OVERWRITE TABLE src_union_2 PARTITION (ds='2', part_1='2') SELECT * FROM src;
-ALTER INDEX src_union_2_key_idx ON src_union_2 PARTITION (ds='2', part_1='1') REBUILD;
-ALTER INDEX src_union_2_key_idx ON src_union_2 PARTITION (ds='2', part_1='2') REBUILD;
INSERT OVERWRITE TABLE src_union_3 PARTITION (ds='3', part_1='1', part_2='2:3+4') SELECT * FROM src;
INSERT OVERWRITE TABLE src_union_3 PARTITION (ds='3', part_1='2', part_2='2:3+4') SELECT * FROM src;
-ALTER INDEX src_union_3_key_idx ON src_union_3 PARTITION (ds='3', part_1='1', part_2='2:3+4') REBUILD;
-ALTER INDEX src_union_3_key_idx ON src_union_3 PARTITION (ds='3', part_1='2', part_2='2:3+4') REBUILD;
EXPLAIN SELECT key, value, ds FROM src_union_1 WHERE key=86 and ds='1';
EXPLAIN SELECT key, value, ds FROM src_union_2 WHERE key=86 and ds='2';
@@ -80,7 +71,6 @@ SELECT count(1) from src_union_view WHERE ds ='2';
SELECT count(1) from src_union_view WHERE ds ='3';
INSERT OVERWRITE TABLE src_union_3 PARTITION (ds='4', part_1='1', part_2='2:3+4') SELECT * FROM src;
-ALTER INDEX src_union_3_key_idx ON src_union_3 PARTITION (ds='4', part_1='1', part_2='2:3+4') REBUILD;
EXPLAIN SELECT key, value, ds FROM src_union_view WHERE key=86 AND ds ='4';
SELECT key, value, ds FROM src_union_view WHERE key=86 AND ds ='4';
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out b/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out
index 9accae0..d390d90 100644
--- a/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out
+++ b/ql/src/test/results/clientnegative/authorization_invalid_priv_v2.q.out
@@ -6,7 +6,7 @@ POSTHOOK: query: create table if not exists authorization_invalid_v2 (key int, v
POSTHOOK: type: CREATETABLE
POSTHOOK: Output: database:default
POSTHOOK: Output: default@authorization_invalid_v2
-PREHOOK: query: grant index on table authorization_invalid_v2 to user hive_test_user
+PREHOOK: query: grant lock on table authorization_invalid_v2 to user hive_test_user
PREHOOK: type: GRANT_PRIVILEGE
PREHOOK: Output: default@authorization_invalid_v2
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Unsupported privilege type INDEX
+FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.DDLTask. Unsupported privilege type LOCK
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientnegative/index_bitmap_no_map_aggr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/index_bitmap_no_map_aggr.q.out b/ql/src/test/results/clientnegative/index_bitmap_no_map_aggr.q.out
deleted file mode 100644
index b29d3a6..0000000
--- a/ql/src/test/results/clientnegative/index_bitmap_no_map_aggr.q.out
+++ /dev/null
@@ -1,20 +0,0 @@
-PREHOOK: query: EXPLAIN
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-POSTHOOK: query: EXPLAIN
-CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-STAGE DEPENDENCIES:
- Stage-0 is a root stage
-
-STAGE PLANS:
- Stage: Stage-0
-
-PREHOOK: query: CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: CREATE INDEX src1_index ON TABLE src(key) as 'BITMAP' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src1_index__
-FAILED: SemanticException org.apache.hadoop.hive.ql.parse.SemanticException: org.apache.hadoop.hive.ql.metadata.HiveException: Cannot construct index without map-side aggregation
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out b/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out
deleted file mode 100644
index f844ee4..0000000
--- a/ql/src/test/results/clientnegative/index_compact_entry_limit.q.out
+++ /dev/null
@@ -1,37 +0,0 @@
-PREHOOK: query: drop index src_index on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index__
-PREHOOK: query: ALTER INDEX src_index ON src REBUILD
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@src
-PREHOOK: Output: default@default__src_src_index__
-POSTHOOK: query: ALTER INDEX src_index ON src REBUILD
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index__
-POSTHOOK: Lineage: default__src_src_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-#### A masked pattern was here ####
-PREHOOK: type: QUERY
-PREHOOK: Input: default@default__src_src_index__
-#### A masked pattern was here ####
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__src_src_index__
-#### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-#### A masked pattern was here ####
-Job Submission failed with exception 'java.io.IOException(org.apache.hadoop.hive.ql.metadata.HiveException: Number of compact index entries loaded during the query exceeded the maximum of 5 set in hive.index.compact.query.max.entries)'
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask. org.apache.hadoop.hive.ql.metadata.HiveException: Number of compact index entries loaded during the query exceeded the maximum of 5 set in hive.index.compact.query.max.entries
http://git-wip-us.apache.org/repos/asf/hive/blob/b0d3cb45/ql/src/test/results/clientnegative/index_compact_size_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientnegative/index_compact_size_limit.q.out b/ql/src/test/results/clientnegative/index_compact_size_limit.q.out
deleted file mode 100644
index 9ff8f8f..0000000
--- a/ql/src/test/results/clientnegative/index_compact_size_limit.q.out
+++ /dev/null
@@ -1,37 +0,0 @@
-PREHOOK: query: drop index src_index on src
-PREHOOK: type: DROPINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: drop index src_index on src
-POSTHOOK: type: DROPINDEX
-POSTHOOK: Input: default@src
-PREHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
-PREHOOK: type: CREATEINDEX
-PREHOOK: Input: default@src
-POSTHOOK: query: CREATE INDEX src_index ON TABLE src(key) as 'COMPACT' WITH DEFERRED REBUILD
-POSTHOOK: type: CREATEINDEX
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index__
-PREHOOK: query: ALTER INDEX src_index ON src REBUILD
-PREHOOK: type: ALTERINDEX_REBUILD
-PREHOOK: Input: default@src
-PREHOOK: Output: default@default__src_src_index__
-POSTHOOK: query: ALTER INDEX src_index ON src REBUILD
-POSTHOOK: type: ALTERINDEX_REBUILD
-POSTHOOK: Input: default@src
-POSTHOOK: Output: default@default__src_src_index__
-POSTHOOK: Lineage: default__src_src_index__._bucketname SIMPLE [(src)src.FieldSchema(name:INPUT__FILE__NAME, type:string, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__._offsets EXPRESSION [(src)src.FieldSchema(name:BLOCK__OFFSET__INSIDE__FILE, type:bigint, comment:), ]
-POSTHOOK: Lineage: default__src_src_index__.key SIMPLE [(src)src.FieldSchema(name:key, type:string, comment:default), ]
-#### A masked pattern was here ####
-PREHOOK: type: QUERY
-PREHOOK: Input: default@default__src_src_index__
-#### A masked pattern was here ####
-POSTHOOK: type: QUERY
-POSTHOOK: Input: default@default__src_src_index__
-#### A masked pattern was here ####
-PREHOOK: query: SELECT key, value FROM src WHERE key=100 ORDER BY key
-PREHOOK: type: QUERY
-PREHOOK: Input: default@src
-#### A masked pattern was here ####
-Job Submission failed with exception 'java.io.IOException(Size of data to read during a compact-index-based query exceeded the maximum of 1024 set in hive.index.compact.query.max.size)'
-FAILED: Execution Error, return code 1 from org.apache.hadoop.hive.ql.exec.mr.MapRedTask. Size of data to read during a compact-index-based query exceeded the maximum of 1024 set in hive.index.compact.query.max.size