update

amorynan · Nov 22, 2024 · 7908a1a · 7908a1a
1 parent 6ddba03
commit 7908a1a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 22 deletions.
diff --git a/be/src/vec/functions/function_ip.h b/be/src/vec/functions/function_ip.h
@@ -725,18 +725,12 @@ class FunctionIsIPAddressInRange : public IFunction {
         DBUG_EXECUTE_IF("ip.inverted_index_filtered", {
             auto req_id = DebugPoints::instance()->get_debug_param_or_default<int32_t>(
                     "ip.inverted_index_filtered", "req_id", 0);
-            LOG(INFO) << "execute inverted index req_id: " << req_id
-                      << " max: " << max_roaring->cardinality()
-                      << " result: " << res_roaring->cardinality();
+	                LOG(WARNING) << "execute inverted index req_id: " << req_id
+                      << " max: " << max_roaring->toString()
+                      << " result: " << res_roaring->toString()
+                        << " null_bitmap: " << null_bitmap->toString();
         });
-        LOG(WARNING) << "ip_search:" << data_type_with_name.first << " input_rows:" << num_rows
-                     << " max_ro:" << max_roaring->toString() << " res_ro:" << res_roaring->toString()
-                     << " null_bitmap: " << null_bitmap->toString();	
         segment_v2::InvertedIndexResultBitmap result(res_roaring, null_bitmap);
-	if (!result.get_data_bitmap()->isEmpty() || !null_bitmap->isEmpty()) {
-            LOG(FATAL) << "ip.inverted_index_filtered : " << result.get_data_bitmap()->toString() << "  null:"
-                       << result.get_null_bitmap()->toString();
-        }
         bitmap_result = result;
         bitmap_result.mask_out_null();
         return Status::OK();

diff --git a/regression-test/data/inverted_index_p0/test_ip_cidr_search_with_inverted_index.out b/regression-test/data/inverted_index_p0/test_ip_cidr_search_with_inverted_index.out
@@ -24,9 +24,23 @@
 
 -- !sql_without_ii_9 --
 
--- !sql_with_ii_0 --
+-- !sql --
+
+-- !sql --
+
+-- !sql --
+
+-- !sql --
+2	42.117.228.166	2001:16a0:2:200a::2
 
--- !sql_with_ii_4 --
+-- !sql --
+
+-- !sql --
+5	255.255.255.255	\N
+
+-- !sql --
+
+-- !sql --
 
 -- !sql --
 

diff --git a/regression-test/suites/inverted_index_p0/test_ip_cidr_search_with_inverted_index.groovy b/regression-test/suites/inverted_index_p0/test_ip_cidr_search_with_inverted_index.groovy
@@ -74,21 +74,24 @@ suite("test_ip_cidr_search_with_inverted_index", "nonConcurrent"){
     sql """ set enable_inverted_index_query=true; """
     sql """ set inverted_index_skip_threshold = 0; """ // set skip threshold to 0
 
-    // select ipv6 in ipv4 cidr
-    qt_sql_with_ii_0 """  select id, ipv4, ipv6, is_ip_address_in_range(ipv6, '255.255.255.255/12') from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv6, '255.255.255.255/12') order by id; """
-    // select ipv6 in ipv6 cidr
-
-    // select ipv4 in ipv6 cidr
-    qt_sql_with_ii_4 """  select id, ipv4, ipv6, is_ip_address_in_range(ipv4, 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/12') from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv4, 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/12') order by id; """
-
-
 
     def create_sql = {
         List<String> list = new ArrayList<>()
         // select ipv6 in ipv4 cidr
         list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv6, '255.255.255.255/12') order by id;")
+        // select ipv6 in ipv6 cidr
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv6, 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/12') order by id;")
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv6, '::ffff:192.168.0.4/128') order by id;")
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv6, '2001:16a0:2:200a::2/64') order by id;")
+        // select ipv4 in ipv6 cidr
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv4, 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/12') order by id;")
         // select ipv4 in ipv4 cidr
-	list.add("select id, ipv4, ipv6, is_ip_address_in_range(ipv4, 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/12') from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv4, 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff/12') order by id;")
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv4, '255.255.255.255/12') order by id;")
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv4, '127.0.0.0/8') order by id;")
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv4, '192.168.100.0/24') order by id;")
+        // select in null cidr
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv4, null) order by id;")
+        list.add("select id, ipv4, ipv6 from tc_ip_cidr_search_with_inverted_index where is_ip_address_in_range(ipv6, null) order by id;")
         return list;
     }
 
@@ -98,7 +101,7 @@ suite("test_ip_cidr_search_with_inverted_index", "nonConcurrent"){
         for (sqlStr in sqlList) {
             try {
                 log.info("execute sql: ${i} : ${sqlStr}")
-		GetDebugPoint().enableDebugPointForAllBEs(checkpoints_name, [req_id: i])
+                GetDebugPoint().enableDebugPointForAllBEs(checkpoints_name, [req_id: i])
                 order_qt_sql """ ${sqlStr} """
             } finally {
                 GetDebugPoint().disableDebugPointForAllBEs(checkpoints_name)