Skip to content

Commit

Permalink
qtests update
Browse files Browse the repository at this point in the history
  • Loading branch information
@deniskuzZ
deniskuzZ committed Oct 18, 2024
1 parent 2431f72 commit bd05903
Show file tree
Hide file tree
Showing 8 changed files with 186 additions and 7 deletions.
9 changes: 5 additions & 4 deletions ...g/iceberg-handler/src/main/java/org/apache/iceberg/mr/hive/HiveIcebergStorageHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,8 +429,8 @@ public boolean canProvideBasicStatistics() {
@Override
public boolean canProvidePartitionStatistics(org.apache.hadoop.hive.ql.metadata.Table hmsTable) {
Table table = IcebergTableUtil.getTable(conf, hmsTable.getTTable());
Map<String, String> summary = table.currentSnapshot().summary();
if (summary != null) {
if (table.currentSnapshot() != null) {
Map<String, String> summary = table.currentSnapshot().summary();
return Boolean.parseBoolean(summary.get(SnapshotSummary.PARTITION_SUMMARY_PROP));
}
return false;
Expand Down Expand Up @@ -2022,8 +2022,9 @@ public boolean isPartitioned(org.apache.hadoop.hive.ql.metadata.Table hmsTable)
hasUndergonePartitionEvolution(hmsTable)) {
return false;
}
Table table = IcebergTableUtil.getTable(conf, hmsTable.getTTable());
return table.spec().isPartitioned();
// Table table = IcebergTableUtil.getTable(conf, hmsTable.getTTable());
// return table.spec().isPartitioned();
return false;
}

@Override
Expand Down
32 changes: 32 additions & 0 deletions ...handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution.q.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,41 +103,57 @@ POSTHOOK: Output: default@ice_orc
PREHOOK: query: update ice_orc set last_name = 'ln1a' where first_name='fn1'
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2/team_id=21
PREHOOK: Output: default@ice_orc
PREHOOK: Output: default@ice_orc
POSTHOOK: query: update ice_orc set last_name = 'ln1a' where first_name='fn1'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2/team_id=21
POSTHOOK: Output: default@ice_orc
POSTHOOK: Output: default@ice_orc
PREHOOK: query: update ice_orc set last_name = 'ln2a' where first_name='fn2'
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1/team_id=10
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2/team_id=21
PREHOOK: Output: default@ice_orc
PREHOOK: Output: default@ice_orc
POSTHOOK: query: update ice_orc set last_name = 'ln2a' where first_name='fn2'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1/team_id=10
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2/team_id=21
POSTHOOK: Output: default@ice_orc
POSTHOOK: Output: default@ice_orc
PREHOOK: query: update ice_orc set last_name = 'ln3a' where first_name='fn3'
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1/team_id=10
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2/team_id=21
PREHOOK: Output: default@ice_orc
PREHOOK: Output: default@ice_orc
POSTHOOK: query: update ice_orc set last_name = 'ln3a' where first_name='fn3'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1/team_id=10
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2/team_id=21
POSTHOOK: Output: default@ice_orc
POSTHOOK: Output: default@ice_orc
PREHOOK: query: update ice_orc set last_name = 'ln4a' where first_name='fn4'
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1/team_id=10
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1/team_id=11
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2/team_id=21
PREHOOK: Output: default@ice_orc
PREHOOK: Output: default@ice_orc
POSTHOOK: query: update ice_orc set last_name = 'ln4a' where first_name='fn4'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1/team_id=10
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1/team_id=11
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2/team_id=21
POSTHOOK: Output: default@ice_orc
POSTHOOK: Output: default@ice_orc
PREHOOK: query: alter table ice_orc set partition spec(company_id, dept_id)
Expand All @@ -150,41 +166,57 @@ POSTHOOK: Output: default@ice_orc
PREHOOK: query: update ice_orc set last_name = 'ln5a' where first_name='fn5'
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2
PREHOOK: Output: default@ice_orc
PREHOOK: Output: default@ice_orc
POSTHOOK: query: update ice_orc set last_name = 'ln5a' where first_name='fn5'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2
POSTHOOK: Output: default@ice_orc
POSTHOOK: Output: default@ice_orc
PREHOOK: query: update ice_orc set last_name = 'ln6a' where first_name='fn6'
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2
PREHOOK: Output: default@ice_orc
PREHOOK: Output: default@ice_orc
POSTHOOK: query: update ice_orc set last_name = 'ln6a' where first_name='fn6'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2
POSTHOOK: Output: default@ice_orc
POSTHOOK: Output: default@ice_orc
PREHOOK: query: update ice_orc set last_name = 'ln7a' where first_name='fn7'
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2
PREHOOK: Output: default@ice_orc
PREHOOK: Output: default@ice_orc
POSTHOOK: query: update ice_orc set last_name = 'ln7a' where first_name='fn7'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2
POSTHOOK: Output: default@ice_orc
POSTHOOK: Output: default@ice_orc
PREHOOK: query: update ice_orc set last_name = 'ln8a' where first_name='fn8'
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2
PREHOOK: Output: default@ice_orc
PREHOOK: Output: default@ice_orc
POSTHOOK: query: update ice_orc set last_name = 'ln8a' where first_name='fn8'
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2
POSTHOOK: Output: default@ice_orc
POSTHOOK: Output: default@ice_orc
PREHOOK: query: delete from ice_orc where last_name in ('ln1a', 'ln8a')
Expand Down
24 changes: 24 additions & 0 deletions ...sults/positive/llap/iceberg_major_compaction_partition_evolution_w_id_spec_w_filter.q.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,26 +128,50 @@ POSTHOOK: Output: default@ice_orc
PREHOOK: query: delete from ice_orc where last_name in ('ln1', 'ln9')
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=3
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=4
PREHOOK: Output: default@ice_orc
POSTHOOK: query: delete from ice_orc where last_name in ('ln1', 'ln9')
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=3
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=4
POSTHOOK: Output: default@ice_orc
PREHOOK: query: delete from ice_orc where last_name in ('ln3', 'ln11')
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=3
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=4
PREHOOK: Output: default@ice_orc
POSTHOOK: query: delete from ice_orc where last_name in ('ln3', 'ln11')
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=3
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=4
POSTHOOK: Output: default@ice_orc
PREHOOK: query: delete from ice_orc where last_name in ('ln5', 'ln13')
PREHOOK: type: QUERY
PREHOOK: Input: default@ice_orc
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=1
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=2
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=3
PREHOOK: Input: default@ice_orc@company_id=100/dept_id=4
PREHOOK: Output: default@ice_orc
POSTHOOK: query: delete from ice_orc where last_name in ('ln5', 'ln13')
POSTHOOK: type: QUERY
POSTHOOK: Input: default@ice_orc
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=1
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=2
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=3
POSTHOOK: Input: default@ice_orc@company_id=100/dept_id=4
POSTHOOK: Output: default@ice_orc
PREHOOK: query: select * from ice_orc
PREHOOK: type: QUERY
Expand Down
Loading

0 comments on commit bd05903

Please sign in to comment.