From 455c54ddf14a728a1bffa674f942154c5e581923 Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Mon, 26 Mar 2018 15:40:50 +0200 Subject: [PATCH 1/2] ZEPPELIN-3160. Fixed Checkstyle issues in kylin module --- kylin/pom.xml | 10 +- .../zeppelin/kylin/KylinErrorResponse.java | 3 +- .../zeppelin/kylin/KylinInterpreter.java | 10 +- .../zeppelin/kylin/KylinInterpreterTest.java | 160 +++++++++--------- zeppelin-web/package-lock.json | 20 ++- 5 files changed, 106 insertions(+), 97 deletions(-) diff --git a/kylin/pom.xml b/kylin/pom.xml index 6d78fdfc52c..b70bfb2f2eb 100644 --- a/kylin/pom.xml +++ b/kylin/pom.xml @@ -73,7 +73,13 @@ maven-resources-plugin + + org.apache.maven.plugins + maven-checkstyle-plugin + + false + + - - + \ No newline at end of file diff --git a/kylin/src/main/java/org/apache/zeppelin/kylin/KylinErrorResponse.java b/kylin/src/main/java/org/apache/zeppelin/kylin/KylinErrorResponse.java index 00439e8c626..04d04797ccc 100644 --- a/kylin/src/main/java/org/apache/zeppelin/kylin/KylinErrorResponse.java +++ b/kylin/src/main/java/org/apache/zeppelin/kylin/KylinErrorResponse.java @@ -34,7 +34,7 @@ class KylinErrorResponse implements JsonSerializable { private Object data; private String msg; - public KylinErrorResponse(String stacktrace, String exception, String url, + KylinErrorResponse(String stacktrace, String exception, String url, String code, Object data, String msg) { this.stacktrace = stacktrace; this.exception = exception; @@ -59,5 +59,4 @@ public static KylinErrorResponse fromJson(String json) { return null; } } - } diff --git a/kylin/src/main/java/org/apache/zeppelin/kylin/KylinInterpreter.java b/kylin/src/main/java/org/apache/zeppelin/kylin/KylinInterpreter.java index c7cd689a745..444f5cbc287 100755 --- a/kylin/src/main/java/org/apache/zeppelin/kylin/KylinInterpreter.java +++ b/kylin/src/main/java/org/apache/zeppelin/kylin/KylinInterpreter.java @@ -24,10 +24,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.zeppelin.interpreter.Interpreter; -import org.apache.zeppelin.interpreter.InterpreterContext; -import org.apache.zeppelin.interpreter.InterpreterResult; -import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,6 +33,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.zeppelin.interpreter.Interpreter; +import org.apache.zeppelin.interpreter.InterpreterContext; +import org.apache.zeppelin.interpreter.InterpreterResult; +import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion; + /** * Kylin interpreter for Zeppelin. (http://kylin.apache.org) */ @@ -233,5 +234,4 @@ String formatResult(String msg) { } return res.toString(); } - } diff --git a/kylin/src/test/java/org/apache/zeppelin/kylin/KylinInterpreterTest.java b/kylin/src/test/java/org/apache/zeppelin/kylin/KylinInterpreterTest.java index 35f0f3c2ebb..66b6f9afb3e 100755 --- a/kylin/src/test/java/org/apache/zeppelin/kylin/KylinInterpreterTest.java +++ b/kylin/src/test/java/org/apache/zeppelin/kylin/KylinInterpreterTest.java @@ -19,13 +19,6 @@ import static org.junit.Assert.assertEquals; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.Locale; -import java.util.Properties; - import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -33,23 +26,31 @@ import org.apache.http.StatusLine; import org.apache.http.client.methods.HttpPost; import org.apache.http.message.AbstractHttpMessage; -import org.apache.zeppelin.interpreter.InterpreterResult; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Locale; +import java.util.Properties; + +import org.apache.zeppelin.interpreter.InterpreterResult; + public class KylinInterpreterTest { - static final Properties kylinProperties = new Properties(); + static final Properties KYLIN_PROPERTIES = new Properties(); @BeforeClass public static void setUpClass() { - kylinProperties.put("kylin.api.url", "http://localhost:7070/kylin/api/query"); - kylinProperties.put("kylin.api.user", "ADMIN"); - kylinProperties.put("kylin.api.password", "KYLIN"); - kylinProperties.put("kylin.query.project", "default"); - kylinProperties.put("kylin.query.offset", "0"); - kylinProperties.put("kylin.query.limit", "5000"); - kylinProperties.put("kylin.query.ispartial", "true"); + KYLIN_PROPERTIES.put("kylin.api.url", "http://localhost:7070/kylin/api/query"); + KYLIN_PROPERTIES.put("kylin.api.user", "ADMIN"); + KYLIN_PROPERTIES.put("kylin.api.password", "KYLIN"); + KYLIN_PROPERTIES.put("kylin.query.project", "default"); + KYLIN_PROPERTIES.put("kylin.query.offset", "0"); + KYLIN_PROPERTIES.put("kylin.query.limit", "5000"); + KYLIN_PROPERTIES.put("kylin.query.ispartial", "true"); } @Test @@ -58,47 +59,57 @@ public void testWithDefault() { InterpreterResult result = t.interpret( "select a.date,sum(b.measure) as measure from kylin_fact_table a " + "inner join kylin_lookup_table b on a.date=b.date group by a.date", null); - assertEquals("default", t.getProject("select a.date,sum(b.measure) as measure " + - "from kylin_fact_table a inner join kylin_lookup_table b on a.date=b.date group by a.date")); - assertEquals(InterpreterResult.Type.TABLE,result.message().get(0).getType()); + assertEquals("default", t.getProject("select a.date,sum(b.measure) as measure " + + "from kylin_fact_table a inner join kylin_lookup_table b on a.date=b.date " + + "group by a.date")); + assertEquals(InterpreterResult.Type.TABLE, result.message().get(0).getType()); } @Test public void testWithProject() { KylinInterpreter t = new MockKylinInterpreter(getDefaultProperties()); - assertEquals("project2", t.getProject("(project2)\n select a.date,sum(b.measure) as measure " + - "from kylin_fact_table a inner join kylin_lookup_table b on a.date=b.date group by a.date")); - assertEquals("", t.getProject("()\n select a.date,sum(b.measure) as measure " + - "from kylin_fact_table a inner join kylin_lookup_table b on a.date=b.date group by a.date")); - assertEquals("\n select a.date,sum(b.measure) as measure from kylin_fact_table a inner join " + - "kylin_lookup_table b on a.date=b.date group by a.date", t.getSQL("(project2)\n select a.date," + - "sum(b.measure) as measure from kylin_fact_table a inner join kylin_lookup_table b on a.date=b.date " + - "group by a.date")); - assertEquals("\n select a.date,sum(b.measure) as measure from kylin_fact_table a inner join kylin_lookup_table b " + - "on a.date=b.date group by a.date", t.getSQL("()\n select a.date,sum(b.measure) as measure " + - "from kylin_fact_table a inner join kylin_lookup_table b on a.date=b.date group by a.date")); + assertEquals("project2", t.getProject("(project2)\n select a.date,sum(b.measure) " + + "as measure from kylin_fact_table a inner join kylin_lookup_table b on " + + "a.date=b.date group by a.date")); + assertEquals("", t.getProject("()\n select a.date,sum(b.measure) as measure " + + "from kylin_fact_table a inner join kylin_lookup_table b on a.date=b.date " + + "group by a.date")); + assertEquals("\n select a.date,sum(b.measure) as measure from kylin_fact_table a " + + "inner join kylin_lookup_table b on a.date=b.date group by a.date", + t.getSQL("(project2)\n select a.date,sum(b.measure) as measure " + + "from kylin_fact_table a inner join kylin_lookup_table b on a.date=b.date " + + "group by a.date")); + assertEquals("\n select a.date,sum(b.measure) as measure from kylin_fact_table a " + + "inner join kylin_lookup_table b on a.date=b.date group by a.date", + t.getSQL("()\n select a.date,sum(b.measure) as measure from kylin_fact_table a " + + "inner join kylin_lookup_table b on a.date=b.date group by a.date")); } @Test public void testParseResult() { - String msg = "{\"columnMetas\":[{\"isNullable\":1,\"displaySize\":256,\"label\":\"COUNTRY\",\"name\":\"COUNTRY\"," - + "\"schemaName\":\"DEFAULT\",\"catelogName\":null,\"tableName\":\"SALES_TABLE\",\"precision\":256," - + "\"scale\":0,\"columnType\":12,\"columnTypeName\":\"VARCHAR\",\"writable\":false,\"readOnly\":true," - + "\"definitelyWritable\":false,\"autoIncrement\":false,\"caseSensitive\":true,\"searchable\":false," - + "\"currency\":false,\"signed\":true},{\"isNullable\":1,\"displaySize\":256,\"label\":\"CURRENCY\"," - + "\"name\":\"CURRENCY\",\"schemaName\":\"DEFAULT\",\"catelogName\":null,\"tableName\":\"SALES_TABLE\"," - + "\"precision\":256,\"scale\":0,\"columnType\":12,\"columnTypeName\":\"VARCHAR\",\"writable\":false," - + "\"readOnly\":true,\"definitelyWritable\":false,\"autoIncrement\":false,\"caseSensitive\":true," - + "\"searchable\":false,\"currency\":false,\"signed\":true},{\"isNullable\":0,\"displaySize\":19," - + "\"label\":\"COUNT__\",\"name\":\"COUNT__\",\"schemaName\":\"DEFAULT\",\"catelogName\":null," - + "\"tableName\":\"SALES_TABLE\",\"precision\":19,\"scale\":0,\"columnType\":-5,\"columnTypeName\":" - + "\"BIGINT\",\"writable\":false,\"readOnly\":true,\"definitelyWritable\":false,\"autoIncrement\":false," - + "\"caseSensitive\":true,\"searchable\":false,\"currency\":false,\"signed\":true}],\"results\":" - + "[[\"AMERICA\",\"USD\",null],[null,\"RMB\",0],[\"KOR\",null,100],[\"\\\"abc\\\"\",\"a,b,c\",-1]]," - + "\"cube\":\"Sample_Cube\",\"affectedRowCount\":0,\"isException\":false,\"exceptionMessage\":null," - + "\"duration\":134,\"totalScanCount\":1,\"hitExceptionCache\":false,\"storageCacheUsed\":false," + String msg = "{\"columnMetas\":[{\"isNullable\":1,\"displaySize\":256,\"label\":\"COUNTRY\"," + + "\"name\":\"COUNTRY\",\"schemaName\":\"DEFAULT\",\"catelogName\":null," + + "\"tableName\":\"SALES_TABLE\",\"precision\":256,\"scale\":0,\"columnType\":12," + + "\"columnTypeName\":\"VARCHAR\",\"writable\":false,\"readOnly\":true," + + "\"definitelyWritable\":false,\"autoIncrement\":false,\"caseSensitive\":true," + + "\"searchable\":false,\"currency\":false,\"signed\":true},{\"isNullable\":1," + + "\"displaySize\":256,\"label\":\"CURRENCY\",\"name\":\"CURRENCY\"," + + "\"schemaName\":\"DEFAULT\",\"catelogName\":null,\"tableName\":\"SALES_TABLE\"," + + "\"precision\":256,\"scale\":0,\"columnType\":12,\"columnTypeName\":\"VARCHAR\"," + + "\"writable\":false,\"readOnly\":true,\"definitelyWritable\":false," + + "\"autoIncrement\":false,\"caseSensitive\":true,\"searchable\":false," + + "\"currency\":false,\"signed\":true},{\"isNullable\":0,\"displaySize\":19," + + "\"label\":\"COUNT__\",\"name\":\"COUNT__\",\"schemaName\":\"DEFAULT\"," + + "\"catelogName\":null,\"tableName\":\"SALES_TABLE\",\"precision\":19,\"scale\":0," + + "\"columnType\":-5,\"columnTypeName\":\"BIGINT\",\"writable\":false," + + "\"readOnly\":true,\"definitelyWritable\":false,\"autoIncrement\":false," + + "\"caseSensitive\":true,\"searchable\":false,\"currency\":false,\"signed\":true}]," + + "\"results\":[[\"AMERICA\",\"USD\",null],[null,\"RMB\",0],[\"KOR\",null,100]," + + "[\"\\\"abc\\\"\",\"a,b,c\",-1]],\"cube\":\"Sample_Cube\",\"affectedRowCount\":0," + + "\"isException\":false,\"exceptionMessage\":null,\"duration\":134," + + "\"totalScanCount\":1,\"hitExceptionCache\":false,\"storageCacheUsed\":false," + "\"partial\":false}"; - String expected="%table COUNTRY \tCURRENCY \tCOUNT__ \t \n" + + String expected = "%table COUNTRY \tCURRENCY \tCOUNT__ \t \n" + "AMERICA \tUSD \tnull \t \n" + "null \tRMB \t0 \t \n" + "KOR \tnull \t100 \t \n" + @@ -110,23 +121,28 @@ public void testParseResult() { @Test public void testParseEmptyResult() { - String msg = "{\"columnMetas\":[{\"isNullable\":1,\"displaySize\":256,\"label\":\"COUNTRY\",\"name\":\"COUNTRY\"," - + "\"schemaName\":\"DEFAULT\",\"catelogName\":null,\"tableName\":\"SALES_TABLE\",\"precision\":256," - + "\"scale\":0,\"columnType\":12,\"columnTypeName\":\"VARCHAR\",\"writable\":false,\"readOnly\":true," - + "\"definitelyWritable\":false,\"autoIncrement\":false,\"caseSensitive\":true,\"searchable\":false," - + "\"currency\":false,\"signed\":true},{\"isNullable\":1,\"displaySize\":256,\"label\":\"CURRENCY\"," - + "\"name\":\"CURRENCY\",\"schemaName\":\"DEFAULT\",\"catelogName\":null,\"tableName\":\"SALES_TABLE\"," - + "\"precision\":256,\"scale\":0,\"columnType\":12,\"columnTypeName\":\"VARCHAR\",\"writable\":false," - + "\"readOnly\":true,\"definitelyWritable\":false,\"autoIncrement\":false,\"caseSensitive\":true," - + "\"searchable\":false,\"currency\":false,\"signed\":true},{\"isNullable\":0,\"displaySize\":19," - + "\"label\":\"COUNT__\",\"name\":\"COUNT__\",\"schemaName\":\"DEFAULT\",\"catelogName\":null," - + "\"tableName\":\"SALES_TABLE\",\"precision\":19,\"scale\":0,\"columnType\":-5,\"columnTypeName\":" - + "\"BIGINT\",\"writable\":false,\"readOnly\":true,\"definitelyWritable\":false,\"autoIncrement\":false," - + "\"caseSensitive\":true,\"searchable\":false,\"currency\":false,\"signed\":true}],\"results\":" - + "[]," + "\"cube\":\"Sample_Cube\",\"affectedRowCount\":0,\"isException\":false,\"exceptionMessage\":null," - + "\"duration\":134,\"totalScanCount\":1,\"hitExceptionCache\":false,\"storageCacheUsed\":false," - + "\"partial\":false}"; - String expected="%table COUNTRY \tCURRENCY \tCOUNT__ \t \n"; + String msg = "{\"columnMetas\":[{\"isNullable\":1,\"displaySize\":256,\"label\":\"COUNTRY\"," + + "\"name\":\"COUNTRY\",\"schemaName\":\"DEFAULT\",\"catelogName\":null," + + "\"tableName\":\"SALES_TABLE\",\"precision\":256,\"scale\":0,\"columnType\":12," + + "\"columnTypeName\":\"VARCHAR\",\"writable\":false,\"readOnly\":true," + + "\"definitelyWritable\":false,\"autoIncrement\":false,\"caseSensitive\":true," + + "\"searchable\":false,\"currency\":false,\"signed\":true},{\"isNullable\":1," + + "\"displaySize\":256,\"label\":\"CURRENCY\",\"name\":\"CURRENCY\"," + + "\"schemaName\":\"DEFAULT\",\"catelogName\":null,\"tableName\":\"SALES_TABLE\"," + + "\"precision\":256,\"scale\":0,\"columnType\":12,\"columnTypeName\":\"VARCHAR\"," + + "\"writable\":false,\"readOnly\":true,\"definitelyWritable\":false," + + "\"autoIncrement\":false,\"caseSensitive\":true,\"searchable\":false," + + "\"currency\":false,\"signed\":true},{\"isNullable\":0,\"displaySize\":19," + + "\"label\":\"COUNT__\",\"name\":\"COUNT__\",\"schemaName\":\"DEFAULT\"," + + "\"catelogName\":null,\"tableName\":\"SALES_TABLE\",\"precision\":19,\"scale\":0," + + "\"columnType\":-5,\"columnTypeName\":\"BIGINT\",\"writable\":false," + + "\"readOnly\":true,\"definitelyWritable\":false,\"autoIncrement\":false," + + "\"caseSensitive\":true,\"searchable\":false,\"currency\":false,\"signed\":true}]," + + "\"results\":[]," + "\"cube\":\"Sample_Cube\",\"affectedRowCount\":0," + + "\"isException\":false,\"exceptionMessage\":null,\"duration\":134," + + "\"totalScanCount\":1,\"hitExceptionCache\":false,\"storageCacheUsed\":false," + + "\"partial\":false}"; + String expected = "%table COUNTRY \tCURRENCY \tCOUNT__ \t \n"; KylinInterpreter t = new MockKylinInterpreter(getDefaultProperties()); String actual = t.formatResult(msg); Assert.assertEquals(expected, actual); @@ -146,8 +162,7 @@ private Properties getDefaultProperties() { } class MockKylinInterpreter extends KylinInterpreter { - - public MockKylinInterpreter(Properties property) { + MockKylinInterpreter(Properties property) { super(property); } @@ -156,7 +171,6 @@ public HttpResponse prepareRequest(String sql) throws IOException { MockHttpClient client = new MockHttpClient(); return client.execute(new HttpPost()); } - } class MockHttpClient{ @@ -166,7 +180,6 @@ public MockHttpResponse execute(HttpPost post){ } class MockHttpResponse extends AbstractHttpMessage implements HttpResponse{ - @Override public StatusLine getStatusLine() { return new MockStatusLine(); @@ -174,27 +187,22 @@ public StatusLine getStatusLine() { @Override public void setStatusLine(StatusLine statusLine) { - } @Override public void setStatusLine(ProtocolVersion protocolVersion, int i) { - } @Override public void setStatusLine(ProtocolVersion protocolVersion, int i, String s) { - } @Override public void setStatusCode(int i) throws IllegalStateException { - } @Override public void setReasonPhrase(String s) throws IllegalStateException { - } @Override @@ -204,7 +212,6 @@ public HttpEntity getEntity() { @Override public void setEntity(HttpEntity httpEntity) { - } @Override @@ -214,7 +221,6 @@ public Locale getLocale() { @Override public void setLocale(Locale locale) { - } @Override @@ -224,7 +230,6 @@ public ProtocolVersion getProtocolVersion() { } class MockStatusLine implements StatusLine{ - @Override public ProtocolVersion getProtocolVersion() { return null; @@ -242,7 +247,6 @@ public String getReasonPhrase() { } class MockEntity implements HttpEntity{ - @Override public boolean isRepeatable() { return false; @@ -278,7 +282,6 @@ public InputStream getContent() throws IOException, IllegalStateException { @Override public void writeTo(OutputStream outputStream) throws IOException { - } @Override @@ -288,6 +291,5 @@ public boolean isStreaming() { @Override public void consumeContent() throws IOException { - } } diff --git a/zeppelin-web/package-lock.json b/zeppelin-web/package-lock.json index 443c7b77034..71fb52d98ae 100644 --- a/zeppelin-web/package-lock.json +++ b/zeppelin-web/package-lock.json @@ -154,17 +154,19 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, - "angular": { - "version": "1.5.11", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.5.11.tgz", - "integrity": "sha1-jFunOG8VllyazzQp9ogVU6raMNY=" - }, "angular-ui-grid": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/angular-ui-grid/-/angular-ui-grid-4.0.11.tgz", - "integrity": "sha1-lqp1KkH2CiVMGeBSV2iehMZhhiY=", + "version": "4.4.4", + "resolved": "https://registry.npmjs.org/angular-ui-grid/-/angular-ui-grid-4.4.4.tgz", + "integrity": "sha512-lx2pVPz0S6ddBGoaTuA0952Mr8VJKAwZ4wDj4NeBz9+SC2vP8QCwi2b8cTJOSb5DoSxTEb26CtUSqtCDSRaScA==", "requires": { - "angular": "1.5.11" + "angular": "1.6.9" + }, + "dependencies": { + "angular": { + "version": "1.6.9", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.6.9.tgz", + "integrity": "sha512-6igWH2GIsxV+J38wNWCh8oyjaZsrIPIDO35twloIUyjlF2Yit6UyLAWujHP05ma/LFxTsx4NtYibRoMNBXPR1A==" + } } }, "angular-viewport-watch": { From d01830b7c8a76114ad405de2652cd2e4a567ce18 Mon Sep 17 00:00:00 2001 From: Jan Hentschel Date: Tue, 27 Mar 2018 12:22:44 +0200 Subject: [PATCH 2/2] ZEPPELIN-3160. Reverted package-lock.json --- zeppelin-web/package-lock.json | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/zeppelin-web/package-lock.json b/zeppelin-web/package-lock.json index 71fb52d98ae..443c7b77034 100644 --- a/zeppelin-web/package-lock.json +++ b/zeppelin-web/package-lock.json @@ -154,19 +154,17 @@ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" }, + "angular": { + "version": "1.5.11", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.5.11.tgz", + "integrity": "sha1-jFunOG8VllyazzQp9ogVU6raMNY=" + }, "angular-ui-grid": { - "version": "4.4.4", - "resolved": "https://registry.npmjs.org/angular-ui-grid/-/angular-ui-grid-4.4.4.tgz", - "integrity": "sha512-lx2pVPz0S6ddBGoaTuA0952Mr8VJKAwZ4wDj4NeBz9+SC2vP8QCwi2b8cTJOSb5DoSxTEb26CtUSqtCDSRaScA==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/angular-ui-grid/-/angular-ui-grid-4.0.11.tgz", + "integrity": "sha1-lqp1KkH2CiVMGeBSV2iehMZhhiY=", "requires": { - "angular": "1.6.9" - }, - "dependencies": { - "angular": { - "version": "1.6.9", - "resolved": "https://registry.npmjs.org/angular/-/angular-1.6.9.tgz", - "integrity": "sha512-6igWH2GIsxV+J38wNWCh8oyjaZsrIPIDO35twloIUyjlF2Yit6UyLAWujHP05ma/LFxTsx4NtYibRoMNBXPR1A==" - } + "angular": "1.5.11" } }, "angular-viewport-watch": {