Skip to content

HIVE-27686 ORC upgraded to 1.8.5.#4690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abstractdog merged 1 commit into from
Oct 16, 2023
Merged

HIVE-27686 ORC upgraded to 1.8.5. #4690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCompactor.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -398,7 +398,6 @@ public void testStatsAfterCompactionPartTbl() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1396", parameters.get("totalSize"));

parameters = partitions
.stream()
Expand All@@ -408,7 +407,6 @@ public void testStatsAfterCompactionPartTbl() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1453", parameters.get("totalSize"));

//Do a major compaction
CompactionRequest rqst = new CompactionRequest(dbName, tblName, CompactionType.MAJOR);
Expand All@@ -433,7 +431,6 @@ public void testStatsAfterCompactionPartTbl() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "808", parameters.get("totalSize"));

parameters = partitions
.stream()
Expand All@@ -443,7 +440,6 @@ public void testStatsAfterCompactionPartTbl() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1453", parameters.get("totalSize"));
}

/**
Expand DownExpand Up@@ -486,7 +482,6 @@ public void testStatsAfterCompactionTbl() throws Exception {
Map<String, String> parameters = Hive.get().getTable(tblName).getParameters();
Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "1446", parameters.get("totalSize"));

//Do a major compaction
CompactionRequest rqst = new CompactionRequest(dbName, tblName, CompactionType.MAJOR);
Expand All@@ -504,7 +499,6 @@ public void testStatsAfterCompactionTbl() throws Exception {
parameters = Hive.get().getTable(tblName).getParameters();
Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "783", parameters.get("totalSize"));
}

@Test
Expand Down
105 changes: 57 additions & 48 deletions ...ve-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,8 +108,8 @@ private void testRebalanceCompactionWithParallelDeleteAsSecond(boolean optimisti
conf.setBoolVar(HiveConf.ConfVars.TXN_WRITE_X_LOCK, optimisticLock);

//set grouping size to have 3 buckets, and re-create driver with the new config
conf.set("tez.grouping.min-size", "1000");
conf.set("tez.grouping.max-size", "80000");
conf.set("tez.grouping.min-size", "400");
Comment thread
zratkai marked this conversation as resolved.
conf.set("tez.grouping.max-size", "5000");
driver = new Driver(conf);

final String tableName = "rebalance_test";
Expand DownExpand Up@@ -145,8 +145,8 @@ private void testRebalanceCompactionWithParallelDeleteAsSecond(boolean optimisti
Assert.fail("In case of TXN_WRITE_X_LOCK = true, the transaction must be retried instead of being aborted.");
}
aborted = true;
Assert.assertEquals(e.getCause().getClass(), LockException.class);
Assert.assertEquals(e.getCauseMessage(), "Transaction manager has aborted the transaction txnid:21. Reason: Aborting [txnid:21,24] due to a write conflict on default/rebalance_test committed by [txnid:20,24] d/u");
Assert.assertEquals(LockException.class, e.getCause().getClass());
Assert.assertEquals( "Transaction manager has aborted the transaction txnid:21. Reason: Aborting [txnid:21,24] due to a write conflict on default/rebalance_test committed by [txnid:20,24] d/u", e.getCauseMessage());
Comment thread
zratkai marked this conversation as resolved.
// Delete the record, so the rest of the test can be the same in both cases
executeStatementOnDriver("DELETE FROM " + tableName + " WHERE b = 12", driver);
} finally {
Expand DownExpand Up@@ -177,24 +177,26 @@ private void testRebalanceCompactionWithParallelDeleteAsSecond(boolean optimisti
"{\"writeid\":7,\"bucketid\":536870912,\"rowid\":4}\t13\t13",
},
{
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":6}\t2\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":6}\t4\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":7}\t3\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":8}\t4\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":8}\t2\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":9}\t5\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":10}\t6\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":11}\t5\t3",
},
{
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":12}\t6\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":13}\t4\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":14}\t2\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":15}\t3\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":16}\t6\t2",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":17}\t5\t2",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":10}\t6\t4",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":11}\t5\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":12}\t3\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":13}\t2\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":14}\t4\t3",
},
{
"{\"writeid\":7,\"bucketid\":537067520,\"rowid\":15}\t6\t3",
"{\"writeid\":7,\"bucketid\":537067520,\"rowid\":16}\t5\t2",
"{\"writeid\":7,\"bucketid\":537067520,\"rowid\":17}\t6\t2",
},
};
verifyRebalance(testDataProvider, tableName, null, expectedBuckets,
new String[] {"bucket_00000", "bucket_00001", "bucket_00002"}, "base_0000007_v0000020");
new String[] {"bucket_00000", "bucket_00001", "bucket_00002", "bucket_00003"}, "base_0000007_v0000020");
}

@Test
Expand All@@ -204,8 +206,8 @@ public void testRebalanceCompactionOfNotPartitionedImplicitlyBucketedTableWithOr
conf.setBoolVar(HiveConf.ConfVars.HIVESTATSAUTOGATHER, false);

//set grouping size to have 3 buckets, and re-create driver with the new config
conf.set("tez.grouping.min-size", "1000");
conf.set("tez.grouping.max-size", "80000");
conf.set("tez.grouping.min-size", "400");
conf.set("tez.grouping.max-size", "5000");
driver = new Driver(conf);

final String tableName = "rebalance_test";
Expand All@@ -228,27 +230,29 @@ public void testRebalanceCompactionOfNotPartitionedImplicitlyBucketedTableWithOr
"{\"writeid\":7,\"bucketid\":536870912,\"rowid\":2}\t15\t15",
"{\"writeid\":7,\"bucketid\":536870912,\"rowid\":3}\t14\t14",
"{\"writeid\":7,\"bucketid\":536870912,\"rowid\":4}\t13\t13",
"{\"writeid\":7,\"bucketid\":536870912,\"rowid\":5}\t12\t12",
},
{
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":6}\t2\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":5}\t12\t12",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":6}\t4\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":7}\t3\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":8}\t4\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":8}\t2\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":9}\t5\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":10}\t6\t4",
"{\"writeid\":7,\"bucketid\":536936448,\"rowid\":11}\t5\t3",
},
{
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":12}\t6\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":13}\t4\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":14}\t2\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":15}\t3\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":16}\t6\t2",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":17}\t5\t2",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":10}\t6\t4",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":11}\t5\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":12}\t3\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":13}\t2\t3",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":14}\t4\t3",
},
{
"{\"writeid\":7,\"bucketid\":537067520,\"rowid\":15}\t6\t3",
"{\"writeid\":7,\"bucketid\":537067520,\"rowid\":16}\t5\t2",
"{\"writeid\":7,\"bucketid\":537067520,\"rowid\":17}\t6\t2",
},
};
verifyRebalance(testDataProvider, tableName, null, expectedBuckets,
new String[] {"bucket_00000", "bucket_00001", "bucket_00002"}, "base_0000007_v0000020");
new String[] {"bucket_00000", "bucket_00001", "bucket_00002","bucket_00003"}, "base_0000007_v0000020");
}

@Test
Expand All@@ -258,8 +262,8 @@ public void testRebalanceCompactionOfNotPartitionedImplicitlyBucketedTable() thr
conf.setBoolVar(HiveConf.ConfVars.HIVESTATSAUTOGATHER, false);

//set grouping size to have 3 buckets, and re-create driver with the new config
conf.set("tez.grouping.min-size", "1000");
conf.set("tez.grouping.max-size", "80000");
conf.set("tez.grouping.min-size", "400");
conf.set("tez.grouping.max-size", "5000");
driver = new Driver(conf);

final String tableName = "rebalance_test";
Expand All@@ -279,27 +283,30 @@ public void testRebalanceCompactionOfNotPartitionedImplicitlyBucketedTable() thr
"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":2}\t6\t3",
"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":3}\t6\t4",
"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":4}\t5\t2",
"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":5}\t5\t3",
},
{

"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":5}\t5\t3",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":6}\t2\t4",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":7}\t3\t3",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":8}\t4\t4",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":9}\t4\t3",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":10}\t2\t3",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":11}\t3\t4",
},
{
"{\"writeid\":1,\"bucketid\":537001984,\"rowid\":10}\t2\t3",
"{\"writeid\":1,\"bucketid\":537001984,\"rowid\":11}\t3\t4",
"{\"writeid\":2,\"bucketid\":537001984,\"rowid\":12}\t12\t12",
"{\"writeid\":3,\"bucketid\":537001984,\"rowid\":13}\t13\t13",
"{\"writeid\":4,\"bucketid\":537001984,\"rowid\":14}\t14\t14",
"{\"writeid\":5,\"bucketid\":537001984,\"rowid\":15}\t15\t15",
"{\"writeid\":6,\"bucketid\":537001984,\"rowid\":16}\t16\t16",
"{\"writeid\":7,\"bucketid\":537001984,\"rowid\":17}\t17\t17",
},
{
"{\"writeid\":5,\"bucketid\":537067520,\"rowid\":15}\t15\t15",
"{\"writeid\":6,\"bucketid\":537067520,\"rowid\":16}\t16\t16",
"{\"writeid\":7,\"bucketid\":537067520,\"rowid\":17}\t17\t17",
},
};
verifyRebalance(testDataProvider, tableName, null, expectedBuckets,
new String[] {"bucket_00000", "bucket_00001", "bucket_00002"}, "base_0000007_v0000020");
new String[] {"bucket_00000", "bucket_00001", "bucket_00002","bucket_00003"}, "base_0000007_v0000020");
}

@Test
Expand DownExpand Up@@ -440,8 +447,8 @@ public void testRebalanceCompactionNotPartitionedExplicitBucketNumbers() throws
conf.setBoolVar(HiveConf.ConfVars.HIVESTATSAUTOGATHER, false);

//set grouping size to have 3 buckets, and re-create driver with the new config
conf.set("tez.grouping.min-size", "1000");
conf.set("tez.grouping.max-size", "80000");
conf.set("tez.grouping.min-size", "400");
conf.set("tez.grouping.max-size", "5000");
driver = new Driver(conf);

final String tableName = "rebalance_test";
Expand DownExpand Up@@ -509,7 +516,7 @@ private TestDataProvider prepareRebalanceTestData(String tableName) throws Excep
Table table = msClient.getTable("default", tableName);
FileSystem fs = FileSystem.get(conf);
Assert.assertEquals("Test setup does not match the expected: different buckets",
Arrays.asList("bucket_00000_0", "bucket_00001_0", "bucket_00002_0"),
Arrays.asList("bucket_00000_0", "bucket_00001_0", "bucket_00002_0","bucket_00003_0"),
CompactorTestUtil.getBucketFileNames(fs, table, null, "base_0000001"));
String[][] expectedBuckets = new String[][] {
{
Expand All@@ -519,7 +526,6 @@ private TestDataProvider prepareRebalanceTestData(String tableName) throws Excep
"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":3}\t6\t4",
"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":4}\t5\t2",
"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":5}\t5\t3",
"{\"writeid\":1,\"bucketid\":536870912,\"rowid\":6}\t2\t4",
"{\"writeid\":2,\"bucketid\":536870912,\"rowid\":0}\t12\t12",
"{\"writeid\":3,\"bucketid\":536870912,\"rowid\":0}\t13\t13",
"{\"writeid\":4,\"bucketid\":536870912,\"rowid\":0}\t14\t14",
Expand All@@ -528,13 +534,16 @@ private TestDataProvider prepareRebalanceTestData(String tableName) throws Excep
"{\"writeid\":7,\"bucketid\":536870912,\"rowid\":0}\t17\t17",
},
{
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t3\t3",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":1}\t4\t4",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":2}\t4\t3",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":3}\t2\t3",
"{\"writeid\":1,\"bucketid\":536936448,\"rowid\":0}\t2\t4",
},
{
"{\"writeid\":1,\"bucketid\":537001984,\"rowid\":0}\t3\t3",
"{\"writeid\":1,\"bucketid\":537001984,\"rowid\":1}\t4\t4",
"{\"writeid\":1,\"bucketid\":537001984,\"rowid\":2}\t4\t3",
},
{
"{\"writeid\":1,\"bucketid\":537001984,\"rowid\":0}\t3\t4",
"{\"writeid\":1,\"bucketid\":537067520,\"rowid\":0}\t2\t3",
"{\"writeid\":1,\"bucketid\":537067520,\"rowid\":1}\t3\t4",
},
};
AcidOutputFormat.Options options = new AcidOutputFormat.Options(conf);
Expand DownExpand Up@@ -826,7 +835,7 @@ public void testStatsAfterQueryCompactionOnTez() throws Exception {
parameters = Hive.get().getTable(tblName).getParameters();
Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "735", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "736", parameters.get("totalSize"));
Comment thread
zratkai marked this conversation as resolved.
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -182,7 +182,7 @@
<postgres.version>42.5.1</postgres.version>
<oracle.version>21.3.0.0</oracle.version>
<opencsv.version>2.3</opencsv.version>
<orc.version>1.8.3</orc.version>
<orc.version>1.8.5</orc.version>
<mockito-core.version>3.4.4</mockito-core.version>
<powermock.version>2.0.2</powermock.version>
<mina.version>2.0.0-M5</mina.version>
Expand Down
2 changes: 1 addition & 1 deletion ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -848,7 +848,7 @@ public void testCompactStatsGather() throws Exception {
.getParameters();
Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
Assert.assertEquals("The number of rows is differing from the expected", "4", parameters.get("numRows"));
Assert.assertEquals("The total table size is differing from the expected", "704", parameters.get("totalSize"));
Assert.assertEquals("The total table size is differing from the expected", "705", parameters.get("totalSize"));

@zhangbutaozhangbutaoOct 6, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I saw you have removed totalSize in the UT of TestCompactor.java, so should we remove this line as well?

@zratkaizratkaiOct 10, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be better to handle this in a separate ticket as refactoring. Would this be okay so we can close this ticket?

@zhangbutaozhangbutaoOct 10, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure

@abstractdogabstractdogOct 10, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're removing some totalSize assertions but not others, let's simply keep it consistent, choose 1 option now from the below ones:

  1. remove all occurrences that have been changed here by the patch, so it's visible now
  2. remove only from qtests
  3. remove all occurrences from the code -> time-consuming, I'm not recommending this
  4. don't remove any totalSize assertions

I believe only 1) makes sense

@abstractdogabstractdogOct 11, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just unresolved this conversation, it's time to finally address this whole totalSize somehow
option 5) would be to create another ticket to remove that stuff, merge ASAP, and then we can see how clear is this upgrade alone, because masking/totalSize related changes won't bring the noise into this PR, so I guess this is even better than 1)

@zratkaizratkaiOct 11, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Option 5 means we remove only the totalSize checks which are in this ticket and not others, which would be a little bit weird, because it is hard to address which to eliminate outside this ticket. How can be the other ticket reviewed without this? So I would say create a ticket with clear description which to delete: a) from Qtests, b) Qtest and unit tests. Or create 2 new ticket, one for Qtests only, one for unit tests only. Since the build env is really unstable I had to run many times this build to finally succeed.

@abstractdogabstractdogOct 16, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okay, makes sense, so we can agree to remove totalSize checks here from every place that were affected by this ORC upgrade and do the rest in subsequent patches, like HIVE-27791

}

@Test
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/acid_bloom_filter_orc_file_dump.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(File Version:)(.+)/$1#Masked#/
SET hive.vectorized.execution.enabled=FALSE;
SET hive.mapred.mode=nonstrict;

Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/acid_no_buckets.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
--! qt:dataset:srcpart
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
--this has 4 groups of tests
--Acid tables w/o bucketing
--the tests with bucketing (make sure we get the same results)
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/default_constraint.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
-- create table
-- numeric type

Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/deleteAnalyze.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
set hive.stats.autogather=true;
set hive.explain.user=true;

Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
-- SORT_QUERY_RESULTS

set hive.vectorized.execution.enabled=false;
Expand Down
2 changes: 1 addition & 1 deletion ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
-- Test Incremental rebuild of materialized view with aggregate but without count(*)
-- when source tables have delete operations since last rebuild.

SET hive.vectorized.execution.enabled=false;
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/materialized_view_create_rewrite_by_text_multi_db.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
set hive.vectorized.execution.enabled=false;
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
-- SORT_QUERY_RESULTS

SET hive.vectorized.execution.enabled=false;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
set hive.vectorized.execution.enabled=false;
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
set hive.strict.checks.cartesian.product=false;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window_2.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
set hive.support.concurrency=true;
set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
set hive.strict.checks.cartesian.product=false;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/orc_analyze.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
set hive.vectorized.execution.enabled=false;
set hive.mapred.mode=nonstrict;
set hive.exec.submitviachild=false;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/orc_file_dump.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(File Version:)(.+)/$1#Masked#/
set hive.vectorized.execution.enabled=false;
set hive.mapred.mode=nonstrict;

Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/orc_llap_counters.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
set hive.vectorized.execution.enabled=false;
set hive.compute.query.using.stats=false;
set hive.mapred.mode=nonstrict;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/orc_llap_counters1.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
set hive.vectorized.execution.enabled=false;
set hive.mapred.mode=nonstrict;
SET hive.optimize.index.filter=true;
Expand Down
2 changes: 1 addition & 1 deletion ql/src/test/queries/clientpositive/orc_merge10.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
--! qt:dataset:src
--! qt:dataset:part

--! qt:replace:/(File Version:)(.+)/$1#Masked#/
set hive.vectorized.execution.enabled=false;
set hive.compute.query.using.stats=false;
set hive.mapred.mode=nonstrict;
Expand Down
1 change: 1 addition & 0 deletions ql/src/test/queries/clientpositive/orc_merge11.q
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
--! qt:replace:/(File Version:)(.+)/$1#Masked#/
set hive.vectorized.execution.enabled=false;

DROP TABLE orcfile_merge1_n2;
Expand Down
Loading