Index: build-common.xml
===================================================================
--- build-common.xml (revision 1309098)
+++ build-common.xml (working copy)
@@ -30,23 +30,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
Index: src/test/org/apache/hcatalog/pig/TestHCatLoaderComplexSchema.java
===================================================================
--- src/test/org/apache/hcatalog/pig/TestHCatLoaderComplexSchema.java (revision 1309098)
+++ src/test/org/apache/hcatalog/pig/TestHCatLoaderComplexSchema.java (working copy)
@@ -50,9 +50,9 @@
public class TestHCatLoaderComplexSchema {
- private static MiniCluster cluster = MiniCluster.buildCluster();
+ //private static MiniCluster cluster = MiniCluster.buildCluster();
private static Driver driver;
- private static Properties props;
+ //private static Properties props;
private void dropTable(String tablename) throws IOException, CommandNeedRetryException{
driver.run("drop table "+tablename);
@@ -87,8 +87,8 @@
hiveConf.set(HiveConf.ConfVars.HIVE_SUPPORT_CONCURRENCY.varname, "false");
driver = new Driver(hiveConf);
SessionState.start(new CliSessionState(hiveConf));
- props = new Properties();
- props.setProperty("fs.default.name", cluster.getProperties().getProperty("fs.default.name"));
+ //props = new Properties();
+ //props.setProperty("fs.default.name", cluster.getProperties().getProperty("fs.default.name"));
}
@@ -180,7 +180,7 @@
MockLoader.setData(tablename+"Input", data);
try {
createTable(tablename, tableSchema);
- PigServer server = new PigServer(ExecType.LOCAL, props);
+ PigServer server = new PigServer(ExecType.LOCAL);
server.setBatchOn();
server.registerQuery("A = load '"+tablename+"Input' using org.apache.hcatalog.pig.MockLoader() AS "+pigSchema+";");
Schema dumpedASchema = server.dumpSchema("A");
Property changes on: hive
___________________________________________________________________
Modified: svn:externals
- http://svn.apache.org/repos/asf/hive/trunk external
+
Index: hive/README
===================================================================
--- hive/README (revision 1309098)
+++ hive/README (working copy)
@@ -1,16 +0,0 @@
-The Hive code is pulled in via an SVN external definition. This allows
-us to have a local version of hive to build against, including an
-up to date trunk version, without needing to fork the code.
-
-The external definition is pegged to an SVN revision, so that
-changes in Hive's code base do not cause suprising changes in HCatalog.
-The SVN revision should be updated regularly.
-
-For release branches, the SVN revision should be pegged against a Hive release
-tag.
-
-The external definition can be edited by doing:
-
-svn propedit svn:externals hive
-
-in the top level directory.
Index: build.xml
===================================================================
--- build.xml (revision 1309098)
+++ build.xml (working copy)
@@ -44,7 +44,6 @@
-
@@ -69,7 +68,6 @@
-
@@ -136,23 +134,10 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
-
-
@@ -699,9 +649,6 @@
-
-
-
@@ -724,132 +671,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: storage-handlers/hbase/ivy.xml
===================================================================
--- storage-handlers/hbase/ivy.xml (revision 1309098)
+++ storage-handlers/hbase/ivy.xml (working copy)
@@ -47,10 +47,81 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: storage-handlers/hbase/ivy/ivysettings.xml
===================================================================
--- storage-handlers/hbase/ivy/ivysettings.xml (revision 1309098)
+++ storage-handlers/hbase/ivy/ivysettings.xml (working copy)
@@ -1,65 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: storage-handlers/hbase/ivy/libraries.properties
===================================================================
--- storage-handlers/hbase/ivy/libraries.properties (revision 1309098)
+++ storage-handlers/hbase/ivy/libraries.properties (working copy)
@@ -1,23 +0,0 @@
-# Licensed 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.
-
-#This properties file lists the versions of the various artifacts used by hadoop and components.
-#It drives ivy and the generation of a maven POM
-
-junit.version=3.8.1
-ivy.version=2.2.0
-rats-lib.version=0.5.1
-hbase.version=0.92.0
-zookeeper.version=3.4.3
-guava.version=11.0
-jetty.version=6.1.26
-high-scale-lib.version=1.1.1
Index: storage-handlers/hbase/build.xml
===================================================================
--- storage-handlers/hbase/build.xml (revision 1309098)
+++ storage-handlers/hbase/build.xml (working copy)
@@ -75,7 +75,7 @@
-
+
@@ -103,29 +103,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: ivy/ivysettings.xml
===================================================================
--- ivy/ivysettings.xml (revision 1309098)
+++ ivy/ivysettings.xml (working copy)
@@ -30,12 +30,22 @@
http://www.ibiblio.net/pub/packages/maven2
-->
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
Index: ivy/libraries.properties
===================================================================
--- ivy/libraries.properties (revision 1309098)
+++ ivy/libraries.properties (working copy)
@@ -13,15 +13,38 @@
#This properties file lists the versions of the various artifacts used by hadoop and components.
#It drives ivy and the generation of a maven POM
-junit.version=3.8.1
+activemq.version=5.5.0
+antlr.version=3.0.1
+commons-cli.version=1.2
+commons-configuration.version=1.6
+commons-dbcp.version=1.4
+commons-httpclient.version=3.0.1
+commons-lang.version=2.4
+commons-logging.version=1.0.4
+commons-pool.version=1.5.4
+datanucleus-connectionpool.version=2.0.3
+datanucleus-core.version=2.0.3
+datanucleus-enhancer.version=2.0.3
+datanucleus-rdbms.version=2.0.3
+derby.version=10.4.2.0
+fb303.version=0.7.0
+guava.version=11.0
+hadoop-core.version=1.0.1
+hadoop-test.version=1.0.1
+hadoop-tools.version=1.0.1
+hbase.version=0.92.0
+high-scale-lib.version=1.1.1
+hive.version=0.9.0-SNAPSHOT
ivy.version=2.1.0
+jackson.version=1.7.3
+javax-mgmt.version=1.1-rev-1
+jdeb.version=0.8
+jdo.version=2.3-ec
+jetty.version=6.1.26
+jms.version=1.1
+junit.version=4.10
+log4j.version=1.2.16
pig.version=0.8.0
-commons-cli.version=1.2
-#hadoop-core.version=0.20.2 Waiting for a secure version of hadoop in maven
-hadoop-tools.version=0.20.205.0
-jms.version=1.1
-activemq.version=5.5.0
-javax-mgmt.version=1.1-rev-1
rats-lib.version=0.5.1
-jdeb.version=0.8
-jackson.version=1.7.3
+slf4j.version=1.6.1
+zookeeper.version=3.4.3