You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by do...@apache.org on 2021/08/14 22:50:30 UTC
[orc] branch branch-1.7 updated: ORC-691: Remove unused
Snapcraft-related code (#726)
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch branch-1.7
in repository https://gitbox.apache.org/repos/asf/orc.git
The following commit(s) were added to refs/heads/branch-1.7 by this push:
new b87e891 ORC-691: Remove unused Snapcraft-related code (#726)
b87e891 is described below
commit b87e891cf41350fa69cde0ce9a69b88438c478e8
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Mon Jun 28 09:30:04 2021 -0700
ORC-691: Remove unused Snapcraft-related code (#726)
### What changes were proposed in this pull request?
This PR aims to remove unused `Snapcraft`-related code from Apache ORC repository at Apache ORC 1.8.0.
### Why are the changes needed?
The last release was Apache ORC 1.5.2 on `7 August 2018`. We had better remove this from Apache ORC repo and Snapstore officially to reduce the confusion.
- https://snapcraft.io/orc
### How was this patch tested?
N/A (This is a removal of unused code)
(cherry picked from commit 07168140d15b12bc57afa6ff4679a4b6acf66e8f)
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
.github/labeler.yml | 1 -
README.md | 1 -
snap/.gitignore | 5 -----
snap/README.md | 44 ---------------------------------------
snap/Vagrantfile | 35 -------------------------------
snap/snapcraft.yaml | 53 -----------------------------------------------
snap/vagrant-provision.sh | 19 -----------------
7 files changed, 158 deletions(-)
diff --git a/.github/labeler.yml b/.github/labeler.yml
index fcf411c..b6a9fc0 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -24,7 +24,6 @@ INFRA:
- ".asf.yaml"
- ".gitignore"
- "docker/**/*"
- - "snap/**/*"
BUILD:
- "CMakeLists.txt"
- "cmake_modules/**/*"
diff --git a/README.md b/README.md
index fd6c7dc..e8c4868 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,6 @@ The subdirectories are:
* java - the java reader and writer
* proto - the protocol buffer definition for the ORC metadata
* site - the website and documentation
-* snap - the script to build [snaps](https://snapcraft.io/) of the ORC tools
* tools - the c++ tools for reading and inspecting ORC files
### Building
diff --git a/snap/.gitignore b/snap/.gitignore
deleted file mode 100644
index 4ff5e06..0000000
--- a/snap/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.snap
-parts
-prime
-snap
-stage
\ No newline at end of file
diff --git a/snap/README.md b/snap/README.md
deleted file mode 100644
index 11042e2..0000000
--- a/snap/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-This directory is for building [snaps](https://snapcraft.io/) of the ORC tools.
-
-If you are running on a non-Linux system, you'll need to create a VM. Vagrant
-scripts are provided to accomplish that.
-
-```bash
-% vagrant up
-% vagrant ssh
-% git clone https://github.com/apache/orc.git -o apache
-```
-
-If you don't use VM, you'll need to install snapcraft, which is the tool to build
-snaps.
-
-```bash
-% sudo apt-get install snapcraft
-```
-
-In both cases, go into the snap directory and build the snap:
-
-```bash
-% cd orc/snap
-% snapcraft
-```
-
-To publish to the snapcraft store, you need to:
-
-```bash
-% snapcraft login
-% snapcraft push orc_*.snap
-```
-
-For users to install the snap, they'll use:
-
-```bash
-% sudo snap install orc
-```
-
-The commands are:
-
-* orc.contents - C++ ORC tool for displaying data contents
-* orc.java - Java ORC tool
-* orc.metadata - C++ ORC metadata tool
-* orc.statistics - C++ ORC statistics tool
\ No newline at end of file
diff --git a/snap/Vagrantfile b/snap/Vagrantfile
deleted file mode 100644
index 8fccfdf..0000000
--- a/snap/Vagrantfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.
-
-Vagrant.require_version ">= 1.9.1"
-
-VAGRANTFILE_API_VERSION = "2"
-
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
- if Vagrant.has_plugin?("vagrant-cachier")
- # Configure cached packages to be shared between instances of the same base box.
- config.cache.scope = :box
- end
- config.ssh.insert_key = false
-
- config.vm.provider :virtualbox do |vb|
- vb.customize ["modifyvm", :id, "--memory", 2048]
- vb.customize ["modifyvm", :id, "--cpus", 2]
- vb.customize ["modifyvm", :id, "--ioapic", "on"]
- end
-
- config.vm.box = "hashicorp-vagrant/ubuntu-16.04"
- config.vm.provision :shell, path: "vagrant-provision.sh"
-end
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
deleted file mode 100644
index ed78a83..0000000
--- a/snap/snapcraft.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: orc
-version: '1.5.2'
-summary: Apache ORC is the fastest columnar file format for big data.
-description: |
- Apache ORC is the smallest, fastest columnar file format for Spark
- or Hadoop workloads. This snap includes the command line tools to
- inspect, read, and write ORC files.
-
-grade: stable
-confinement: strict
-
-parts:
- orc:
- source: https://github.com/apache/orc.git
- source-type: git
- source-tag: rel/release-1.5.2
- plugin: cmake
- configflags:
- - -DLZ4_HOME=/usr
- - -DPROTOBUF_HOME=/usr
- - -DSNAPPY_HOME=/usr
- - -DZLIB_HOME=/usr
- build-packages:
- - build-essential
- - cmake
- - liblz4-dev
- - make
- - libprotobuf-dev
- - libprotoc-dev
- - libsasl2-dev
- - libsnappy-dev
- - maven
- - openjdk-8-jdk-headless
- - protobuf-compiler
- - zlib1g-dev
- stage-packages:
- - libdb5.3
- - libsasl2-2
- - openjdk-8-jre-headless
-
-apps:
- contents:
- command: bin/orc-contents
- plugs: [home, network, removable-media]
- java:
- command: usr/lib/jvm/java-8-openjdk-amd64/bin/java -jar "$(ls $SNAP/share/orc-tools*.jar)"
- plugs: [home, network, removable-media]
- metadata:
- command: bin/orc-metadata
- plugs: [home, network, removable-media]
- statistics:
- command: bin/orc-statistics
- plugs: [home, network, removable-media]
diff --git a/snap/vagrant-provision.sh b/snap/vagrant-provision.sh
deleted file mode 100644
index be08316..0000000
--- a/snap/vagrant-provision.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# 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.
-
-apt-get update
-DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
-apt-get install -y \
- emacs-nox \
- snapcraft