INSTALL.md and packaging fixes given recent merges.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/4871fd0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/4871fd0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/4871fd0d
Branch: refs/heads/master
Commit: 4871fd0de300fb099152697239e4c9548b8ec5c0
Parents: cdfee72
Author: Jacques Nadeau <jacques@apache.org>
Authored: Tue Mar 4 00:03:12 2014 -0800
Committer: Jacques Nadeau <jacques@apache.org>
Committed: Tue Mar 4 00:03:12 2014 -0800
----------------------------------------------------------------------
INSTALL.md | 18 ++++++++----
distribution/pom.xml | 6 +++-
distribution/src/assemble/bin.xml | 13 ++++++++
distribution/src/resources/storage-engines.json | 5 +++-
.../exec/store/ischema/InfoSchemaGroupScan.java | 2 +-
.../store/ischema/InfoSchemaStoragePlugin.java | 5 ++--
sqlline | 31 --------------------
7 files changed, 37 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4871fd0d/INSTALL.md
----------------------------------------------------------------------
diff --git a/INSTALL.md b/INSTALL.md
index e89da01..aeab9f4 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -23,17 +23,23 @@ Currently, the Apache Drill build process is known to work on Linux, Windows
and
cd incubator-drill
mvn clean install
-
-## Start SQLLine
- ./sqlline -u jdbc:drill:zk=local -n admin -p admin
+## Explode tarball in installation directory
+
+ mkdir /opt/drill
+ tar xvzf distribution/target/*.tar.gz --strip=1 -C /opt/drill
+
+## Start SQLLine (which starts Drill in embedded mode)
+
+ cd /opt/drill
+ bin/sqlline -u jdbc:drill:zk=local -n admin -p admin
## Run a query
SELECT
- region_key,
- r_comment
- FROM "sample-data/region.parquet";
+ employee_id,
+ first_name
+ FROM cp.`employee.json`;
## More information
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4871fd0d/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 3ad42cb..a77e419 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -28,7 +28,11 @@
<groupId>sqlline</groupId>
<artifactId>sqlline</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.drill</groupId>
+ <artifactId>storage-hive</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.drill</groupId>
<artifactId>drill-protocol</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4871fd0d/distribution/src/assemble/bin.xml
----------------------------------------------------------------------
diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml
index 60aea67..fbc98b8 100644
--- a/distribution/src/assemble/bin.xml
+++ b/distribution/src/assemble/bin.xml
@@ -37,6 +37,7 @@
<include>org.apache.drill:drill-protocol:jar:rebuffed</include>
<include>org.apache.drill:drill-common:jar:rebuffed</include>
<include>org.apache.drill.exec:drill-java-exec:jar:rebuffed</include>
+ <include>org.apache.drill:storage-hive:jar</include>
</includes>
@@ -76,6 +77,18 @@
<files>
<file>
+ <source>../KEYS</source>
+ <outputDirectory></outputDirectory>
+ </file>
+ <file>
+ <source>../LICENSE</source>
+ <outputDirectory></outputDirectory>
+ </file>
+ <file>
+ <source>../NOTICE</source>
+ <outputDirectory></outputDirectory>
+ </file>
+ <file>
<source>src/resources/runbit</source>
<outputDirectory>bin</outputDirectory>
</file>
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4871fd0d/distribution/src/resources/storage-engines.json
----------------------------------------------------------------------
diff --git a/distribution/src/resources/storage-engines.json b/distribution/src/resources/storage-engines.json
index a22e7d0..8b22858 100644
--- a/distribution/src/resources/storage-engines.json
+++ b/distribution/src/resources/storage-engines.json
@@ -7,7 +7,9 @@
cp: {
type: "file",
connection: "classpath:///"
- },
+ }
+
+ /*,
hive : {
type:"hive",
config :
@@ -19,5 +21,6 @@
"hive.metastore.sasl.enabled" : "false"
}
}
+ */
}
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4871fd0d/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java
index ac625b7..b8b66dc 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java
@@ -33,7 +33,7 @@ import org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonTypeName;
-import com.google.hive12.common.base.Preconditions;
+import com.google.common.base.Preconditions;
@JsonTypeName("info-schema")
public class InfoSchemaGroupScan extends AbstractGroupScan{
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4871fd0d/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java
b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java
index 04b027c..891419d 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java
@@ -24,7 +24,6 @@ import java.util.Set;
import net.hydromatic.optiq.Schema;
import net.hydromatic.optiq.SchemaPlus;
-import org.apache.drill.common.exceptions.ExecutionSetupException;
import org.apache.drill.common.logical.data.Scan;
import org.apache.drill.exec.planner.logical.DrillTable;
import org.apache.drill.exec.server.DrillbitContext;
@@ -32,8 +31,8 @@ import org.apache.drill.exec.store.AbstractSchema;
import org.apache.drill.exec.store.AbstractStoragePlugin;
import org.apache.drill.exec.store.SchemaHolder;
-import com.google.hive12.common.collect.ImmutableMap;
-import com.google.hive12.common.collect.Maps;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
public class InfoSchemaStoragePlugin extends AbstractStoragePlugin{
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(InfoSchemaStoragePlugin.class);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/4871fd0d/sqlline
----------------------------------------------------------------------
diff --git a/sqlline b/sqlline
deleted file mode 100755
index 8cc9531..0000000
--- a/sqlline
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-# sqlline - Script to launch SQL shell
-#
-# Example:
-# $ ./sqlline
-# sqlline> !connect jdbc:optiq:model=common/target/test-classes/donuts-model.json admin
admin
-
-# Build classpath on first call. (To force rebuild, remove .classpath.)
-if [ ! -f .classpath ]; then
- (cd contrib/sqlline; mvn dependency:build-classpath -Dmdep.outputFile=../../.classpath)
-fi
-
-#exec java -Drebel.log=true -javaagent:/src/jrebel/jrebel.jar -Dlogback.configurationFile=/src/drill/sandbox/prototype/sqlparser/src/test/resources/logback.xml
-cp ./:"$(cat .classpath)" sqlline.SqlLine "$@"
-exec java -Xmx2G -Dlogback.configurationFile=./sqlparser/src/test/resources/logback.xml -cp
./:"$(cat .classpath)" sqlline.SqlLine --verbose=true "$@"
-
-
-# End sqlline
|