@@ -370,28 +370,35 @@ class HiveDDLSuite
370370 spark.range(10 ).write.saveAsTable(tabName)
371371 val viewName = " view1"
372372 withView(viewName) {
373+ def checkProperties (
374+ properties : Map [String , String ],
375+ expected : Map [String , String ]): Boolean = {
376+ properties.filterNot { case (key, value) =>
377+ Seq (" transient_lastDdlTime" , CatalogTable .VIEW_DEFAULT_DATABASE ).contains(key) ||
378+ key.startsWith(CatalogTable .VIEW_QUERY_OUTPUT_PREFIX )
379+ } == expected
380+ }
381+
373382 val catalog = spark.sessionState.catalog
374383 sql(s " CREATE VIEW $viewName AS SELECT * FROM $tabName" )
375384
376- assert(catalog.getTableMetadata(TableIdentifier (viewName))
377- .properties.filter(_._1 != " transient_lastDdlTime" ) == Map ())
385+ checkProperties(catalog.getTableMetadata(TableIdentifier (viewName)).properties, Map ())
378386 sql(s " ALTER VIEW $viewName SET TBLPROPERTIES ('p' = 'an') " )
379- assert (catalog.getTableMetadata(TableIdentifier (viewName))
380- .properties.filter(_._1 != " transient_lastDdlTime " ) == Map (" p" -> " an" ))
387+ checkProperties (catalog.getTableMetadata(TableIdentifier (viewName)).properties,
388+ Map (" p" -> " an" ))
381389
382390 // no exception or message will be issued if we set it again
383391 sql(s " ALTER VIEW $viewName SET TBLPROPERTIES ('p' = 'an') " )
384- assert (catalog.getTableMetadata(TableIdentifier (viewName))
385- .properties.filter(_._1 != " transient_lastDdlTime " ) == Map (" p" -> " an" ))
392+ checkProperties (catalog.getTableMetadata(TableIdentifier (viewName)).properties,
393+ Map (" p" -> " an" ))
386394
387395 // the value will be updated if we set the same key to a different value
388396 sql(s " ALTER VIEW $viewName SET TBLPROPERTIES ('p' = 'b') " )
389- assert (catalog.getTableMetadata(TableIdentifier (viewName))
390- .properties.filter(_._1 != " transient_lastDdlTime " ) == Map (" p" -> " b" ))
397+ checkProperties (catalog.getTableMetadata(TableIdentifier (viewName)).properties,
398+ Map (" p" -> " b" ))
391399
392400 sql(s " ALTER VIEW $viewName UNSET TBLPROPERTIES ('p') " )
393- assert(catalog.getTableMetadata(TableIdentifier (viewName))
394- .properties.filter(_._1 != " transient_lastDdlTime" ) == Map ())
401+ checkProperties(catalog.getTableMetadata(TableIdentifier (viewName)).properties, Map ())
395402
396403 val message = intercept[AnalysisException ] {
397404 sql(s " ALTER VIEW $viewName UNSET TBLPROPERTIES ('p') " )
@@ -644,10 +651,7 @@ class HiveDDLSuite
644651 Seq (
645652 Row (" # View Information" , " " , " " ),
646653 Row (" View Original Text:" , " SELECT * FROM tbl" , " " ),
647- Row (" View Expanded Text:" ,
648- " SELECT `gen_attr_0` AS `a` FROM (SELECT `gen_attr_0` FROM " +
649- " (SELECT `a` AS `gen_attr_0` FROM `default`.`tbl`) AS gen_subquery_0) AS tbl" ,
650- " " )
654+ Row (" View Expanded Text:" , " SELECT * FROM tbl" , " " )
651655 )
652656 ))
653657 }
0 commit comments