You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/05/01 02:41:36 UTC
[incubator-iotdb] branch rel/0.9 updated (3d269b1 -> 8b54554)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch rel/0.9
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
from 3d269b1 [IOTDB-528][cherry-pick] modify grafana group by (#1138)
add ed71d50 [maven-release-plugin] prepare release release/0.9.2
add 022ec77 [maven-release-plugin] prepare for next development iteration
add da0db51 [maven-release-plugin] rollback the release of release/0.9.2
add 50e03c8 Merge branch 'rel/0.9' of github.com:apache/incubator-iotdb into rel/0.9
new 8d99910 Merge branch 'rel/0.9' of github.com:apache/incubator-iotdb into rel/0.9
new 295d3bf Merge branch 'rel/0.9' of github.com:apache/incubator-iotdb into rel/0.9
new d89458c Merge branch 'rel/0.9' of github.com:apache/incubator-iotdb into rel/0.9
new 8b54554 fix group by grammar
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
[incubator-iotdb] 03/04: Merge branch 'rel/0.9' of
github.com:apache/incubator-iotdb into rel/0.9
Posted by qi...@apache.org.
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 d89458c4628be22bfff47bc6530b954847fb1adc
Merge: 295d3bf 3d269b1
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri May 1 10:16:36 2020 +0800
Merge branch 'rel/0.9' of github.com:apache/incubator-iotdb into rel/0.9
.../UserGuide/7-Ecosystem Integration/1-Grafana.md | 77 +++++++++++++-----
.../UserGuide/7-Ecosystem Integration/1-Grafana.md | 65 +++++++++++----
grafana/readme.md | 74 ++++++++++++-----
grafana/readme_zh.md | 95 +++++++++++++++-------
.../iotdb/web/grafana/dao/impl/BasicDaoImpl.java | 70 +++++++++++++---
.../main/resources}/application.properties | 13 ++-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 34 +++-----
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 4 +-
8 files changed, 311 insertions(+), 121 deletions(-)
[incubator-iotdb] 04/04: fix group by grammar
Posted by qi...@apache.org.
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 <64...@qq.com>
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>
[incubator-iotdb] 01/04: Merge branch 'rel/0.9' of
github.com:apache/incubator-iotdb into rel/0.9
Posted by qi...@apache.org.
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 8d99910b9eaab7000d2f9a4f3b57297684003f11
Merge: 50e03c8 dd7bb77
Author: qiaojialin <64...@qq.com>
AuthorDate: Mon Apr 27 11:17:28 2020 +0800
Merge branch 'rel/0.9' of github.com:apache/incubator-iotdb into rel/0.9
server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 6 +++++-
.../java/org/apache/iotdb/db/qp/executor/QueryProcessExecutor.java | 7 +++++++
2 files changed, 12 insertions(+), 1 deletion(-)
[incubator-iotdb] 02/04: Merge branch 'rel/0.9' of
github.com:apache/incubator-iotdb into rel/0.9
Posted by qi...@apache.org.
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 295d3bf19f0543cc3e29822b908c13fcf3d936da
Merge: 8d99910 d68f616
Author: qiaojialin <64...@qq.com>
AuthorDate: Wed Apr 29 15:11:44 2020 +0800
Merge branch 'rel/0.9' of github.com:apache/incubator-iotdb into rel/0.9
.../6-System Tools/8-Load External Tsfile.md | 71 --------------------
.../6-System Tools/8-Load External Tsfile.md | 77 ----------------------
2 files changed, 148 deletions(-)