This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch rel/0.9 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 8b545545972ad11790ca6a9f7fe13234ef9709e0 Author: qiaojialin <[email protected]> AuthorDate: Fri May 1 10:40:09 2020 +0800 fix group by grammar --- grafana/pom.xml | 2 +- .../java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 6 +++--- jdbc/pom.xml | 2 +- pom.xml | 6 +++--- service-rpc/pom.xml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/grafana/pom.xml b/grafana/pom.xml index b17caf8..a97e45f 100644 --- a/grafana/pom.xml +++ b/grafana/pom.xml @@ -165,7 +165,7 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> <resource>META-INF/spring.schemas</resource> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" /> + <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <mainClass>${start-class}</mainClass> </transformer> diff --git a/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java b/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java index 85ca1ed..7af408f 100644 --- a/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java +++ b/grafana/src/main/java/org/apache/iotdb/web/grafana/dao/impl/BasicDaoImpl.java @@ -116,9 +116,9 @@ public class BasicDaoImpl implements BasicDao { } sql = String.format( "SELECT " + function - + "(%s) FROM root.%s WHERE time > %d and time < %d group by ([%d, %d),%s)", - s.substring(s.lastIndexOf('.') + 1), s.substring(0, s.lastIndexOf('.')), from, to, from, - to, interval); + + "(%s) FROM root.%s WHERE time > %d and time < %d group by (%s, [%d, %d])", + s.substring(s.lastIndexOf('.') + 1), s.substring(0, s.lastIndexOf('.')), from, to, + interval, from, to); columnName = function + "(root." + s + ")"; } logger.info(sql); diff --git a/jdbc/pom.xml b/jdbc/pom.xml index afb3f42..77f0bfb 100644 --- a/jdbc/pom.xml +++ b/jdbc/pom.xml @@ -126,7 +126,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> </pluginExecutions> diff --git a/pom.xml b/pom.xml index 06b18c7..80dd08f 100644 --- a/pom.xml +++ b/pom.xml @@ -533,7 +533,7 @@ <id>enforce-version-convergence</id> <configuration> <rules> - <dependencyConvergence /> + <dependencyConvergence/> </rules> </configuration> <goals> @@ -579,7 +579,7 @@ </requireJavaVersion> <!-- Disabled for now as it breaks the ability to build single modules --> <!--reactorModuleConvergence/--> - <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies" /> + <banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/> </rules> </configuration> </execution> @@ -727,7 +727,7 @@ <instrumentation> <ignoreTrivial>true</ignoreTrivial> </instrumentation> - <check /> + <check/> </configuration> <executions> <execution> diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml index 74a258b..f8bbba6 100644 --- a/service-rpc/pom.xml +++ b/service-rpc/pom.xml @@ -148,7 +148,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore /> + <ignore/> </action> </pluginExecution> <pluginExecution>
