Skip to content

Commit

Permalink
Bump version number
Browse files Browse the repository at this point in the history
  • Loading branch information
jmorton committed May 29, 2018
1 parent c66cefd commit c1101e2
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 7 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MKDIR_P = mkdir -p
NAME = tableau-sdk-wrapper
VERSION = 1.1
VERSION = 1.2
BUILD_DIR = ${NAME}-${VERSION}
ARTIFACT = tableau-${VERSION}.jar
ARCHIVE = ${NAME}-${VERSION}.zip
Expand All @@ -20,7 +20,9 @@ mkdir:
${MKDIR_P} ${BUILD_DIR}/logs

copy_files:
cp ${TARGET}/${ARTIFACT} ${BUILD_DIR}/lib
mkdir -p lib
cp ${TARGET}/${ARTIFACT} lib/
cp ${TARGET}/${ARTIFACT} ${BUILD_DIR}/lib/
cp -a ${SAMPLES}/* ${BUILD_DIR}/samples/
cp -a ${BIN_DIR}/* ${BUILD_DIR}/bin/

Expand Down
21 changes: 20 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,32 @@ On my small dual core Macbook Pro, I see the following performance:
2 Threads: 40,072 rows/second
3 Threads: 44,624 rows/second
```

On my 4-core 2015 iMac, I see the following performance:
```
1 Thread: 37,034 rows/s
2 Threads: 53,494 rows/s
3 Threads: 60,181 rows/s
4 Threads: 66,868 rows/s
```

# Platforms
I have tested this on CentOS 7, and OS X High Sierra. The Tableau SDK supports Fedora 18 and later, CentOS 7 and later, and Ubuntu 12.04 and later. Support for CentOS 6 was removed from the Tableau SDK in version 10.2 of the SDK.

If you encounter a problem such as `java.lang.UnsatisfiedLinkError: Unable to load library TableauCommon: /lib64/libc.so.6: version 'GLIBC_2.14' not found`, your OS is unfortunately not supported. Docker containers may help in this situation.
If you encounter a problem such as `java.lang.UnsatisfiedLinkError: Unable to load library TableauCommon: /lib64/libc.so.6: version 'GLIBC_2.14' not found`, your OS is unfortunately not supported. Consider running in a Docker container (see below).

I have not tested this on Windows. Certainly the various shell scripts will not work, but you should be able to install the SDK for Windows and invoke Java directly. Any pull requests to add better support for Windows would be appreciated.

## Docker
There are public images for this project in Docker Hub. You can simple mount a Docker volume, and invoke this utility within the container. For example, assuming you have a folder called "Tableau" within your home directory:
```
docker run --rm -it -v ~/tableau:/build \
jlmorton/tableau-sdk-wrapper:latest \
/opt/tableau-sdk-wrapper/bin/extract.sh -o /build/sample.tde -s /build/sample.schema -f /build/sample.csv -t 4
```

This will download the latest image from Docker Hub, run a container, and attempt to build a TDE extract using the "sample.csv" and "sample.schema" within your ~/tableau folder.

# Dependencies

This library uses the Tableau SDK to create and publish Tableau extracts. This SDK is not available in Central Maven repositories. The SDK license allows distribution, but I've chosen to exclude it from this repository.
Expand Down
2 changes: 1 addition & 1 deletion bin/extract.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.."
LIB="$DIR/lib"
MAX_MEMORY="2g"
JARFILE="$LIB/tableau-1.1.jar"
JARFILE="$LIB/tableau-1.2.jar"
SDK_DIR="$LIB/tableausdk-linux64-10300.18.0510.1135"
JAVA_SDK_DIR="$SDK_DIR/lib64/tableausdk/Java/"

Expand Down
2 changes: 1 addition & 1 deletion bin/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BASE_PATH="$DIR/..";
LIB="$BASE_PATH/lib"
JARFILE="$LIB/tableau-1.1.jar"
JARFILE="$LIB/tableau-1.2.jar"
SDK_DIR="$LIB/tableausdk-linux64-10300.18.0510.1135"
JAVA_SDK_DIR="$SDK_DIR/lib64/tableausdk/Java/"

Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ RUN apt-get update -y && apt-get install -y openjdk-8-jdk-headless libglib2.0 wg

ADD %ARTIFACT_DIR% /opt/tableau-sdk-wrapper

RUN /opt/tableau-sdk-wrapper/bin/install_tableau_sdk.sh -w
RUN /opt/tableau-sdk-wrapper/bin/install_tableau_sdk.sh -w && \
rm -f /opt/tableau-sdk-wrapper/tmp/TableauSDK.tar.gz
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.jlmorton</groupId>
<artifactId>tableau</artifactId>
<version>1.1</version>
<version>1.2</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.language.version>1.8</java.language.version>
Expand Down

0 comments on commit c1101e2

Please sign in to comment.