Merge pull request #12137 from ClickHouse/fix-loop-geodistance

alexey-milovidov · web-flow · commit f02edaa48c02 · 2020-07-05T18:22:15.000+03:00
Remove harmful code from "geoDistance"
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
@@ -102,8 +102,6 @@ void geodistInit()
 inline float geodistDegDiff(float f)
 {
     f = fabsf(f);
-    while (f > 360)
-        f -= 360;
     if (f > 180)
         f = 360 - f;
     return f;
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
@@ -45,7 +45,8 @@ class InterpreterCreateQuery : public IInterpreter
         internal = internal_;
     }
 
-    /// Obtain information about columns, their types, default values and column comments, for case when columns in CREATE query is specified explicitly.
+    /// Obtain information about columns, their types, default values and column comments,
+    ///  for case when columns in CREATE query is specified explicitly.
     static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, const Context & context, bool sanity_check_compression_codecs);
     static ConstraintsDescription getConstraintsDescription(const ASTExpressionList * constraints);
 
diff --git a/tests/queries/0_stateless/01359_geodistance_loop.reference b/tests/queries/0_stateless/01359_geodistance_loop.reference
@@ -0,0 +1 @@
+inf
diff --git a/tests/queries/0_stateless/01359_geodistance_loop.sql b/tests/queries/0_stateless/01359_geodistance_loop.sql
@@ -0,0 +1 @@
+SELECT geoDistance(0., 0., -inf, 1.);

Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,6 @@ void geodistInit()`
`102`	`102`	`inline float geodistDegDiff(float f)`
`103`	`103`	`{`
`104`	`104`	`f = fabsf(f);`
`105`		`- while (f > 360)`
`106`		`- f -= 360;`
`107`	`105`	`if (f > 180)`
`108`	`106`	`f = 360 - f;`
`109`	`107`	`return f;`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ class InterpreterCreateQuery : public IInterpreter`
`45`	`45`	`internal = internal_;`
`46`	`46`	`}`
`47`	`47`
`48`		`- /// Obtain information about columns, their types, default values and column comments, for case when columns in CREATE query is specified explicitly.`
	`48`	`+ /// Obtain information about columns, their types, default values and column comments,`
	`49`	`+ /// for case when columns in CREATE query is specified explicitly.`
`49`	`50`	`static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, const Context & context, bool sanity_check_compression_codecs);`
`50`	`51`	`static ConstraintsDescription getConstraintsDescription(const ASTExpressionList * constraints);`
`51`	`52`