You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by si...@apache.org on 2021/08/03 05:59:19 UTC

[atlas] 04/11: ATLAS-4152: Entity correlation for deleted entities. Part #2. Unit test fix.

This is an automated email from the ASF dual-hosted git repository.

sidmishra pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git

commit 10df394c8ee94e42b5551de8a45feef4edb7f6ef
Author: Ashutosh Mestry <am...@cloudera.com>
AuthorDate: Mon May 24 17:08:39 2021 -0700

    ATLAS-4152: Entity correlation for deleted entities. Part #2. Unit test fix.
    
    (cherry picked from commit f3afbdb3953e8ddbfcab6177083227b6cb89ecba)
---
 .../java/org/apache/atlas/notification/spool/SpoolConfiguration.java    | 2 +-
 .../src/test/java/org/apache/atlas/notification/spool/BaseTest.java     | 1 +
 test-tools/src/main/resources/solr/core-template/solrconfig.xml         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/notification/src/main/java/org/apache/atlas/notification/spool/SpoolConfiguration.java b/notification/src/main/java/org/apache/atlas/notification/spool/SpoolConfiguration.java
index 74b8687..76f05ef 100644
--- a/notification/src/main/java/org/apache/atlas/notification/spool/SpoolConfiguration.java
+++ b/notification/src/main/java/org/apache/atlas/notification/spool/SpoolConfiguration.java
@@ -37,7 +37,7 @@ public class SpoolConfiguration {
     public  static final String PROP_FILE_SPOOL_FILE_ROLLOVER_SEC               = PROPERTY_PREFIX_SPOOL + "file.rollover.sec";
     public  static final String PROP_FILE_SPOOL_DEST_RETRY_MS                   = PROPERTY_PREFIX_SPOOL + "destination.retry.ms";
     private static final String PROP_MESSAGE_BATCH_SIZE                         = PROPERTY_PREFIX_SPOOL + "destination.message.batchsize";
-    private static final String PROP_FILE_SPOOL_PAUSE_BEFORE_SEND_SEC           = PROPERTY_PREFIX_SPOOL + "pause.before.send.sec";
+    public  static final String PROP_FILE_SPOOL_PAUSE_BEFORE_SEND_SEC           = PROPERTY_PREFIX_SPOOL + "pause.before.send.sec";
     private static final String PROP_HIVE_METASTORE_NAME                        = PROPERTY_PREFIX_SPOOL + "hivemetastore.name";
 
     private final String messageHandlerName;
diff --git a/notification/src/test/java/org/apache/atlas/notification/spool/BaseTest.java b/notification/src/test/java/org/apache/atlas/notification/spool/BaseTest.java
index 7ca745f..304c821 100644
--- a/notification/src/test/java/org/apache/atlas/notification/spool/BaseTest.java
+++ b/notification/src/test/java/org/apache/atlas/notification/spool/BaseTest.java
@@ -61,6 +61,7 @@ public class BaseTest {
         props.setProperty(SpoolConfiguration.PROP_FILE_SPOOL_LOCAL_DIR, spoolDir);
         props.setProperty(SpoolConfiguration.PROP_FILE_SPOOL_DEST_RETRY_MS, Integer.toString(destinationRetry));
         props.setProperty(SpoolConfiguration.PROP_FILE_SPOOL_FILE_ROLLOVER_SEC, Integer.toString(2));
+        props.setProperty(SpoolConfiguration.PROP_FILE_SPOOL_PAUSE_BEFORE_SEND_SEC, 0);
         return props;
     }
 
diff --git a/test-tools/src/main/resources/solr/core-template/solrconfig.xml b/test-tools/src/main/resources/solr/core-template/solrconfig.xml
index 977ebc4..e7956cb 100644
--- a/test-tools/src/main/resources/solr/core-template/solrconfig.xml
+++ b/test-tools/src/main/resources/solr/core-template/solrconfig.xml
@@ -445,7 +445,7 @@
          -->
         <lst name="defaults">
             <str name="defType">edismax</str>
-            <str name="qf">35x_t 5j9_t 7wl_t a9x_t but_t dfp_l f0l_t i6d_l iyt_l jr9_t kjp_s lc5_t m4l_s mx1_t ohx_t xz9_i 1151_t 12px_t 14at_t 16o5_t 1891_t 19tx_t 1bet_t 1czp_t 1fd1_t 1gxx_l 1iit_t 3v2d_t 47ph_s 464l_s 43r9_s 426d_s 45c5_t 4d8l_t 49ad_t 4av9_l 4bnp_t 4hz9_t 4ged_t 4jk5_t 4qo5_t 4w79_t 50xx_t 4ykl_t 4zd1_t 4xs5_t 579h_t 56h1_t 5f5x_l 5gqt_l 5dl1_t 5c05_t 5ibp_t 581x_t 58ud_t 5af9_t 5slh_t 5tdx_l 5pfp_t 5m9x_l 5nut_l 5j45_t 5r0l_t 8ikl_t 8ao5_t 8k5h_t 8g79_t 8jd1_t 8hs5_ [...]
+            <str name="qf">35x_t 5j9_t 7wl_t a9x_t but_t dfp_l f0l_t i6d_l iyt_l jr9_t kjp_s lc5_t m4l_s mx1_t ohx_t xz9_i 1151_t 12px_t 14at_l 15vp_t 1891_t 19tx_t 1bet_t 1czp_t 1ekl_t 1gxx_t 1iit_l 1k3p_t 3wn9_t 49ad_s 47ph_s 45c5_s 43r9_s 46x1_t 4eth_t 4av9_t 4cg5_l 4d8l_t 4jk5_t 4hz9_t 4l51_t 4s91_t 4xs5_t 52it_t 505h_t 50xx_t 4zd1_t 58ud_t 581x_t 5gqt_l 5ibp_l 5f5x_t 5dl1_t 5jwl_t 59mt_t 5af9_t 5c05_t 5u6d_t 5uyt_l 5r0l_t 5nut_l 5pfp_l 5kp1_t 5slh_t 8k5h_t 8c91_t 8lqd_t 8hs5_t 8kxx_ [...]
             <str name="hl.fl">*</str>
             <bool name="hl.requireFieldMatch">true</bool>
             <bool name="lowercaseOperators">true</bool>