Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import javax.net.ssl.SSLSocket;
import javax.net.ssl.TrustManagerFactory;

import org.apache.thrift.TConfiguration;
import org.apache.thrift.transport.TSSLTransportFactory;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TSocket;
Expand All @@ -45,8 +46,8 @@
public class HiveAuthUtils {
private static final Logger LOG = LoggerFactory.getLogger(HiveAuthUtils.class);

public static TTransport getSocketTransport(String host, int port, int loginTimeout) {
return new TSocket(host, port, loginTimeout);
public static TTransport getSocketTransport(String host, int port, int loginTimeout) throws TTransportException {
return new TSocket(new TConfiguration(),host, port, loginTimeout);
}

public static TTransport getSSLSocket(String host, int port, int loginTimeout)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class MetadataJSONSerializer extends MetadataSerializer {
public String serializeTable(HCatTable hcatTable) throws HCatException {
try {
return new TSerializer(new TJSONProtocol.Factory())
.toString(hcatTable.toHiveTable(), "UTF-8");
.toString(hcatTable.toHiveTable());
}
catch (TException exception) {
throw new HCatException("Could not serialize HCatTable: " + hcatTable, exception);
Expand All @@ -74,7 +74,7 @@ public HCatTable deserializeTable(String hcatTableStringRep) throws HCatExceptio
public String serializePartition(HCatPartition hcatPartition) throws HCatException {
try {
return new TSerializer(new TJSONProtocol.Factory())
.toString(hcatPartition.toHivePartition(), "UTF-8");
.toString(hcatPartition.toHivePartition());
}
catch (TException exception) {
throw new HCatException("Could not serialize HCatPartition: " + hcatPartition, exception);
Expand Down Expand Up @@ -103,7 +103,7 @@ public List<String> serializePartitionSpec(HCatPartitionSpec hcatPartitionSpec)
List<String> stringReps = new ArrayList<String>();
TSerializer serializer = new TSerializer(new TJSONProtocol.Factory());
for (PartitionSpec partitionSpec : hcatPartitionSpec.partitionSpecProxy.toPartitionSpec()) {
stringReps.add(serializer.toString(partitionSpec, "UTF-8"));
stringReps.add(serializer.toString(partitionSpec));
}
return stringReps;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,12 @@ public Catalog getCatalog(String catalogName) throws NoSuchObjectException, Meta

@Override
public List<String> getCatalogs() {
return objectStore.getCatalogs();
try {
return objectStore.getCatalogs();
} catch (Exception e) {
e.printStackTrace();
}
return null;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<kudu.version>1.12.0</kudu.version>
<!-- Leaving libfb303 at 0.9.3 regardless of libthrift: As per THRIFT-4613 The Apache Thrift project does not publish items related to fb303 at this point -->
<libfb303.version>0.9.3</libfb303.version>
<libthrift.version>0.13.0</libthrift.version>
<libthrift.version>0.14.1</libthrift.version>
<log4j2.version>2.13.2</log4j2.version>
<mariadb.version>2.5.0</mariadb.version>
<postgres.version>42.2.14</postgres.version>
Expand Down
17 changes: 0 additions & 17 deletions ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp

This file was deleted.

24 changes: 0 additions & 24 deletions ql/src/gen/thrift/gen-cpp/queryplan_constants.h

This file was deleted.

12 changes: 6 additions & 6 deletions ql/src/gen/thrift/gen-cpp/queryplan_types.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 21 additions & 1 deletion ql/src/gen/thrift/gen-cpp/queryplan_types.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading