Skip to content

FLUME-3354. Fix compilation error against Hive 2.3.5 and above. #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

FLUME-3354. Fix compilation error against Hive 2.3.5 and above. #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions flume-ng-sinks/flume-hive-sink/src/test/java/org/apache/flume/sink/hive/TestHiveSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@ public TestHiveSink() throws Exception {

conf = new HiveConf(this.getClass());
TestUtil.setConfValues(conf);
TxnDbUtil.setConfValues(conf);

// 1) prepare hive
TxnDbUtil.cleanDb();
TxnDbUtil.prepDb();
TxnDbUtil.cleanDb(conf);
TxnDbUtil.prepDb(conf);

// 2) Setup Hive client
SessionState.start(new CliSessionState(conf));
Expand Down
5 changes: 3 additions & 2 deletions flume-ng-sinks/flume-hive-sink/src/test/java/org/apache/flume/sink/hive/TestHiveWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ public TestHiveWriter() throws Exception {
// 1) Start metastore
conf = new HiveConf(this.getClass());
TestUtil.setConfValues(conf);
TxnDbUtil.setConfValues(conf);
if (metaStoreURI != null) {
conf.setVar(HiveConf.ConfVars.METASTOREURIS, metaStoreURI);
}
Expand All @@ -99,8 +100,8 @@ public TestHiveWriter() throws Exception {
@Before
public void setUp() throws Exception {
// 1) prepare hive
TxnDbUtil.cleanDb();
TxnDbUtil.prepDb();
TxnDbUtil.cleanDb(conf);
TxnDbUtil.prepDb(conf);

// 1) Setup tables
TestUtil.dropDB(conf, dbName);
Expand Down
2 changes: 2 additions & 0 deletions flume-ng-sinks/flume-hive-sink/src/test/java/org/apache/flume/sink/hive/TestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ public static void setConfValues(HiveConf conf) {
conf.setVar(HiveConf.ConfVars.HIVE_TXN_MANAGER, txnMgr);
conf.setBoolVar(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY, true);
conf.set("fs.raw.impl", RawFileSystem.class.getName());
conf.setBoolVar(HiveConf.ConfVars.METASTORE_SCHEMA_VERIFICATION, false);
conf.set("datanucleus.schema.autoCreateAll", "true");
}

public static void createDbAndTable(Driver driver, String databaseName,
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ limitations under the License.
<hbase.version>1.0.0</hbase.version>
<hbase2.jetty.version>9.3.19.v20170502</hbase2.jetty.version>
<hbase2.version>2.0.0</hbase2.version>
<hive.version>1.0.0</hive.version>
<hive.version>2.3.6</hive.version>
<httpcore.version>4.4.6</httpcore.version>
<httpclient.version>4.5.3</httpclient.version>
<irclib.version>1.10</irclib.version>
Expand Down