dbms: development [#CONV-2944].

dbms/include/DB/Interpreters/HashMap.h

@@ -188,7 +188,7 @@ public:
 			else
 				++ptr;
 
-			while (ZeroTraits::check(ptr->first) && ptr < container->buf + container->buf_size())
+			while (ptr < container->buf + container->buf_size() && ZeroTraits::check(ptr->first))
 				++ptr;
 
 			return *this;
@@ -222,7 +222,7 @@ public:
 			else
 				++ptr;
 
-			while (ZeroTraits::check(ptr->first) && ptr < container->buf + container->buf_size())
+			while (ptr < container->buf + container->buf_size() && ZeroTraits::check(ptr->first))
 				++ptr;
 
 			return *this;
@@ -239,7 +239,7 @@ public:
 			return const_iterator(this, zero_value());
 
 		const Value * ptr = buf;
-		while (ZeroTraits::check(ptr->first) && ptr < buf + buf_size())
+		while (ptr < buf + buf_size() && ZeroTraits::check(ptr->first))
 			++ptr;
 
 		return const_iterator(this, ptr);
@@ -251,7 +251,7 @@ public:
 			return iterator(this, zero_value());
 
 		Value * ptr = buf;
-		while (ZeroTraits::check(ptr->first) && ptr < buf + buf_size())
+		while (ptr < buf + buf_size() && ZeroTraits::check(ptr->first))
 			++ptr;
 
 		return iterator(this, ptr);

dbms/src/Interpreters/tests/hash_map.cpp

@@ -118,7 +118,7 @@ int main(int argc, char ** argv)
 			<< " (" << n / watch.elapsedSeconds() << " elem/sec.)"
 			<< std::endl;
 	}
-/*
+
 	{
 		Stopwatch watch;
 
@@ -133,9 +133,9 @@ int main(int argc, char ** argv)
 			<< ", elapsed: " << watch.elapsedSeconds()
 			<< " (" << n / watch.elapsedSeconds() << " elem/sec.)"
 			<< std::endl;
-	}*/
+	}
 
-	/*{
+	{
 		Stopwatch watch;
 
 		google::sparse_hash_map<Key, Value> map;
@@ -148,7 +148,7 @@ int main(int argc, char ** argv)
 			<< ", elapsed: " << watch.elapsedSeconds()
 			<< " (" << n / watch.elapsedSeconds() << " elem/sec.)"
 			<< std::endl;
-	}*/
+	}
 	
 	return 0;
 }