Allow VECTOR_SIZE=16, fix off-by-one in assertion and fix for NLJ wit…

…h NULL values
duckdb · Feb 19, 2020 · 6562ceb · 6562ceb
1 parent 6ee2515
commit 6562ceb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/execution/operator/join/physical_nested_loop_join.cpp b/src/execution/operator/join/physical_nested_loop_join.cpp
@@ -126,7 +126,9 @@ void PhysicalNestedLoopJoin::GetChunkInternal(ClientContext &context, DataChunk
 		} else {
 			// disqualify tuples from the RHS that have NULL values
 			for (index_t i = 0; i < state->right_chunks.chunks.size(); i++) {
-				state->has_null = state->has_null || RemoveNullValues(*state->right_chunks.chunks[i]);
+				if (RemoveNullValues(*state->right_chunks.chunks[i])) {
+					state->has_null = true;
+				}
 			}
 			// initialize the chunks for the join conditions
 			state->left_join_condition.Initialize(condition_types);

diff --git a/src/execution/window_segment_tree.cpp b/src/execution/window_segment_tree.cpp
@@ -56,7 +56,7 @@ void WindowSegmentTree::WindowSegmentValue(index_t l_idx, index_t begin, index_t
 		}
 		aggregate.update(&inputs.data[0], input_count, s);
 	} else {
-		assert(end - begin < STANDARD_VECTOR_SIZE);
+		assert(end - begin <= STANDARD_VECTOR_SIZE);
 		data_ptr_t ptr = levels_flat_native.get() + state.size() * (begin + levels_flat_start[l_idx - 1]);
 		Vector v(inputs, result_type, ptr);
 		v.Verify();

diff --git a/src/include/duckdb/common/constants.hpp b/src/include/duckdb/common/constants.hpp
@@ -33,8 +33,8 @@ using std::vector;
 #define STANDARD_VECTOR_SIZE 1024
 #endif
 
-#if (STANDARD_VECTOR_SIZE < 32) || ((STANDARD_VECTOR_SIZE & (STANDARD_VECTOR_SIZE - 1)) != 0)
-#error Vector size should be a power of two and bigger than or equal to 32
+#if (STANDARD_VECTOR_SIZE < 16) || ((STANDARD_VECTOR_SIZE & (STANDARD_VECTOR_SIZE - 1)) != 0)
+#error Vector size should be a power of two and bigger than or equal to 16
 #endif
 
 //! a saner size_t for loop indices etc