You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ka...@apache.org on 2019/01/27 10:06:20 UTC
[incubator-iotdb] branch fix_sonar updated: fix jt conversation
This is an automated email from the ASF dual-hosted git repository.
kangrong pushed a commit to branch fix_sonar
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/fix_sonar by this push:
new cb06f4f fix jt conversation
cb06f4f is described below
commit cb06f4f919de4474c9b3abbdd54710957d020dc1
Author: kr11 <30...@qq.com>
AuthorDate: Sun Jan 27 18:06:09 2019 +0800
fix jt conversation
---
.../src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java | 7 ++++---
.../src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java | 6 +++++-
iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java | 8 ++++++--
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java b/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java
index 4232a08..ba94f80 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/metadata/ColumnSchema.java
@@ -28,15 +28,16 @@ public class ColumnSchema implements Serializable {
private static final long serialVersionUID = -8257474930341487207L;
- public void setName(String name) {
- this.name = name;
- }
private String name;
public TSDataType dataType;
public TSEncoding encoding;
private Map<String, String> args;
+ public void setName(String name) {
+ this.name = name;
+ }
+
/**
* constructor of ColumnSchema.
*
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
index 1994d7f..a54123d 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/sql/parse/AstErrorNode.java
@@ -26,7 +26,11 @@ import org.antlr.runtime.tree.CommonErrorNode;
public class AstErrorNode extends AstNode {
private static final long serialVersionUID = 1L;
- transient CommonErrorNode delegate;
+
+ /**
+ * delegate needn't be serialized.
+ */
+ private transient CommonErrorNode delegate;
public AstErrorNode(TokenStream input, Token start, Token stop, RecognitionException e) {
delegate = new CommonErrorNode(input, start, stop, e);
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
index dc388b0..fd9bac9 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/utils/AuthUtils.java
@@ -42,7 +42,9 @@ public class AuthUtils {
private static final String ENCRYPT_ALGORITHM = "MD5";
private static final String STRING_ENCODING = "utf-8";
- private AuthUtils(){}
+ private AuthUtils() {
+
+ }
/**
* validate password length.
@@ -193,7 +195,9 @@ public class AuthUtils {
}
for (PathPrivilege pathPrivilege : privilegeList) {
if (path != null) {
- if (pathPrivilege.getPath() != null && AuthUtils.pathBelongsTo(path, pathPrivilege.getPath()) && pathPrivilege.getPrivileges().contains(privilegeId)) {
+ if (pathPrivilege.getPath() != null &&
+ AuthUtils.pathBelongsTo(path, pathPrivilege.getPath()) &&
+ pathPrivilege.getPrivileges().contains(privilegeId)) {
return true;
}
} else {