> On Oct. 23, 2019, 2:06 p.m., Velmurugan Periasamy wrote: > > security-admin/src/main/resources/META-INF/jpa_named_queries.xml > > Lines 1601 (patched) > > <https://reviews.apache.org/r/71554/diff/2/?file=2169297#file2169297line1601> > > > > Patch fails to apply. can you please check? Thanks. > > > > ``` > > $ git apply --check -v > > ~/Downloads/0001-RANGER-2595-Improve-policy-delete-performance-using-.patch > > Checking patch > > security-admin/src/main/java/org/apache/ranger/biz/PolicyRefUpdater.java... > > Checking patch > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefAccessTypeDao.java... > > Checking patch > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefConditionDao.java... > > Checking patch > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefDataMaskTypeDao.java... > > Checking patch > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefGroupDao.java... > > Checking patch > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefResourceDao.java... > > Checking patch > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefRoleDao.java... > > error: while searching for: > > return ret; > > } > > > > } > > > > > > error: patch failed: > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefRoleDao.java:96 > > error: > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefRoleDao.java: > > patch does not apply > > Checking patch > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefUserDao.java... > > Checking patch > > security-admin/src/main/resources/META-INF/jpa_named_queries.xml... > > Hunk #1 succeeded at 592 (offset 4 lines). > > Hunk #2 succeeded at 605 (offset 4 lines). > > Hunk #3 succeeded at 623 (offset 4 lines). > > Hunk #4 succeeded at 778 (offset 4 lines). > > Hunk #5 succeeded at 791 (offset 4 lines). > > Hunk #6 succeeded at 808 (offset 4 lines). > > error: while searching for: > > </query> > > </named-query> > > > > > > <!-- XXTagChangeLog --> > > <named-query name="XXTagChangeLog.findSinceVersion"> > > > > error: patch failed: > > security-admin/src/main/resources/META-INF/jpa_named_queries.xml:1574 > > error: > > security-admin/src/main/resources/META-INF/jpa_named_queries.xml: patch > > does not apply > > ```
Thanks, rebased. - Andrew ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/71554/#review218353 ----------------------------------------------------------- On Oct. 28, 2019, 6:41 a.m., Andrew Luo wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/71554/ > ----------------------------------------------------------- > > (Updated Oct. 28, 2019, 6:41 a.m.) > > > Review request for ranger. > > > Bugs: RANGER-2595 > https://issues.apache.org/jira/browse/RANGER-2595 > > > Repository: ranger > > > Description > ------- > > Policy deletion is slow for policies that have a large number of users or > resources. This patch uses batch SQL deletion to speed up deletion. > > > Diffs > ----- > > security-admin/src/main/java/org/apache/ranger/biz/PolicyRefUpdater.java > 055cd382b > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefAccessTypeDao.java > 1ef01bb28 > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefConditionDao.java > 2c04ab483 > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefDataMaskTypeDao.java > 258e3b0ba > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefGroupDao.java > 08829d4f7 > > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefResourceDao.java > e259ee864 > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefRoleDao.java > dbcacb716 > security-admin/src/main/java/org/apache/ranger/db/XXPolicyRefUserDao.java > f7b6131c6 > security-admin/src/main/resources/META-INF/jpa_named_queries.xml 6cc479991 > > > Diff: https://reviews.apache.org/r/71554/diff/3/ > > > Testing > ------- > > Tested manually, ran build/tests > > > Thanks, > > Andrew Luo > >
