You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2015/10/20 05:34:57 UTC
tajo git commit: TAJO-1911: Change guava's Optional to Java's
Optional.
Repository: tajo
Updated Branches:
refs/heads/master 0006536bd -> f29c007a9
TAJO-1911: Change guava's Optional to Java's Optional.
Closes #806
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/f29c007a
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/f29c007a
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/f29c007a
Branch: refs/heads/master
Commit: f29c007a97a30a181062fc3f725511111d84733a
Parents: 0006536
Author: Hyunsik Choi <hy...@apache.org>
Authored: Mon Oct 19 20:32:39 2015 -0700
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Mon Oct 19 20:32:39 2015 -0700
----------------------------------------------------------------------
CHANGES | 2 ++
.../java/org/apache/tajo/catalog/CatalogServer.java | 1 -
.../org/apache/tajo/catalog/LinkedMetadataManager.java | 4 ++--
.../org/apache/tajo/engine/query/TestHBaseTable.java | 6 +-----
.../java/org/apache/tajo/storage/TablespaceManager.java | 12 ++++--------
.../org/apache/tajo/storage/TestFileTablespace.java | 4 ++--
.../org/apache/tajo/storage/pgsql/PgSQLTestServer.java | 2 +-
.../tajo/storage/pgsql/TestPgSQLJdbcTableSpace.java | 2 +-
.../apache/tajo/storage/pgsql/TestPgSQLQueryTests.java | 4 ++--
9 files changed, 15 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index d389ac4..fafe41b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,8 @@ Release 0.12.0 - unreleased
IMPROVEMENT
+ TAJO-1911: Change guava's Optional to Java's Optional. (hyunsik)
+
TAJO-1850: Using TUtil.newHash(Set/Map) should be replaced by Java's
diamond operator. (Contributed by Dongkyu Hwangbo, committed by hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/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 060cb78..d649c5f 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
@@ -21,7 +21,6 @@ package org.apache.tajo.catalog;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Objects;
-import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/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 e6fd285..1ffe550 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
@@ -18,7 +18,6 @@
package org.apache.tajo.catalog;
-import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -32,6 +31,7 @@ import javax.annotation.Nullable;
import java.net.URI;
import java.util.Collection;
import java.util.Map;
+import java.util.Optional;
import static com.google.common.collect.Collections2.filter;
@@ -85,7 +85,7 @@ public class LinkedMetadataManager {
});
if (filtered.isEmpty()) {
- return Optional.absent();
+ return Optional.empty();
} else {
MetadataProvider found = filtered.iterator().next();
return Optional.of(new Pair<>(found.getTablespaceName(), found.getTablespaceUri()));
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
----------------------------------------------------------------------
diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
index 5cbac60..3583f6d 100644
--- a/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
+++ b/tajo-core-tests/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
@@ -18,7 +18,6 @@
package org.apache.tajo.engine.query;
-import com.google.common.base.Optional;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.FileStatus;
@@ -62,10 +61,7 @@ import java.net.InetAddress;
import java.net.URI;
import java.sql.ResultSet;
import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/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 407f865..569f1a2 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
@@ -20,7 +20,6 @@ package org.apache.tajo.storage;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Maps;
@@ -47,10 +46,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.reflect.Constructor;
import java.net.URI;
-import java.util.Collection;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
+import java.util.*;
import static org.apache.tajo.storage.StorageConstants.LOCAL_FS_URI;
@@ -320,7 +316,7 @@ public class TablespaceManager implements StorageService {
registerTableSpace(space.name, space.uri, space.getConfig(), true, true);
}
// if there is an existing one, return it.
- return Optional.fromNullable(existing);
+ return Optional.ofNullable(existing);
}
@VisibleForTesting
@@ -332,7 +328,7 @@ public class TablespaceManager implements StorageService {
existing = TABLE_SPACES.remove(uri);
}
}
- return Optional.fromNullable(existing);
+ return Optional.ofNullable(existing);
}
public Iterable<String> getSupportSchemes() {
@@ -419,7 +415,7 @@ public class TablespaceManager implements StorageService {
}
}
- return Optional.absent();
+ return Optional.empty();
}
@Override
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileTablespace.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileTablespace.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileTablespace.java
index 627e4ed..cd5bd32 100644
--- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileTablespace.java
+++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestFileTablespace.java
@@ -18,7 +18,6 @@
package org.apache.tajo.storage;
-import com.google.common.base.Optional;
import com.google.common.collect.Lists;
import net.minidev.json.JSONObject;
import org.apache.hadoop.conf.Configuration;
@@ -42,6 +41,7 @@ import org.junit.Test;
import java.io.IOException;
import java.net.URI;
import java.util.List;
+import java.util.Optional;
import java.util.UUID;
import static org.junit.Assert.*;
@@ -271,7 +271,7 @@ public class TestFileTablespace {
cluster.waitClusterUp();
URI uri = URI.create(cluster.getFileSystem().getUri() + "/tajo");
- Optional<Tablespace> existingTs = Optional.absent();
+ Optional<Tablespace> existingTs = Optional.empty();
try {
/* Local FileSystem */
FileTablespace space = TablespaceManager.getLocalFs();
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/PgSQLTestServer.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/PgSQLTestServer.java b/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/PgSQLTestServer.java
index 024b497..0a4f917 100644
--- a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/PgSQLTestServer.java
+++ b/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/PgSQLTestServer.java
@@ -18,7 +18,6 @@
package org.apache.tajo.storage.pgsql;
-import com.google.common.base.Optional;
import io.airlift.testing.postgresql.TestingPostgreSqlServer;
import net.minidev.json.JSONObject;
import org.apache.commons.logging.Log;
@@ -39,6 +38,7 @@ import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Map;
+import java.util.Optional;
public class PgSQLTestServer {
private static final Log LOG = LogFactory.getLog(PgSQLTestServer.class);
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLJdbcTableSpace.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLJdbcTableSpace.java b/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLJdbcTableSpace.java
index 05b26e8..59af23d 100644
--- a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLJdbcTableSpace.java
+++ b/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLJdbcTableSpace.java
@@ -18,7 +18,6 @@
package org.apache.tajo.storage.pgsql;
-import com.google.common.base.Optional;
import net.minidev.json.JSONObject;
import org.apache.tajo.catalog.MetadataProvider;
import org.apache.tajo.catalog.TableDesc;
@@ -37,6 +36,7 @@ import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import static org.junit.Assert.*;
http://git-wip-us.apache.org/repos/asf/tajo/blob/f29c007a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java b/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java
index 5614bba..e394e1b 100644
--- a/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java
+++ b/tajo-storage/tajo-storage-pgsql/src/test/java/org/apache/tajo/storage/pgsql/TestPgSQLQueryTests.java
@@ -18,7 +18,6 @@
package org.apache.tajo.storage.pgsql;
-import com.google.common.base.Optional;
import org.apache.tajo.QueryTestCaseBase;
import org.apache.tajo.conf.TajoConf;
import org.apache.tajo.storage.Tablespace;
@@ -28,6 +27,7 @@ import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
public class TestPgSQLQueryTests extends QueryTestCaseBase {
@SuppressWarnings("unused")
@@ -187,7 +187,7 @@ public class TestPgSQLQueryTests extends QueryTestCaseBase {
connProperties.put("user", "postgres");
connProperties.put("password", "");
- Optional<Tablespace> old = Optional.absent();
+ Optional<Tablespace> old = Optional.empty();
try {
old = PgSQLTestServer.resetAllParamsAndSetConnProperties(connProperties);
runSimpleTests();