Refined the patch.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/555ac7d8 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/555ac7d8 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/555ac7d8 Branch: refs/heads/TAJO-1730 Commit: 555ac7d85f528a074525b5a87e017a60cd09e55b Parents: 705bf9b Author: Hyunsik Choi <[email protected]> Authored: Wed Sep 2 20:01:37 2015 +0900 Committer: Hyunsik Choi <[email protected]> Committed: Wed Sep 2 20:01:37 2015 +0900 ---------------------------------------------------------------------- .../org/apache/tajo/catalog/CatalogServer.java | 7 ++- .../tajo/catalog/LinkedMetadataManager.java | 14 +---- .../org/apache/tajo/storage/StorageService.java | 1 - .../org/apache/tajo/util/JavaResourceUtil.java | 3 ++ .../main/java/org/apache/tajo/util/UriUtil.java | 4 +- .../org/apache/tajo/util/TestFileUtils.java | 54 ------------------- .../engine/planner/PhysicalPlannerImpl.java | 2 - .../physical/OperatorPushableScanExec.java | 56 -------------------- .../org/apache/tajo/plan/logical/ScanNode.java | 2 +- .../org/apache/tajo/plan/util/PlannerUtil.java | 9 ++++ tajo-plan/src/main/proto/Plan.proto | 5 -- .../org/apache/tajo/storage/PlanPushable.java | 36 ------------- .../java/org/apache/tajo/storage/Scanner.java | 1 + .../apache/tajo/storage/TablespaceManager.java | 4 +- .../src/main/resources/storage-default.json | 4 -- .../org/apache/tajo/storage/FileTablespace.java | 1 - .../apache/tajo/storage/jdbc/JdbcFragment.java | 1 - .../apache/tajo/storage/jdbc/JdbcScanner.java | 1 - .../tajo/storage/jdbc/JdbcTablespace.java | 5 +- .../storage/jdbc/SQLExpressionGenerator.java | 1 - .../tajo/storage/pgsql/PgSQLTablespace.java | 5 +- .../dataset/TestPgSQLQueryTests/lineitem.csv | 0 22 files changed, 28 insertions(+), 188 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java index 8a500db..4028f9b 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/CatalogServer.java @@ -103,7 +103,8 @@ public class CatalogServer extends AbstractService { this.builtingFuncs = new ArrayList<FunctionDesc>(); } - public CatalogServer(Collection<MetadataProvider> metadataProviders, Collection<FunctionDesc> sqlFuncs) throws IOException { + public CatalogServer(Collection<MetadataProvider> metadataProviders, Collection<FunctionDesc> sqlFuncs) + throws IOException { super(CatalogServer.class.getName()); this.handler = new CatalogProtocolHandler(); this.linkedMetadataManager = new LinkedMetadataManager(metadataProviders); @@ -193,6 +194,10 @@ public class CatalogServer extends AbstractService { super.serviceStop(); } + /** + * Refresh the linked metadata manager. This must be used for only testing. + * @param metadataProviders + */ @VisibleForTesting public void refresh(Collection<MetadataProvider> metadataProviders) { this.linkedMetadataManager = new LinkedMetadataManager(metadataProviders); http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LinkedMetadataManager.java ---------------------------------------------------------------------- diff --git a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LinkedMetadataManager.java b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LinkedMetadataManager.java index a12d8f8..73fd188 100644 --- a/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LinkedMetadataManager.java +++ b/tajo-catalog/tajo-catalog-server/src/main/java/org/apache/tajo/catalog/LinkedMetadataManager.java @@ -167,19 +167,7 @@ public class LinkedMetadataManager { @Nullable final String schemaPattern, @Nullable final String tablePattern) throws UndefinedDatabaseException { ensureIfDBExists(dbName); - -// if (tablePattern == null) { // all tables in this database - return providerMap.get(dbName).getTables(schemaPattern, tablePattern); -// -// } else { -// final Pattern pattern = Pattern.compile(tablePattern); -// return filter(providerMap.get(dbName).getTables(schemaPattern, tablePattern), new Predicate<String>() { -// @Override -// public boolean apply(@Nullable String input) { -// return pattern.matcher(tablePattern).matches(); -// } -// }); -// } + return providerMap.get(dbName).getTables(schemaPattern, tablePattern); } /** http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-common/src/main/java/org/apache/tajo/storage/StorageService.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/storage/StorageService.java b/tajo-common/src/main/java/org/apache/tajo/storage/StorageService.java index 44349ba..0c3c031 100644 --- a/tajo-common/src/main/java/org/apache/tajo/storage/StorageService.java +++ b/tajo-common/src/main/java/org/apache/tajo/storage/StorageService.java @@ -21,7 +21,6 @@ package org.apache.tajo.storage; import org.apache.tajo.exception.UnsupportedException; import javax.annotation.Nullable; -import java.io.IOException; import java.net.URI; /** http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-common/src/main/java/org/apache/tajo/util/JavaResourceUtil.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/util/JavaResourceUtil.java b/tajo-common/src/main/java/org/apache/tajo/util/JavaResourceUtil.java index cd19b5e..5a6e50e 100644 --- a/tajo-common/src/main/java/org/apache/tajo/util/JavaResourceUtil.java +++ b/tajo-common/src/main/java/org/apache/tajo/util/JavaResourceUtil.java @@ -22,6 +22,9 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +/** + * An utility for Java resources + */ public class JavaResourceUtil { public static URL getResourceURL(String resource) throws IOException { http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-common/src/main/java/org/apache/tajo/util/UriUtil.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/util/UriUtil.java b/tajo-common/src/main/java/org/apache/tajo/util/UriUtil.java index c0ee853..0cf9629 100644 --- a/tajo-common/src/main/java/org/apache/tajo/util/UriUtil.java +++ b/tajo-common/src/main/java/org/apache/tajo/util/UriUtil.java @@ -20,8 +20,10 @@ package org.apache.tajo.util; import java.net.URI; +/** + * Utility for URI representation + */ public class UriUtil { - public static String getScheme(URI uri) { return getScheme(uri.toASCIIString()); } http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-common/src/test/java/org/apache/tajo/util/TestFileUtils.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/test/java/org/apache/tajo/util/TestFileUtils.java b/tajo-common/src/test/java/org/apache/tajo/util/TestFileUtils.java deleted file mode 100644 index 90b1a39..0000000 --- a/tajo-common/src/test/java/org/apache/tajo/util/TestFileUtils.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.tajo.util; - -import org.apache.tajo.util.TestProtos.TestMessageProto; -import org.junit.After; -import org.junit.Before; - -import java.io.File; - -public class TestFileUtils { - private static final String TEST_PATH = "target/test-data/TestFileUTils"; - TestMessageProto proto = null; - - @Before - public void setUp() throws Exception { - TestMessageProto.Builder builder = TestMessageProto.newBuilder(); - builder.setName("TestFileUtils"); - builder.setAge(30); - builder.setAddr(TestFileUtils.class.getName()); - - proto = builder.build(); - - File testDir = new File(TEST_PATH); - if(testDir.exists()) { - testDir.delete(); - } - testDir.mkdirs(); - } - - @After - public void tearDown() throws Exception { - File testDir = new File(TEST_PATH); - if (testDir.exists()) { - testDir.delete(); - } - } -} http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java index 70c48e7..9847ff6 100644 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java +++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/PhysicalPlannerImpl.java @@ -120,8 +120,6 @@ public class PhysicalPlannerImpl implements PhysicalPlanner { PhysicalExec leftExec; PhysicalExec rightExec; - //ctx.getEnforcer().getEnforceProperties().get - switch (logicalNode.getType()) { case ROOT: http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/OperatorPushableScanExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/OperatorPushableScanExec.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/OperatorPushableScanExec.java deleted file mode 100644 index 66ae844..0000000 --- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/physical/OperatorPushableScanExec.java +++ /dev/null @@ -1,56 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.tajo.engine.planner.physical; - -import org.apache.tajo.catalog.Schema; -import org.apache.tajo.plan.logical.LogicalNode; -import org.apache.tajo.storage.Tuple; -import org.apache.tajo.worker.TaskAttemptContext; - -import java.io.IOException; - -public class OperatorPushableScanExec extends PhysicalExec { - private final LogicalNode plan; - - - public OperatorPushableScanExec(TaskAttemptContext context, Schema inSchema, Schema outSchema, LogicalNode plan) { - super(context, inSchema, outSchema); - this.plan = plan; - } - - @Override - public Tuple next() throws IOException { - return null; - } - - @Override - public void rescan() throws IOException { - - } - - @Override - public void close() throws IOException { - - } - - @Override - public float getProgress() { - return 0; - } -} http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ScanNode.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ScanNode.java b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ScanNode.java index f5e6b78..4b8a9e9 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ScanNode.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/logical/ScanNode.java @@ -38,7 +38,7 @@ public class ScanNode extends RelationNode implements Projectable, SelectableNod @Expose protected EvalNode qual; @Expose protected Target[] targets; @Expose protected boolean broadcastTable; - @Expose protected long limit = -1; // -1 is infinite + @Expose protected long limit = -1; // -1 means no set protected ScanNode(int pid, NodeType nodeType) { super(pid, nodeType); http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java b/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java index 8defa99..0210865 100644 --- a/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java +++ b/tajo-plan/src/main/java/org/apache/tajo/plan/util/PlannerUtil.java @@ -968,6 +968,15 @@ public class PlannerUtil { return inSubqueries; } + /** + * Return a list of integers, maps input schema and projected columns. + * Each integer value means a column index of input schema corresponding to each project column + * + * @param inputSchema Input Schema + * @param targets Columns to be projected + * @return A list of integers, each of which is an index number of input schema corresponding + * to each projected column. + */ public static int [] getTargetIds(Schema inputSchema, Column...targets) { int [] targetIds = new int[targets.length]; for (int i = 0; i < targetIds.length; i++) { http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-plan/src/main/proto/Plan.proto ---------------------------------------------------------------------- diff --git a/tajo-plan/src/main/proto/Plan.proto b/tajo-plan/src/main/proto/Plan.proto index 93e1e7e..7815cac 100644 --- a/tajo-plan/src/main/proto/Plan.proto +++ b/tajo-plan/src/main/proto/Plan.proto @@ -582,7 +582,6 @@ message EnforceProperty { BROADCAST = 5; COLUMN_PARTITION = 6; DISTINCT_GROUP_BY = 7; - STORAGE_PUSHDOWN = 8; } // Identifies which field is filled in. @@ -674,8 +673,4 @@ message DistinctGroupbyEnforcer { repeated SortSpecArray sortSpecArrays = 3; required bool isMultipleAggregation = 4 [default = false]; optional MultipleAggregationStage multipleAggregationStage = 5; -} - -message StoragePushdownEnforcer { - required int32 marker = 1; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/PlanPushable.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/PlanPushable.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/PlanPushable.java deleted file mode 100644 index 7500e9a..0000000 --- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/PlanPushable.java +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.tajo.storage; - -import org.apache.tajo.catalog.Column; -import org.apache.tajo.catalog.SchemaObject; -import org.apache.tajo.catalog.statistics.TableStats; -import org.apache.tajo.plan.expr.EvalNode; -import org.apache.tajo.plan.logical.LogicalNode; - -import java.io.Closeable; -import java.io.IOException; - -/** - * Scanner Interface - */ - -public interface PlanPushable { - void pushdown(LogicalNode pushed); -} http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Scanner.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Scanner.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Scanner.java index f421515..e95f318 100644 --- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Scanner.java +++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/Scanner.java @@ -60,6 +60,7 @@ public interface Scanner extends SchemaObject, Closeable { void close() throws IOException; /** + * Push a plan part into scanner. It will be used in future issues. * * @param planPart */ http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/TablespaceManager.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/TablespaceManager.java b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/TablespaceManager.java index e57dc3a..869394e 100644 --- a/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/TablespaceManager.java +++ b/tajo-storage/tajo-storage-common/src/main/java/org/apache/tajo/storage/TablespaceManager.java @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * <p/> + * * http://www.apache.org/licenses/LICENSE-2.0 - * <p/> + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-common/src/main/resources/storage-default.json ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-common/src/main/resources/storage-default.json b/tajo-storage/tajo-storage-common/src/main/resources/storage-default.json index 6060d50..3ede2d4 100644 --- a/tajo-storage/tajo-storage-common/src/main/resources/storage-default.json +++ b/tajo-storage/tajo-storage-common/src/main/resources/storage-default.json @@ -16,10 +16,6 @@ "handler": "org.apache.tajo.storage.hbase.HBaseTablespace", "default-format": "hbase" }, - "jdbc:mysql": { - "handler": "org.apache.tajo.storage.mysql.MySQLTablespace", - "default-format": "rowstore" - }, "jdbc:postgresql": { "handler": "org.apache.tajo.storage.pgsql.PgSQLTablespace", "default-format": "rowstore" http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java index 9f29c34..aa3f81a 100644 --- a/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java +++ b/tajo-storage/tajo-storage-hdfs/src/main/java/org/apache/tajo/storage/FileTablespace.java @@ -41,7 +41,6 @@ import org.apache.tajo.plan.LogicalPlan; import org.apache.tajo.plan.expr.EvalNode; import org.apache.tajo.plan.logical.LogicalNode; import org.apache.tajo.plan.logical.NodeType; -import org.apache.tajo.plan.logical.ScanNode; import org.apache.tajo.storage.fragment.FileFragment; import org.apache.tajo.storage.fragment.Fragment; import org.apache.tajo.util.Bytes; http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java index e8a18fc..30b4197 100644 --- a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java +++ b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcFragment.java @@ -20,7 +20,6 @@ package org.apache.tajo.storage.jdbc; import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import org.apache.tajo.BuiltinStorages; import org.apache.tajo.catalog.proto.CatalogProtos; import org.apache.tajo.storage.fragment.Fragment; import org.apache.tajo.storage.jdbc.JdbcFragmentProtos.JdbcFragmentProto; http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcScanner.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcScanner.java b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcScanner.java index c08451d..f5af7d4 100644 --- a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcScanner.java +++ b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcScanner.java @@ -36,7 +36,6 @@ import org.apache.tajo.plan.logical.LogicalNode; import org.apache.tajo.storage.Scanner; import org.apache.tajo.storage.Tuple; import org.apache.tajo.storage.VTuple; -import org.apache.tajo.util.datetime.DateTimeUtil; import java.io.Closeable; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcTablespace.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcTablespace.java b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcTablespace.java index d3ec273..5ec0ac8 100644 --- a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcTablespace.java +++ b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/JdbcTablespace.java @@ -44,10 +44,7 @@ import java.sql.SQLException; import java.util.List; /** - * <h3>URI Examples:</h3> - * <ul> - * <li>jdbc:mysql//primaryhost,secondaryhost1,secondaryhost2/test?profileSQL=true</li> - * </ul> + * JDBC Tablespace */ public abstract class JdbcTablespace extends Tablespace { http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/SQLExpressionGenerator.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/SQLExpressionGenerator.java b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/SQLExpressionGenerator.java index da07257..b1420e9 100644 --- a/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/SQLExpressionGenerator.java +++ b/tajo-storage/tajo-storage-jdbc/src/main/java/org/apache/tajo/storage/jdbc/SQLExpressionGenerator.java @@ -24,7 +24,6 @@ import org.apache.tajo.datum.Datum; import org.apache.tajo.exception.TajoRuntimeException; import org.apache.tajo.exception.UnsupportedDataTypeException; import org.apache.tajo.plan.expr.*; -import org.apache.tajo.util.Pair; import java.sql.DatabaseMetaData; import java.sql.SQLException; http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java b/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java index 4abb37b..3e187ee 100644 --- a/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java +++ b/tajo-storage/tajo-storage-pgsql/src/main/java/org/apache/tajo/storage/pgsql/PgSQLTablespace.java @@ -35,10 +35,7 @@ import java.io.IOException; import java.net.URI; /** - * <h3>URI Examples:</h3> - * <ul> - * <li>jdbc:mysql//primaryhost,secondaryhost1,secondaryhost2/test?profileSQL=true</li> - * </ul> + * Postgresql Database Tablespace */ public class PgSQLTablespace extends JdbcTablespace { private final String database; http://git-wip-us.apache.org/repos/asf/tajo/blob/555ac7d8/tajo-storage/tajo-storage-pgsql/src/test/resources/dataset/TestPgSQLQueryTests/lineitem.csv ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-pgsql/src/test/resources/dataset/TestPgSQLQueryTests/lineitem.csv b/tajo-storage/tajo-storage-pgsql/src/test/resources/dataset/TestPgSQLQueryTests/lineitem.csv deleted file mode 100644 index e69de29..0000000
