hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hubertzh...@apache.org
Subject incubator-hawq git commit: HAWQ-1359. Add additional policy for select view.
Date Fri, 03 Mar 2017 09:43:40 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 68013fac1 -> 597576433


HAWQ-1359. Add additional policy for select view.

Signed-off-by: Chuling Wang <wangchunling14@126.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/59757643
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/59757643
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/59757643

Branch: refs/heads/master
Commit: 59757643376f1f4c765ffce4a6d8cac66010cfae
Parents: 68013fa
Author: Hubert Zhang <hubertzhang@apache.org>
Authored: Fri Mar 3 17:20:23 2017 +0800
Committer: hubertzhang <hubertzhang@apache.org>
Committed: Fri Mar 3 17:35:19 2017 +0800

----------------------------------------------------------------------
 src/test/feature/Ranger/policy/43/3.json | 2 +-
 src/test/feature/Ranger/sql/init_file    | 1 +
 src/test/feature/gtest-parallel          | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/59757643/src/test/feature/Ranger/policy/43/3.json
----------------------------------------------------------------------
diff --git a/src/test/feature/Ranger/policy/43/3.json b/src/test/feature/Ranger/policy/43/3.json
index 7762ff7..0318f3d 100644
--- a/src/test/feature/Ranger/policy/43/3.json
+++ b/src/test/feature/Ranger/policy/43/3.json
@@ -1 +1 @@
-{"allowExceptions": [], "denyExceptions": [], "denyPolicyItems": [], "description": "no description",
"isAuditEnabled": true, "isEnabled": true, "name": "policy43-3", "policyItems": [{"accesses":
[{"isAllowed": true, "type": "select"}], "conditions": [], "delegateAdmin": true, "groups":
null, "users": ["usertest43", "usersuper43"]}], "resources": {"database": {"isExcludes": false,
"isRecursive": false, "values": ["hawq_feature_test_db"]}, "schema": {"isExcludes": false,
"isRecursive": false, "values": ["public"]}, "table": {"isExcludes": false, "isRecursive":
false, "values": ["a"]}}, "service": "hawq", "version": 1}
\ No newline at end of file
+{"allowExceptions": [], "denyExceptions": [], "denyPolicyItems": [], "description": "no description",
"isAuditEnabled": true, "isEnabled": true, "name": "policy43-3", "policyItems": [{"accesses":
[{"isAllowed": true, "type": "select"}], "conditions": [], "delegateAdmin": true, "groups":
null, "users": ["usertest34", "usersuper34","usertest43", "usersuper43"]}], "resources": {"database":
{"isExcludes": false, "isRecursive": false, "values": ["hawq_feature_test_db"]}, "schema":
{"isExcludes": false, "isRecursive": false, "values": ["public"]}, "table": {"isExcludes":
false, "isRecursive": false, "values": ["a"]}}, "service": "hawq", "version": 1}

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/59757643/src/test/feature/Ranger/sql/init_file
----------------------------------------------------------------------
diff --git a/src/test/feature/Ranger/sql/init_file b/src/test/feature/Ranger/sql/init_file
index 6c5dbe7..9647404 100644
--- a/src/test/feature/Ranger/sql/init_file
+++ b/src/test/feature/Ranger/sql/init_file
@@ -15,6 +15,7 @@
 -- start_matchignore
 m/You are now connected to database*/
 m/Settings:  default_hash_table_bucket_number=.*/
+m/Settings:  optimizer=.*/
 m/[O|o]ptimizer status:.*/
 s/public\|a\|table\|.*\|append only/public\|a\|table\|gpadmin\|append only/
 s/public\|aa\|table\|.*\|append only/public\|aa\|table\|gpadmin\|append only/

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/59757643/src/test/feature/gtest-parallel
----------------------------------------------------------------------
diff --git a/src/test/feature/gtest-parallel b/src/test/feature/gtest-parallel
index 19c0aed..757c001 100755
--- a/src/test/feature/gtest-parallel
+++ b/src/test/feature/gtest-parallel
@@ -381,13 +381,14 @@ for test_binary in binaries:
       
   if options.gtest_filter :
     tests = do_gtest_filter(list_command, command, options.gtest_filter)
+    parallel_id = 0
     if options.workers > 1:
       for test in tests:
         test_map[test[2]] = 'PARALLEL'
+      parallel_id = parallel_id + len(tests)
     else:
       for test in tests:
         test_map[test[2]] = 'SERIAL'
-    parallel_id = len(tests)
 
 if options.failed:
   # The first element of each entry is the runtime of the most recent
@@ -468,9 +469,9 @@ def start_daemon(func):
   t.start()
   return t
 
-
 #run test in serail way
 job_id = parallel_id
+
 while True:
   job = None
   if job_id < len(tests):
@@ -482,13 +483,12 @@ while True:
     break
   times.record_test_time(test_binary, test, run_job(job))
 
-
+job_id = 0
 #run test in parallel way
 workers = [start_daemon(worker) for i in range(options.workers)]
 
 [t.join() for t in workers]
 
-
 logger.end()
 times.write_to_file(save_file)
 if options.print_test_times:


Mime
View raw message