git commit: PHOENIX-1250 Remove use of Closeables.closeQuietly
Repository: phoenix
Updated Branches:
refs/heads/master 89c2f2741 -> 3034b6583
PHOENIX-1250 Remove use of Closeables.closeQuietly
Remove the use of Guava's Closeables.closeQuietly to allow using
Phoenix within a client-side application that has a more recent
version of Guava. After this commit, Phoenix can be built against
Guava 18.0 (although full integration tests will not work because
HBase/Hadoop still rely on an older version of Guava internally).
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3034b658
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3034b658
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3034b658
Branch: refs/heads/master
Commit: 3034b6583b7af3a5356ee77bba5028dc243c0bb4
Parents: 89c2f27
Author: Gabriel Reid
Authored: Tue Sep 16 11:58:33 2014 +0200
Committer: Gabriel Reid
Committed: Wed Sep 17 09:16:36 2014 +0200
--
phoenix-core/pom.xml| 4 ++
.../apache/phoenix/cache/ServerCacheClient.java | 4 +-
.../phoenix/cache/aggcache/SpillFile.java | 2 +-
.../phoenix/cache/aggcache/SpillManager.java| 2 +-
.../cache/aggcache/SpillableGroupByCache.java | 2 +-
.../apache/phoenix/compile/FromCompiler.java| 2 +-
.../GroupedAggregateRegionObserver.java | 3 +-
.../phoenix/iterate/TableResultIterator.java| 2 +-
.../query/ConnectionQueryServicesImpl.java | 7 ++-
.../org/apache/phoenix/util/Closeables.java | 46 +---
.../apache/phoenix/flume/sink/PhoenixSink.java | 7 +--
pom.xml | 5 +++
12 files changed, 62 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3034b658/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index d5774ea..eb1004b 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -325,6 +325,10 @@
org.apache.commons
commons-csv
+
+ com.google.code.findbugs
+ jsr305
+
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3034b658/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 301c452..f4be508 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -17,8 +17,6 @@
*/
package org.apache.phoenix.cache;
-import static com.google.common.io.Closeables.closeQuietly;
-
import java.io.Closeable;
import java.io.IOException;
import java.sql.SQLException;
@@ -319,7 +317,7 @@ public class ServerCacheClient {
LOG.warn("Unable to remove hash cache for " +
remainingOnServers, lastThrowable);
}
} finally {
- closeQuietly(iterateOverTable);
+ Closeables.closeQuietly(iterateOverTable);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3034b658/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
index 31ad5ce..8dd64d0 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
@@ -28,11 +28,11 @@ import java.nio.channels.FileChannel.MapMode;
import java.util.Map;
import java.util.UUID;
+import org.apache.phoenix.util.Closeables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
-import com.google.common.io.Closeables;
/**
* This class abstracts a SpillFile It is a accessible on a per page basis
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3034b658/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
index 3f4bf35..2fbea5c 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
@@ -40,12 +40,12 @@ import org.apache.phoenix.schema.KeyValu
git commit: PHOENIX-1250 Remove use of Closeables.closeQuietly
Repository: phoenix
Updated Branches:
refs/heads/4.0 45e2891ce -> 89262f2be
PHOENIX-1250 Remove use of Closeables.closeQuietly
Remove the use of Guava's Closeables.closeQuietly to allow using
Phoenix within a client-side application that has a more recent
version of Guava. After this commit, Phoenix can be built against
Guava 18.0 (although full integration tests will not work because
HBase/Hadoop still rely on an older version of Guava internally).
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/89262f2b
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/89262f2b
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/89262f2b
Branch: refs/heads/4.0
Commit: 89262f2be4c6bf6b63b6e57364141a2a2d5d673e
Parents: 45e2891
Author: Gabriel Reid
Authored: Tue Sep 16 11:58:33 2014 +0200
Committer: Gabriel Reid
Committed: Wed Sep 17 09:17:41 2014 +0200
--
phoenix-core/pom.xml| 4 ++
.../apache/phoenix/cache/ServerCacheClient.java | 4 +-
.../phoenix/cache/aggcache/SpillFile.java | 2 +-
.../phoenix/cache/aggcache/SpillManager.java| 2 +-
.../cache/aggcache/SpillableGroupByCache.java | 2 +-
.../apache/phoenix/compile/FromCompiler.java| 2 +-
.../GroupedAggregateRegionObserver.java | 3 +-
.../phoenix/iterate/TableResultIterator.java| 2 +-
.../query/ConnectionQueryServicesImpl.java | 7 ++-
.../org/apache/phoenix/util/Closeables.java | 46 +---
.../apache/phoenix/flume/sink/PhoenixSink.java | 7 +--
pom.xml | 5 +++
12 files changed, 62 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/89262f2b/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index ff3f5d8..0a8b61b 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -325,6 +325,10 @@
org.apache.commons
commons-csv
+
+ com.google.code.findbugs
+ jsr305
+
http://git-wip-us.apache.org/repos/asf/phoenix/blob/89262f2b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index 301c452..f4be508 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -17,8 +17,6 @@
*/
package org.apache.phoenix.cache;
-import static com.google.common.io.Closeables.closeQuietly;
-
import java.io.Closeable;
import java.io.IOException;
import java.sql.SQLException;
@@ -319,7 +317,7 @@ public class ServerCacheClient {
LOG.warn("Unable to remove hash cache for " +
remainingOnServers, lastThrowable);
}
} finally {
- closeQuietly(iterateOverTable);
+ Closeables.closeQuietly(iterateOverTable);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/89262f2b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
index 31ad5ce..8dd64d0 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
@@ -28,11 +28,11 @@ import java.nio.channels.FileChannel.MapMode;
import java.util.Map;
import java.util.UUID;
+import org.apache.phoenix.util.Closeables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
-import com.google.common.io.Closeables;
/**
* This class abstracts a SpillFile It is a accessible on a per page basis
http://git-wip-us.apache.org/repos/asf/phoenix/blob/89262f2b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
index 3f4bf35..2fbea5c 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
@@ -40,12 +40,12 @@ import org.apache.phoenix.schema.KeyValueSchem
git commit: PHOENIX-1250 Remove use of Closeables.closeQuietly
Repository: phoenix
Updated Branches:
refs/heads/3.0 a56b2f48c -> 12494b7bf
PHOENIX-1250 Remove use of Closeables.closeQuietly
Remove the use of Guava's Closeables.closeQuietly to allow using
Phoenix within a client-side application that has a more recent
version of Guava. After this commit, Phoenix can be built against
Guava 18.0 (although full integration tests will not work because
HBase/Hadoop still rely on an older version of Guava internally).
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/12494b7b
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/12494b7b
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/12494b7b
Branch: refs/heads/3.0
Commit: 12494b7bfd3116d9a68977b63f3fbd9bfca6db5c
Parents: a56b2f4
Author: Gabriel Reid
Authored: Tue Sep 16 11:58:33 2014 +0200
Committer: Gabriel Reid
Committed: Wed Sep 17 09:23:24 2014 +0200
--
phoenix-core/pom.xml| 4 +
.../apache/phoenix/cache/ServerCacheClient.java | 4 +-
.../phoenix/cache/aggcache/SpillFile.java | 2 +-
.../phoenix/cache/aggcache/SpillManager.java| 2 +-
.../cache/aggcache/SpillableGroupByCache.java | 2 +-
.../apache/phoenix/compile/FromCompiler.java| 2 +-
.../GroupedAggregateRegionObserver.java | 32 ++--
.../phoenix/iterate/TableResultIterator.java| 2 +-
.../query/ConnectionQueryServicesImpl.java | 145 +--
.../org/apache/phoenix/util/Closeables.java | 46 +-
.../apache/phoenix/flume/sink/PhoenixSink.java | 7 +-
pom.xml | 5 +
12 files changed, 146 insertions(+), 107 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/12494b7b/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index ad7b802..6d3c0c5 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -271,6 +271,10 @@
jackson-xc
+ com.google.code.findbugs
+ jsr305
+
+
junit
junit
test
http://git-wip-us.apache.org/repos/asf/phoenix/blob/12494b7b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
index a67c639..a6ee92e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
@@ -17,8 +17,6 @@
*/
package org.apache.phoenix.cache;
-import static com.google.common.io.Closeables.closeQuietly;
-
import java.io.Closeable;
import java.io.IOException;
import java.sql.SQLException;
@@ -263,7 +261,7 @@ public class ServerCacheClient {
LOG.warn("Unable to remove hash cache for " +
remainingOnServers, lastThrowable);
}
} finally {
- closeQuietly(iterateOverTable);
+ Closeables.closeQuietly(iterateOverTable);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/12494b7b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
index 31ad5ce..8dd64d0 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillFile.java
@@ -28,11 +28,11 @@ import java.nio.channels.FileChannel.MapMode;
import java.util.Map;
import java.util.UUID;
+import org.apache.phoenix.util.Closeables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.collect.Maps;
-import com.google.common.io.Closeables;
/**
* This class abstracts a SpillFile It is a accessible on a per page basis
http://git-wip-us.apache.org/repos/asf/phoenix/blob/12494b7b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
index 3f4bf35..2fbea5c 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillManager.java
@@ -40,12 +40,12 @@ import org.apache.phoenix
