Merge branch 'test_email' into test_email_self

hubgeter · Nov 12, 2024 · c497711 · c497711
2 parents 0e1d17d + 03c40f6
commit c497711
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 3 deletions.
diff --git a/2 b/2
diff --git a/be/src/clucene b/be/src/clucene
diff --git a/be/src/io/io_common.h b/be/src/io/io_common.h
@@ -59,6 +59,7 @@ struct IOContext {
     bool should_stop = false;
     int64_t expiration_time = 0;
     const TUniqueId* query_id = nullptr;             // Ref
+
     FileCacheStatistics* file_cache_stats = nullptr; // Ref
 };
 

diff --git a/be/src/olap/tablet_schema.cpp b/be/src/olap/tablet_schema.cpp
@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-
+#
 #include "olap/tablet_schema.h"
 
 #include <gen_cpp/Descriptors_types.h>

diff --git a/bin/start_fe.sh b/bin/start_fe.sh
@@ -17,6 +17,7 @@
 # under the License.
 
 set -eo pipefail
+#zdtest1
 
 curdir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
 

diff --git a/conf/be.conf b/conf/be.conf
@@ -88,6 +88,6 @@ sys_log_level = INFO
 #    Debug = 5,
 #    Trace = 6
 # Default to turn off aws sdk log, because aws sdk errors that need to be cared will be output through Doris logs
-aws_log_level=0
+aws_log_level=1
 ## If you are not running in aws cloud, you can disable EC2 metadata
 AWS_EC2_METADATA_DISABLED=true
diff --git a/env.sh b/env.sh
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env bash
 
 # Licensed to the Apache Software Foundation (ASF) under one

diff --git a/regression-test/suites/inverted_index_p1/index_compaction/test_index_compaction_p1.groovy b/regression-test/suites/inverted_index_p1/index_compaction/test_index_compaction_p1.groovy
@@ -1,3 +1,4 @@
++
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information

diff --git a/test b/test
@@ -0,0 +1 @@
+test
+5 −13		src/core/CLucene/index/FieldInfos.cpp
+0 −1		src/core/CLucene/index/IndexVersion.h
+7 −38		src/core/CLucene/index/IndexWriter.cpp
+2 −3		src/core/CLucene/index/IndexWriter.h
+1 −11		src/core/CLucene/index/SDocumentWriter.cpp
+0 −1		src/core/CLucene/index/SDocumentWriter.h
+2 −2		src/core/CLucene/index/SegmentTermDocs.cpp
+5 −11		src/core/CLucene/index/SegmentTermPositions.cpp
+3 −6		src/core/CLucene/index/_FieldInfos.h
+0 −61		src/core/CLucene/index/_SegmentHeader.h
+0 −53		src/core/CLucene/util/PFORUtil.cpp
+0 −13		src/core/CLucene/util/PFORUtil.h
+0 −1		src/test/CMakeLists.txt
+0 −309		src/test/index/TestIndexCompress.cpp
+0 −1		src/test/test.h
+0 −1		src/test/tests.cpp
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@

		#!/usr/bin/env bash

		# Licensed to the Apache Software Foundation (ASF) under one
Expand Down