http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java index 46ad628..8e69e68 100644 --- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java +++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinMeta.java @@ -59,29 +59,25 @@ public class KylinMeta extends MetaImpl { } @Override - public ExecuteBatchResult prepareAndExecuteBatch(StatementHandle sh, List<String> sqlCommands) - throws NoSuchStatementException { - return new ExecuteBatchResult(new long[] {}); + public ExecuteBatchResult prepareAndExecuteBatch(StatementHandle sh, List<String> sqlCommands) throws NoSuchStatementException { + return new ExecuteBatchResult(new long[]{}); } @Override - public ExecuteBatchResult executeBatch(StatementHandle sh, List<List<TypedValue>> parameterValues) - throws NoSuchStatementException { - return new ExecuteBatchResult(new long[] {}); + public ExecuteBatchResult executeBatch(StatementHandle sh, List<List<TypedValue>> parameterValues) throws NoSuchStatementException { + return new ExecuteBatchResult(new long[]{}); } // real execution happens in KylinResultSet.execute() @Override @Deprecated - public ExecuteResult execute(StatementHandle sh, List<TypedValue> parameterValues, long maxRowCount) - throws NoSuchStatementException { + public ExecuteResult execute(StatementHandle sh, List<TypedValue> parameterValues, long maxRowCount) throws NoSuchStatementException { final MetaResultSet metaResultSet = MetaResultSet.create(sh.connectionId, sh.id, false, sh.signature, null); return new ExecuteResult(Collections.singletonList(metaResultSet)); } @Override - public ExecuteResult execute(StatementHandle sh, List<TypedValue> parameterValues, int maxRowsInFirstFrame) - throws NoSuchStatementException { + public ExecuteResult execute(StatementHandle sh, List<TypedValue> parameterValues, int maxRowsInFirstFrame) throws NoSuchStatementException { final MetaResultSet metaResultSet = MetaResultSet.create(sh.connectionId, sh.id, false, sh.signature, null); return new ExecuteResult(Collections.singletonList(metaResultSet)); } @@ -105,8 +101,7 @@ public class KylinMeta extends MetaImpl { } @Override - public ExecuteResult prepareAndExecute(StatementHandle sh, String sql, long maxRowCount, int maxRowsInFirstFrame, - PrepareCallback callback) throws NoSuchStatementException { + public ExecuteResult prepareAndExecute(StatementHandle sh, String sql, long maxRowCount, int maxRowsInFirstFrame, PrepareCallback callback) throws NoSuchStatementException { try { synchronized (callback.getMonitor()) { callback.clear(); @@ -156,8 +151,7 @@ public class KylinMeta extends MetaImpl { } @Override - public MetaResultSet getTables(ConnectionHandle ch, String catalog, Pat schemaPattern, Pat tableNamePattern, - List<String> typeList) { + public MetaResultSet getTables(ConnectionHandle ch, String catalog, Pat schemaPattern, Pat tableNamePattern, List<String> typeList) { List<KMetaTable> tables = getMetaProject().getTables(catalog, schemaPattern, tableNamePattern, typeList); return createResultSet(tables, KMetaTable.class, // "TABLE_CAT", // @@ -173,10 +167,8 @@ public class KylinMeta extends MetaImpl { } @Override - public MetaResultSet getColumns(ConnectionHandle ch, String catalog, Pat schemaPattern, Pat tableNamePattern, - Pat columnNamePattern) { - List<KMetaColumn> columns = getMetaProject().getColumns(catalog, schemaPattern, tableNamePattern, - columnNamePattern); + public MetaResultSet getColumns(ConnectionHandle ch, String catalog, Pat schemaPattern, Pat tableNamePattern, Pat columnNamePattern) { + List<KMetaColumn> columns = getMetaProject().getColumns(catalog, schemaPattern, tableNamePattern, columnNamePattern); return createResultSet(columns, KMetaColumn.class, // "TABLE_CAT", // "TABLE_SCHEM", // @@ -223,8 +215,7 @@ public class KylinMeta extends MetaImpl { } CursorFactory cursorFactory = CursorFactory.record(clazz, fields, fieldNames); - Signature signature = new Signature(columns, "", null, Collections.<String, Object> emptyMap(), cursorFactory, - StatementType.SELECT); + Signature signature = new Signature(columns, "", null, Collections.<String, Object> emptyMap(), cursorFactory, StatementType.SELECT); StatementHandle sh = this.createStatement(connection().handle); Frame frame = new Frame(0, true, iterable); @@ -327,16 +318,13 @@ public class KylinMeta extends MetaImpl { } @SuppressWarnings("unchecked") - public List<KMetaTable> getTables(String catalog, Pat schemaPattern, Pat tableNamePattern, - List<String> typeList) { + public List<KMetaTable> getTables(String catalog, Pat schemaPattern, Pat tableNamePattern, List<String> typeList) { return (List<KMetaTable>) searchByPatterns(this, Pat.of(catalog), schemaPattern, tableNamePattern); } @SuppressWarnings("unchecked") - public List<KMetaColumn> getColumns(String catalog, Pat schemaPattern, Pat tableNamePattern, - Pat columnNamePattern) { - return (List<KMetaColumn>) searchByPatterns(this, Pat.of(catalog), schemaPattern, tableNamePattern, - columnNamePattern); + public List<KMetaColumn> getColumns(String catalog, Pat schemaPattern, Pat tableNamePattern, Pat columnNamePattern) { + return (List<KMetaColumn>) searchByPatterns(this, Pat.of(catalog), schemaPattern, tableNamePattern, columnNamePattern); } @Override @@ -387,8 +375,7 @@ public class KylinMeta extends MetaImpl { public static class KMetaTable extends MetaTable implements NamedWithChildren { public final List<KMetaColumn> columns; - public KMetaTable(String tableCat, String tableSchem, String tableName, String tableType, - List<KMetaColumn> columns) { + public KMetaTable(String tableCat, String tableSchem, String tableName, String tableType, List<KMetaColumn> columns) { super(tableCat, tableSchem, tableName, tableType); this.columns = columns; } @@ -401,11 +388,8 @@ public class KylinMeta extends MetaImpl { public static class KMetaColumn extends MetaColumn implements NamedWithChildren { - public KMetaColumn(String tableCat, String tableSchem, String tableName, String columnName, int dataType, - String typeName, int columnSize, Integer decimalDigits, int numPrecRadix, int nullable, - int charOctetLength, int ordinalPosition, String isNullable) { - super(tableCat, tableSchem, tableName, columnName, dataType, typeName, columnSize, decimalDigits, - numPrecRadix, nullable, charOctetLength, ordinalPosition, isNullable); + public KMetaColumn(String tableCat, String tableSchem, String tableName, String columnName, int dataType, String typeName, int columnSize, Integer decimalDigits, int numPrecRadix, int nullable, int charOctetLength, int ordinalPosition, String isNullable) { + super(tableCat, tableSchem, tableName, columnName, dataType, typeName, columnSize, decimalDigits, numPrecRadix, nullable, charOctetLength, ordinalPosition, isNullable); } @Override @@ -415,8 +399,7 @@ public class KylinMeta extends MetaImpl { } @Override - public Frame fetch(StatementHandle h, long offset, int fetchMaxRowCount) - throws NoSuchStatementException, MissingResultsException { + public Frame fetch(StatementHandle h, long offset, int fetchMaxRowCount) throws NoSuchStatementException, MissingResultsException { // TODO Auto-generated method stub return null; }
http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java index baa740d..510243b 100644 --- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java +++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java @@ -35,8 +35,7 @@ import org.apache.calcite.avatica.remote.TypedValue; public class KylinPreparedStatement extends AvaticaPreparedStatement { - protected KylinPreparedStatement(AvaticaConnection connection, StatementHandle h, Signature signature, - int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { + protected KylinPreparedStatement(AvaticaConnection connection, StatementHandle h, Signature signature, int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException { super(connection, h, signature, resultSetType, resultSetConcurrency, resultSetHoldability); if (this.handle.signature == null) this.handle.signature = signature; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java index b267942..1c1157a 100644 --- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java +++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java @@ -37,8 +37,7 @@ import org.apache.kylin.jdbc.IRemoteClient.QueryResult; public class KylinResultSet extends AvaticaResultSet { - public KylinResultSet(AvaticaStatement statement, QueryState state, Signature signature, - ResultSetMetaData resultSetMetaData, TimeZone timeZone, Frame firstFrame) { + public KylinResultSet(AvaticaStatement statement, QueryState state, Signature signature, ResultSetMetaData resultSetMetaData, TimeZone timeZone, Frame firstFrame) { super(statement, state, signature, resultSetMetaData, timeZone, firstFrame); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/jdbc/src/main/java/org/apache/kylin/jdbc/KylinStatement.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinStatement.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinStatement.java index 1f3c184..6596389 100644 --- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinStatement.java +++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinStatement.java @@ -24,8 +24,7 @@ import org.apache.calcite.avatica.Meta.StatementHandle; public class KylinStatement extends AvaticaStatement { - protected KylinStatement(AvaticaConnection connection, StatementHandle h, int resultSetType, - int resultSetConcurrency, int resultSetHoldability) { + protected KylinStatement(AvaticaConnection connection, StatementHandle h, int resultSetType, int resultSetConcurrency, int resultSetHoldability) { super(connection, h, resultSetType, resultSetConcurrency, resultSetHoldability); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/jdbc/src/main/java/org/apache/kylin/jdbc/json/SQLResponseStub.java ---------------------------------------------------------------------- diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/json/SQLResponseStub.java b/jdbc/src/main/java/org/apache/kylin/jdbc/json/SQLResponseStub.java index a444155..a05b6d6 100644 --- a/jdbc/src/main/java/org/apache/kylin/jdbc/json/SQLResponseStub.java +++ b/jdbc/src/main/java/org/apache/kylin/jdbc/json/SQLResponseStub.java @@ -154,7 +154,7 @@ public class SQLResponseStub implements Serializable { } @JsonIgnoreProperties(ignoreUnknown = true) - public static class ColumnMetaStub implements Serializable { + public static class ColumnMetaStub implements Serializable{ private boolean isAutoIncrement; private boolean isCaseSensitive; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java index b4cd199..0887634 100644 --- a/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java +++ b/jdbc/src/test/java/org/apache/kylin/jdbc/DriverTest.java @@ -177,8 +177,7 @@ public class DriverTest { info.put("password", "KYLIN"); Connection conn = driver.connect("jdbc:kylin://localhost:7070/default", info); - PreparedStatement state = conn - .prepareStatement("select cal_dt, count(*) from test_kylin_fact where seller_id=? group by cal_dt"); + PreparedStatement state = conn.prepareStatement("select cal_dt, count(*) from test_kylin_fact where seller_id=? group by cal_dt"); state.setLong(1, 10000001); ResultSet resultSet = state.executeQuery(); @@ -212,12 +211,7 @@ public class DriverTest { System.out.println("Metadata:"); for (int i = 0; i < metadata.getColumnCount(); i++) { - String metaStr = metadata.getCatalogName(i + 1) + " " + metadata.getColumnClassName(i + 1) + " " - + metadata.getColumnDisplaySize(i + 1) + " " + metadata.getColumnLabel(i + 1) + " " - + metadata.getColumnName(i + 1) + " " + metadata.getColumnType(i + 1) + " " - + metadata.getColumnTypeName(i + 1) + " " + metadata.getPrecision(i + 1) + " " - + metadata.getScale(i + 1) + " " + metadata.getSchemaName(i + 1) + " " - + metadata.getTableName(i + 1); + String metaStr = metadata.getCatalogName(i + 1) + " " + metadata.getColumnClassName(i + 1) + " " + metadata.getColumnDisplaySize(i + 1) + " " + metadata.getColumnLabel(i + 1) + " " + metadata.getColumnName(i + 1) + " " + metadata.getColumnType(i + 1) + " " + metadata.getColumnTypeName(i + 1) + " " + metadata.getPrecision(i + 1) + " " + metadata.getScale(i + 1) + " " + metadata.getSchemaName(i + 1) + " " + metadata.getTableName(i + 1); System.out.println(metaStr); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java index bd0ce5c..6578825 100644 --- a/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java +++ b/jdbc/src/test/java/org/apache/kylin/jdbc/DummyClient.java @@ -64,8 +64,7 @@ public class DummyClient implements IRemoteClient { } @Override - public QueryResult executeQuery(String sql, List<AvaticaParameter> params, List<Object> paramValues, - Map<String, String> queryToggles) throws IOException { + public QueryResult executeQuery(String sql, List<AvaticaParameter> params, List<Object> paramValues, Map<String, String> queryToggles) throws IOException { List<Object> data = new ArrayList<Object>(); Object[] row = new Object[] { "foo", "bar", "tool" }; data.add(row); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/jdbc/src/test/java/org/apache/kylin/jdbc/SQLResonseStubTest.java ---------------------------------------------------------------------- diff --git a/jdbc/src/test/java/org/apache/kylin/jdbc/SQLResonseStubTest.java b/jdbc/src/test/java/org/apache/kylin/jdbc/SQLResonseStubTest.java index c2e5445..e090af6 100644 --- a/jdbc/src/test/java/org/apache/kylin/jdbc/SQLResonseStubTest.java +++ b/jdbc/src/test/java/org/apache/kylin/jdbc/SQLResonseStubTest.java @@ -36,8 +36,7 @@ public class SQLResonseStubTest { @Test public void testReadValuePartRecognizedField() throws IOException { - final String payload = "{ \"columnMetas\":[ { \"isNullable\":1, \"displaySize\":0, \"schemaName\":null, \"catelogName\":null, \"tableName\":null, \"precision\":0, \"scale\":0, \"columnType\":91, \"columnTypeName\":\"DATE\", \"readOnly\":true, \"writable\":false, \"caseSensitive\":true, \"searchable\":false, \"currency\":false, \"signed\":true, \"autoIncrement\":false, \"definitelyWritable\":false }," - + "{ \"isNullable\":1, \"displaySize\":10, \"label\":\"LEAF_CATEG_ID\", \"name\":\"LEAF_CATEG_ID\", " + final String payload = "{ \"columnMetas\":[ { \"isNullable\":1, \"displaySize\":0, \"schemaName\":null, \"catelogName\":null, \"tableName\":null, \"precision\":0, \"scale\":0, \"columnType\":91, \"columnTypeName\":\"DATE\", \"readOnly\":true, \"writable\":false, \"caseSensitive\":true, \"searchable\":false, \"currency\":false, \"signed\":true, \"autoIncrement\":false, \"definitelyWritable\":false }," + "{ \"isNullable\":1, \"displaySize\":10, \"label\":\"LEAF_CATEG_ID\", \"name\":\"LEAF_CATEG_ID\", " + "\"schemaName\":null, \"catelogName\":null, \"tableName\":null, \"precision\":10, \"scale\":0, \"columnType\":4, \"columnTypeName\":\"INTEGER\", \"readOnly\":true, \"writable\":false, \"caseSensitive\":true, \"searchable\":false, \"currency\":false, \"signed\":true, \"autoIncrement\":false, \"definitelyWritable\":false } ], \"results\":[ [ \"2013-08-07\", \"32996\", \"15\", \"15\", \"Auction\", \"10000000\", \"49.048952730908745\", \"49.048952730908745\", \"49.048952730908745\", \"1\" ], [ \"2013-08-07\", \"43398\", \"0\", \"14\", \"ABIN\", \"10000633\", \"85.78317064220418\", \"85.78317064220418\", \"85.78317064220418\", \"1\" ] ], \"cube\":\"test_kylin_cube_with_slr_desc\", \"affectedRowCount\":0, \"isException\":false, \"exceptionMessage\":null, \"duration\":3451, \"partial\":false }"; final SQLResponseStub stub = new ObjectMapper().readValue(payload, SQLResponseStub.class); assertEquals("test_kylin_cube_with_slr_desc", stub.getCube()); @@ -51,10 +50,7 @@ public class SQLResonseStubTest { @Test public void testReadValueWithUnrecognizedField() throws IOException { - final String payload = "{ \"columnMetas\":[ { \"Unrecognized\":0, \"isNullable\":1, \"displaySize\":0, " - + "\"label\":\"CAL_DT\", \"name\":\"CAL_DT\", \"schemaName\":null, \"catelogName\":null, " - + "\"tableName\":null, \"precision\":0, \"scale\":0, \"columnType\":91, \"columnTypeName\":\"DATE\", " - + "\"readOnly\":true, \"writable\":false, \"caseSensitive\":true, \"searchable\":false, \"currency\":false, \"signed\":true, \"autoIncrement\":false, \"definitelyWritable\":false }," + final String payload = "{ \"columnMetas\":[ { \"Unrecognized\":0, \"isNullable\":1, \"displaySize\":0, " + "\"label\":\"CAL_DT\", \"name\":\"CAL_DT\", \"schemaName\":null, \"catelogName\":null, " + "\"tableName\":null, \"precision\":0, \"scale\":0, \"columnType\":91, \"columnTypeName\":\"DATE\", " + "\"readOnly\":true, \"writable\":false, \"caseSensitive\":true, \"searchable\":false, \"currency\":false, \"signed\":true, \"autoIncrement\":false, \"definitelyWritable\":false }," + " { \"isNullable\":1, \"displaySize\":10, \"label\":\"LEAF_CATEG_ID\", \"name\":\"LEAF_CATEG_ID\", \"schemaName\":null, \"catelogName\":null, \"tableName\":null, \"precision\":10, \"scale\":0, \"columnType\":4, \"columnTypeName\":\"INTEGER\", \"readOnly\":true, \"writable\":false, \"caseSensitive\":true, \"searchable\":false, \"currency\":false, \"signed\":true, \"autoIncrement\":false, \"definitelyWritable\":false } ], \"results\":[ [ \"2013-08-07\", \"32996\", \"15\", \"15\", \"Auction\", \"10000000\", \"49.048952730908745\", \"49.048952730908745\", \"49.048952730908745\", \"1\" ], [ \"2013-08-07\", \"43398\", \"0\", \"14\", \"ABIN\", \"10000633\", \"85.78317064220418\", \"85.78317064220418\", \"85.78317064220418\", \"1\" ] ], \"cube\":\"test_kylin_cube_with_slr_desc\", \"affectedRowCount\":0, \"isException\":false, \"exceptionMessage\":null, \"duration\":3451, \"partial\":false, \"hitCache\":false }"; final SQLResponseStub stub = new ObjectMapper().readValue(payload, SQLResponseStub.class); assertEquals("test_kylin_cube_with_slr_desc", stub.getCube()); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/cube/ITDictionaryManagerTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/cube/ITDictionaryManagerTest.java b/kylin-it/src/test/java/org/apache/kylin/cube/ITDictionaryManagerTest.java index 833672b..4dcfdb2 100644 --- a/kylin-it/src/test/java/org/apache/kylin/cube/ITDictionaryManagerTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/cube/ITDictionaryManagerTest.java @@ -60,8 +60,7 @@ public class ITDictionaryManagerTest extends LocalFileMetadataTestCase { @Test public void basic() throws Exception { dictMgr = DictionaryManager.getInstance(getTestConfig()); - CubeDesc cubeDesc = CubeDescManager.getInstance(getTestConfig()) - .getCubeDesc("test_kylin_cube_without_slr_desc"); + CubeDesc cubeDesc = CubeDescManager.getInstance(getTestConfig()).getCubeDesc("test_kylin_cube_without_slr_desc"); TblColRef col = cubeDesc.findColumnRef("DEFAULT.TEST_KYLIN_FACT", "LSTG_FORMAT_NAME"); MockDistinctColumnValuesProvider mockupData = new MockDistinctColumnValuesProvider("A", "B", "C"); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITDoggedCubeBuilderTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITDoggedCubeBuilderTest.java b/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITDoggedCubeBuilderTest.java index fae04f3..dbd9ce2 100644 --- a/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITDoggedCubeBuilderTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITDoggedCubeBuilderTest.java @@ -71,8 +71,7 @@ public class ITDoggedCubeBuilderTest extends LocalFileMetadataTestCase { CubeManager cubeManager = CubeManager.getInstance(kylinConfig); cube = cubeManager.getCube("ssb"); - flatTable = LocalFileMetadataTestCase.LOCALMETA_TEST_DATA - + "/data/kylin_intermediate_ssb_19920101000000_19920201000000.csv"; + flatTable = LocalFileMetadataTestCase.LOCALMETA_TEST_DATA + "/data/kylin_intermediate_ssb_19920101000000_19920201000000.csv"; dictionaryMap = ITInMemCubeBuilderTest.getDictionaryMap(cube, flatTable); } @@ -162,4 +161,4 @@ public class ITDoggedCubeBuilderTest extends LocalFileMetadataTestCase { writer.close(); } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITInMemCubeBuilderTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITInMemCubeBuilderTest.java b/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITInMemCubeBuilderTest.java index f42a231..ea66c73 100644 --- a/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITInMemCubeBuilderTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/cube/inmemcubing/ITInMemCubeBuilderTest.java @@ -119,24 +119,21 @@ public class ITInMemCubeBuilderTest extends LocalFileMetadataTestCase { try { // round 1 { - Future<?> future = executorService - .submit(cubeBuilder.buildAsRunnable(queue, new ConsoleGTRecordWriter())); + Future<?> future = executorService.submit(cubeBuilder.buildAsRunnable(queue, new ConsoleGTRecordWriter())); feedData(cube, flatTable, queue, nInpRows); future.get(); } // round 2, zero input { - Future<?> future = executorService - .submit(cubeBuilder.buildAsRunnable(queue, new ConsoleGTRecordWriter())); + Future<?> future = executorService.submit(cubeBuilder.buildAsRunnable(queue, new ConsoleGTRecordWriter())); feedData(cube, flatTable, queue, 0); future.get(); } // round 3 { - Future<?> future = executorService - .submit(cubeBuilder.buildAsRunnable(queue, new ConsoleGTRecordWriter())); + Future<?> future = executorService.submit(cubeBuilder.buildAsRunnable(queue, new ConsoleGTRecordWriter())); feedData(cube, flatTable, queue, nInpRows); future.get(); } @@ -147,13 +144,11 @@ public class ITInMemCubeBuilderTest extends LocalFileMetadataTestCase { } } - static void feedData(final CubeInstance cube, final String flatTable, ArrayBlockingQueue<List<String>> queue, - int count) throws IOException, InterruptedException { + static void feedData(final CubeInstance cube, final String flatTable, ArrayBlockingQueue<List<String>> queue, int count) throws IOException, InterruptedException { feedData(cube, flatTable, queue, count, 0); } - static void feedData(final CubeInstance cube, final String flatTable, ArrayBlockingQueue<List<String>> queue, - int count, long randSeed) throws IOException, InterruptedException { + static void feedData(final CubeInstance cube, final String flatTable, ArrayBlockingQueue<List<String>> queue, int count, long randSeed) throws IOException, InterruptedException { IJoinedFlatTableDesc flatDesc = EngineFactory.getJoinedFlatTableDesc(cube.getDescriptor()); int nColumns = flatDesc.getAllColumns().size(); @@ -195,8 +190,7 @@ public class ITInMemCubeBuilderTest extends LocalFileMetadataTestCase { static Map<TblColRef, Dictionary<String>> getDictionaryMap(CubeInstance cube, String flatTable) throws IOException { Map<TblColRef, Dictionary<String>> result = Maps.newHashMap(); CubeDesc desc = cube.getDescriptor(); - CubeJoinedFlatTableEnrich flatDesc = new CubeJoinedFlatTableEnrich(EngineFactory.getJoinedFlatTableDesc(desc), - desc); + CubeJoinedFlatTableEnrich flatDesc = new CubeJoinedFlatTableEnrich(EngineFactory.getJoinedFlatTableDesc(desc), desc); int nColumns = flatDesc.getAllColumns().size(); List<TblColRef> columns = Cuboid.getBaseCuboid(desc).getColumns(); @@ -205,8 +199,7 @@ public class ITInMemCubeBuilderTest extends LocalFileMetadataTestCase { if (desc.getRowkey().isUseDictionary(col)) { logger.info("Building dictionary for " + col); List<String> valueList = readValueList(flatTable, nColumns, flatDesc.getRowKeyColumnIndexes()[c]); - Dictionary<String> dict = DictionaryGenerator.buildDictionary(col.getType(), - new IterableDictionaryValueEnumerator(valueList)); + Dictionary<String> dict = DictionaryGenerator.buildDictionary(col.getType(), new IterableDictionaryValueEnumerator(valueList)); result.put(col, dict); } } @@ -226,8 +219,7 @@ public class ITInMemCubeBuilderTest extends LocalFileMetadataTestCase { int colIdxOnFlat = flatTableIdx[i]; logger.info("Building dictionary for " + col); List<String> valueList = readValueList(flatTable, nColumns, colIdxOnFlat); - Dictionary<String> dict = DictionaryGenerator.buildDictionary(col.getType(), - new IterableDictionaryValueEnumerator(valueList)); + Dictionary<String> dict = DictionaryGenerator.buildDictionary(col.getType(), new IterableDictionaryValueEnumerator(valueList)); result.put(col, dict); } @@ -276,4 +268,4 @@ public class ITInMemCubeBuilderTest extends LocalFileMetadataTestCase { } } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/dict/ITGlobalDictionaryBuilderTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/dict/ITGlobalDictionaryBuilderTest.java b/kylin-it/src/test/java/org/apache/kylin/dict/ITGlobalDictionaryBuilderTest.java index 193a86b..df2ebf7 100644 --- a/kylin-it/src/test/java/org/apache/kylin/dict/ITGlobalDictionaryBuilderTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/dict/ITGlobalDictionaryBuilderTest.java @@ -18,12 +18,6 @@ package org.apache.kylin.dict; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; - -import java.io.IOException; -import java.util.concurrent.CountDownLatch; - import org.apache.hadoop.fs.Path; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.Dictionary; @@ -33,6 +27,12 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import java.io.IOException; +import java.util.concurrent.CountDownLatch; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + public class ITGlobalDictionaryBuilderTest extends HBaseMetadataTestCase { private DictionaryInfo dictionaryInfo; @@ -49,8 +49,7 @@ public class ITGlobalDictionaryBuilderTest extends HBaseMetadataTestCase { } private void cleanup() { - String BASE_DIR = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "/resources/GlobalDict" - + dictionaryInfo.getResourceDir() + "/"; + String BASE_DIR = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "/resources/GlobalDict" + dictionaryInfo.getResourceDir() + "/"; Path basePath = new Path(BASE_DIR); try { HadoopUtil.getFileSystem(basePath).delete(basePath, true); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java index 765b12c..bdf61f8 100644 --- a/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/jdbc/ITJDBCDriverTest.java @@ -222,9 +222,7 @@ public class ITJDBCDriverTest extends HBaseMetadataTestCase { public void testPreparedStatement() throws Exception { Connection conn = getConnection(); - PreparedStatement statement = conn.prepareStatement( - "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact " - + "where LSTG_FORMAT_NAME = ? group by LSTG_FORMAT_NAME"); + PreparedStatement statement = conn.prepareStatement("select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact " + "where LSTG_FORMAT_NAME = ? group by LSTG_FORMAT_NAME"); statement.setString(1, "FP-GTC"); @@ -244,8 +242,7 @@ public class ITJDBCDriverTest extends HBaseMetadataTestCase { @Test public void testResultSet() throws Exception { - String sql = "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact \n" - + " group by LSTG_FORMAT_NAME "; + String sql = "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact \n" + " group by LSTG_FORMAT_NAME "; Connection conn = getConnection(); Statement statement = conn.createStatement(); @@ -273,8 +270,7 @@ public class ITJDBCDriverTest extends HBaseMetadataTestCase { @Test public void testResultSetWithMaxRows() throws Exception { - String sql = "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact \n" - + " group by LSTG_FORMAT_NAME "; + String sql = "select LSTG_FORMAT_NAME, sum(price) as GMV, count(1) as TRANS_CNT from test_kylin_fact \n" + " group by LSTG_FORMAT_NAME "; Connection conn = getConnection(); Statement statement = conn.createStatement(); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java b/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java index 9e51306..1ea6507 100644 --- a/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java +++ b/kylin-it/src/test/java/org/apache/kylin/job/BaseTestDistributedScheduler.java @@ -86,7 +86,7 @@ public class BaseTestDistributedScheduler extends HBaseMetadataTestCase { kylinConfig2 = KylinConfig.createInstanceFromUri(new File(confDstPath2).getAbsolutePath()); initZk(); - + ZookeeperDistributedLock.Factory factory = new ZookeeperDistributedLock.Factory(kylinConfig1); jobLock1 = (ZookeeperDistributedLock) factory.lockForClient(serverName1); jobLock2 = (ZookeeperDistributedLock) factory.lockForClient(serverName2); @@ -114,7 +114,7 @@ public class BaseTestDistributedScheduler extends HBaseMetadataTestCase { @AfterClass public static void after() throws Exception { jobLock1.purgeLocks(""); - + if (scheduler1 != null) { scheduler1.shutdown(); scheduler1 = null; @@ -138,8 +138,7 @@ public class BaseTestDistributedScheduler extends HBaseMetadataTestCase { while (true) { AbstractExecutable job = execMgr.getJob(jobId); final ExecutableState status = job.getStatus(); - if (status == ExecutableState.SUCCEED || status == ExecutableState.ERROR - || status == ExecutableState.STOPPED || status == ExecutableState.DISCARDED) { + if (status == ExecutableState.SUCCEED || status == ExecutableState.ERROR || status == ExecutableState.STOPPED || status == ExecutableState.DISCARDED) { break; } else { try { @@ -197,7 +196,6 @@ public class BaseTestDistributedScheduler extends HBaseMetadataTestCase { } private String getFullLockPath(String segName) { - return DistributedScheduler.dropDoubleSlash( - "/kylin/" + kylinConfig1.getMetadataUrlPrefix() + DistributedScheduler.getLockPath(segName)); + return DistributedScheduler.dropDoubleSlash("/kylin/" + kylinConfig1.getMetadataUrlPrefix() + DistributedScheduler.getLockPath(segName)); } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java index 4c6f387..5719523 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java @@ -55,13 +55,13 @@ import org.apache.kylin.job.execution.DefaultChainedExecutable; import org.apache.kylin.job.execution.ExecutableManager; import org.apache.kylin.job.execution.ExecutableState; import org.apache.kylin.job.impl.threadpool.DefaultScheduler; -import org.apache.kylin.rest.job.StorageCleanupJob; import org.apache.kylin.source.ISource; import org.apache.kylin.source.SourceFactory; import org.apache.kylin.source.SourcePartition; import org.apache.kylin.storage.hbase.HBaseConnection; import org.apache.kylin.storage.hbase.util.HBaseRegionSizeCalculator; import org.apache.kylin.storage.hbase.util.ZookeeperJobLock; +import org.apache.kylin.rest.job.StorageCleanupJob; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -125,8 +125,7 @@ public class BuildCubeWithEngine { System.setProperty("SPARK_HOME", "/usr/local/spark"); // need manually create and put spark to this folder on Jenkins System.setProperty("kylin.hadoop.conf.dir", HBaseMetadataTestCase.SANDBOX_TEST_DATA); if (StringUtils.isEmpty(System.getProperty("hdp.version"))) { - throw new RuntimeException( - "No hdp.version set; Please set hdp.version in your jvm option, for example: -Dhdp.version=2.4.0.0-169"); + throw new RuntimeException("No hdp.version set; Please set hdp.version in your jvm option, for example: -Dhdp.version=2.4.0.0-169"); } HBaseMetadataTestCase.staticCreateTestMetadata(HBaseMetadataTestCase.SANDBOX_TEST_DATA); @@ -141,10 +140,7 @@ public class BuildCubeWithEngine { throw new IOException("mkdir fails"); } } catch (IOException e) { - throw new RuntimeException( - "failed to create kylin.env.hdfs-working-dir, Please make sure the user has right to access " - + KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory(), - e); + throw new RuntimeException("failed to create kylin.env.hdfs-working-dir, Please make sure the user has right to access " + KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory(), e); } } @@ -344,8 +340,7 @@ public class BuildCubeWithEngine { private Boolean buildSegment(String cubeName, long startDate, long endDate) throws Exception { CubeInstance cubeInstance = cubeManager.getCube(cubeName); ISource source = SourceFactory.getSource(cubeInstance); - SourcePartition partition = source.enrichSourcePartitionBeforeBuild(cubeInstance, - new SourcePartition(0, endDate, 0, 0, null, null)); + SourcePartition partition = source.enrichSourcePartitionBeforeBuild(cubeInstance, new SourcePartition(0, endDate, 0, 0, null, null)); CubeSegment segment = cubeManager.appendSegment(cubeInstance, partition.getStartDate(), partition.getEndDate()); DefaultChainedExecutable job = EngineFactory.createBatchCubingJob(segment, "TEST"); jobService.addJob(job); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java index 901486d..9c80413 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithStream.java @@ -60,7 +60,6 @@ import org.apache.kylin.job.streaming.Kafka10DataLoader; import org.apache.kylin.metadata.model.SegmentStatusEnum; import org.apache.kylin.metadata.streaming.StreamingConfig; import org.apache.kylin.metadata.streaming.StreamingManager; -import org.apache.kylin.rest.job.StorageCleanupJob; import org.apache.kylin.source.ISource; import org.apache.kylin.source.SourceFactory; import org.apache.kylin.source.SourcePartition; @@ -69,6 +68,7 @@ import org.apache.kylin.source.kafka.config.BrokerConfig; import org.apache.kylin.source.kafka.config.KafkaConfig; import org.apache.kylin.storage.hbase.util.ZookeeperJobLock; import org.apache.kylin.storage.hbase.util.ZookeeperUtil; +import org.apache.kylin.rest.job.StorageCleanupJob; import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -235,8 +235,7 @@ public class BuildCubeWithStream { for (int i = 0; i < futures.size(); i++) { ExecutableState result = futures.get(i).get(20, TimeUnit.MINUTES); logger.info("Checking building task " + i + " whose state is " + result); - Assert.assertTrue( - result == null || result == ExecutableState.SUCCEED || result == ExecutableState.DISCARDED); + Assert.assertTrue(result == null || result == ExecutableState.SUCCEED || result == ExecutableState.DISCARDED); if (result == ExecutableState.SUCCEED) succeedBuild++; } @@ -265,8 +264,7 @@ public class BuildCubeWithStream { } private ExecutableState mergeSegment(String cubeName, long startOffset, long endOffset) throws Exception { - CubeSegment segment = cubeManager.mergeSegments(cubeManager.getCube(cubeName), 0, 0, startOffset, endOffset, - false); + CubeSegment segment = cubeManager.mergeSegments(cubeManager.getCube(cubeName), 0, 0, startOffset, endOffset, false); DefaultChainedExecutable job = EngineFactory.createBatchMergeJob(segment, "TEST"); jobService.addJob(job); waitForJob(job.getId()); @@ -284,8 +282,7 @@ public class BuildCubeWithStream { protected ExecutableState buildSegment(String cubeName, long startOffset, long endOffset) throws Exception { CubeInstance cubeInstance = cubeManager.getCube(cubeName); ISource source = SourceFactory.getSource(cubeInstance); - SourcePartition partition = source.enrichSourcePartitionBeforeBuild(cubeInstance, - new SourcePartition(0, 0, startOffset, endOffset, null, null)); + SourcePartition partition = source.enrichSourcePartitionBeforeBuild(cubeInstance, new SourcePartition(0, 0, startOffset, endOffset, null, null)); CubeSegment segment = cubeManager.appendSegment(cubeManager.getCube(cubeName), partition); DefaultChainedExecutable job = EngineFactory.createBatchCubingJob(segment, "TEST"); jobService.addJob(job); @@ -304,8 +301,7 @@ public class BuildCubeWithStream { ClassUtil.addClasspath(new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath()); System.setProperty(KylinConfig.KYLIN_CONF, HBaseMetadataTestCase.SANDBOX_TEST_DATA); if (StringUtils.isEmpty(System.getProperty("hdp.version"))) { - throw new RuntimeException( - "No hdp.version set; Please set hdp.version in your jvm option, for example: -Dhdp.version=2.4.0.0-169"); + throw new RuntimeException("No hdp.version set; Please set hdp.version in your jvm option, for example: -Dhdp.version=2.4.0.0-169"); } HBaseMetadataTestCase.staticCreateTestMetadata(HBaseMetadataTestCase.SANDBOX_TEST_DATA); } @@ -333,8 +329,7 @@ public class BuildCubeWithStream { protected void waitForJob(String jobId) { while (true) { AbstractExecutable job = jobService.getJob(jobId); - if (job.getStatus() == ExecutableState.SUCCEED || job.getStatus() == ExecutableState.ERROR - || job.getStatus() == ExecutableState.DISCARDED) { + if (job.getStatus() == ExecutableState.SUCCEED || job.getStatus() == ExecutableState.ERROR || job.getStatus() == ExecutableState.DISCARDED) { break; } else { try { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/provision/MockKafka.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/MockKafka.java b/kylin-it/src/test/java/org/apache/kylin/provision/MockKafka.java index a57acb6..fce422a 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/MockKafka.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/MockKafka.java @@ -38,8 +38,7 @@ import kafka.server.KafkaServerStartable; import kafka.utils.ZkUtils; public class MockKafka { - private static Properties createProperties(ZkConnection zkServerConnection, String logDir, String port, - String brokerId) { + private static Properties createProperties(ZkConnection zkServerConnection, String logDir, String port, String brokerId) { Properties properties = new Properties(); properties.put("port", port); properties.put("broker.id", brokerId); @@ -60,8 +59,7 @@ public class MockKafka { private ZkConnection zkConnection; public MockKafka(ZkConnection zkServerConnection) { - this(zkServerConnection, System.getProperty("java.io.tmpdir") + "/" + UUID.randomUUID().toString(), "9092", - "1"); + this(zkServerConnection, System.getProperty("java.io.tmpdir") + "/" + UUID.randomUUID().toString(), "9092", "1"); start(); } @@ -71,16 +69,14 @@ public class MockKafka { } public MockKafka(ZkConnection zkServerConnection, int port, int brokerId) { - this(zkServerConnection, System.getProperty("java.io.tmpdir") + "/" + UUID.randomUUID().toString(), - String.valueOf(port), String.valueOf(brokerId)); + this(zkServerConnection, System.getProperty("java.io.tmpdir") + "/" + UUID.randomUUID().toString(), String.valueOf(port), String.valueOf(brokerId)); //start(); } private MockKafka(ZkConnection zkServerConnection, String logDir, String port, String brokerId) { this(createProperties(zkServerConnection, logDir, port, brokerId)); this.zkConnection = zkServerConnection; - System.out.println(String.format("Kafka %s:%s dir:%s", kafkaServer.serverConfig().brokerId(), - kafkaServer.serverConfig().port(), kafkaServer.serverConfig().logDirs())); + System.out.println(String.format("Kafka %s:%s dir:%s", kafkaServer.serverConfig().brokerId(), kafkaServer.serverConfig().port(), kafkaServer.serverConfig().logDirs())); } public void createTopic(String topic, int partition, int replication) { @@ -191,4 +187,4 @@ class ZKStringSerializer implements ZkSerializer { } } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java b/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java index ec0ba6b..78ed1b6 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/H2Database.java @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.google.common.collect.Lists; import org.apache.commons.io.IOUtils; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.metadata.MetadataManager; @@ -37,8 +38,6 @@ import org.apache.kylin.metadata.model.TableDesc; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.Lists; - public class H2Database { @SuppressWarnings("unused") private static final Logger logger = LoggerFactory.getLogger(H2Database.class); @@ -139,8 +138,7 @@ public class H2Database { csvColumns.append(col.getName()); } ddl.append(")" + "\n"); - ddl.append("AS SELECT * FROM CSVREAD('" + csvFilePath + "', '" + csvColumns - + "', 'charset=UTF-8 fieldSeparator=,');"); + ddl.append("AS SELECT * FROM CSVREAD('" + csvFilePath + "', '" + csvColumns + "', 'charset=UTF-8 fieldSeparator=,');"); return ddl.toString(); } @@ -151,8 +149,7 @@ public class H2Database { for (ColumnDesc col : tableDesc.getColumns()) { if ("T".equalsIgnoreCase(col.getIndex())) { StringBuilder ddl = new StringBuilder(); - ddl.append("CREATE INDEX IDX_" + tableDesc.getName() + "_" + x + " ON " + tableDesc.getIdentity() + "(" - + col.getName() + ")"); + ddl.append("CREATE INDEX IDX_" + tableDesc.getName() + "_" + x + " ON " + tableDesc.getIdentity() + "(" + col.getName() + ")"); ddl.append("\n"); result.add(ddl.toString()); x++; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/query/HackedDbUnitAssert.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/HackedDbUnitAssert.java b/kylin-it/src/test/java/org/apache/kylin/query/HackedDbUnitAssert.java index 5b9c5d7..3a21570 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/HackedDbUnitAssert.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/HackedDbUnitAssert.java @@ -54,8 +54,7 @@ public class HackedDbUnitAssert extends DbUnitAssert { } // THIS METHOD IS MOSTLY COPIED FROM DbUnitAssert. CHANGES ARE LEAD BY hackXXX CONDITION CHECKS. - public void assertEquals(ITable expectedTable, ITable actualTable, FailureHandler failureHandler) - throws DatabaseUnitException { + public void assertEquals(ITable expectedTable, ITable actualTable, FailureHandler failureHandler) throws DatabaseUnitException { logger.trace("assertEquals(expectedTable, actualTable, failureHandler) - start"); logger.debug("assertEquals: expectedTable={}", expectedTable); logger.debug("assertEquals: actualTable={}", actualTable); @@ -63,8 +62,7 @@ public class HackedDbUnitAssert extends DbUnitAssert { // Do not continue if same instance if (expectedTable == actualTable) { - logger.debug("The given tables reference the same object. Will return immediately. (Table={})", - expectedTable); + logger.debug("The given tables reference the same object. Will return immediately. (Table={})", expectedTable); return; } @@ -83,8 +81,7 @@ public class HackedDbUnitAssert extends DbUnitAssert { if (!hackCheckContains) { if (expectedRowsCount != actualRowsCount) { String msg = "row count (table=" + expectedTableName + ")"; - Error error = failureHandler.createFailure(msg, String.valueOf(expectedRowsCount), - String.valueOf(actualRowsCount)); + Error error = failureHandler.createFailure(msg, String.valueOf(expectedRowsCount), String.valueOf(actualRowsCount)); logger.error(error.toString()); throw error; } @@ -105,15 +102,13 @@ public class HackedDbUnitAssert extends DbUnitAssert { Columns.ColumnDiff columnDiff = Columns.getColumnDiff(expectedMetaData, actualMetaData); if (columnDiff.hasDifference()) { String message = columnDiff.getMessage(); - Error error = failureHandler.createFailure(message, Columns.getColumnNamesAsString(expectedColumns), - Columns.getColumnNamesAsString(actualColumns)); + Error error = failureHandler.createFailure(message, Columns.getColumnNamesAsString(expectedColumns), Columns.getColumnNamesAsString(actualColumns)); logger.error(error.toString()); throw error; } // Get the datatypes to be used for comparing the sorted columns - ComparisonColumn[] comparisonCols = getComparisonColumns(expectedTableName, expectedColumns, actualColumns, - failureHandler); + ComparisonColumn[] comparisonCols = getComparisonColumns(expectedTableName, expectedColumns, actualColumns, failureHandler); // Finally compare the data if (hackCheckContains) @@ -124,8 +119,7 @@ public class HackedDbUnitAssert extends DbUnitAssert { // THIS METHOD IS COPIED FROM SUPER CLASS TO CHANGE ComparisonColumn TO OUR OWN. @Override - protected ComparisonColumn[] getComparisonColumns(String expectedTableName, Column[] expectedColumns, - Column[] actualColumns, FailureHandler failureHandler) { + protected ComparisonColumn[] getComparisonColumns(String expectedTableName, Column[] expectedColumns, Column[] actualColumns, FailureHandler failureHandler) { ComparisonColumn[] result = new ComparisonColumn[expectedColumns.length]; for (int j = 0; j < expectedColumns.length; j++) { @@ -141,12 +135,11 @@ public class HackedDbUnitAssert extends DbUnitAssert { private String columnName; private DataType dataType; - public HackedComparisonColumn(String tableName, Column expectedColumn, Column actualColumn, - FailureHandler failureHandler) { - + public HackedComparisonColumn(String tableName, Column expectedColumn, Column actualColumn, FailureHandler failureHandler) { + // super class is actually useless, all public methods are overridden below super(tableName, expectedColumn, expectedColumn, failureHandler); - + this.columnName = expectedColumn.getColumnName(); this.dataType = getComparisonDataType(tableName, expectedColumn, actualColumn, failureHandler); } @@ -162,12 +155,9 @@ public class HackedDbUnitAssert extends DbUnitAssert { } // COPIED FROM SUPER CLASS, CHANGES ARE LEAD BY hackXXX CONDITION CHECKS. - private DataType getComparisonDataType(String tableName, Column expectedColumn, Column actualColumn, - FailureHandler failureHandler) { + private DataType getComparisonDataType(String tableName, Column expectedColumn, Column actualColumn, FailureHandler failureHandler) { if (logger.isDebugEnabled()) - logger.debug( - "getComparisonDataType(tableName={}, expectedColumn={}, actualColumn={}, failureHandler={}) - start", - new Object[] { tableName, expectedColumn, actualColumn, failureHandler }); + logger.debug("getComparisonDataType(tableName={}, expectedColumn={}, actualColumn={}, failureHandler={}) - start", new Object[] { tableName, expectedColumn, actualColumn, failureHandler }); DataType expectedDataType = expectedColumn.getDataType(); DataType actualDataType = actualColumn.getDataType(); @@ -183,17 +173,15 @@ public class HackedDbUnitAssert extends DbUnitAssert { if (actualDataType instanceof UnknownDataType) { return expectedDataType; } - + if (hackIgnoreIntBigIntMismatch) { if (expectedDataType instanceof IntegerDataType && actualDataType instanceof BigIntegerDataType) return actualDataType; } // Impossible to determine which data type to use - String msg = "Incompatible data types: (table=" + tableName + ", col=" + expectedColumn.getColumnName() - + ")"; - throw failureHandler.createFailure(msg, String.valueOf(expectedDataType), - String.valueOf(actualDataType)); + String msg = "Incompatible data types: (table=" + tableName + ", col=" + expectedColumn.getColumnName() + ")"; + throw failureHandler.createFailure(msg, String.valueOf(expectedDataType), String.valueOf(actualDataType)); } // Both columns have same data type, return any one of them @@ -202,10 +190,8 @@ public class HackedDbUnitAssert extends DbUnitAssert { } - private void compareDataContains(ITable expectedTable, ITable actualTable, ComparisonColumn[] comparisonCols, - FailureHandler failureHandler) throws DataSetException { - logger.debug("compareData(expectedTable={}, actualTable={}, " + "comparisonCols={}, failureHandler={}) - start", - new Object[] { expectedTable, actualTable, comparisonCols, failureHandler }); + private void compareDataContains(ITable expectedTable, ITable actualTable, ComparisonColumn[] comparisonCols, FailureHandler failureHandler) throws DataSetException { + logger.debug("compareData(expectedTable={}, actualTable={}, " + "comparisonCols={}, failureHandler={}) - start", new Object[] { expectedTable, actualTable, comparisonCols, failureHandler }); if (expectedTable == null) { throw new NullPointerException("The parameter 'expectedTable' must not be null"); @@ -228,8 +214,7 @@ public class HackedDbUnitAssert extends DbUnitAssert { } - private boolean findRowInExpectedTable(ITable expectedTable, ITable actualTable, ComparisonColumn[] comparisonCols, - FailureHandler failureHandler, int index) throws DataSetException { + private boolean findRowInExpectedTable(ITable expectedTable, ITable actualTable, ComparisonColumn[] comparisonCols, FailureHandler failureHandler, int index) throws DataSetException { // iterate over all rows for (int i = 0; i < expectedTable.getRowCount(); i++) { @@ -247,8 +232,7 @@ public class HackedDbUnitAssert extends DbUnitAssert { // Compare the values if (skipCompare(columnName, expectedValue, actualValue)) { if (logger.isTraceEnabled()) { - logger.trace("ignoring comparison " + expectedValue + "=" + actualValue + " on column " - + columnName); + logger.trace("ignoring comparison " + expectedValue + "=" + actualValue + " on column " + columnName); } continue; } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/query/ITCombinationTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/ITCombinationTest.java b/kylin-it/src/test/java/org/apache/kylin/query/ITCombinationTest.java index f5b41d6..0bed5ed 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/ITCombinationTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/ITCombinationTest.java @@ -74,8 +74,7 @@ public class ITCombinationTest extends ITKylinQueryTest { public ITCombinationTest(String joinType, String coprocessorToggle, String queryEngine) throws Exception { - logger.info("Into combination join type: " + joinType + ", coprocessor toggle: " + coprocessorToggle - + ", query engine: " + queryEngine); + logger.info("Into combination join type: " + joinType + ", coprocessor toggle: " + coprocessorToggle + ", query engine: " + queryEngine); ITKylinQueryTest.clean(); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java index 55270e4..55041e3 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java @@ -83,8 +83,7 @@ public class ITKylinQueryTest extends KylinTestBase { try { Map<String, String> toggles = Maps.newHashMap(); - toggles.put(BackdoorToggles.DEBUG_TOGGLE_COPROCESSOR_BEHAVIOR, - StorageSideBehavior.SCAN_FILTER_AGGR_CHECKMEM_WITHDELAY.toString());//delay 10ms for every scan + toggles.put(BackdoorToggles.DEBUG_TOGGLE_COPROCESSOR_BEHAVIOR, StorageSideBehavior.SCAN_FILTER_AGGR_CHECKMEM_WITHDELAY.toString());//delay 10ms for every scan BackdoorToggles.setToggles(toggles); KylinConfig.getInstanceFromEnv().setProperty("kylin.storage.hbase.coprocessor-timeout-seconds", "3"); @@ -106,8 +105,7 @@ public class ITKylinQueryTest extends KylinTestBase { } protected void runTimeoutQueries() throws Exception { - List<File> sqlFiles = getFilesFromFolder( - new File(getQueryFolderPrefix() + "src/test/resources/query/sql_timeout"), ".sql"); + List<File> sqlFiles = getFilesFromFolder(new File(getQueryFolderPrefix() + "src/test/resources/query/sql_timeout"), ".sql"); for (File sqlFile : sqlFiles) { try { runSQL(sqlFile, false, false); @@ -239,8 +237,7 @@ public class ITKylinQueryTest extends KylinTestBase { @Test public void testComputedColumnsQuery() throws Exception { - execAndCompQuery(getQueryFolderPrefix() + "src/test/resources/query/sql_computedcolumn", null, true, - CompareQueryBySuffix.INSTANCE); + execAndCompQuery(getQueryFolderPrefix() + "src/test/resources/query/sql_computedcolumn", null, true, CompareQueryBySuffix.INSTANCE); } @Test @@ -339,8 +336,7 @@ public class ITKylinQueryTest extends KylinTestBase { @Test public void testLimitEnabled() throws Exception { - List<File> sqlFiles = getFilesFromFolder( - new File(getQueryFolderPrefix() + "src/test/resources/query/sql_limit"), ".sql"); + List<File> sqlFiles = getFilesFromFolder(new File(getQueryFolderPrefix() + "src/test/resources/query/sql_limit"), ".sql"); for (File sqlFile : sqlFiles) { runSQL(sqlFile, false, false); assertTrue(checkFinalPushDownLimit()); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/query/ITMassInQueryTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/ITMassInQueryTest.java b/kylin-it/src/test/java/org/apache/kylin/query/ITMassInQueryTest.java index c1e3ef5..cca0be6 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/ITMassInQueryTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/ITMassInQueryTest.java @@ -142,8 +142,7 @@ public class ITMassInQueryTest extends KylinTestBase { ITable kylinTable = executeQuery(kylinConn, queryName, sql, needSort); // execute H2 - sql = sql.replace("massin(test_kylin_fact.SELLER_ID,'vip_customers')", "test_kylin_fact.SELLER_ID in ( " - + org.apache.commons.lang.StringUtils.join(vipSellers, ",") + ")"); + sql = sql.replace("massin(test_kylin_fact.SELLER_ID,'vip_customers')", "test_kylin_fact.SELLER_ID in ( " + org.apache.commons.lang.StringUtils.join(vipSellers, ",") + ")"); logger.info("Query Result from H2 - " + queryName); logger.info("Query for H2 - " + sql); ITable h2Table = executeQuery(newH2Connection(), queryName, sql, needSort); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java b/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java index f6b520a..42f3a44 100644 --- a/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java +++ b/kylin-it/src/test/java/org/apache/kylin/query/KylinTestBase.java @@ -42,14 +42,15 @@ import java.util.Set; import java.util.TreeSet; import java.util.logging.LogManager; +import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.HBaseMetadataTestCase; import org.apache.kylin.common.util.Pair; import org.apache.kylin.metadata.project.ProjectInstance; -import org.apache.kylin.metadata.querymeta.SelectedColumnMeta; import org.apache.kylin.query.relnode.OLAPContext; import org.apache.kylin.query.routing.rules.RemoveBlackoutRealizationsRule; +import org.apache.kylin.metadata.querymeta.SelectedColumnMeta; import org.apache.kylin.rest.util.AdHocUtil; import org.dbunit.DatabaseUnitException; import org.dbunit.database.DatabaseConfig; @@ -69,7 +70,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import com.google.common.io.Files; /** @@ -110,8 +110,7 @@ public class KylinTestBase { // h2 (BIGINT) public static class TestH2DataTypeFactory extends H2DataTypeFactory { @Override - public DataType createDataType(int sqlType, String sqlTypeName, String tableName, String columnName) - throws DataTypeException { + public DataType createDataType(int sqlType, String sqlTypeName, String tableName, String columnName) throws DataTypeException { if ((columnName.startsWith("COL") || columnName.startsWith("col")) && sqlType == Types.BIGINT) { return DataType.INTEGER; @@ -224,8 +223,7 @@ public class KylinTestBase { // //////////////////////////////////////////////////////////////////////////////////////// // execute - protected ITable executeQuery(IDatabaseConnection dbConn, String queryName, String sql, boolean needSort) - throws Exception { + protected ITable executeQuery(IDatabaseConnection dbConn, String queryName, String sql, boolean needSort) throws Exception { // change join type to match current setting sql = changeJoinType(sql, joinType); @@ -260,7 +258,7 @@ public class KylinTestBase { return output(resultSet, needDisplay); } catch (SQLException sqlException) { - List<List<String>> results = Lists.newArrayList(); + List<List<String>> results = Lists.newArrayList(); List<SelectedColumnMeta> columnMetas = Lists.newArrayList(); AdHocUtil.doAdHocQuery(sql, results, columnMetas, sqlException); return results.size(); @@ -282,8 +280,7 @@ public class KylinTestBase { } } - protected ITable executeDynamicQuery(IDatabaseConnection dbConn, String queryName, String sql, - List<String> parameters, boolean needSort) throws Exception { + protected ITable executeDynamicQuery(IDatabaseConnection dbConn, String queryName, String sql, List<String> parameters, boolean needSort) throws Exception { // change join type to match current setting sql = changeJoinType(sql, joinType); @@ -319,8 +316,7 @@ public class KylinTestBase { String[] tokens = StringUtils.split(sql, null);// split white spaces for (int i = 0; i < tokens.length - 1; ++i) { - if ((tokens[i].equalsIgnoreCase("inner") || tokens[i].equalsIgnoreCase("left")) - && tokens[i + 1].equalsIgnoreCase("join")) { + if ((tokens[i].equalsIgnoreCase("inner") || tokens[i].equalsIgnoreCase("left")) && tokens[i + 1].equalsIgnoreCase("join")) { tokens[i] = targetType.toLowerCase(); } } @@ -411,8 +407,7 @@ public class KylinTestBase { } } - protected void execAndCompResultSize(String queryFolder, String[] exclusiveQuerys, boolean needSort) - throws Exception { + protected void execAndCompResultSize(String queryFolder, String[] exclusiveQuerys, boolean needSort) throws Exception { logger.info("---------- test folder: " + queryFolder); Set<String> exclusiveSet = buildExclusiveSet(exclusiveQuerys); @@ -509,6 +504,7 @@ public class KylinTestBase { logger.info("Queries appended with limit: " + appendLimitQueries); } + protected void execAndCompQuery(String queryFolder, String[] exclusiveQuerys, boolean needSort) throws Exception { execAndCompQuery(queryFolder, exclusiveQuerys, needSort, new ICompareQueryTranslator() { @Override @@ -522,8 +518,7 @@ public class KylinTestBase { }); } - protected void execAndCompQuery(String queryFolder, String[] exclusiveQuerys, boolean needSort, - ICompareQueryTranslator translator) throws Exception { + protected void execAndCompQuery(String queryFolder, String[] exclusiveQuerys, boolean needSort, ICompareQueryTranslator translator) throws Exception { logger.info("---------- test folder: " + new File(queryFolder).getAbsolutePath()); Set<String> exclusiveSet = buildExclusiveSet(exclusiveQuerys); @@ -562,8 +557,7 @@ public class KylinTestBase { } } - protected void execAndCompDynamicQuery(String queryFolder, String[] exclusiveQuerys, boolean needSort) - throws Exception { + protected void execAndCompDynamicQuery(String queryFolder, String[] exclusiveQuerys, boolean needSort) throws Exception { logger.info("---------- test folder: " + queryFolder); Set<String> exclusiveSet = buildExclusiveSet(exclusiveQuerys); @@ -689,8 +683,7 @@ public class KylinTestBase { cubeConnection = QueryDataSource.create(ProjectInstance.DEFAULT_PROJECT_NAME, config).getConnection(); //setup h2 - h2Connection = DriverManager.getConnection("jdbc:h2:mem:db" + (h2InstanceCount++) + ";CACHE_SIZE=32072", "sa", - ""); + h2Connection = DriverManager.getConnection("jdbc:h2:mem:db" + (h2InstanceCount++) + ";CACHE_SIZE=32072", "sa", ""); // Load H2 Tables (inner join) H2Database h2DB = new H2Database(h2Connection, config); h2DB.loadAllTables(); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java b/kylin-it/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java index 9bfb643..d972eeb 100644 --- a/kylin-it/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/source/hive/ITHiveSourceTableLoaderTest.java @@ -25,8 +25,8 @@ import org.apache.kylin.common.util.Pair; import org.apache.kylin.metadata.model.TableDesc; import org.apache.kylin.metadata.model.TableExtDesc; import org.apache.kylin.source.ISource; -import org.apache.kylin.source.ISourceMetadataExplorer; import org.apache.kylin.source.SourceFactory; +import org.apache.kylin.source.ISourceMetadataExplorer; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -48,13 +48,13 @@ public class ITHiveSourceTableLoaderTest extends HBaseMetadataTestCase { ISource source = SourceFactory.getDefaultSource(); ISourceMetadataExplorer explr = source.getSourceMetadataExplorer(); Pair<TableDesc, TableExtDesc> pair; - + pair = explr.loadTableMetadata("DEFAULT", "TEST_KYLIN_FACT"); assertTrue(pair.getFirst().getIdentity().equals("DEFAULT.TEST_KYLIN_FACT")); - + pair = explr.loadTableMetadata("EDW", "TEST_CAL_DT"); assertTrue(pair.getFirst().getIdentity().equals("EDW.TEST_CAL_DT")); - + } } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java index 8540116..65d5b52 100644 --- a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITAclTableMigrationToolTest.java @@ -71,8 +71,7 @@ public class ITAclTableMigrationToolTest extends HBaseMetadataTestCase { private TableName userTable = TableName.valueOf(STORE_WITH_OLD_TABLE + AclHBaseStorage.USER_TABLE_NAME); - private Serializer<UserGrantedAuthority[]> ugaSerializer = new Serializer<UserGrantedAuthority[]>( - UserGrantedAuthority[].class); + private Serializer<UserGrantedAuthority[]> ugaSerializer = new Serializer<UserGrantedAuthority[]>(UserGrantedAuthority[].class); private AclTableMigrationTool aclTableMigrationJob; @@ -128,8 +127,7 @@ public class ITAclTableMigrationToolTest extends HBaseMetadataTestCase { private void createTestHTables() throws IOException { Configuration conf = HBaseConnection.getCurrentHBaseConfiguration(); Admin hbaseAdmin = new HBaseAdmin(conf); - creatTable(hbaseAdmin, conf, aclTable, - new String[] { AclHBaseStorage.ACL_INFO_FAMILY, AclHBaseStorage.ACL_ACES_FAMILY }); + creatTable(hbaseAdmin, conf, aclTable, new String[] { AclHBaseStorage.ACL_INFO_FAMILY, AclHBaseStorage.ACL_ACES_FAMILY }); creatTable(hbaseAdmin, conf, userTable, new String[] { AclHBaseStorage.USER_AUTHORITY_FAMILY }); } @@ -137,8 +135,7 @@ public class ITAclTableMigrationToolTest extends HBaseMetadataTestCase { Table htable = HBaseConnection.get(kylinConfig.getStorageUrl()).getTable(userTable); Pair<byte[], byte[]> pair = getRandomUserRecord(); Put put = new Put(pair.getKey()); - put.addColumn(Bytes.toBytes(AclHBaseStorage.USER_AUTHORITY_FAMILY), - Bytes.toBytes(AclHBaseStorage.USER_AUTHORITY_COLUMN), pair.getSecond()); + put.addColumn(Bytes.toBytes(AclHBaseStorage.USER_AUTHORITY_FAMILY), Bytes.toBytes(AclHBaseStorage.USER_AUTHORITY_COLUMN), pair.getSecond()); htable.put(put); } http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java index 6be724e..fd91397 100644 --- a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITHBaseResourceStoreTest.java @@ -18,9 +18,6 @@ package org.apache.kylin.storage.hbase; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; @@ -33,6 +30,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class ITHBaseResourceStoreTest extends HBaseMetadataTestCase { private KylinConfig kylinConfig; @@ -59,8 +59,7 @@ public class ITHBaseResourceStoreTest extends HBaseMetadataTestCase { String path = "/cube/_test_large_cell.json"; String largeContent = "THIS_IS_A_LARGE_CELL"; StringEntity content = new StringEntity(largeContent); - String oldUrl = ResourceStoreTest.replaceMetadataUrl(kylinConfig, - ResourceStoreTest.mockUrl("hbase", kylinConfig)); + String oldUrl = ResourceStoreTest.replaceMetadataUrl(kylinConfig, ResourceStoreTest.mockUrl("hbase", kylinConfig)); HBaseResourceStore store = new HBaseResourceStore(KylinConfig.getInstanceFromEnv()); Configuration hconf = store.getConnection().getConfiguration(); int origSize = Integer.parseInt(hconf.get("hbase.client.keyvalue.maxsize", "10485760")); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITStorageTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITStorageTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITStorageTest.java index 112740e..24589a8 100644 --- a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITStorageTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITStorageTest.java @@ -131,16 +131,13 @@ public class ITStorageTest extends HBaseMetadataTestCase { assertTrue(count > 0); } */ - private int search(List<TblColRef> groups, List<FunctionDesc> aggregations, TupleFilter filter, - StorageContext context) { + private int search(List<TblColRef> groups, List<FunctionDesc> aggregations, TupleFilter filter, StorageContext context) { int count = 0; ITupleIterator iterator = null; try { - SQLDigest sqlDigest = new SQLDigest("default.test_kylin_fact", - /*allCol*/ Collections.<TblColRef> emptySet(), /*join*/ null, // + SQLDigest sqlDigest = new SQLDigest("default.test_kylin_fact", /*allCol*/ Collections.<TblColRef> emptySet(), /*join*/ null, // groups, /*subqueryJoinParticipants*/ Sets.<TblColRef> newHashSet(), // - /*metricCol*/ Collections.<TblColRef> emptySet(), aggregations, - /*aggrSqlCalls*/ Collections.<SQLCall> emptyList(), // + /*metricCol*/ Collections.<TblColRef> emptySet(), aggregations, /*aggrSqlCalls*/ Collections.<SQLCall> emptyList(), // /*filter col*/ Collections.<TblColRef> emptySet(), filter, null, // /*sortCol*/ new ArrayList<TblColRef>(), new ArrayList<SQLDigest.OrderEnum>(), false); iterator = storageEngine.search(context, sqlDigest, mockup.newTupleInfo(groups, aggregations)); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITZookeeperDistributedLockTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITZookeeperDistributedLockTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITZookeeperDistributedLockTest.java index 00d57fd..48d6736 100644 --- a/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITZookeeperDistributedLockTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/storage/hbase/ITZookeeperDistributedLockTest.java @@ -176,7 +176,7 @@ public class ITZookeeperDistributedLockTest extends HBaseMetadataTestCase { for (int i = 0; i < nClients; i++) { threads[i].join(); } - + Thread.sleep(3000); // verify counters http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java index a64bc7c..82e0406 100644 --- a/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITHDFSResourceStoreTest.java @@ -18,6 +18,7 @@ package org.apache.kylin.storage.hdfs; + import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.persistence.ResourceStoreTest; import org.apache.kylin.common.util.HBaseMetadataTestCase; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITLockManagerTest.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITLockManagerTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITLockManagerTest.java index 6a0779f..5587eee 100644 --- a/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITLockManagerTest.java +++ b/kylin-it/src/test/java/org/apache/kylin/storage/hdfs/ITLockManagerTest.java @@ -17,19 +17,6 @@ */ package org.apache.kylin.storage.hdfs; -import static org.junit.Assert.assertEquals; - -import java.io.Closeable; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.FutureTask; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - import org.apache.curator.RetryPolicy; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; @@ -44,6 +31,19 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.Closeable; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.FutureTask; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import static org.junit.Assert.assertEquals; + public class ITLockManagerTest extends HBaseMetadataTestCase { private KylinConfig kylinConfig; @@ -110,8 +110,7 @@ public class ITLockManagerTest extends HBaseMetadataTestCase { public Void call() throws Exception { LockManager threadLocalLockManager = new LockManager(kylinConfig, lockRootPath); try { - ExampleClientThatLocks example = new ExampleClientThatLocks(threadLocalLockManager, - lockRootPath, resource, "Client " + index); + ExampleClientThatLocks example = new ExampleClientThatLocks(threadLocalLockManager, lockRootPath, resource, "Client " + index); for (int j = 0; j < REPETITIONS; ++j) { example.doWork(10, TimeUnit.SECONDS); } @@ -183,8 +182,7 @@ public class ITLockManagerTest extends HBaseMetadataTestCase { private String lockPath; - public ExampleClientThatLocks(LockManager lockManager, String lockPath, FakeLimitedResource resource, - String clientName) { + public ExampleClientThatLocks(LockManager lockManager, String lockPath, FakeLimitedResource resource, String clientName) { this.resource = resource; this.clientName = clientName; this.lockManager = lockManager; http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/query/src/main/java/org/apache/kylin/query/QueryCli.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/QueryCli.java b/query/src/main/java/org/apache/kylin/query/QueryCli.java index 98f2b4e..5ced8e3 100644 --- a/query/src/main/java/org/apache/kylin/query/QueryCli.java +++ b/query/src/main/java/org/apache/kylin/query/QueryCli.java @@ -35,12 +35,10 @@ import org.apache.kylin.common.util.DBUtils; public class QueryCli { @SuppressWarnings("static-access") - private static final Option OPTION_METADATA = OptionBuilder.withArgName("metadata url").hasArg().isRequired() - .withDescription("Metadata URL").create("metadata"); + private static final Option OPTION_METADATA = OptionBuilder.withArgName("metadata url").hasArg().isRequired().withDescription("Metadata URL").create("metadata"); @SuppressWarnings("static-access") - private static final Option OPTION_SQL = OptionBuilder.withArgName("input sql").hasArg().isRequired() - .withDescription("SQL").create("sql"); + private static final Option OPTION_SQL = OptionBuilder.withArgName("input sql").hasArg().isRequired().withDescription("SQL").create("sql"); public static void main(String[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/query/src/main/java/org/apache/kylin/query/QueryDataSource.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/QueryDataSource.java b/query/src/main/java/org/apache/kylin/query/QueryDataSource.java index 78b3189..9ffdf0e 100644 --- a/query/src/main/java/org/apache/kylin/query/QueryDataSource.java +++ b/query/src/main/java/org/apache/kylin/query/QueryDataSource.java @@ -71,12 +71,12 @@ public class QueryDataSource { if (project == null) { throw new IllegalArgumentException("project should not be null"); } - + DataSource ds = olapDataSources.get(project); if (ds != null) { return ds; } - + WrappedDataSource wrappedDS = getWrapped(project, config, props); ds = wrappedDS.getDataSource(); olapDataSources.putIfAbsent(project, ds); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java b/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java index 14e3a1d..28ee623 100644 --- a/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java +++ b/query/src/main/java/org/apache/kylin/query/enumerator/LookupTableEnumerator.java @@ -64,8 +64,7 @@ public class LookupTableEnumerator implements Enumerator<Object[]> { String lookupTableName = olapContext.firstTableScan.getTableName(); DimensionDesc dim = cube.getDescriptor().findDimensionByTable(lookupTableName); if (dim == null) - throw new IllegalStateException("No dimension with derived columns found for lookup table " - + lookupTableName + ", cube desc " + cube.getDescriptor()); + throw new IllegalStateException("No dimension with derived columns found for lookup table " + lookupTableName + ", cube desc " + cube.getDescriptor()); CubeManager cubeMgr = CubeManager.getInstance(cube.getConfig()); LookupStringTable table = cubeMgr.getLookupTable(cube.getLatestReadySegment(), dim.getJoin()); http://git-wip-us.apache.org/repos/asf/kylin/blob/19585846/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java ---------------------------------------------------------------------- diff --git a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java index fee2877..56b82b9 100644 --- a/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java +++ b/query/src/main/java/org/apache/kylin/query/enumerator/OLAPEnumerator.java @@ -117,8 +117,7 @@ public class OLAPEnumerator implements Enumerator<Object[]> { // query storage engine IStorageQuery storageEngine = StorageFactory.createQuery(olapContext.realization); - ITupleIterator iterator = storageEngine.search(olapContext.storageContext, sqlDigest, - olapContext.returnTupleInfo); + ITupleIterator iterator = storageEngine.search(olapContext.storageContext, sqlDigest, olapContext.returnTupleInfo); if (logger.isDebugEnabled()) { logger.debug("return TupleIterator..."); }
