Skip to content

Commit c1101e2

Browse files
author
jmorton
committed
Bump version number
1 parent c66cefd commit c1101e2

File tree

6 files changed

+29
-7
lines changed

6 files changed

+29
-7
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MKDIR_P = mkdir -p
22
NAME = tableau-sdk-wrapper
3-
VERSION = 1.1
3+
VERSION = 1.2
44
BUILD_DIR = ${NAME}-${VERSION}
55
ARTIFACT = tableau-${VERSION}.jar
66
ARCHIVE = ${NAME}-${VERSION}.zip
@@ -20,7 +20,9 @@ mkdir:
2020
${MKDIR_P} ${BUILD_DIR}/logs
2121

2222
copy_files:
23-
cp ${TARGET}/${ARTIFACT} ${BUILD_DIR}/lib
23+
mkdir -p lib
24+
cp ${TARGET}/${ARTIFACT} lib/
25+
cp ${TARGET}/${ARTIFACT} ${BUILD_DIR}/lib/
2426
cp -a ${SAMPLES}/* ${BUILD_DIR}/samples/
2527
cp -a ${BIN_DIR}/* ${BUILD_DIR}/bin/
2628

README.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,32 @@ On my small dual core Macbook Pro, I see the following performance:
1414
2 Threads: 40,072 rows/second
1515
3 Threads: 44,624 rows/second
1616
```
17+
18+
On my 4-core 2015 iMac, I see the following performance:
19+
```
20+
1 Thread: 37,034 rows/s
21+
2 Threads: 53,494 rows/s
22+
3 Threads: 60,181 rows/s
23+
4 Threads: 66,868 rows/s
24+
```
25+
1726
# Platforms
1827
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.
1928

20-
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.
29+
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).
2130

2231
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.
2332

33+
## Docker
34+
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:
35+
```
36+
docker run --rm -it -v ~/tableau:/build \
37+
jlmorton/tableau-sdk-wrapper:latest \
38+
/opt/tableau-sdk-wrapper/bin/extract.sh -o /build/sample.tde -s /build/sample.schema -f /build/sample.csv -t 4
39+
```
40+
41+
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.
42+
2443
# Dependencies
2544

2645
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.

bin/extract.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.."
33
LIB="$DIR/lib"
44
MAX_MEMORY="2g"
5-
JARFILE="$LIB/tableau-1.1.jar"
5+
JARFILE="$LIB/tableau-1.2.jar"
66
SDK_DIR="$LIB/tableausdk-linux64-10300.18.0510.1135"
77
JAVA_SDK_DIR="$SDK_DIR/lib64/tableausdk/Java/"
88

bin/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33
BASE_PATH="$DIR/..";
44
LIB="$BASE_PATH/lib"
5-
JARFILE="$LIB/tableau-1.1.jar"
5+
JARFILE="$LIB/tableau-1.2.jar"
66
SDK_DIR="$LIB/tableausdk-linux64-10300.18.0510.1135"
77
JAVA_SDK_DIR="$SDK_DIR/lib64/tableausdk/Java/"
88

docker/Dockerfile.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ RUN apt-get update -y && apt-get install -y openjdk-8-jdk-headless libglib2.0 wg
66

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

9-
RUN /opt/tableau-sdk-wrapper/bin/install_tableau_sdk.sh -w
9+
RUN /opt/tableau-sdk-wrapper/bin/install_tableau_sdk.sh -w && \
10+
rm -f /opt/tableau-sdk-wrapper/tmp/TableauSDK.tar.gz

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>net.jlmorton</groupId>
66
<artifactId>tableau</artifactId>
7-
<version>1.1</version>
7+
<version>1.2</version>
88
<properties>
99
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1010
<java.language.version>1.8</java.language.version>

0 commit comments

Comments
 (0)